diff --git a/source/RobotAPI/CMakeLists.txt b/source/RobotAPI/CMakeLists.txt
index 8da782e87eda183a9c6266f76e3f6381118cb146..6014d839f0e42274dd1c08a8848ea760400e11eb 100644
--- a/source/RobotAPI/CMakeLists.txt
+++ b/source/RobotAPI/CMakeLists.txt
@@ -2,5 +2,4 @@ add_subdirectory(core)
 add_subdirectory(motioncontrol)
 add_subdirectory(applications)
 add_subdirectory(units)
-add_subdirectory(GraspingWithTorques)
-add_subdirectory(OpenHand)
+add_subdirectory(statecharts)
diff --git a/source/RobotAPI/statecharts/CMakeLists.txt b/source/RobotAPI/statecharts/CMakeLists.txt
new file mode 100644
index 0000000000000000000000000000000000000000..d49eaefadf4a1deb4c5fd4ddc881c5baca4a2b53
--- /dev/null
+++ b/source/RobotAPI/statecharts/CMakeLists.txt
@@ -0,0 +1,2 @@
+add_subdirectory(GraspingWithTorques)
+add_subdirectory(OpenHand)
diff --git a/source/RobotAPI/GraspingWithTorques/CMakeLists.txt b/source/RobotAPI/statecharts/GraspingWithTorques/CMakeLists.txt
similarity index 100%
rename from source/RobotAPI/GraspingWithTorques/CMakeLists.txt
rename to source/RobotAPI/statecharts/GraspingWithTorques/CMakeLists.txt
diff --git a/source/RobotAPI/GraspingWithTorques/GraspingWithTorques.cpp b/source/RobotAPI/statecharts/GraspingWithTorques/GraspingWithTorques.cpp
similarity index 99%
rename from source/RobotAPI/GraspingWithTorques/GraspingWithTorques.cpp
rename to source/RobotAPI/statecharts/GraspingWithTorques/GraspingWithTorques.cpp
index c10bcd492fabb0c7db8aa33a9c8d776f76793e39..02ffd83b67625df55a4a7e03e4c5c61b62523642 100644
--- a/source/RobotAPI/GraspingWithTorques/GraspingWithTorques.cpp
+++ b/source/RobotAPI/statecharts/GraspingWithTorques/GraspingWithTorques.cpp
@@ -24,7 +24,7 @@
 
 #include "GraspingWithTorques.h"
 //#include "Armar3GraspContext.h"   //MP: Maybe necessary again later?
-#include "../core/RobotStatechartContext.h"
+#include "../../core/RobotStatechartContext.h"
 
 #include <Core/observers/variant/ChannelRef.h>
 #include <Core/observers/variant/SingleTypeVariantList.h>
diff --git a/source/RobotAPI/GraspingWithTorques/GraspingWithTorques.h b/source/RobotAPI/statecharts/GraspingWithTorques/GraspingWithTorques.h
similarity index 100%
rename from source/RobotAPI/GraspingWithTorques/GraspingWithTorques.h
rename to source/RobotAPI/statecharts/GraspingWithTorques/GraspingWithTorques.h
diff --git a/source/RobotAPI/OpenHand/CMakeLists.txt b/source/RobotAPI/statecharts/OpenHand/CMakeLists.txt
similarity index 100%
rename from source/RobotAPI/OpenHand/CMakeLists.txt
rename to source/RobotAPI/statecharts/OpenHand/CMakeLists.txt
diff --git a/source/RobotAPI/OpenHand/OpenHand.cpp b/source/RobotAPI/statecharts/OpenHand/OpenHand.cpp
similarity index 99%
rename from source/RobotAPI/OpenHand/OpenHand.cpp
rename to source/RobotAPI/statecharts/OpenHand/OpenHand.cpp
index a78a7cb41e6c2098a97830268bda2967ff5cb84b..1baf286ef48decad27ad31f9499b5b58ac11faa7 100644
--- a/source/RobotAPI/OpenHand/OpenHand.cpp
+++ b/source/RobotAPI/statecharts/OpenHand/OpenHand.cpp
@@ -24,7 +24,7 @@
 
 #include "OpenHand.h"
 //#include "Armar3GraspContext.h"   //MP: Maybe necessary again later?
-#include "../core/RobotStatechartContext.h"
+#include "../../core/RobotStatechartContext.h"
 
 #include <Core/observers/variant/ChannelRef.h>
 #include <Core/observers/variant/SingleTypeVariantList.h>
diff --git a/source/RobotAPI/OpenHand/OpenHand.h b/source/RobotAPI/statecharts/OpenHand/OpenHand.h
similarity index 100%
rename from source/RobotAPI/OpenHand/OpenHand.h
rename to source/RobotAPI/statecharts/OpenHand/OpenHand.h