diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6a971a8..16e3c7d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -4,9 +4,7 @@ project(icsneonext VERSION 0.1.0)
 set(CMAKE_CXX_STANDARD 11)
 
 include(GNUInstallDirs)
-
-message(STATUS "icsneo source dir ${CMAKE_CURRENT_SOURCE_DIR}")
-include_directories(${CMAKE_CURRENT_SOURCE_DIR})
+include_directories(${CMAKE_CURRENT_SOURCE_DIR}/include)
 
 # Enable Warnings
 if(MSVC)
diff --git a/api/icsneoc/icsneoc.cpp b/api/icsneoc/icsneoc.cpp
index b4853a9..2015eb3 100644
--- a/api/icsneoc/icsneoc.cpp
+++ b/api/icsneoc/icsneoc.cpp
@@ -4,9 +4,9 @@
 
 #define ICSNEOC_MAKEDLL
 
-#include "include/icsneoc.h"
-#include "api/icsneocpp/include/icsneocpp.h"
-#include "platform/include/dynamiclib.h"
+#include "icsneo/icsneoc.h"
+#include "icsneo/icsneocpp.h"
+#include "icsneo/platform/dynamiclib.h"
 #include <string>
 #include <vector>
 #include <memory>
diff --git a/api/icsneocpp/icsneocpp.cpp b/api/icsneocpp/icsneocpp.cpp
index fa950b5..c152a19 100644
--- a/api/icsneocpp/icsneocpp.cpp
+++ b/api/icsneocpp/icsneocpp.cpp
@@ -1,8 +1,8 @@
 #include <iterator>
 #include <iostream>
 
-#include "include/icsneocpp.h"
-#include "device/include/devicefinder.h"
+#include "icsneo/icsneocpp.h"
+#include "icsneo/device/devicefinder.h"
 
 using namespace icsneo;
 
diff --git a/api/icsneolegacy/dllhelper/include/icsneo40DLLAPI.h b/api/icsneolegacy/dllhelper/icsneo40DLLAPI.h
similarity index 99%
rename from api/icsneolegacy/dllhelper/include/icsneo40DLLAPI.h
rename to api/icsneolegacy/dllhelper/icsneo40DLLAPI.h
index 459bc38..2a4aff3 100644
--- a/api/icsneolegacy/dllhelper/include/icsneo40DLLAPI.h
+++ b/api/icsneolegacy/dllhelper/icsneo40DLLAPI.h
@@ -1,7 +1,7 @@
 //FILE: icsneo40DLLAPI.H
 
 #include <windows.h>
-#include "icsnVC40.h"
+#include "icsneo/icsnVC40.h"
 
 
 
diff --git a/api/icsneolegacy/icsneolegacy.cpp b/api/icsneolegacy/icsneolegacy.cpp
index a7a8eed..c71b1a7 100644
--- a/api/icsneolegacy/icsneolegacy.cpp
+++ b/api/icsneolegacy/icsneolegacy.cpp
@@ -3,12 +3,12 @@
 #endif
 
 #define ICSNEOC_MAKEDLL
-#include "api/icsneolegacy/include/icsneolegacy.h"
+#include "icsneo/icsneolegacy.h"
 
 #undef ICSNEOC_MAKEDLL
-#include "api/icsneoc/include/icsneoc.h"
+#include "icsneo/icsneoc.h"
 
-#include "communication/include/network.h"
+#include "icsneo/communication/network.h"
 #include <map>
 #include <algorithm>
 
diff --git a/communication/communication.cpp b/communication/communication.cpp
index 4b525e4..b2a0479 100644
--- a/communication/communication.cpp
+++ b/communication/communication.cpp
@@ -1,4 +1,4 @@
-#include "communication/include/communication.h"
+#include "icsneo/communication/communication.h"
 #include <chrono>
 #include <iostream>
 #include <queue>
@@ -6,11 +6,11 @@
 #include <cstring>
 #include <mutex>
 #include <condition_variable>
-#include "communication/include/command.h"
-#include "communication/include/decoder.h"
-#include "communication/include/packetizer.h"
-#include "communication/message/include/serialnumbermessage.h"
-#include "communication/message/filter/include/main51messagefilter.h"
+#include "icsneo/communication/command.h"
+#include "icsneo/communication/decoder.h"
+#include "icsneo/communication/packetizer.h"
+#include "icsneo/communication/message/serialnumbermessage.h"
+#include "icsneo/communication/message/filter/main51messagefilter.h"
 
 using namespace icsneo;
 
diff --git a/communication/decoder.cpp b/communication/decoder.cpp
index 5499ed9..86b7393 100644
--- a/communication/decoder.cpp
+++ b/communication/decoder.cpp
@@ -1,9 +1,9 @@
-#include "communication/include/decoder.h"
-#include "communication/include/communication.h"
-#include "communication/message/include/serialnumbermessage.h"
-#include "communication/message/include/resetstatusmessage.h"
-#include "communication/include/command.h"
-#include "device/include/device.h"
+#include "icsneo/communication/decoder.h"
+#include "icsneo/communication/communication.h"
+#include "icsneo/communication/message/serialnumbermessage.h"
+#include "icsneo/communication/message/resetstatusmessage.h"
+#include "icsneo/communication/command.h"
+#include "icsneo/device/device.h"
 #include <iostream>
 
 using namespace icsneo;
diff --git a/communication/encoder.cpp b/communication/encoder.cpp
index 3f8293d..f41fe66 100644
--- a/communication/encoder.cpp
+++ b/communication/encoder.cpp
@@ -1,4 +1,4 @@
-#include "communication/include/encoder.h"
+#include "icsneo/communication/encoder.h"
 
 using namespace icsneo;
 
diff --git a/communication/icommunication.cpp b/communication/icommunication.cpp
index 2c7dd9b..87c7c01 100644
--- a/communication/icommunication.cpp
+++ b/communication/icommunication.cpp
@@ -1,4 +1,4 @@
-#include "communication/include/icommunication.h"
+#include "icsneo/communication/icommunication.h"
 
 using namespace icsneo;
 
diff --git a/communication/message/neomessage.cpp b/communication/message/neomessage.cpp
index 97aa0fa..aef02ff 100644
--- a/communication/message/neomessage.cpp
+++ b/communication/message/neomessage.cpp
@@ -1,5 +1,5 @@
-#include "communication/message/include/neomessage.h"
-#include "communication/message/include/canmessage.h"
+#include "icsneo/communication/message/neomessage.h"
+#include "icsneo/communication/message/canmessage.h"
 
 using namespace icsneo;
 
diff --git a/communication/multichannelcommunication.cpp b/communication/multichannelcommunication.cpp
index 6bdf8a3..338bebd 100644
--- a/communication/multichannelcommunication.cpp
+++ b/communication/multichannelcommunication.cpp
@@ -1,7 +1,7 @@
-#include "communication/include/multichannelcommunication.h"
-#include "communication/include/command.h"
-#include "communication/include/decoder.h"
-#include "communication/include/packetizer.h"
+#include "icsneo/communication/multichannelcommunication.h"
+#include "icsneo/communication/command.h"
+#include "icsneo/communication/decoder.h"
+#include "icsneo/communication/packetizer.h"
 #include <iostream>
 #include <iomanip>
 
diff --git a/communication/packetizer.cpp b/communication/packetizer.cpp
index d6157bb..f20bb26 100644
--- a/communication/packetizer.cpp
+++ b/communication/packetizer.cpp
@@ -1,4 +1,4 @@
-#include "communication/include/packetizer.h"
+#include "icsneo/communication/packetizer.h"
 #include <iostream>
 #include <iomanip>
 
diff --git a/device/device.cpp b/device/device.cpp
index acfa870..e4f2d60 100644
--- a/device/device.cpp
+++ b/device/device.cpp
@@ -1,6 +1,6 @@
-#include "include/device.h"
-#include "communication/message/callback/include/messagecallback.h"
-#include "communication/include/command.h"
+#include "icsneo/device/device.h"
+#include "icsneo/communication/message/callback/messagecallback.h"
+#include "icsneo/communication/command.h"
 #include <string.h>
 #include <iostream>
 #include <sstream>
diff --git a/device/devicefinder.cpp b/device/devicefinder.cpp
index 08bd969..a15ee74 100644
--- a/device/devicefinder.cpp
+++ b/device/devicefinder.cpp
@@ -1,5 +1,5 @@
-#include "device/include/devicefinder.h"
-#include "platform/include/devices.h"
+#include "icsneo/device/devicefinder.h"
+#include "icsneo/platform/devices.h"
 
 using namespace icsneo;
 
diff --git a/device/idevicesettings.cpp b/device/idevicesettings.cpp
index e05d56d..0c81e1a 100644
--- a/device/idevicesettings.cpp
+++ b/device/idevicesettings.cpp
@@ -1,5 +1,5 @@
-#include "device/include/idevicesettings.h"
-#include "communication/message/filter/include/main51messagefilter.h"
+#include "icsneo/device/idevicesettings.h"
+#include "icsneo/communication/message/filter/main51messagefilter.h"
 #include <cstring>
 
 using namespace icsneo;
diff --git a/communication/include/command.h b/include/icsneo/communication/command.h
similarity index 100%
rename from communication/include/command.h
rename to include/icsneo/communication/command.h
diff --git a/communication/include/communication.h b/include/icsneo/communication/communication.h
similarity index 81%
rename from communication/include/communication.h
rename to include/icsneo/communication/communication.h
index e8ccae6..28175cd 100644
--- a/communication/include/communication.h
+++ b/include/icsneo/communication/communication.h
@@ -1,15 +1,15 @@
 #ifndef __COMMUNICATION_H_
 #define __COMMUNICATION_H_
 
-#include "communication/include/icommunication.h"
-#include "communication/include/command.h"
-#include "communication/include/network.h"
-#include "communication/include/packet.h"
-#include "communication/message/callback/include/messagecallback.h"
-#include "communication/message/include/serialnumbermessage.h"
-#include "communication/include/packetizer.h"
-#include "communication/include/encoder.h"
-#include "communication/include/decoder.h"
+#include "icsneo/communication/icommunication.h"
+#include "icsneo/communication/command.h"
+#include "icsneo/communication/network.h"
+#include "icsneo/communication/packet.h"
+#include "icsneo/communication/message/callback/messagecallback.h"
+#include "icsneo/communication/message/serialnumbermessage.h"
+#include "icsneo/communication/packetizer.h"
+#include "icsneo/communication/encoder.h"
+#include "icsneo/communication/decoder.h"
 #include <memory>
 #include <vector>
 #include <atomic>
diff --git a/communication/include/decoder.h b/include/icsneo/communication/decoder.h
similarity index 92%
rename from communication/include/decoder.h
rename to include/icsneo/communication/decoder.h
index 45105b2..e12fb56 100644
--- a/communication/include/decoder.h
+++ b/include/icsneo/communication/decoder.h
@@ -1,10 +1,10 @@
 #ifndef __DECODER_H_
 #define __DECODER_H_
 
-#include "communication/message/include/message.h"
-#include "communication/message/include/canmessage.h"
-#include "communication/include/packet.h"
-#include "communication/include/network.h"
+#include "icsneo/communication/message/message.h"
+#include "icsneo/communication/message/canmessage.h"
+#include "icsneo/communication/packet.h"
+#include "icsneo/communication/network.h"
 #include <queue>
 #include <vector>
 #include <memory>
diff --git a/communication/include/encoder.h b/include/icsneo/communication/encoder.h
similarity index 70%
rename from communication/include/encoder.h
rename to include/icsneo/communication/encoder.h
index 078e48e..575a4b0 100644
--- a/communication/include/encoder.h
+++ b/include/icsneo/communication/encoder.h
@@ -1,12 +1,12 @@
 #ifndef __ENCODER_H_
 #define __ENCODER_H_
 
-#include "communication/message/include/message.h"
-#include "communication/message/include/canmessage.h"
-#include "communication/include/packet.h"
-#include "communication/include/command.h"
-#include "communication/include/network.h"
-#include "communication/include/packetizer.h"
+#include "icsneo/communication/message/message.h"
+#include "icsneo/communication/message/canmessage.h"
+#include "icsneo/communication/packet.h"
+#include "icsneo/communication/command.h"
+#include "icsneo/communication/network.h"
+#include "icsneo/communication/packetizer.h"
 #include <queue>
 #include <vector>
 #include <memory>
diff --git a/communication/include/icommunication.h b/include/icsneo/communication/icommunication.h
similarity index 89%
rename from communication/include/icommunication.h
rename to include/icsneo/communication/icommunication.h
index 784f72b..4e613d6 100644
--- a/communication/include/icommunication.h
+++ b/include/icsneo/communication/icommunication.h
@@ -5,7 +5,7 @@
 #include <chrono>
 #include <atomic>
 #include <thread>
-#include "third-party/concurrentqueue/blockingconcurrentqueue.h"
+#include "icsneo/third-party/concurrentqueue/blockingconcurrentqueue.h"
 
 namespace icsneo {
 
diff --git a/communication/message/callback/include/canmessagecallback.h b/include/icsneo/communication/message/callback/canmessagecallback.h
similarity index 79%
rename from communication/message/callback/include/canmessagecallback.h
rename to include/icsneo/communication/message/callback/canmessagecallback.h
index 8bdfcd4..6758c98 100644
--- a/communication/message/callback/include/canmessagecallback.h
+++ b/include/icsneo/communication/message/callback/canmessagecallback.h
@@ -1,9 +1,9 @@
 #ifndef __CANMESSAGECALLBACK_H_
 #define __CANMESSAGECALLBACK_H_
 
-#include "communication/message/callback/include/messagecallback.h"
-#include "communication/message/include/canmessage.h"
-#include "communication/message/filter/include/canmessagefilter.h"
+#include "icsneo/communication/message/callback/messagecallback.h"
+#include "icsneo/communication/message/canmessage.h"
+#include "icsneo/communication/message/filter/canmessagefilter.h"
 #include <memory>
 
 namespace icsneo {
diff --git a/communication/message/callback/include/main51messagecallback.h b/include/icsneo/communication/message/callback/main51messagecallback.h
similarity index 79%
rename from communication/message/callback/include/main51messagecallback.h
rename to include/icsneo/communication/message/callback/main51messagecallback.h
index c508ab2..71269da 100644
--- a/communication/message/callback/include/main51messagecallback.h
+++ b/include/icsneo/communication/message/callback/main51messagecallback.h
@@ -1,9 +1,9 @@
 #ifndef __MAIN51MESSAGECALLBACK_H_
 #define __MAIN51MESSAGECALLBACK_H_
 
-#include "communication/message/callback/include/messagecallback.h"
-#include "communication/message/include/main51message.h"
-#include "communication/message/filter/include/main51messagefilter.h"
+#include "icsneo/communication/message/callback/messagecallback.h"
+#include "icsneo/communication/message/main51message.h"
+#include "icsneo/communication/message/filter/main51messagefilter.h"
 #include <memory>
 
 namespace icsneo {
diff --git a/communication/message/callback/include/messagecallback.h b/include/icsneo/communication/message/callback/messagecallback.h
similarity index 88%
rename from communication/message/callback/include/messagecallback.h
rename to include/icsneo/communication/message/callback/messagecallback.h
index 325178f..279c3a7 100644
--- a/communication/message/callback/include/messagecallback.h
+++ b/include/icsneo/communication/message/callback/messagecallback.h
@@ -1,8 +1,8 @@
 #ifndef __MESSAGECALLBACK_H_
 #define __MESSAGECALLBACK_H_
 
-#include "communication/message/include/message.h"
-#include "communication/message/filter/include/messagefilter.h"
+#include "icsneo/communication/message/message.h"
+#include "icsneo/communication/message/filter/messagefilter.h"
 #include <memory>
 #include <functional>
 
diff --git a/communication/message/include/canmessage.h b/include/icsneo/communication/message/canmessage.h
similarity index 78%
rename from communication/message/include/canmessage.h
rename to include/icsneo/communication/message/canmessage.h
index ea750f1..7c1dc80 100644
--- a/communication/message/include/canmessage.h
+++ b/include/icsneo/communication/message/canmessage.h
@@ -1,7 +1,7 @@
 #ifndef __CANMESSAGE_H_
 #define __CANMESSAGE_H_
 
-#include "communication/message/include/message.h"
+#include "icsneo/communication/message/message.h"
 
 namespace icsneo {
 
diff --git a/communication/message/filter/include/canmessagefilter.h b/include/icsneo/communication/message/filter/canmessagefilter.h
similarity index 78%
rename from communication/message/filter/include/canmessagefilter.h
rename to include/icsneo/communication/message/filter/canmessagefilter.h
index 6e28d18..4bc9b93 100644
--- a/communication/message/filter/include/canmessagefilter.h
+++ b/include/icsneo/communication/message/filter/canmessagefilter.h
@@ -1,10 +1,10 @@
 #ifndef __CANMESSAGEFILTER_H_
 #define __CANMESSAGEFILTER_H_
 
-#include "communication/message/filter/include/messagefilter.h"
-#include "communication/include/network.h"
-#include "communication/message/include/message.h"
-#include "communication/message/include/canmessage.h"
+#include "icsneo/communication/message/filter/messagefilter.h"
+#include "icsneo/communication/network.h"
+#include "icsneo/communication/message/message.h"
+#include "icsneo/communication/message/canmessage.h"
 #include <memory>
 
 namespace icsneo {
diff --git a/communication/message/filter/include/main51messagefilter.h b/include/icsneo/communication/message/filter/main51messagefilter.h
similarity index 84%
rename from communication/message/filter/include/main51messagefilter.h
rename to include/icsneo/communication/message/filter/main51messagefilter.h
index cf09bab..2466029 100644
--- a/communication/message/filter/include/main51messagefilter.h
+++ b/include/icsneo/communication/message/filter/main51messagefilter.h
@@ -1,10 +1,10 @@
 #ifndef __MAIN51MESSAGEFILTER_H_
 #define __MAIN51MESSAGEFILTER_H_
 
-#include "communication/message/filter/include/messagefilter.h"
-#include "communication/include/network.h"
-#include "communication/include/communication.h"
-#include "communication/message/include/main51message.h"
+#include "icsneo/communication/message/filter/messagefilter.h"
+#include "icsneo/communication/network.h"
+#include "icsneo/communication/communication.h"
+#include "icsneo/communication/message/main51message.h"
 #include <memory>
 #include <iostream>
 
diff --git a/communication/message/filter/include/messagefilter.h b/include/icsneo/communication/message/filter/messagefilter.h
similarity index 87%
rename from communication/message/filter/include/messagefilter.h
rename to include/icsneo/communication/message/filter/messagefilter.h
index 2320cc2..6e16784 100644
--- a/communication/message/filter/include/messagefilter.h
+++ b/include/icsneo/communication/message/filter/messagefilter.h
@@ -1,8 +1,8 @@
 #ifndef __MESSAGEFILTER_H_
 #define __MESSAGEFILTER_H_
 
-#include "communication/include/network.h"
-#include "communication/message/include/message.h"
+#include "icsneo/communication/network.h"
+#include "icsneo/communication/message/message.h"
 #include <memory>
 
 namespace icsneo {
diff --git a/communication/message/include/main51message.h b/include/icsneo/communication/message/main51message.h
similarity index 63%
rename from communication/message/include/main51message.h
rename to include/icsneo/communication/message/main51message.h
index 1a5eb61..5effebb 100644
--- a/communication/message/include/main51message.h
+++ b/include/icsneo/communication/message/main51message.h
@@ -1,8 +1,8 @@
 #ifndef __MAIN51MESSAGE_H_
 #define __MAIN51MESSAGE_H_
 
-#include "communication/message/include/message.h"
-#include "communication/include/communication.h"
+#include "icsneo/communication/message/message.h"
+#include "icsneo/communication/communication.h"
 
 namespace icsneo {
 
diff --git a/communication/message/include/message.h b/include/icsneo/communication/message/message.h
similarity index 75%
rename from communication/message/include/message.h
rename to include/icsneo/communication/message/message.h
index 3379d1d..41255b9 100644
--- a/communication/message/include/message.h
+++ b/include/icsneo/communication/message/message.h
@@ -1,7 +1,7 @@
 #ifndef __MESSAGE_H_
 #define __MESSAGE_H_
 
-#include "communication/include/network.h"
+#include "icsneo/communication/network.h"
 #include <vector>
 
 namespace icsneo {
diff --git a/communication/message/include/neomessage.h b/include/icsneo/communication/message/neomessage.h
similarity index 98%
rename from communication/message/include/neomessage.h
rename to include/icsneo/communication/message/neomessage.h
index ef10c79..b4b7709 100644
--- a/communication/message/include/neomessage.h
+++ b/include/icsneo/communication/message/neomessage.h
@@ -119,7 +119,7 @@ typedef struct {
 #pragma pack(pop)
 
 #ifdef __cplusplus
-#include "communication/message/include/message.h"
+#include "icsneo/communication/message/message.h"
 #include <memory>
 
 static_assert(sizeof(neomessage_can_t) == sizeof(neomessage_t), "All types of neomessage_t must be the same size!");
diff --git a/communication/message/include/resetstatusmessage.h b/include/icsneo/communication/message/resetstatusmessage.h
similarity index 85%
rename from communication/message/include/resetstatusmessage.h
rename to include/icsneo/communication/message/resetstatusmessage.h
index e67b36f..63fbe92 100644
--- a/communication/message/include/resetstatusmessage.h
+++ b/include/icsneo/communication/message/resetstatusmessage.h
@@ -1,8 +1,8 @@
 #ifndef __RESETSTATUSMESSAGE_H_
 #define __RESETSTATUSMESSAGE_H_
 
-#include "communication/message/include/main51message.h"
-#include "communication/include/command.h"
+#include "icsneo/communication/message/main51message.h"
+#include "icsneo/communication/command.h"
 #include <string>
 
 namespace icsneo {
diff --git a/communication/message/include/serialnumbermessage.h b/include/icsneo/communication/message/serialnumbermessage.h
similarity index 85%
rename from communication/message/include/serialnumbermessage.h
rename to include/icsneo/communication/message/serialnumbermessage.h
index 64e7b85..1fcb55b 100644
--- a/communication/message/include/serialnumbermessage.h
+++ b/include/icsneo/communication/message/serialnumbermessage.h
@@ -1,8 +1,8 @@
 #ifndef __SERIALNUMBERMESSAGE_H_
 #define __SERIALNUMBERMESSAGE_H_
 
-#include "communication/message/include/main51message.h"
-#include "communication/include/command.h"
+#include "icsneo/communication/message/main51message.h"
+#include "icsneo/communication/command.h"
 #include <string>
 
 namespace icsneo {
diff --git a/communication/include/multichannelcommunication.h b/include/icsneo/communication/multichannelcommunication.h
similarity index 94%
rename from communication/include/multichannelcommunication.h
rename to include/icsneo/communication/multichannelcommunication.h
index fc3ebe5..96009e5 100644
--- a/communication/include/multichannelcommunication.h
+++ b/include/icsneo/communication/multichannelcommunication.h
@@ -1,10 +1,10 @@
 #ifndef __MULTICHANNELCOMMUNICATION_H_
 #define __MULTICHANNELCOMMUNICATION_H_
 
-#include "communication/include/communication.h"
-#include "communication/include/icommunication.h"
-#include "communication/include/command.h"
-#include "communication/include/encoder.h"
+#include "icsneo/communication/communication.h"
+#include "icsneo/communication/icommunication.h"
+#include "icsneo/communication/command.h"
+#include "icsneo/communication/encoder.h"
 
 namespace icsneo {
 
diff --git a/communication/include/network.h b/include/icsneo/communication/network.h
similarity index 100%
rename from communication/include/network.h
rename to include/icsneo/communication/network.h
diff --git a/communication/include/packet.h b/include/icsneo/communication/packet.h
similarity index 78%
rename from communication/include/packet.h
rename to include/icsneo/communication/packet.h
index 54188f2..4956ae8 100644
--- a/communication/include/packet.h
+++ b/include/icsneo/communication/packet.h
@@ -1,7 +1,7 @@
 #ifndef __PACKET_H_
 #define __PACKET_H_
 
-#include "communication/include/network.h"
+#include "icsneo/communication/network.h"
 #include <vector>
 #include <stdint.h>
 
diff --git a/communication/include/packetizer.h b/include/icsneo/communication/packetizer.h
similarity index 95%
rename from communication/include/packetizer.h
rename to include/icsneo/communication/packetizer.h
index c11d9a8..822d2a6 100644
--- a/communication/include/packetizer.h
+++ b/include/icsneo/communication/packetizer.h
@@ -1,7 +1,7 @@
 #ifndef __PACKETIZER_H_
 #define __PACKETIZER_H_
 
-#include "communication/include/packet.h"
+#include "icsneo/communication/packet.h"
 #include <queue>
 #include <vector>
 #include <memory>
diff --git a/device/include/device.h b/include/icsneo/device/device.h
similarity index 84%
rename from device/include/device.h
rename to include/icsneo/device/device.h
index 7a8d660..7a05f90 100644
--- a/device/include/device.h
+++ b/include/icsneo/device/device.h
@@ -4,15 +4,15 @@
 #include <vector>
 #include <memory>
 #include <cstring>
-#include "device/include/neodevice.h"
-#include "device/include/idevicesettings.h"
-#include "device/include/devicetype.h"
-#include "communication/include/communication.h"
-#include "communication/include/packetizer.h"
-#include "communication/include/encoder.h"
-#include "communication/include/decoder.h"
-#include "communication/message/include/resetstatusmessage.h"
-#include "third-party/concurrentqueue/concurrentqueue.h"
+#include "icsneo/device/neodevice.h"
+#include "icsneo/device/idevicesettings.h"
+#include "icsneo/device/devicetype.h"
+#include "icsneo/communication/communication.h"
+#include "icsneo/communication/packetizer.h"
+#include "icsneo/communication/encoder.h"
+#include "icsneo/communication/decoder.h"
+#include "icsneo/communication/message/resetstatusmessage.h"
+#include "icsneo/third-party/concurrentqueue/concurrentqueue.h"
 
 namespace icsneo {
 
diff --git a/device/include/devicefinder.h b/include/icsneo/device/devicefinder.h
similarity index 77%
rename from device/include/devicefinder.h
rename to include/icsneo/device/devicefinder.h
index c98cf9c..56d1194 100644
--- a/device/include/devicefinder.h
+++ b/include/icsneo/device/devicefinder.h
@@ -1,7 +1,7 @@
 #ifndef __DEVICEFINDER_H_
 #define __DEVICEFINDER_H_
 
-#include "device/include/device.h"
+#include "icsneo/device/device.h"
 #include <vector>
 #include <memory>
 
diff --git a/device/include/devicetype.h b/include/icsneo/device/devicetype.h
similarity index 100%
rename from device/include/devicetype.h
rename to include/icsneo/device/devicetype.h
diff --git a/device/include/idevicesettings.h b/include/icsneo/device/idevicesettings.h
similarity index 99%
rename from device/include/idevicesettings.h
rename to include/icsneo/device/idevicesettings.h
index 270d4d6..b47102d 100644
--- a/device/include/idevicesettings.h
+++ b/include/icsneo/device/idevicesettings.h
@@ -271,7 +271,7 @@ typedef struct _UART_SETTINGS
 #pragma pack(pop)
 
 #ifdef __cplusplus
-#include "communication/include/communication.h"
+#include "icsneo/communication/communication.h"
 #include <iostream>
 
 namespace icsneo {
diff --git a/device/include/neodevice.h b/include/icsneo/device/neodevice.h
similarity index 92%
rename from device/include/neodevice.h
rename to include/icsneo/device/neodevice.h
index 3990d2c..e1ae7ce 100644
--- a/device/include/neodevice.h
+++ b/include/icsneo/device/neodevice.h
@@ -2,7 +2,7 @@
 #define __NEODEVICE_H_
 
 #include <stdint.h>
-#include "device/include/devicetype.h"
+#include "icsneo/device/devicetype.h"
 
 #ifdef __cplusplus
 // A forward declaration is needed as there is a circular dependency
diff --git a/device/neoobd2pro/include/neoobd2pro.h b/include/icsneo/device/neoobd2pro/neoobd2pro.h
similarity index 89%
rename from device/neoobd2pro/include/neoobd2pro.h
rename to include/icsneo/device/neoobd2pro/neoobd2pro.h
index 3f7f5aa..ea04f1c 100644
--- a/device/neoobd2pro/include/neoobd2pro.h
+++ b/include/icsneo/device/neoobd2pro/neoobd2pro.h
@@ -1,9 +1,9 @@
 #ifndef __NEOOBD2PRO_H_
 #define __NEOOBD2PRO_H_
 
-#include "device/include/device.h"
-#include "device/include/devicetype.h"
-#include "platform/include/stm32.h"
+#include "icsneo/device/device.h"
+#include "icsneo/device/devicetype.h"
+#include "icsneo/platform/stm32.h"
 
 namespace icsneo {
 
diff --git a/device/neoobd2sim/include/neoobd2sim.h b/include/icsneo/device/neoobd2sim/neoobd2sim.h
similarity index 89%
rename from device/neoobd2sim/include/neoobd2sim.h
rename to include/icsneo/device/neoobd2sim/neoobd2sim.h
index 07b1126..5af0553 100644
--- a/device/neoobd2sim/include/neoobd2sim.h
+++ b/include/icsneo/device/neoobd2sim/neoobd2sim.h
@@ -1,9 +1,9 @@
 #ifndef __NEOOBD2SIM_H_
 #define __NEOOBD2SIM_H_
 
-#include "device/include/device.h"
-#include "device/include/devicetype.h"
-#include "platform/include/stm32.h"
+#include "icsneo/device/device.h"
+#include "icsneo/device/devicetype.h"
+#include "icsneo/platform/stm32.h"
 
 namespace icsneo {
 
diff --git a/device/neovifire/include/neovifire.h b/include/icsneo/device/neovifire/neovifire.h
similarity index 93%
rename from device/neovifire/include/neovifire.h
rename to include/icsneo/device/neovifire/neovifire.h
index fef48da..b86f6bb 100644
--- a/device/neovifire/include/neovifire.h
+++ b/include/icsneo/device/neovifire/neovifire.h
@@ -1,9 +1,9 @@
 #ifndef __NEOVIFIRE_H_
 #define __NEOVIFIRE_H_
 
-#include "device/include/device.h"
-#include "device/include/devicetype.h"
-#include "platform/include/ftdi.h"
+#include "icsneo/device/device.h"
+#include "icsneo/device/devicetype.h"
+#include "icsneo/platform/ftdi.h"
 
 namespace icsneo {
 
diff --git a/device/neovifire2/include/neovifire2.h b/include/icsneo/device/neovifire2/neovifire2.h
similarity index 87%
rename from device/neovifire2/include/neovifire2.h
rename to include/icsneo/device/neovifire2/neovifire2.h
index fe57eec..e2d08df 100644
--- a/device/neovifire2/include/neovifire2.h
+++ b/include/icsneo/device/neovifire2/neovifire2.h
@@ -1,9 +1,9 @@
 #ifndef __NEOVIFIRE2_H_
 #define __NEOVIFIRE2_H_
 
-#include "device/include/device.h"
-#include "device/include/devicetype.h"
-#include "platform/include/ftdi.h"
+#include "icsneo/device/device.h"
+#include "icsneo/device/devicetype.h"
+#include "icsneo/platform/ftdi.h"
 
 namespace icsneo {
 
diff --git a/device/neovifire2/include/neovifire2eth.h b/include/icsneo/device/neovifire2/neovifire2eth.h
similarity index 91%
rename from device/neovifire2/include/neovifire2eth.h
rename to include/icsneo/device/neovifire2/neovifire2eth.h
index b2253c3..a18af76 100644
--- a/device/neovifire2/include/neovifire2eth.h
+++ b/include/icsneo/device/neovifire2/neovifire2eth.h
@@ -1,9 +1,9 @@
 #ifndef __NEOVIFIRE2ETH_H_
 #define __NEOVIFIRE2ETH_H_
 
-#include "device/neovifire2/include/neovifire2.h"
-#include "platform/include/pcap.h"
-#include "device/neovifire2/include/neovifire2settings.h"
+#include "icsneo/device/neovifire2/neovifire2.h"
+#include "icsneo/platform/pcap.h"
+#include "icsneo/device/neovifire2/neovifire2settings.h"
 #include <memory>
 
 namespace icsneo {
diff --git a/device/neovifire2/include/neovifire2settings.h b/include/icsneo/device/neovifire2/neovifire2settings.h
similarity index 98%
rename from device/neovifire2/include/neovifire2settings.h
rename to include/icsneo/device/neovifire2/neovifire2settings.h
index f99b74b..63e05e6 100644
--- a/device/neovifire2/include/neovifire2settings.h
+++ b/include/icsneo/device/neovifire2/neovifire2settings.h
@@ -2,7 +2,7 @@
 #define __NEOVIFIRE2SETTINGS_H_
 
 #include <stdint.h>
-#include "device/include/idevicesettings.h"
+#include "icsneo/device/idevicesettings.h"
 
 #ifdef __cplusplus
 
diff --git a/device/neovifire2/include/neovifire2usb.h b/include/icsneo/device/neovifire2/neovifire2usb.h
similarity index 82%
rename from device/neovifire2/include/neovifire2usb.h
rename to include/icsneo/device/neovifire2/neovifire2usb.h
index fea7e49..65dc6f4 100644
--- a/device/neovifire2/include/neovifire2usb.h
+++ b/include/icsneo/device/neovifire2/neovifire2usb.h
@@ -1,9 +1,9 @@
 #ifndef __NEOVIFIRE2USB_H_
 #define __NEOVIFIRE2USB_H_
 
-#include "device/neovifire2/include/neovifire2.h"
-#include "platform/include/ftdi.h"
-#include "device/neovifire2/include/neovifire2settings.h"
+#include "icsneo/device/neovifire2/neovifire2.h"
+#include "icsneo/platform/ftdi.h"
+#include "icsneo/device/neovifire2/neovifire2settings.h"
 
 namespace icsneo {
 
diff --git a/device/plasion/include/neoviion.h b/include/icsneo/device/plasion/neoviion.h
similarity index 82%
rename from device/plasion/include/neoviion.h
rename to include/icsneo/device/plasion/neoviion.h
index 2af1a20..fc03482 100644
--- a/device/plasion/include/neoviion.h
+++ b/include/icsneo/device/plasion/neoviion.h
@@ -1,9 +1,9 @@
 #ifndef __NEOVIION_H_
 #define __NEOVIION_H_
 
-#include "device/plasion/include/plasion.h"
-#include "device/include/devicetype.h"
-#include "platform/include/ftdi.h"
+#include "icsneo/device/plasion/plasion.h"
+#include "icsneo/device/devicetype.h"
+#include "icsneo/platform/ftdi.h"
 
 namespace icsneo {
 
diff --git a/device/plasion/include/neoviplasma.h b/include/icsneo/device/plasion/neoviplasma.h
similarity index 83%
rename from device/plasion/include/neoviplasma.h
rename to include/icsneo/device/plasion/neoviplasma.h
index e49d5fb..3eae324 100644
--- a/device/plasion/include/neoviplasma.h
+++ b/include/icsneo/device/plasion/neoviplasma.h
@@ -1,9 +1,9 @@
 #ifndef __NEOVIPLASMA_H_
 #define __NEOVIPLASMA_H_
 
-#include "device/plasion/include/plasion.h"
-#include "device/include/devicetype.h"
-#include "platform/include/ftdi.h"
+#include "icsneo/device/plasion/plasion.h"
+#include "icsneo/device/devicetype.h"
+#include "icsneo/platform/ftdi.h"
 
 namespace icsneo {
 
diff --git a/device/plasion/include/plasion.h b/include/icsneo/device/plasion/plasion.h
similarity index 80%
rename from device/plasion/include/plasion.h
rename to include/icsneo/device/plasion/plasion.h
index a2ad641..0f15516 100644
--- a/device/plasion/include/plasion.h
+++ b/include/icsneo/device/plasion/plasion.h
@@ -1,9 +1,9 @@
 #ifndef __PLASION_H_
 #define __PLASION_H_
 
-#include "device/include/device.h"
-#include "communication/include/multichannelcommunication.h"
-#include "platform/include/ftdi.h"
+#include "icsneo/device/device.h"
+#include "icsneo/communication/multichannelcommunication.h"
+#include "icsneo/platform/ftdi.h"
 
 namespace icsneo {
 
diff --git a/device/radgalaxy/include/radgalaxy.h b/include/icsneo/device/radgalaxy/radgalaxy.h
similarity index 91%
rename from device/radgalaxy/include/radgalaxy.h
rename to include/icsneo/device/radgalaxy/radgalaxy.h
index 9b70b6b..ee34588 100644
--- a/device/radgalaxy/include/radgalaxy.h
+++ b/include/icsneo/device/radgalaxy/radgalaxy.h
@@ -1,11 +1,11 @@
 #ifndef __RADGALAXY_H_
 #define __RADGALAXY_H_
 
-#include "device/include/device.h"
-#include "device/include/devicetype.h"
-#include "platform/include/pcap.h"
-#include "communication/include/packetizer.h"
-#include "communication/include/decoder.h"
+#include "icsneo/device/device.h"
+#include "icsneo/device/devicetype.h"
+#include "icsneo/platform/pcap.h"
+#include "icsneo/communication/packetizer.h"
+#include "icsneo/communication/decoder.h"
 
 namespace icsneo {
 
diff --git a/device/radstar2/include/radstar2.h b/include/icsneo/device/radstar2/radstar2.h
similarity index 81%
rename from device/radstar2/include/radstar2.h
rename to include/icsneo/device/radstar2/radstar2.h
index f88855a..6ded110 100644
--- a/device/radstar2/include/radstar2.h
+++ b/include/icsneo/device/radstar2/radstar2.h
@@ -1,8 +1,8 @@
 #ifndef __RADSTAR2_H_
 #define __RADSTAR2_H_
 
-#include "device/include/device.h"
-#include "device/include/devicetype.h"
+#include "icsneo/device/device.h"
+#include "icsneo/device/devicetype.h"
 
 namespace icsneo {
 
diff --git a/device/radstar2/include/radstar2eth.h b/include/icsneo/device/radstar2/radstar2eth.h
similarity index 90%
rename from device/radstar2/include/radstar2eth.h
rename to include/icsneo/device/radstar2/radstar2eth.h
index 1bcdc76..33845f7 100644
--- a/device/radstar2/include/radstar2eth.h
+++ b/include/icsneo/device/radstar2/radstar2eth.h
@@ -1,10 +1,10 @@
 #ifndef __RADSTAR2ETH_H_
 #define __RADSTAR2ETH_H_
 
-#include "device/radstar2/include/radstar2.h"
-#include "communication/include/network.h"
-#include "communication/message/include/serialnumbermessage.h"
-#include "platform/include/pcap.h"
+#include "icsneo/device/radstar2/radstar2.h"
+#include "icsneo/communication/network.h"
+#include "icsneo/communication/message/serialnumbermessage.h"
+#include "icsneo/platform/pcap.h"
 
 namespace icsneo {
 
diff --git a/device/radstar2/include/radstar2usb.h b/include/icsneo/device/radstar2/radstar2usb.h
similarity index 90%
rename from device/radstar2/include/radstar2usb.h
rename to include/icsneo/device/radstar2/radstar2usb.h
index f7340d4..1519f30 100644
--- a/device/radstar2/include/radstar2usb.h
+++ b/include/icsneo/device/radstar2/radstar2usb.h
@@ -1,8 +1,8 @@
 #ifndef __RADSTAR2USB_H_
 #define __RADSTAR2USB_H_
 
-#include "device/radstar2/include/radstar2.h"
-#include "platform/include/ftdi.h"
+#include "icsneo/device/radstar2/radstar2.h"
+#include "icsneo/platform/ftdi.h"
 
 namespace icsneo {
 
diff --git a/device/radsupermoon/include/radsupermoon.h b/include/icsneo/device/radsupermoon/radsupermoon.h
similarity index 88%
rename from device/radsupermoon/include/radsupermoon.h
rename to include/icsneo/device/radsupermoon/radsupermoon.h
index 5555bbb..547e6d0 100644
--- a/device/radsupermoon/include/radsupermoon.h
+++ b/include/icsneo/device/radsupermoon/radsupermoon.h
@@ -1,9 +1,9 @@
 #ifndef __RADSUPERMOON_H_
 #define __RADSUPERMOON_H_
 
-#include "device/include/device.h"
-#include "device/include/devicetype.h"
-#include "platform/include/ftdi.h"
+#include "icsneo/device/device.h"
+#include "icsneo/device/devicetype.h"
+#include "icsneo/platform/ftdi.h"
 
 namespace icsneo {
 
diff --git a/device/valuecan3/include/valuecan3.h b/include/icsneo/device/valuecan3/valuecan3.h
similarity index 86%
rename from device/valuecan3/include/valuecan3.h
rename to include/icsneo/device/valuecan3/valuecan3.h
index 1dab4db..dfa136c 100644
--- a/device/valuecan3/include/valuecan3.h
+++ b/include/icsneo/device/valuecan3/valuecan3.h
@@ -1,9 +1,9 @@
 #ifndef __VALUECAN3_H_
 #define __VALUECAN3_H_
 
-#include "device/include/device.h"
-#include "device/include/devicetype.h"
-#include "platform/include/ftdi.h"
+#include "icsneo/device/device.h"
+#include "icsneo/device/devicetype.h"
+#include "icsneo/platform/ftdi.h"
 
 namespace icsneo {
 
diff --git a/device/valuecan4/settings/include/valuecan4-1-2settings.h b/include/icsneo/device/valuecan4/settings/valuecan4-1-2settings.h
similarity index 78%
rename from device/valuecan4/settings/include/valuecan4-1-2settings.h
rename to include/icsneo/device/valuecan4/settings/valuecan4-1-2settings.h
index 2fec2ca..f1fc66e 100644
--- a/device/valuecan4/settings/include/valuecan4-1-2settings.h
+++ b/include/icsneo/device/valuecan4/settings/valuecan4-1-2settings.h
@@ -1,8 +1,8 @@
 #ifndef __VALUECAN4_1_2_SETTINGS_H_
 #define __VALUECAN4_1_2_SETTINGS_H_
 
-#include "device/include/idevicesettings.h"
-#include "device/valuecan4/settings/include/valuecan4settings.h"
+#include "icsneo/device/idevicesettings.h"
+#include "icsneo/device/valuecan4/settings/valuecan4settings.h"
 
 #ifdef __cplusplus
 
diff --git a/device/valuecan4/settings/include/valuecan4-1settings.h b/include/icsneo/device/valuecan4/settings/valuecan4-1settings.h
similarity index 89%
rename from device/valuecan4/settings/include/valuecan4-1settings.h
rename to include/icsneo/device/valuecan4/settings/valuecan4-1settings.h
index 053811e..46125b4 100644
--- a/device/valuecan4/settings/include/valuecan4-1settings.h
+++ b/include/icsneo/device/valuecan4/settings/valuecan4-1settings.h
@@ -1,7 +1,7 @@
 #ifndef __VALUECAN4_1_SETTINGS_H_
 #define __VALUECAN4_1_SETTINGS_H_
 
-#include "device/valuecan4/settings/include/valuecan4-1-2settings.h"
+#include "icsneo/device/valuecan4/settings/valuecan4-1-2settings.h"
 
 #ifdef __cplusplus
 
diff --git a/device/valuecan4/settings/include/valuecan4-2elsettings.h b/include/icsneo/device/valuecan4/settings/valuecan4-2elsettings.h
similarity index 86%
rename from device/valuecan4/settings/include/valuecan4-2elsettings.h
rename to include/icsneo/device/valuecan4/settings/valuecan4-2elsettings.h
index e6bc68f..adf127e 100644
--- a/device/valuecan4/settings/include/valuecan4-2elsettings.h
+++ b/include/icsneo/device/valuecan4/settings/valuecan4-2elsettings.h
@@ -1,8 +1,8 @@
 #ifndef __VALUECAN4_2EL_SETTINGS_H_
 #define __VALUECAN4_2EL_SETTINGS_H_
 
-#include "device/include/idevicesettings.h"
-#include "device/valuecan4/settings/include/valuecan4-4-2elsettings.h"
+#include "icsneo/device/idevicesettings.h"
+#include "icsneo/device/valuecan4/settings/valuecan4-4-2elsettings.h"
 
 #ifdef __cplusplus
 
diff --git a/device/valuecan4/settings/include/valuecan4-2settings.h b/include/icsneo/device/valuecan4/settings/valuecan4-2settings.h
similarity index 90%
rename from device/valuecan4/settings/include/valuecan4-2settings.h
rename to include/icsneo/device/valuecan4/settings/valuecan4-2settings.h
index c046692..4310ef5 100644
--- a/device/valuecan4/settings/include/valuecan4-2settings.h
+++ b/include/icsneo/device/valuecan4/settings/valuecan4-2settings.h
@@ -1,7 +1,7 @@
 #ifndef __VALUECAN4_2_SETTINGS_H_
 #define __VALUECAN4_2_SETTINGS_H_
 
-#include "device/valuecan4/settings/include/valuecan4-1-2settings.h"
+#include "icsneo/device/valuecan4/settings/valuecan4-1-2settings.h"
 
 #ifdef __cplusplus
 
diff --git a/device/valuecan4/settings/include/valuecan4-4-2elsettings.h b/include/icsneo/device/valuecan4/settings/valuecan4-4-2elsettings.h
similarity index 80%
rename from device/valuecan4/settings/include/valuecan4-4-2elsettings.h
rename to include/icsneo/device/valuecan4/settings/valuecan4-4-2elsettings.h
index cec826d..fb68102 100644
--- a/device/valuecan4/settings/include/valuecan4-4-2elsettings.h
+++ b/include/icsneo/device/valuecan4/settings/valuecan4-4-2elsettings.h
@@ -1,8 +1,8 @@
 #ifndef __VALUECAN4_4_2EL_SETTINGS_H_
 #define __VALUECAN4_4_2EL_SETTINGS_H_
 
-#include "device/include/idevicesettings.h"
-#include "device/valuecan4/settings/include/valuecan4settings.h"
+#include "icsneo/device/idevicesettings.h"
+#include "icsneo/device/valuecan4/settings/valuecan4settings.h"
 
 #ifdef __cplusplus
 
diff --git a/device/valuecan4/settings/include/valuecan4-4settings.h b/include/icsneo/device/valuecan4/settings/valuecan4-4settings.h
similarity index 86%
rename from device/valuecan4/settings/include/valuecan4-4settings.h
rename to include/icsneo/device/valuecan4/settings/valuecan4-4settings.h
index 1e8c168..9917a9c 100644
--- a/device/valuecan4/settings/include/valuecan4-4settings.h
+++ b/include/icsneo/device/valuecan4/settings/valuecan4-4settings.h
@@ -1,8 +1,8 @@
 #ifndef __VALUECAN4_4_SETTINGS_H_
 #define __VALUECAN4_4_SETTINGS_H_
 
-#include "device/include/idevicesettings.h"
-#include "device/valuecan4/settings/include/valuecan4-4-2elsettings.h"
+#include "icsneo/device/idevicesettings.h"
+#include "icsneo/device/valuecan4/settings/valuecan4-4-2elsettings.h"
 
 #ifdef __cplusplus
 
diff --git a/device/valuecan4/settings/include/valuecan4settings.h b/include/icsneo/device/valuecan4/settings/valuecan4settings.h
similarity index 97%
rename from device/valuecan4/settings/include/valuecan4settings.h
rename to include/icsneo/device/valuecan4/settings/valuecan4settings.h
index 1dd271e..24e0bfa 100644
--- a/device/valuecan4/settings/include/valuecan4settings.h
+++ b/include/icsneo/device/valuecan4/settings/valuecan4settings.h
@@ -2,7 +2,7 @@
 #define __VALUECAN4_SETTINGS_H_
 
 #include <stdint.h>
-#include "device/include/idevicesettings.h"
+#include "icsneo/device/idevicesettings.h"
 
 #ifdef __cplusplus
 
diff --git a/device/valuecan4/include/valuecan4-1.h b/include/icsneo/device/valuecan4/valuecan4-1.h
similarity index 84%
rename from device/valuecan4/include/valuecan4-1.h
rename to include/icsneo/device/valuecan4/valuecan4-1.h
index 87e70e0..5df8569 100644
--- a/device/valuecan4/include/valuecan4-1.h
+++ b/include/icsneo/device/valuecan4/valuecan4-1.h
@@ -1,8 +1,8 @@
 #ifndef __VALUECAN4_1_H_
 #define __VALUECAN4_1_H_
 
-#include "device/valuecan4/include/valuecan4.h"
-#include "device/valuecan4/settings/include/valuecan4-1settings.h"
+#include "icsneo/device/valuecan4/valuecan4.h"
+#include "icsneo/device/valuecan4/settings/valuecan4-1settings.h"
 #include <string>
 
 namespace icsneo {
diff --git a/device/valuecan4/include/valuecan4-2.h b/include/icsneo/device/valuecan4/valuecan4-2.h
similarity index 83%
rename from device/valuecan4/include/valuecan4-2.h
rename to include/icsneo/device/valuecan4/valuecan4-2.h
index 5eaaefd..96b718d 100644
--- a/device/valuecan4/include/valuecan4-2.h
+++ b/include/icsneo/device/valuecan4/valuecan4-2.h
@@ -1,8 +1,8 @@
 #ifndef __VALUECAN4_2_H_
 #define __VALUECAN4_2_H_
 
-#include "device/valuecan4/include/valuecan4.h"
-#include "device/valuecan4/settings/include/valuecan4-2settings.h"
+#include "icsneo/device/valuecan4/valuecan4.h"
+#include "icsneo/device/valuecan4/settings/valuecan4-2settings.h"
 #include <string>
 
 namespace icsneo {
diff --git a/device/valuecan4/include/valuecan4-2el.h b/include/icsneo/device/valuecan4/valuecan4-2el.h
similarity index 83%
rename from device/valuecan4/include/valuecan4-2el.h
rename to include/icsneo/device/valuecan4/valuecan4-2el.h
index 11152f4..5179f89 100644
--- a/device/valuecan4/include/valuecan4-2el.h
+++ b/include/icsneo/device/valuecan4/valuecan4-2el.h
@@ -1,8 +1,8 @@
 #ifndef __VALUECAN4_2EL_H_
 #define __VALUECAN4_2EL_H_
 
-#include "device/valuecan4/include/valuecan4.h"
-#include "device/valuecan4/settings/include/valuecan4-2elsettings.h"
+#include "icsneo/device/valuecan4/valuecan4.h"
+#include "icsneo/device/valuecan4/settings/valuecan4-2elsettings.h"
 #include <string>
 
 namespace icsneo {
diff --git a/device/valuecan4/include/valuecan4-4.h b/include/icsneo/device/valuecan4/valuecan4-4.h
similarity index 83%
rename from device/valuecan4/include/valuecan4-4.h
rename to include/icsneo/device/valuecan4/valuecan4-4.h
index 9bf0142..be517ed 100644
--- a/device/valuecan4/include/valuecan4-4.h
+++ b/include/icsneo/device/valuecan4/valuecan4-4.h
@@ -1,8 +1,8 @@
 #ifndef __VALUECAN4_4_H_
 #define __VALUECAN4_4_H_
 
-#include "device/valuecan4/include/valuecan4.h"
-#include "device/valuecan4/settings/include/valuecan4-4settings.h"
+#include "icsneo/device/valuecan4/valuecan4.h"
+#include "icsneo/device/valuecan4/settings/valuecan4-4settings.h"
 #include <string>
 
 namespace icsneo {
diff --git a/device/valuecan4/include/valuecan4.h b/include/icsneo/device/valuecan4/valuecan4.h
similarity index 83%
rename from device/valuecan4/include/valuecan4.h
rename to include/icsneo/device/valuecan4/valuecan4.h
index 06eeb84..ddc5e96 100644
--- a/device/valuecan4/include/valuecan4.h
+++ b/include/icsneo/device/valuecan4/valuecan4.h
@@ -1,9 +1,9 @@
 #ifndef __VALUECAN4_H_
 #define __VALUECAN4_H_
 
-#include "device/include/device.h"
-#include "device/include/devicetype.h"
-#include "platform/include/stm32.h"
+#include "icsneo/device/device.h"
+#include "icsneo/device/devicetype.h"
+#include "icsneo/platform/stm32.h"
 
 namespace icsneo {
 
diff --git a/device/vividcan/include/vividcan.h b/include/icsneo/device/vividcan/vividcan.h
similarity index 87%
rename from device/vividcan/include/vividcan.h
rename to include/icsneo/device/vividcan/vividcan.h
index 3f67fec..cff2dfc 100644
--- a/device/vividcan/include/vividcan.h
+++ b/include/icsneo/device/vividcan/vividcan.h
@@ -1,9 +1,9 @@
 #ifndef __VIVIDCAN_H_
 #define __VIVIDCAN_H_
 
-#include "device/include/device.h"
-#include "device/include/devicetype.h"
-#include "platform/include/stm32.h"
+#include "icsneo/device/device.h"
+#include "icsneo/device/devicetype.h"
+#include "icsneo/platform/stm32.h"
 
 namespace icsneo {
 
diff --git a/api/icsneolegacy/dllhelper/include/icsnVC40.h b/include/icsneo/icsnVC40.h
similarity index 100%
rename from api/icsneolegacy/dllhelper/include/icsnVC40.h
rename to include/icsneo/icsnVC40.h
diff --git a/api/icsneoc/include/icsneoc.h b/include/icsneo/icsneoc.h
similarity index 94%
rename from api/icsneoc/include/icsneoc.h
rename to include/icsneo/icsneoc.h
index 993b43b..927af37 100644
--- a/api/icsneoc/include/icsneoc.h
+++ b/include/icsneo/icsneoc.h
@@ -2,9 +2,9 @@
 #define __ICSNEOC_H_
 
 #include <stddef.h>
-#include "device/include/neodevice.h" // For neodevice_t
-#include "communication/message/include/neomessage.h" // For neomessage_t and friends
-#include "platform/include/dynamiclib.h" // Dynamic library loading and exporting
+#include "icsneo/device/neodevice.h" // For neodevice_t
+#include "icsneo/communication/message/neomessage.h" // For neomessage_t and friends
+#include "icsneo/platform/dynamiclib.h" // Dynamic library loading and exporting
 
 #ifndef ICSNEOC_DYNAMICLOAD
 
diff --git a/api/icsneocpp/include/icsneocpp.h b/include/icsneo/icsneocpp.h
similarity index 74%
rename from api/icsneocpp/include/icsneocpp.h
rename to include/icsneo/icsneocpp.h
index 54f985a..4e62308 100644
--- a/api/icsneocpp/include/icsneocpp.h
+++ b/include/icsneo/icsneocpp.h
@@ -4,7 +4,7 @@
 #include <vector>
 #include <memory>
 
-#include "device/include/device.h"
+#include "icsneo/device/device.h"
 
 namespace icsneo {
 
diff --git a/api/icsneolegacy/include/icsneolegacy.h b/include/icsneo/icsneolegacy.h
similarity index 97%
rename from api/icsneolegacy/include/icsneolegacy.h
rename to include/icsneo/icsneolegacy.h
index 7aa96aa..9aa7fb0 100644
--- a/api/icsneolegacy/include/icsneolegacy.h
+++ b/include/icsneo/icsneolegacy.h
@@ -1,12 +1,12 @@
 #ifndef __ICSNEOLEGACY_H_
 #define __ICSNEOLEGACY_H_
 
-#include "platform/include/dynamiclib.h" // Dynamic library loading and exporting
-#include "platform/include/tchar.h"
+#include "icsneo/platform/dynamiclib.h" // Dynamic library loading and exporting
+#include "icsneo/platform/tchar.h"
 
 #include <stdint.h>
 typedef uint8_t byte; // Typedef helper for the following include
-#include "api/icsneolegacy/dllhelper/include/icsnVC40.h" // Definitions for structs
+#include "icsneo/icsnVC40.h" // Definitions for structs
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/platform/include/devices.h b/include/icsneo/platform/devices.h
similarity index 71%
rename from platform/include/devices.h
rename to include/icsneo/platform/devices.h
index 2a2fdaa..3518b6f 100644
--- a/platform/include/devices.h
+++ b/include/icsneo/platform/devices.h
@@ -2,9 +2,9 @@
 #define __DEVICES_H_
 
 #if defined _WIN32
-#include "platform/windows/include/devices.h"
+#include "icsneo/platform/windows/devices.h"
 #elif defined (__unix__) || (defined (__APPLE__) && defined (__MACH__))
-#include "platform/posix/include/devices.h"
+#include "icsneo/platform/posix/devices.h"
 #else
 #error "This platform is not supported by the devices driver, please add a definition!"
 #endif
diff --git a/platform/include/dynamiclib.h b/include/icsneo/platform/dynamiclib.h
similarity index 66%
rename from platform/include/dynamiclib.h
rename to include/icsneo/platform/dynamiclib.h
index 1b20292..4f79b86 100644
--- a/platform/include/dynamiclib.h
+++ b/include/icsneo/platform/dynamiclib.h
@@ -2,9 +2,9 @@
 #define __DYNAMICLIB_H_
 
 #if defined _WIN32
-#include "platform/windows/include/dynamiclib.h"
+#include "icsneo/platform/windows/dynamiclib.h"
 #elif defined (__unix__) || (defined (__APPLE__) && defined (__MACH__))
-#include "platform/posix/include/dynamiclib.h"
+#include "icsneo/platform/posix/dynamiclib.h"
 #else
 #warning "This platform is not supported by the dynamic library driver"
 #endif
diff --git a/platform/include/ftdi.h b/include/icsneo/platform/ftdi.h
similarity index 70%
rename from platform/include/ftdi.h
rename to include/icsneo/platform/ftdi.h
index b4e999a..e8a2669 100644
--- a/platform/include/ftdi.h
+++ b/include/icsneo/platform/ftdi.h
@@ -4,9 +4,9 @@
 #define INTREPID_USB_VENDOR_ID (0x093c)
 
 #if defined _WIN32
-#include "platform/windows/include/ftdi.h"
+#include "icsneo/platform/windows/ftdi.h"
 #elif defined (__unix__) || (defined (__APPLE__) && defined (__MACH__))
-#include "platform/posix/include/ftdi.h"
+#include "icsneo/platform/posix/ftdi.h"
 #else
 #warning "This platform is not supported by the FTDI driver"
 #endif
diff --git a/platform/include/pcap.h b/include/icsneo/platform/pcap.h
similarity index 68%
rename from platform/include/pcap.h
rename to include/icsneo/platform/pcap.h
index dbe6c5c..192c212 100644
--- a/platform/include/pcap.h
+++ b/include/icsneo/platform/pcap.h
@@ -2,9 +2,9 @@
 #define __PCAP_H_
 
 #if defined _WIN32
-#include "platform/windows/include/pcap.h"
+#include "icsneo/platform/windows/pcap.h"
 // #elif defined (__unix__) || (defined (__APPLE__) && defined (__MACH__))
-// #include "platform/posix/include/ftdi.h"
+// #include "icsneo/platform/posix/ftdi.h"
 #else
 #warning "This platform is not supported by the PCAP driver"
 #endif
diff --git a/platform/posix/darwin/include/dynamiclib.h b/include/icsneo/platform/posix/darwin/dynamiclib.h
similarity index 100%
rename from platform/posix/darwin/include/dynamiclib.h
rename to include/icsneo/platform/posix/darwin/dynamiclib.h
diff --git a/include/icsneo/platform/posix/devices.h b/include/icsneo/platform/posix/devices.h
new file mode 100644
index 0000000..c8e2570
--- /dev/null
+++ b/include/icsneo/platform/posix/devices.h
@@ -0,0 +1,22 @@
+#ifndef __DEVICES_POSIX_H_
+#define __DEVICES_POSIX_H_
+
+#include "icsneo/device/neoobd2pro/neoobd2pro.h"
+#include "icsneo/device/neoobd2sim/neoobd2sim.h"
+#include "icsneo/device/neovifire/neovifire.h"
+//#include "icsneo/device/neovifire2/neovifire2eth.h" Ethernet not yet supported
+#include "icsneo/device/neovifire2/neovifire2usb.h"
+#include "icsneo/device/plasion/neoviion.h"
+#include "icsneo/device/plasion/neoviplasma.h"
+//#include "icsneo/device/radgalaxy/radgalaxy.h" Ethernet not yet supported
+//#include "icsneo/device/radstar2/radstar2eth.h" Ethernet not yet supported
+#include "icsneo/device/radstar2/radstar2usb.h"
+#include "icsneo/device/radsupermoon/radsupermoon.h"
+#include "icsneo/device/valuecan3/valuecan3.h"
+#include "icsneo/device/valuecan4/valuecan4-1.h"
+#include "icsneo/device/valuecan4/valuecan4-2.h"
+#include "icsneo/device/valuecan4/valuecan4-2el.h"
+#include "icsneo/device/valuecan4/valuecan4-4.h"
+#include "icsneo/device/vividcan/vividcan.h"
+
+#endif
\ No newline at end of file
diff --git a/platform/posix/include/dynamiclib.h b/include/icsneo/platform/posix/dynamiclib.h
similarity index 76%
rename from platform/posix/include/dynamiclib.h
rename to include/icsneo/platform/posix/dynamiclib.h
index c36f918..8b4fc4d 100644
--- a/platform/posix/include/dynamiclib.h
+++ b/include/icsneo/platform/posix/dynamiclib.h
@@ -4,9 +4,9 @@
 #include <dlfcn.h>
 
 #ifdef __APPLE__
-#include "platform/posix/darwin/include/dynamiclib.h"
+#include "icsneo/platform/posix/darwin/dynamiclib.h"
 #else
-#include "platform/posix/linux/include/dynamiclib.h"
+#include "icsneo/platform/posix/linux/dynamiclib.h"
 #endif
 
 // Nothing special is needed to export
diff --git a/platform/posix/include/ftdi.h b/include/icsneo/platform/posix/ftdi.h
similarity index 87%
rename from platform/posix/include/ftdi.h
rename to include/icsneo/platform/posix/ftdi.h
index c661fbe..7ea478b 100644
--- a/platform/posix/include/ftdi.h
+++ b/include/icsneo/platform/posix/ftdi.h
@@ -6,9 +6,9 @@
 #include <string>
 #include <atomic>
 #include <ftdi.hpp>
-#include "device/include/neodevice.h"
-#include "communication/include/icommunication.h"
-#include "third-party/concurrentqueue/blockingconcurrentqueue.h"
+#include "icsneo/device/neodevice.h"
+#include "icsneo/communication/icommunication.h"
+#include "icsneo/third-party/concurrentqueue/blockingconcurrentqueue.h"
 
 namespace icsneo {
 
diff --git a/platform/posix/linux/include/dynamiclib.h b/include/icsneo/platform/posix/linux/dynamiclib.h
similarity index 100%
rename from platform/posix/linux/include/dynamiclib.h
rename to include/icsneo/platform/posix/linux/dynamiclib.h
diff --git a/platform/posix/include/stm32.h b/include/icsneo/platform/posix/stm32.h
similarity index 83%
rename from platform/posix/include/stm32.h
rename to include/icsneo/platform/posix/stm32.h
index ff729fe..e3bd52e 100644
--- a/platform/posix/include/stm32.h
+++ b/include/icsneo/platform/posix/stm32.h
@@ -1,8 +1,8 @@
 #ifndef __STM32_POSIX_H_
 #define __STM32_POSIX_H_
 
-#include "communication/include/icommunication.h"
-#include "device/include/neodevice.h"
+#include "icsneo/communication/icommunication.h"
+#include "icsneo/device/neodevice.h"
 #include <chrono>
 #include <stdint.h>
 
diff --git a/platform/posix/include/tchar.h b/include/icsneo/platform/posix/tchar.h
similarity index 100%
rename from platform/posix/include/tchar.h
rename to include/icsneo/platform/posix/tchar.h
diff --git a/platform/include/registry.h b/include/icsneo/platform/registry.h
similarity index 69%
rename from platform/include/registry.h
rename to include/icsneo/platform/registry.h
index 0995e49..4805b93 100644
--- a/platform/include/registry.h
+++ b/include/icsneo/platform/registry.h
@@ -2,7 +2,7 @@
 #define __REGISTRY_H_
 
 #if defined _WIN32
-#include "platform/windows/include/registry.h"
+#include "icsneo/platform/windows/registry.h"
 #else
 #warning "This platform is not supported by the registry driver"
 #endif
diff --git a/platform/include/stm32.h b/include/icsneo/platform/stm32.h
similarity index 70%
rename from platform/include/stm32.h
rename to include/icsneo/platform/stm32.h
index 767adcf..d732174 100644
--- a/platform/include/stm32.h
+++ b/include/icsneo/platform/stm32.h
@@ -4,9 +4,9 @@
 #define INTREPID_USB_VENDOR_ID (0x093c)
 
 #if defined _WIN32
-#include "platform/windows/include/stm32.h"
+#include "icsneo/platform/windows/stm32.h"
 #elif defined (__unix__) || (defined (__APPLE__) && defined (__MACH__))
-#include "platform/posix/include/stm32.h"
+#include "icsneo/platform/posix/stm32.h"
 #else
 #warning "This platform is not supported by the STM32 driver"
 #endif
diff --git a/platform/include/tchar.h b/include/icsneo/platform/tchar.h
similarity index 85%
rename from platform/include/tchar.h
rename to include/icsneo/platform/tchar.h
index 7384237..0e95a5f 100644
--- a/platform/include/tchar.h
+++ b/include/icsneo/platform/tchar.h
@@ -4,7 +4,7 @@
 #if defined _WIN32
 // Windows does not need a TCHAR definition, as it is natively defined
 #elif defined (__unix__) || (defined (__APPLE__) && defined (__MACH__))
-#include "platform/posix/include/tchar.h"
+#include "icsneo/platform/posix/tchar.h"
 #else
 #warning "Please add a definition for this platform's equivalent to TCHAR"
 #endif
diff --git a/include/icsneo/platform/windows/devices.h b/include/icsneo/platform/windows/devices.h
new file mode 100644
index 0000000..f44e6b7
--- /dev/null
+++ b/include/icsneo/platform/windows/devices.h
@@ -0,0 +1,22 @@
+#ifndef __DEVICES_WINDOWS_H_
+#define __DEVICES_WINDOWS_H_
+
+#include "icsneo/device/neoobd2pro/neoobd2pro.h"
+#include "icsneo/device/neoobd2sim/neoobd2sim.h"
+#include "icsneo/device/neovifire/neovifire.h"
+#include "icsneo/device/neovifire2/neovifire2eth.h"
+#include "icsneo/device/neovifire2/neovifire2usb.h"
+#include "icsneo/device/plasion/neoviion.h"
+#include "icsneo/device/plasion/neoviplasma.h"
+#include "icsneo/device/radgalaxy/radgalaxy.h"
+#include "icsneo/device/radstar2/radstar2eth.h"
+#include "icsneo/device/radstar2/radstar2usb.h"
+#include "icsneo/device/radsupermoon/radsupermoon.h"
+#include "icsneo/device/valuecan3/valuecan3.h"
+#include "icsneo/device/valuecan4/valuecan4-1.h"
+#include "icsneo/device/valuecan4/valuecan4-2.h"
+#include "icsneo/device/valuecan4/valuecan4-2el.h"
+#include "icsneo/device/valuecan4/valuecan4-4.h"
+#include "icsneo/device/vividcan/vividcan.h"
+
+#endif
\ No newline at end of file
diff --git a/platform/windows/include/dynamiclib.h b/include/icsneo/platform/windows/dynamiclib.h
similarity index 100%
rename from platform/windows/include/dynamiclib.h
rename to include/icsneo/platform/windows/dynamiclib.h
diff --git a/platform/windows/include/ftdi.h b/include/icsneo/platform/windows/ftdi.h
similarity index 81%
rename from platform/windows/include/ftdi.h
rename to include/icsneo/platform/windows/ftdi.h
index b54d523..4cb50cd 100644
--- a/platform/windows/include/ftdi.h
+++ b/include/icsneo/platform/windows/ftdi.h
@@ -1,7 +1,7 @@
 #ifndef __FTDI_WINDOWS_H_
 #define __FTDI_WINDOWS_H_
 
-#include "platform/windows/include/vcp.h"
+#include "icsneo/platform/windows/vcp.h"
 
 namespace icsneo {
 
diff --git a/platform/windows/internal/include/pcapdll.h b/include/icsneo/platform/windows/internal/pcapdll.h
similarity index 100%
rename from platform/windows/internal/include/pcapdll.h
rename to include/icsneo/platform/windows/internal/pcapdll.h
diff --git a/platform/windows/include/pcap.h b/include/icsneo/platform/windows/pcap.h
similarity index 93%
rename from platform/windows/include/pcap.h
rename to include/icsneo/platform/windows/pcap.h
index da03a8e..424a912 100644
--- a/platform/windows/include/pcap.h
+++ b/include/icsneo/platform/windows/pcap.h
@@ -1,9 +1,9 @@
 #ifndef __PCAP_WINDOWS_H_
 #define __PCAP_WINDOWS_H_
 
-#include "platform/windows/internal/include/pcapdll.h"
-#include "device/include/neodevice.h"
-#include "communication/include/icommunication.h"
+#include "icsneo/platform/windows/internal/pcapdll.h"
+#include "icsneo/device/neodevice.h"
+#include "icsneo/communication/icommunication.h"
 #include <string>
 
 namespace icsneo {
diff --git a/platform/windows/include/registry.h b/include/icsneo/platform/windows/registry.h
similarity index 100%
rename from platform/windows/include/registry.h
rename to include/icsneo/platform/windows/registry.h
diff --git a/platform/windows/include/stm32.h b/include/icsneo/platform/windows/stm32.h
similarity index 81%
rename from platform/windows/include/stm32.h
rename to include/icsneo/platform/windows/stm32.h
index 26314a7..01cc8ee 100644
--- a/platform/windows/include/stm32.h
+++ b/include/icsneo/platform/windows/stm32.h
@@ -1,7 +1,7 @@
 #ifndef __STM32_WINDOWS_H_
 #define __STM32_WINDOWS_H_
 
-#include "platform/windows/include/vcp.h"
+#include "icsneo/platform/windows/vcp.h"
 
 namespace icsneo {
 
diff --git a/platform/windows/include/vcp.h b/include/icsneo/platform/windows/vcp.h
similarity index 88%
rename from platform/windows/include/vcp.h
rename to include/icsneo/platform/windows/vcp.h
index 7572d94..6f13f56 100644
--- a/platform/windows/include/vcp.h
+++ b/include/icsneo/platform/windows/vcp.h
@@ -7,8 +7,8 @@
 #include <atomic>
 #include <chrono>
 #include <Windows.h>
-#include "device/include/neodevice.h"
-#include "communication/include/icommunication.h"
+#include "icsneo/device/neodevice.h"
+#include "icsneo/communication/icommunication.h"
 
 namespace icsneo {
 
diff --git a/third-party/concurrentqueue/.gitignore b/include/icsneo/third-party/concurrentqueue/.gitignore
similarity index 100%
rename from third-party/concurrentqueue/.gitignore
rename to include/icsneo/third-party/concurrentqueue/.gitignore
diff --git a/third-party/concurrentqueue/LICENSE.md b/include/icsneo/third-party/concurrentqueue/LICENSE.md
similarity index 100%
rename from third-party/concurrentqueue/LICENSE.md
rename to include/icsneo/third-party/concurrentqueue/LICENSE.md
diff --git a/third-party/concurrentqueue/README.md b/include/icsneo/third-party/concurrentqueue/README.md
similarity index 100%
rename from third-party/concurrentqueue/README.md
rename to include/icsneo/third-party/concurrentqueue/README.md
diff --git a/third-party/concurrentqueue/blockingconcurrentqueue.h b/include/icsneo/third-party/concurrentqueue/blockingconcurrentqueue.h
similarity index 100%
rename from third-party/concurrentqueue/blockingconcurrentqueue.h
rename to include/icsneo/third-party/concurrentqueue/blockingconcurrentqueue.h
diff --git a/third-party/concurrentqueue/concurrentqueue.h b/include/icsneo/third-party/concurrentqueue/concurrentqueue.h
similarity index 100%
rename from third-party/concurrentqueue/concurrentqueue.h
rename to include/icsneo/third-party/concurrentqueue/concurrentqueue.h
diff --git a/third-party/concurrentqueue/internal/concurrentqueue_internal_debug.h b/include/icsneo/third-party/concurrentqueue/internal/concurrentqueue_internal_debug.h
similarity index 100%
rename from third-party/concurrentqueue/internal/concurrentqueue_internal_debug.h
rename to include/icsneo/third-party/concurrentqueue/internal/concurrentqueue_internal_debug.h
diff --git a/third-party/concurrentqueue/samples.md b/include/icsneo/third-party/concurrentqueue/samples.md
similarity index 100%
rename from third-party/concurrentqueue/samples.md
rename to include/icsneo/third-party/concurrentqueue/samples.md
diff --git a/third-party/winpcap/include/Packet32.h b/include/icsneo/third-party/winpcap/Packet32.h
similarity index 100%
rename from third-party/winpcap/include/Packet32.h
rename to include/icsneo/third-party/winpcap/Packet32.h
diff --git a/third-party/winpcap/include/Win32-Extensions.h b/include/icsneo/third-party/winpcap/Win32-Extensions.h
similarity index 100%
rename from third-party/winpcap/include/Win32-Extensions.h
rename to include/icsneo/third-party/winpcap/Win32-Extensions.h
diff --git a/third-party/winpcap/include/bittypes.h b/include/icsneo/third-party/winpcap/bittypes.h
similarity index 100%
rename from third-party/winpcap/include/bittypes.h
rename to include/icsneo/third-party/winpcap/bittypes.h
diff --git a/third-party/winpcap/include/ip6_misc.h b/include/icsneo/third-party/winpcap/ip6_misc.h
similarity index 100%
rename from third-party/winpcap/include/ip6_misc.h
rename to include/icsneo/third-party/winpcap/ip6_misc.h
diff --git a/third-party/winpcap/include/pcap-bpf.h b/include/icsneo/third-party/winpcap/pcap-bpf.h
similarity index 100%
rename from third-party/winpcap/include/pcap-bpf.h
rename to include/icsneo/third-party/winpcap/pcap-bpf.h
diff --git a/third-party/winpcap/include/pcap-namedb.h b/include/icsneo/third-party/winpcap/pcap-namedb.h
similarity index 100%
rename from third-party/winpcap/include/pcap-namedb.h
rename to include/icsneo/third-party/winpcap/pcap-namedb.h
diff --git a/third-party/winpcap/include/pcap-stdinc.h b/include/icsneo/third-party/winpcap/pcap-stdinc.h
similarity index 100%
rename from third-party/winpcap/include/pcap-stdinc.h
rename to include/icsneo/third-party/winpcap/pcap-stdinc.h
diff --git a/third-party/winpcap/include/pcap.h b/include/icsneo/third-party/winpcap/pcap.h
similarity index 100%
rename from third-party/winpcap/include/pcap.h
rename to include/icsneo/third-party/winpcap/pcap.h
diff --git a/third-party/winpcap/include/pcap/bluetooth.h b/include/icsneo/third-party/winpcap/pcap/bluetooth.h
similarity index 100%
rename from third-party/winpcap/include/pcap/bluetooth.h
rename to include/icsneo/third-party/winpcap/pcap/bluetooth.h
diff --git a/third-party/winpcap/include/pcap/bpf.h b/include/icsneo/third-party/winpcap/pcap/bpf.h
similarity index 100%
rename from third-party/winpcap/include/pcap/bpf.h
rename to include/icsneo/third-party/winpcap/pcap/bpf.h
diff --git a/third-party/winpcap/include/pcap/namedb.h b/include/icsneo/third-party/winpcap/pcap/namedb.h
similarity index 100%
rename from third-party/winpcap/include/pcap/namedb.h
rename to include/icsneo/third-party/winpcap/pcap/namedb.h
diff --git a/third-party/winpcap/include/pcap/pcap.h b/include/icsneo/third-party/winpcap/pcap/pcap.h
similarity index 100%
rename from third-party/winpcap/include/pcap/pcap.h
rename to include/icsneo/third-party/winpcap/pcap/pcap.h
diff --git a/third-party/winpcap/include/pcap/sll.h b/include/icsneo/third-party/winpcap/pcap/sll.h
similarity index 100%
rename from third-party/winpcap/include/pcap/sll.h
rename to include/icsneo/third-party/winpcap/pcap/sll.h
diff --git a/third-party/winpcap/include/pcap/usb.h b/include/icsneo/third-party/winpcap/pcap/usb.h
similarity index 100%
rename from third-party/winpcap/include/pcap/usb.h
rename to include/icsneo/third-party/winpcap/pcap/usb.h
diff --git a/third-party/winpcap/include/pcap/vlan.h b/include/icsneo/third-party/winpcap/pcap/vlan.h
similarity index 100%
rename from third-party/winpcap/include/pcap/vlan.h
rename to include/icsneo/third-party/winpcap/pcap/vlan.h
diff --git a/third-party/winpcap/include/remote-ext.h b/include/icsneo/third-party/winpcap/remote-ext.h
similarity index 100%
rename from third-party/winpcap/include/remote-ext.h
rename to include/icsneo/third-party/winpcap/remote-ext.h
diff --git a/platform/posix/ftdi.cpp b/platform/posix/ftdi.cpp
index 7239567..f0cde06 100644
--- a/platform/posix/ftdi.cpp
+++ b/platform/posix/ftdi.cpp
@@ -1,4 +1,4 @@
-#include "platform/include/ftdi.h"
+#include "icsneo/platform/ftdi.h"
 #include <iostream>
 #include <stdio.h>
 #include <cstring>
diff --git a/platform/posix/include/devices.h b/platform/posix/include/devices.h
deleted file mode 100644
index dded6d0..0000000
--- a/platform/posix/include/devices.h
+++ /dev/null
@@ -1,22 +0,0 @@
-#ifndef __DEVICES_POSIX_H_
-#define __DEVICES_POSIX_H_
-
-#include "device/neoobd2pro/include/neoobd2pro.h"
-#include "device/neoobd2sim/include/neoobd2sim.h"
-#include "device/neovifire/include/neovifire.h"
-//#include "device/neovifire2/include/neovifire2eth.h" Ethernet not yet supported
-#include "device/neovifire2/include/neovifire2usb.h"
-#include "device/plasion/include/neoviion.h"
-#include "device/plasion/include/neoviplasma.h"
-//#include "device/radgalaxy/include/radgalaxy.h" Ethernet not yet supported
-//#include "device/radstar2/include/radstar2eth.h" Ethernet not yet supported
-#include "device/radstar2/include/radstar2usb.h"
-#include "device/radsupermoon/include/radsupermoon.h"
-#include "device/valuecan3/include/valuecan3.h"
-#include "device/valuecan4/include/valuecan4-1.h"
-#include "device/valuecan4/include/valuecan4-2.h"
-#include "device/valuecan4/include/valuecan4-2el.h"
-#include "device/valuecan4/include/valuecan4-4.h"
-#include "device/vividcan/include/vividcan.h"
-
-#endif
\ No newline at end of file
diff --git a/platform/posix/stm32.cpp b/platform/posix/stm32.cpp
index ecef923..d64e8b3 100644
--- a/platform/posix/stm32.cpp
+++ b/platform/posix/stm32.cpp
@@ -1,4 +1,4 @@
-#include "platform/include/stm32.h"
+#include "icsneo/platform/stm32.h"
 #include <dirent.h>
 #include <cstring>
 #include <iostream>
diff --git a/platform/windows/include/devices.h b/platform/windows/include/devices.h
deleted file mode 100644
index d70fff9..0000000
--- a/platform/windows/include/devices.h
+++ /dev/null
@@ -1,22 +0,0 @@
-#ifndef __DEVICES_WINDOWS_H_
-#define __DEVICES_WINDOWS_H_
-
-#include "device/neoobd2pro/include/neoobd2pro.h"
-#include "device/neoobd2sim/include/neoobd2sim.h"
-#include "device/neovifire/include/neovifire.h"
-#include "device/neovifire2/include/neovifire2eth.h"
-#include "device/neovifire2/include/neovifire2usb.h"
-#include "device/plasion/include/neoviion.h"
-#include "device/plasion/include/neoviplasma.h"
-#include "device/radgalaxy/include/radgalaxy.h"
-#include "device/radstar2/include/radstar2eth.h"
-#include "device/radstar2/include/radstar2usb.h"
-#include "device/radsupermoon/include/radsupermoon.h"
-#include "device/valuecan3/include/valuecan3.h"
-#include "device/valuecan4/include/valuecan4-1.h"
-#include "device/valuecan4/include/valuecan4-2.h"
-#include "device/valuecan4/include/valuecan4-2el.h"
-#include "device/valuecan4/include/valuecan4-4.h"
-#include "device/vividcan/include/vividcan.h"
-
-#endif
\ No newline at end of file
diff --git a/platform/windows/internal/pcapdll.cpp b/platform/windows/internal/pcapdll.cpp
index 7e3ac39..e3fe895 100644
--- a/platform/windows/internal/pcapdll.cpp
+++ b/platform/windows/internal/pcapdll.cpp
@@ -1,4 +1,4 @@
-#include "platform/windows/internal/include/pcapdll.h"
+#include "icsneo/platform/windows/internal/pcapdll.h"
 
 using namespace icsneo;
 
diff --git a/platform/windows/pcap.cpp b/platform/windows/pcap.cpp
index ad806be..18b2fb1 100644
--- a/platform/windows/pcap.cpp
+++ b/platform/windows/pcap.cpp
@@ -1,7 +1,7 @@
-#include "platform/windows/include/pcap.h"
-#include "communication/include/network.h"
-#include "communication/include/communication.h"
-#include "communication/include/packetizer.h"
+#include "icsneo/platform/windows/pcap.h"
+#include "icsneo/communication/network.h"
+#include "icsneo/communication/communication.h"
+#include "icsneo/communication/packetizer.h"
 #include <pcap.h>
 #include <iphlpapi.h>
 #pragma comment(lib, "IPHLPAPI.lib")
diff --git a/platform/windows/registry.cpp b/platform/windows/registry.cpp
index 93dd0f0..a569f30 100644
--- a/platform/windows/registry.cpp
+++ b/platform/windows/registry.cpp
@@ -1,4 +1,4 @@
-#include "platform/windows/include/registry.h"
+#include "icsneo/platform/windows/registry.h"
 #include <codecvt>
 #include <vector>
 
diff --git a/platform/windows/vcp.cpp b/platform/windows/vcp.cpp
index ee3849c..6406b11 100644
--- a/platform/windows/vcp.cpp
+++ b/platform/windows/vcp.cpp
@@ -1,6 +1,6 @@
-#include "platform/windows/include/ftdi.h"
-#include "platform/include/ftdi.h"
-#include "platform/include/registry.h"
+#include "icsneo/platform/windows/ftdi.h"
+#include "icsneo/platform/ftdi.h"
+#include "icsneo/platform/registry.h"
 #include <iostream>
 #include <iomanip>
 #include <sstream>