diff --git a/source/RobotAPI/CMakeLists.txt b/source/RobotAPI/CMakeLists.txt
index 9df5d8923e062c172471d5b0ce70462009c92e71..59796017c05137bcf7667a83e6cd36006671660c 100644
--- a/source/RobotAPI/CMakeLists.txt
+++ b/source/RobotAPI/CMakeLists.txt
@@ -4,5 +4,4 @@ add_subdirectory(applications)
 add_subdirectory(units)
 #add_subdirectory(armarx-objects)
 add_subdirectory(statecharts)
-add_subdirectory(MovePlatform)
 
diff --git a/source/RobotAPI/applications/MovePlatform/MovePlatformApp.h b/source/RobotAPI/applications/MovePlatform/MovePlatformApp.h
index 4fc8b6b74c17dd17c85841e7ae33b3b99167dbf4..cb18907adc4d1cbfa3a2c98f7af806ad8b83709e 100644
--- a/source/RobotAPI/applications/MovePlatform/MovePlatformApp.h
+++ b/source/RobotAPI/applications/MovePlatform/MovePlatformApp.h
@@ -25,7 +25,7 @@
 #define _ARMARX_APPLICATION_MovePlatform_H
 
 
-#include <RobotAPI/MovePlatform/MovePlatform.h>
+#include <RobotAPI/statecharts/MovePlatform/MovePlatform.h>
 
 #include <Core/core/application/Application.h>
 
diff --git a/source/RobotAPI/statecharts/CMakeLists.txt b/source/RobotAPI/statecharts/CMakeLists.txt
index d49eaefadf4a1deb4c5fd4ddc881c5baca4a2b53..825e2e6bc0f94d29d2b5258732a0420fdbce5606 100644
--- a/source/RobotAPI/statecharts/CMakeLists.txt
+++ b/source/RobotAPI/statecharts/CMakeLists.txt
@@ -1,2 +1,3 @@
 add_subdirectory(GraspingWithTorques)
 add_subdirectory(OpenHand)
+add_subdirectory(MovePlatform)
diff --git a/source/RobotAPI/MovePlatform/CMakeLists.txt b/source/RobotAPI/statecharts/MovePlatform/CMakeLists.txt
similarity index 100%
rename from source/RobotAPI/MovePlatform/CMakeLists.txt
rename to source/RobotAPI/statecharts/MovePlatform/CMakeLists.txt
diff --git a/source/RobotAPI/MovePlatform/MovePlatform.cpp b/source/RobotAPI/statecharts/MovePlatform/MovePlatform.cpp
similarity index 100%
rename from source/RobotAPI/MovePlatform/MovePlatform.cpp
rename to source/RobotAPI/statecharts/MovePlatform/MovePlatform.cpp
diff --git a/source/RobotAPI/MovePlatform/MovePlatform.h b/source/RobotAPI/statecharts/MovePlatform/MovePlatform.h
similarity index 97%
rename from source/RobotAPI/MovePlatform/MovePlatform.h
rename to source/RobotAPI/statecharts/MovePlatform/MovePlatform.h
index e2bb6aed55aa318897d835447d1b61e49b37de52..b63fd58c295eee8d9a991e03716d15c97992a7fa 100644
--- a/source/RobotAPI/MovePlatform/MovePlatform.h
+++ b/source/RobotAPI/statecharts/MovePlatform/MovePlatform.h
@@ -25,7 +25,7 @@
 #define ARMARX_COMPONENT_MOVE_PLATFORM_H
 
 #include <Core/statechart/Statechart.h>
-#include <RobotAPI/MovePlatform/PlatformContext.h>
+#include <RobotAPI/statecharts/MovePlatform/PlatformContext.h>
 
 namespace armarx
 {
diff --git a/source/RobotAPI/MovePlatform/PlatformContext.h b/source/RobotAPI/statecharts/MovePlatform/PlatformContext.h
similarity index 100%
rename from source/RobotAPI/MovePlatform/PlatformContext.h
rename to source/RobotAPI/statecharts/MovePlatform/PlatformContext.h