diff --git a/source/RobotAPI/components/armem/server/SkillsMemory/CMakeLists.txt b/source/RobotAPI/components/armem/server/SkillsMemory/CMakeLists.txt
index f1a8e2414f7af31a27bbb4ca071b06f1c08598a6..b9d1d4fd44ed2bf58f8eccd64faa9ab0eafc83ef 100644
--- a/source/RobotAPI/components/armem/server/SkillsMemory/CMakeLists.txt
+++ b/source/RobotAPI/components/armem/server/SkillsMemory/CMakeLists.txt
@@ -10,6 +10,7 @@ set(COMPONENT_LIBS
     ${IVT_LIBRARIES}
 )
 
+
 set(SOURCES
     SkillsMemory.cpp
 )
@@ -17,14 +18,9 @@ set(HEADERS
     SkillsMemory.h
 )
 
+
 armarx_add_component("${SOURCES}" "${HEADERS}")
 
-#armarx_enable_aron_file_generation_for_target(
-#    TARGET_NAME
-#        ${ARMARX_COMPONENT_NAME}
-#    ARON_FILES
-#        aron/StatechartData.xml
-#)
 
 #generate the application
 armarx_generate_and_add_component_executable()
diff --git a/source/RobotAPI/libraries/CMakeLists.txt b/source/RobotAPI/libraries/CMakeLists.txt
index 46c83e4101e0566024aef99c2ff26117b042040f..1609bb72783e787546c9ef7608d99d4d3374197f 100644
--- a/source/RobotAPI/libraries/CMakeLists.txt
+++ b/source/RobotAPI/libraries/CMakeLists.txt
@@ -22,11 +22,10 @@ add_subdirectory(armem_gui)
 add_subdirectory(armem_objects)
 add_subdirectory(armem_robot_localization)
 add_subdirectory(armem_robot_mapping)
+add_subdirectory(armem_skills)
 add_subdirectory(aron)
 
 add_subdirectory(NJointControllerGuiPluginUtility)
 add_subdirectory(RobotAPINJointControllerWidgets)
 add_subdirectory(RobotUnitDataStreamingReceiver)
 add_subdirectory(GraspingUtility)
-
-add_subdirectory(armem_skills)
\ No newline at end of file