diff --git a/CMakeLists.txt b/CMakeLists.txt
index ef7ff08..a017c61 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -117,10 +117,10 @@ add_module(ringbuffer library/ringbuffer OFF OFF)
 add_module(peripheral peripheral OFF ON)
 add_module(lua lua OFF ON)
 add_module(bspMCU bspMCU OFF OFF)
-add_module(RBcore RBcore OFF OFF)
+add_module(RBcore project/RBcore OFF OFF)
 add_module(optional optional OFF OFF)
-add_module(Spoolend Spoolend OFF OFF)
-add_module(Spoolold Spoolold OFF OFF)
+add_module(Spoolend project/Spoolend OFF OFF)
+add_module(Spoolold project/Spoolold OFF OFF)
 
 if(A_BUILD_MAIN)
     add_subdirectory(main)
diff --git a/RBcore/BHBF_robot.c b/project/RBcore/BHBF_robot.c
similarity index 100%
rename from RBcore/BHBF_robot.c
rename to project/RBcore/BHBF_robot.c
diff --git a/RBcore/CMakeLists.txt b/project/RBcore/CMakeLists.txt
similarity index 79%
rename from RBcore/CMakeLists.txt
rename to project/RBcore/CMakeLists.txt
index a246184..5febc02 100644
--- a/RBcore/CMakeLists.txt
+++ b/project/RBcore/CMakeLists.txt
@@ -1,6 +1,6 @@
 cmake_minimum_required(VERSION 3.10)
 
-set(COMMON_CMAKE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../library/CMakeLists.txt")
+set(COMMON_CMAKE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../../library/CMakeLists.txt")
 
 if(EXISTS ${COMMON_CMAKE_PATH})
     include(${COMMON_CMAKE_PATH})
diff --git a/RBcore/drv_interface.c b/project/RBcore/drv_interface.c
similarity index 100%
rename from RBcore/drv_interface.c
rename to project/RBcore/drv_interface.c
diff --git a/RBcore/include/BHBF_robot.h b/project/RBcore/include/BHBF_robot.h
similarity index 100%
rename from RBcore/include/BHBF_robot.h
rename to project/RBcore/include/BHBF_robot.h
diff --git a/RBcore/include/drv_interface.h b/project/RBcore/include/drv_interface.h
similarity index 100%
rename from RBcore/include/drv_interface.h
rename to project/RBcore/include/drv_interface.h
diff --git a/Spoolend/CMakeLists.txt b/project/Spoolend/CMakeLists.txt
similarity index 79%
rename from Spoolend/CMakeLists.txt
rename to project/Spoolend/CMakeLists.txt
index 6129aa2..0392850 100644
--- a/Spoolend/CMakeLists.txt
+++ b/project/Spoolend/CMakeLists.txt
@@ -1,6 +1,6 @@
 cmake_minimum_required(VERSION 3.10)
 
-set(COMMON_CMAKE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../library/CMakeLists.txt")
+set(COMMON_CMAKE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../../library/CMakeLists.txt")
 
 if(EXISTS ${COMMON_CMAKE_PATH})
     include(${COMMON_CMAKE_PATH})
diff --git a/Spoolend/Spoolend.c b/project/Spoolend/Spoolend.c
similarity index 100%
rename from Spoolend/Spoolend.c
rename to project/Spoolend/Spoolend.c
diff --git a/Spoolold/CMakeLists.txt b/project/Spoolold/CMakeLists.txt
similarity index 80%
rename from Spoolold/CMakeLists.txt
rename to project/Spoolold/CMakeLists.txt
index 48e6597..9f9bfb3 100644
--- a/Spoolold/CMakeLists.txt
+++ b/project/Spoolold/CMakeLists.txt
@@ -1,6 +1,6 @@
 cmake_minimum_required(VERSION 3.10)
 
-set(COMMON_CMAKE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../library/CMakeLists.txt")
+set(COMMON_CMAKE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../../library/CMakeLists.txt")
 
 if(EXISTS ${COMMON_CMAKE_PATH})
     include(${COMMON_CMAKE_PATH})
diff --git a/Spoolold/Spoolold.c b/project/Spoolold/Spoolold.c
similarity index 100%
rename from Spoolold/Spoolold.c
rename to project/Spoolold/Spoolold.c
diff --git a/Spoolold/dmk.c b/project/Spoolold/dmk.c
similarity index 100%
rename from Spoolold/dmk.c
rename to project/Spoolold/dmk.c
diff --git a/Spoolold/flash_operation.c b/project/Spoolold/flash_operation.c
similarity index 100%
rename from Spoolold/flash_operation.c
rename to project/Spoolold/flash_operation.c
diff --git a/Spoolold/include/dmk.h b/project/Spoolold/include/dmk.h
similarity index 100%
rename from Spoolold/include/dmk.h
rename to project/Spoolold/include/dmk.h
diff --git a/Spoolold/include/flash_operation.h b/project/Spoolold/include/flash_operation.h
similarity index 100%
rename from Spoolold/include/flash_operation.h
rename to project/Spoolold/include/flash_operation.h
diff --git a/Spoolold/include/modbus.h b/project/Spoolold/include/modbus.h
similarity index 100%
rename from Spoolold/include/modbus.h
rename to project/Spoolold/include/modbus.h
diff --git a/Spoolold/modbus.c b/project/Spoolold/modbus.c
similarity index 100%
rename from Spoolold/modbus.c
rename to project/Spoolold/modbus.c