reordered directory structure

source/RobotAPI/CMakeLists.txt

 add_subdirectory(interface)
-add_subdirectory(core)
-add_subdirectory(motioncontrol)
 add_subdirectory(applications)
-add_subdirectory(units)
-add_subdirectory(armarx-objects)
+add_subdirectory(components)
 add_subdirectory(statecharts)
-add_subdirectory(drivers)
+add_subdirectory(libraries)
 
-add_subdirectory(robotstate)
-add_subdirectory(robotstate/remote)
-add_subdirectory(operations)
 

source/RobotAPI/applications/ForceTorqueObserver/ForceTorqueObserverApp.h

@@ -23,7 +23,7 @@
 
 
 #include <Core/core/application/Application.h>
-#include <RobotAPI/units/ForceTorqueObserver.h>
+#include <RobotAPI/libraries/units/ForceTorqueObserver.h>
 
 namespace armarx
 {

source/RobotAPI/applications/ForceTorqueUnitSimulation/ForceTorqueUnitSimulationApp.h

@@ -23,7 +23,7 @@
 
 
 #include <Core/core/application/Application.h>
-#include <RobotAPI/units/ForceTorqueUnitSimulation.h>
+#include <RobotAPI/libraries/units/ForceTorqueUnitSimulation.h>
 
 namespace armarx
 {

source/RobotAPI/applications/HandUnitObserver/HandUnitObserverApp.h

@@ -25,7 +25,7 @@
 #define _ARMARX_APPLICATION_RobotAPI_HandUnitObserver_H
 
 
- #include <RobotAPI/units/HandUnitObserver.h>
+ #include <RobotAPI/libraries/units/HandUnitObserver.h>
 
 #include <Core/core/application/Application.h>
 

source/RobotAPI/applications/HandUnitSimulation/HandUnitSimulationApp.h

@@ -25,7 +25,7 @@
 #define _ARMARX_APPLICATION_RobotAPI_HandUnitSimulation_H
 
 
- #include <RobotAPI/units/HandUnitSimulation.h>
+ #include <RobotAPI/libraries/units/HandUnitSimulation.h>
 
 #include <Core/core/application/Application.h>
 

source/RobotAPI/applications/HapticObserver/HapticObserverApp.h

@@ -25,7 +25,7 @@
 #define _ARMARX_APPLICATION_RobotAPI_HapticObserver_H
 
 #include <Core/core/application/Application.h>
-#include <RobotAPI/units/HapticObserver.h>
+#include <RobotAPI/libraries/units/HapticObserver.h>
 
 namespace armarx
 {

source/RobotAPI/applications/HeadIKUnit/HeadIKUnitApp.h

@@ -23,7 +23,7 @@
 
 
 #include <Core/core/application/Application.h>
-#include <RobotAPI/units/HeadIKUnit.h>
+#include <RobotAPI/libraries/units/HeadIKUnit.h>
 
 namespace armarx
 {

source/RobotAPI/applications/KinematicUnitObserver/KinematicUnitObserverApp.h

@@ -23,7 +23,7 @@
 
 
 #include <Core/core/application/Application.h>
-#include <RobotAPI/units/KinematicUnitObserver.h>
+#include <RobotAPI/libraries/units/KinematicUnitObserver.h>
 
 namespace armarx
 {

source/RobotAPI/applications/KinematicUnitSimulation/KinematicUnitSimulationApp.h

@@ -23,7 +23,7 @@
 
 
 #include <Core/core/application/Application.h>
-#include <RobotAPI/units/KinematicUnitSimulation.h>
+#include <RobotAPI/libraries/units/KinematicUnitSimulation.h>
 
 namespace armarx
 {

source/RobotAPI/applications/MotionControl/MotionControlApp.h

@@ -23,7 +23,7 @@
 
 
 #include <Core/core/application/Application.h>
-#include <RobotAPI/motioncontrol/MotionControl.h>
+#include <RobotAPI/statecharts/motioncontrol/MotionControl.h>
 
 namespace armarx
 {

source/RobotAPI/applications/MotionControlTest/MotionControlTestApp.h

@@ -23,7 +23,7 @@
 
 
 #include <Core/core/application/Application.h>
-#include <RobotAPI/motioncontrol/MotionControl.h>
+#include <RobotAPI/statecharts/motioncontrol/MotionControl.h>
 
 namespace armarx
 {

source/RobotAPI/applications/PlatformUnitObserver/PlatformUnitObserverApp.h

@@ -23,7 +23,7 @@
 
 
 #include <Core/core/application/Application.h>
-#include <RobotAPI/units/PlatformUnitObserver.h>
+#include <RobotAPI/libraries/units/PlatformUnitObserver.h>
 
 namespace armarx
 {

source/RobotAPI/applications/PlatformUnitSimulation/PlatformUnitSimulationApp.h

@@ -23,7 +23,7 @@
 
 
 #include <Core/core/application/Application.h>
-#include <RobotAPI/units/PlatformUnitSimulation.h>
+#include <RobotAPI/libraries/units/PlatformUnitSimulation.h>
 
 namespace armarx
 {

source/RobotAPI/applications/RobotControl/RobotControlApp.h

@@ -23,7 +23,7 @@
 
 
 #include <Core/core/application/Application.h>
-#include <RobotAPI/operations/RobotControl.h>
+#include <RobotAPI/statecharts/operations/RobotControl.h>
 
 namespace armarx
 {

source/RobotAPI/applications/RobotControlUI/RobotControlUI.h

@@ -28,7 +28,7 @@
 #include <Core/core/Component.h>
 #include <Core/core/services/tasks/RunningTask.h>
 #include <Core/core/IceManager.h>
-#include <RobotAPI/operations/RobotControl.h>
+#include <RobotAPI/statecharts/operations/RobotControl.h>
 #include <string>
 
 namespace armarx

source/RobotAPI/applications/RobotStateComponent/RobotStateComponentApp.h

@@ -24,7 +24,7 @@
 
 
 #include <Core/core/application/Application.h>
-#include <RobotAPI/robotstate/RobotStateComponent.h>
+#include <RobotAPI/libraries/robotstate/RobotStateComponent.h>
 
 namespace armarx
 {

source/RobotAPI/applications/RobotStateObserver/RobotStateObserverApp.h

@@ -23,7 +23,7 @@
 
 
 #include <Core/core/application/Application.h>
-#include <RobotAPI/robotstate/remote/RobotStateObserver.h>
+#include <RobotAPI/libraries/robotstate/remote/RobotStateObserver.h>
 
 namespace armarx
 {

source/RobotAPI/applications/TCPControlUnit/TCPControlUnitApp.h

@@ -23,8 +23,8 @@
 
 
 #include <Core/core/application/Application.h>
-#include <RobotAPI/units/TCPControlUnit.h>
-#include <RobotAPI/units/TCPControlUnitObserver.h>
+#include <RobotAPI/libraries/units/TCPControlUnit.h>
+#include <RobotAPI/libraries/units/TCPControlUnitObserver.h>
 
 namespace armarx
 {

source/RobotAPI/applications/TCPMoverUnit/TCPMoverUnitApp.h

@@ -23,7 +23,7 @@
 
 
 #include <Core/core/application/Application.h>
-#include <RobotAPI/units/TCPMoverUnit.h>
+#include <RobotAPI/libraries/units/TCPMoverUnit.h>
 
 namespace armarx
 {

source/RobotAPI/applications/WeissHapticSensor/WeissHapticSensorApp.h

@@ -25,10 +25,10 @@
 #define _ARMARX_APPLICATION_RobotAPI_WeissHapticSensor_H
 
 
-#include <RobotAPI/armarx-objects/WeissHapticSensorListener/WeissHapticSensorListener.h>
+#include <RobotAPI/components/WeissHapticSensorListener/WeissHapticSensorListener.h>
 
 #include <Core/core/application/Application.h>
-#include <RobotAPI/units/HapticObserver.h>
+#include <RobotAPI/libraries/units/HapticObserver.h>
 
 namespace armarx
 {