diff --git a/source/RobotAPI/CMakeLists.txt b/source/RobotAPI/CMakeLists.txt
index d46be2e379449e6b4440dec86856626e20979164..11f446c9513707423afad3685500edfd6231c440 100644
--- a/source/RobotAPI/CMakeLists.txt
+++ b/source/RobotAPI/CMakeLists.txt
@@ -1,7 +1,8 @@
 add_subdirectory(interface)
+add_subdirectory(libraries)
 add_subdirectory(components)
+add_subdirectory(drivers)
 add_subdirectory(statecharts)
-add_subdirectory(libraries)
 add_subdirectory(gui-plugins)
 
 add_subdirectory(applications)
diff --git a/source/RobotAPI/libraries/drivers/CMakeLists.txt b/source/RobotAPI/drivers/CMakeLists.txt
similarity index 100%
rename from source/RobotAPI/libraries/drivers/CMakeLists.txt
rename to source/RobotAPI/drivers/CMakeLists.txt
diff --git a/source/RobotAPI/libraries/drivers/WeissHapticSensor/AbstractInterface.cpp b/source/RobotAPI/drivers/WeissHapticSensor/AbstractInterface.cpp
similarity index 100%
rename from source/RobotAPI/libraries/drivers/WeissHapticSensor/AbstractInterface.cpp
rename to source/RobotAPI/drivers/WeissHapticSensor/AbstractInterface.cpp
diff --git a/source/RobotAPI/libraries/drivers/WeissHapticSensor/AbstractInterface.h b/source/RobotAPI/drivers/WeissHapticSensor/AbstractInterface.h
similarity index 100%
rename from source/RobotAPI/libraries/drivers/WeissHapticSensor/AbstractInterface.h
rename to source/RobotAPI/drivers/WeissHapticSensor/AbstractInterface.h
diff --git a/source/RobotAPI/libraries/drivers/WeissHapticSensor/BinaryLogger.cpp b/source/RobotAPI/drivers/WeissHapticSensor/BinaryLogger.cpp
similarity index 100%
rename from source/RobotAPI/libraries/drivers/WeissHapticSensor/BinaryLogger.cpp
rename to source/RobotAPI/drivers/WeissHapticSensor/BinaryLogger.cpp
diff --git a/source/RobotAPI/libraries/drivers/WeissHapticSensor/BinaryLogger.h b/source/RobotAPI/drivers/WeissHapticSensor/BinaryLogger.h
similarity index 100%
rename from source/RobotAPI/libraries/drivers/WeissHapticSensor/BinaryLogger.h
rename to source/RobotAPI/drivers/WeissHapticSensor/BinaryLogger.h
diff --git a/source/RobotAPI/libraries/drivers/WeissHapticSensor/CMakeLists.txt b/source/RobotAPI/drivers/WeissHapticSensor/CMakeLists.txt
similarity index 100%
rename from source/RobotAPI/libraries/drivers/WeissHapticSensor/CMakeLists.txt
rename to source/RobotAPI/drivers/WeissHapticSensor/CMakeLists.txt
diff --git a/source/RobotAPI/libraries/drivers/WeissHapticSensor/CalibrationHelper.cpp b/source/RobotAPI/drivers/WeissHapticSensor/CalibrationHelper.cpp
similarity index 100%
rename from source/RobotAPI/libraries/drivers/WeissHapticSensor/CalibrationHelper.cpp
rename to source/RobotAPI/drivers/WeissHapticSensor/CalibrationHelper.cpp
diff --git a/source/RobotAPI/libraries/drivers/WeissHapticSensor/CalibrationHelper.h b/source/RobotAPI/drivers/WeissHapticSensor/CalibrationHelper.h
similarity index 100%
rename from source/RobotAPI/libraries/drivers/WeissHapticSensor/CalibrationHelper.h
rename to source/RobotAPI/drivers/WeissHapticSensor/CalibrationHelper.h
diff --git a/source/RobotAPI/libraries/drivers/WeissHapticSensor/CalibrationInfo.cpp b/source/RobotAPI/drivers/WeissHapticSensor/CalibrationInfo.cpp
similarity index 100%
rename from source/RobotAPI/libraries/drivers/WeissHapticSensor/CalibrationInfo.cpp
rename to source/RobotAPI/drivers/WeissHapticSensor/CalibrationInfo.cpp
diff --git a/source/RobotAPI/libraries/drivers/WeissHapticSensor/CalibrationInfo.h b/source/RobotAPI/drivers/WeissHapticSensor/CalibrationInfo.h
similarity index 100%
rename from source/RobotAPI/libraries/drivers/WeissHapticSensor/CalibrationInfo.h
rename to source/RobotAPI/drivers/WeissHapticSensor/CalibrationInfo.h
diff --git a/source/RobotAPI/libraries/drivers/WeissHapticSensor/Checksum.cpp b/source/RobotAPI/drivers/WeissHapticSensor/Checksum.cpp
similarity index 100%
rename from source/RobotAPI/libraries/drivers/WeissHapticSensor/Checksum.cpp
rename to source/RobotAPI/drivers/WeissHapticSensor/Checksum.cpp
diff --git a/source/RobotAPI/libraries/drivers/WeissHapticSensor/Checksum.h b/source/RobotAPI/drivers/WeissHapticSensor/Checksum.h
similarity index 100%
rename from source/RobotAPI/libraries/drivers/WeissHapticSensor/Checksum.h
rename to source/RobotAPI/drivers/WeissHapticSensor/Checksum.h
diff --git a/source/RobotAPI/libraries/drivers/WeissHapticSensor/Response.h b/source/RobotAPI/drivers/WeissHapticSensor/Response.h
similarity index 100%
rename from source/RobotAPI/libraries/drivers/WeissHapticSensor/Response.h
rename to source/RobotAPI/drivers/WeissHapticSensor/Response.h
diff --git a/source/RobotAPI/libraries/drivers/WeissHapticSensor/SerialInterface.cpp b/source/RobotAPI/drivers/WeissHapticSensor/SerialInterface.cpp
similarity index 100%
rename from source/RobotAPI/libraries/drivers/WeissHapticSensor/SerialInterface.cpp
rename to source/RobotAPI/drivers/WeissHapticSensor/SerialInterface.cpp
diff --git a/source/RobotAPI/libraries/drivers/WeissHapticSensor/SerialInterface.h b/source/RobotAPI/drivers/WeissHapticSensor/SerialInterface.h
similarity index 100%
rename from source/RobotAPI/libraries/drivers/WeissHapticSensor/SerialInterface.h
rename to source/RobotAPI/drivers/WeissHapticSensor/SerialInterface.h
diff --git a/source/RobotAPI/libraries/drivers/WeissHapticSensor/TactileSensor.cpp b/source/RobotAPI/drivers/WeissHapticSensor/TactileSensor.cpp
similarity index 100%
rename from source/RobotAPI/libraries/drivers/WeissHapticSensor/TactileSensor.cpp
rename to source/RobotAPI/drivers/WeissHapticSensor/TactileSensor.cpp
diff --git a/source/RobotAPI/libraries/drivers/WeissHapticSensor/TactileSensor.h b/source/RobotAPI/drivers/WeissHapticSensor/TactileSensor.h
similarity index 100%
rename from source/RobotAPI/libraries/drivers/WeissHapticSensor/TactileSensor.h
rename to source/RobotAPI/drivers/WeissHapticSensor/TactileSensor.h
diff --git a/source/RobotAPI/libraries/drivers/WeissHapticSensor/TextWriter.cpp b/source/RobotAPI/drivers/WeissHapticSensor/TextWriter.cpp
similarity index 100%
rename from source/RobotAPI/libraries/drivers/WeissHapticSensor/TextWriter.cpp
rename to source/RobotAPI/drivers/WeissHapticSensor/TextWriter.cpp
diff --git a/source/RobotAPI/libraries/drivers/WeissHapticSensor/TextWriter.h b/source/RobotAPI/drivers/WeissHapticSensor/TextWriter.h
similarity index 100%
rename from source/RobotAPI/libraries/drivers/WeissHapticSensor/TextWriter.h
rename to source/RobotAPI/drivers/WeissHapticSensor/TextWriter.h
diff --git a/source/RobotAPI/libraries/drivers/WeissHapticSensor/TransmissionException.h b/source/RobotAPI/drivers/WeissHapticSensor/TransmissionException.h
similarity index 100%
rename from source/RobotAPI/libraries/drivers/WeissHapticSensor/TransmissionException.h
rename to source/RobotAPI/drivers/WeissHapticSensor/TransmissionException.h
diff --git a/source/RobotAPI/libraries/drivers/WeissHapticSensor/Types.h b/source/RobotAPI/drivers/WeissHapticSensor/Types.h
similarity index 100%
rename from source/RobotAPI/libraries/drivers/WeissHapticSensor/Types.h
rename to source/RobotAPI/drivers/WeissHapticSensor/Types.h
diff --git a/source/RobotAPI/libraries/drivers/WeissHapticSensor/WeissHapticSensor.cpp b/source/RobotAPI/drivers/WeissHapticSensor/WeissHapticSensor.cpp
similarity index 100%
rename from source/RobotAPI/libraries/drivers/WeissHapticSensor/WeissHapticSensor.cpp
rename to source/RobotAPI/drivers/WeissHapticSensor/WeissHapticSensor.cpp
diff --git a/source/RobotAPI/libraries/drivers/WeissHapticSensor/WeissHapticSensor.h b/source/RobotAPI/drivers/WeissHapticSensor/WeissHapticSensor.h
similarity index 100%
rename from source/RobotAPI/libraries/drivers/WeissHapticSensor/WeissHapticSensor.h
rename to source/RobotAPI/drivers/WeissHapticSensor/WeissHapticSensor.h
diff --git a/source/RobotAPI/libraries/drivers/WeissHapticSensor/WeissHapticUnit.cpp b/source/RobotAPI/drivers/WeissHapticSensor/WeissHapticUnit.cpp
similarity index 100%
rename from source/RobotAPI/libraries/drivers/WeissHapticSensor/WeissHapticUnit.cpp
rename to source/RobotAPI/drivers/WeissHapticSensor/WeissHapticUnit.cpp
diff --git a/source/RobotAPI/libraries/drivers/WeissHapticSensor/WeissHapticUnit.h b/source/RobotAPI/drivers/WeissHapticSensor/WeissHapticUnit.h
similarity index 100%
rename from source/RobotAPI/libraries/drivers/WeissHapticSensor/WeissHapticUnit.h
rename to source/RobotAPI/drivers/WeissHapticSensor/WeissHapticUnit.h
diff --git a/source/RobotAPI/libraries/drivers/WeissHapticSensor/um_wts0614-34_04-2013_en.pdf b/source/RobotAPI/drivers/WeissHapticSensor/um_wts0614-34_04-2013_en.pdf
similarity index 100%
rename from source/RobotAPI/libraries/drivers/WeissHapticSensor/um_wts0614-34_04-2013_en.pdf
rename to source/RobotAPI/drivers/WeissHapticSensor/um_wts0614-34_04-2013_en.pdf
diff --git a/source/RobotAPI/libraries/drivers/WeissHapticSensor/wts_command_set_reference_manual.pdf b/source/RobotAPI/drivers/WeissHapticSensor/wts_command_set_reference_manual.pdf
similarity index 100%
rename from source/RobotAPI/libraries/drivers/WeissHapticSensor/wts_command_set_reference_manual.pdf
rename to source/RobotAPI/drivers/WeissHapticSensor/wts_command_set_reference_manual.pdf
diff --git a/source/RobotAPI/libraries/drivers/XsensIMU/CMakeLists.txt b/source/RobotAPI/drivers/XsensIMU/CMakeLists.txt
similarity index 100%
rename from source/RobotAPI/libraries/drivers/XsensIMU/CMakeLists.txt
rename to source/RobotAPI/drivers/XsensIMU/CMakeLists.txt
diff --git a/source/RobotAPI/libraries/drivers/XsensIMU/IMU/CMakeLists.txt b/source/RobotAPI/drivers/XsensIMU/IMU/CMakeLists.txt
similarity index 100%
rename from source/RobotAPI/libraries/drivers/XsensIMU/IMU/CMakeLists.txt
rename to source/RobotAPI/drivers/XsensIMU/IMU/CMakeLists.txt
diff --git a/source/RobotAPI/libraries/drivers/XsensIMU/IMU/IIMUEventDispatcher.cpp b/source/RobotAPI/drivers/XsensIMU/IMU/IIMUEventDispatcher.cpp
similarity index 100%
rename from source/RobotAPI/libraries/drivers/XsensIMU/IMU/IIMUEventDispatcher.cpp
rename to source/RobotAPI/drivers/XsensIMU/IMU/IIMUEventDispatcher.cpp
diff --git a/source/RobotAPI/libraries/drivers/XsensIMU/IMU/IIMUEventDispatcher.h b/source/RobotAPI/drivers/XsensIMU/IMU/IIMUEventDispatcher.h
similarity index 100%
rename from source/RobotAPI/libraries/drivers/XsensIMU/IMU/IIMUEventDispatcher.h
rename to source/RobotAPI/drivers/XsensIMU/IMU/IIMUEventDispatcher.h
diff --git a/source/RobotAPI/libraries/drivers/XsensIMU/IMU/IMU.h b/source/RobotAPI/drivers/XsensIMU/IMU/IMU.h
similarity index 100%
rename from source/RobotAPI/libraries/drivers/XsensIMU/IMU/IMU.h
rename to source/RobotAPI/drivers/XsensIMU/IMU/IMU.h
diff --git a/source/RobotAPI/libraries/drivers/XsensIMU/IMU/IMUDeducedReckoning.cpp b/source/RobotAPI/drivers/XsensIMU/IMU/IMUDeducedReckoning.cpp
similarity index 100%
rename from source/RobotAPI/libraries/drivers/XsensIMU/IMU/IMUDeducedReckoning.cpp
rename to source/RobotAPI/drivers/XsensIMU/IMU/IMUDeducedReckoning.cpp
diff --git a/source/RobotAPI/libraries/drivers/XsensIMU/IMU/IMUDeducedReckoning.h b/source/RobotAPI/drivers/XsensIMU/IMU/IMUDeducedReckoning.h
similarity index 100%
rename from source/RobotAPI/libraries/drivers/XsensIMU/IMU/IMUDeducedReckoning.h
rename to source/RobotAPI/drivers/XsensIMU/IMU/IMUDeducedReckoning.h
diff --git a/source/RobotAPI/libraries/drivers/XsensIMU/IMU/IMUDevice.cpp b/source/RobotAPI/drivers/XsensIMU/IMU/IMUDevice.cpp
similarity index 100%
rename from source/RobotAPI/libraries/drivers/XsensIMU/IMU/IMUDevice.cpp
rename to source/RobotAPI/drivers/XsensIMU/IMU/IMUDevice.cpp
diff --git a/source/RobotAPI/libraries/drivers/XsensIMU/IMU/IMUDevice.h b/source/RobotAPI/drivers/XsensIMU/IMU/IMUDevice.h
similarity index 100%
rename from source/RobotAPI/libraries/drivers/XsensIMU/IMU/IMUDevice.h
rename to source/RobotAPI/drivers/XsensIMU/IMU/IMUDevice.h
diff --git a/source/RobotAPI/libraries/drivers/XsensIMU/IMU/IMUEvent.cpp b/source/RobotAPI/drivers/XsensIMU/IMU/IMUEvent.cpp
similarity index 100%
rename from source/RobotAPI/libraries/drivers/XsensIMU/IMU/IMUEvent.cpp
rename to source/RobotAPI/drivers/XsensIMU/IMU/IMUEvent.cpp
diff --git a/source/RobotAPI/libraries/drivers/XsensIMU/IMU/IMUEvent.h b/source/RobotAPI/drivers/XsensIMU/IMU/IMUEvent.h
similarity index 100%
rename from source/RobotAPI/libraries/drivers/XsensIMU/IMU/IMUEvent.h
rename to source/RobotAPI/drivers/XsensIMU/IMU/IMUEvent.h
diff --git a/source/RobotAPI/libraries/drivers/XsensIMU/IMU/IMUHelpers.cpp b/source/RobotAPI/drivers/XsensIMU/IMU/IMUHelpers.cpp
similarity index 100%
rename from source/RobotAPI/libraries/drivers/XsensIMU/IMU/IMUHelpers.cpp
rename to source/RobotAPI/drivers/XsensIMU/IMU/IMUHelpers.cpp
diff --git a/source/RobotAPI/libraries/drivers/XsensIMU/IMU/IMUHelpers.h b/source/RobotAPI/drivers/XsensIMU/IMU/IMUHelpers.h
similarity index 100%
rename from source/RobotAPI/libraries/drivers/XsensIMU/IMU/IMUHelpers.h
rename to source/RobotAPI/drivers/XsensIMU/IMU/IMUHelpers.h
diff --git a/source/RobotAPI/libraries/drivers/XsensIMU/IMU/IMUState.cpp b/source/RobotAPI/drivers/XsensIMU/IMU/IMUState.cpp
similarity index 100%
rename from source/RobotAPI/libraries/drivers/XsensIMU/IMU/IMUState.cpp
rename to source/RobotAPI/drivers/XsensIMU/IMU/IMUState.cpp
diff --git a/source/RobotAPI/libraries/drivers/XsensIMU/IMU/IMUState.h b/source/RobotAPI/drivers/XsensIMU/IMU/IMUState.h
similarity index 100%
rename from source/RobotAPI/libraries/drivers/XsensIMU/IMU/IMUState.h
rename to source/RobotAPI/drivers/XsensIMU/IMU/IMUState.h
diff --git a/source/RobotAPI/libraries/drivers/XsensIMU/IMU/Includes.h b/source/RobotAPI/drivers/XsensIMU/IMU/Includes.h
similarity index 100%
rename from source/RobotAPI/libraries/drivers/XsensIMU/IMU/Includes.h
rename to source/RobotAPI/drivers/XsensIMU/IMU/Includes.h
diff --git a/source/RobotAPI/libraries/drivers/XsensIMU/IMU/Xsens/Xsens.h b/source/RobotAPI/drivers/XsensIMU/IMU/Xsens/Xsens.h
similarity index 100%
rename from source/RobotAPI/libraries/drivers/XsensIMU/IMU/Xsens/Xsens.h
rename to source/RobotAPI/drivers/XsensIMU/IMU/Xsens/Xsens.h
diff --git a/source/RobotAPI/libraries/drivers/XsensIMU/IMU/Xsens/XsensMTiModule.cpp b/source/RobotAPI/drivers/XsensIMU/IMU/Xsens/XsensMTiModule.cpp
similarity index 100%
rename from source/RobotAPI/libraries/drivers/XsensIMU/IMU/Xsens/XsensMTiModule.cpp
rename to source/RobotAPI/drivers/XsensIMU/IMU/Xsens/XsensMTiModule.cpp
diff --git a/source/RobotAPI/libraries/drivers/XsensIMU/IMU/Xsens/XsensMTiModule.h b/source/RobotAPI/drivers/XsensIMU/IMU/Xsens/XsensMTiModule.h
similarity index 100%
rename from source/RobotAPI/libraries/drivers/XsensIMU/IMU/Xsens/XsensMTiModule.h
rename to source/RobotAPI/drivers/XsensIMU/IMU/Xsens/XsensMTiModule.h
diff --git a/source/RobotAPI/libraries/drivers/XsensIMU/XsensIMU.cpp b/source/RobotAPI/drivers/XsensIMU/XsensIMU.cpp
similarity index 100%
rename from source/RobotAPI/libraries/drivers/XsensIMU/XsensIMU.cpp
rename to source/RobotAPI/drivers/XsensIMU/XsensIMU.cpp
diff --git a/source/RobotAPI/libraries/drivers/XsensIMU/XsensIMU.h b/source/RobotAPI/drivers/XsensIMU/XsensIMU.h
similarity index 100%
rename from source/RobotAPI/libraries/drivers/XsensIMU/XsensIMU.h
rename to source/RobotAPI/drivers/XsensIMU/XsensIMU.h
diff --git a/source/RobotAPI/libraries/CMakeLists.txt b/source/RobotAPI/libraries/CMakeLists.txt
index c3d725373ed3d4a44f2cc629f1775fe3e7be8e43..c91c3c67b7b19691e2999f179a31cd990020fcbd 100644
--- a/source/RobotAPI/libraries/CMakeLists.txt
+++ b/source/RobotAPI/libraries/CMakeLists.txt
@@ -1,4 +1,3 @@
-add_subdirectory(drivers)
 add_subdirectory(core)
 add_subdirectory(widgets)