diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7d631d3b..1be2bbdc 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -13,7 +13,7 @@ cmake_minimum_required(VERSION 3.13)
 
 # set(CMAKE_VERBOSE TRUE)
 
-set(CMAKE_SCRIPT_PATH "${CMAKE_CURRENT_SOURCE_DIR}/buildsystem/cmake")
+set(CMAKE_SCRIPT_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
 
 if(NOT OS_FSFW)
 	set(OS_FSFW host CACHE STRING "OS for the FSFW.")
diff --git a/buildsystem/cmake/BuildType.cmake b/cmake/BuildType.cmake
similarity index 100%
rename from buildsystem/cmake/BuildType.cmake
rename to cmake/BuildType.cmake
diff --git a/buildsystem/cmake/HardwareOsPostConfig.cmake b/cmake/HardwareOsPostConfig.cmake
similarity index 100%
rename from buildsystem/cmake/HardwareOsPostConfig.cmake
rename to cmake/HardwareOsPostConfig.cmake
diff --git a/buildsystem/cmake/HardwareOsPreConfig.cmake b/cmake/HardwareOsPreConfig.cmake
similarity index 100%
rename from buildsystem/cmake/HardwareOsPreConfig.cmake
rename to cmake/HardwareOsPreConfig.cmake
diff --git a/buildsystem/cmake/PreProjectConfig.cmake b/cmake/PreProjectConfig.cmake
similarity index 100%
rename from buildsystem/cmake/PreProjectConfig.cmake
rename to cmake/PreProjectConfig.cmake
diff --git a/buildsystem/cmake/Q7SCrossCompileConfig.cmake b/cmake/Q7SCrossCompileConfig.cmake
similarity index 100%
rename from buildsystem/cmake/Q7SCrossCompileConfig.cmake
rename to cmake/Q7SCrossCompileConfig.cmake
diff --git a/buildsystem/cmake/RPiCrossCompileConfig.cmake b/cmake/RPiCrossCompileConfig.cmake
similarity index 100%
rename from buildsystem/cmake/RPiCrossCompileConfig.cmake
rename to cmake/RPiCrossCompileConfig.cmake
diff --git a/buildsystem/cmake/scripts/.idea/inspectionProfiles/profiles_settings.xml b/cmake/scripts/.idea/inspectionProfiles/profiles_settings.xml
similarity index 100%
rename from buildsystem/cmake/scripts/.idea/inspectionProfiles/profiles_settings.xml
rename to cmake/scripts/.idea/inspectionProfiles/profiles_settings.xml
diff --git a/buildsystem/cmake/scripts/.idea/misc.xml b/cmake/scripts/.idea/misc.xml
similarity index 100%
rename from buildsystem/cmake/scripts/.idea/misc.xml
rename to cmake/scripts/.idea/misc.xml
diff --git a/buildsystem/cmake/scripts/.idea/modules.xml b/cmake/scripts/.idea/modules.xml
similarity index 100%
rename from buildsystem/cmake/scripts/.idea/modules.xml
rename to cmake/scripts/.idea/modules.xml
diff --git a/buildsystem/cmake/scripts/.idea/scripts.iml b/cmake/scripts/.idea/scripts.iml
similarity index 100%
rename from buildsystem/cmake/scripts/.idea/scripts.iml
rename to cmake/scripts/.idea/scripts.iml
diff --git a/buildsystem/cmake/scripts/.idea/vcs.xml b/cmake/scripts/.idea/vcs.xml
similarity index 100%
rename from buildsystem/cmake/scripts/.idea/vcs.xml
rename to cmake/scripts/.idea/vcs.xml
diff --git a/buildsystem/cmake/scripts/.idea/workspace.xml b/cmake/scripts/.idea/workspace.xml
similarity index 100%
rename from buildsystem/cmake/scripts/.idea/workspace.xml
rename to cmake/scripts/.idea/workspace.xml
diff --git a/buildsystem/cmake/scripts/Host/create_cmake_debug_cfg.sh b/cmake/scripts/Host/create_cmake_debug_cfg.sh
similarity index 100%
rename from buildsystem/cmake/scripts/Host/create_cmake_debug_cfg.sh
rename to cmake/scripts/Host/create_cmake_debug_cfg.sh
diff --git a/buildsystem/cmake/scripts/Host/create_cmake_release_cfg.sh b/cmake/scripts/Host/create_cmake_release_cfg.sh
similarity index 100%
rename from buildsystem/cmake/scripts/Host/create_cmake_release_cfg.sh
rename to cmake/scripts/Host/create_cmake_release_cfg.sh
diff --git a/buildsystem/cmake/scripts/Host/create_cmake_relwithdeb_cfg.sh b/cmake/scripts/Host/create_cmake_relwithdeb_cfg.sh
similarity index 100%
rename from buildsystem/cmake/scripts/Host/create_cmake_relwithdeb_cfg.sh
rename to cmake/scripts/Host/create_cmake_relwithdeb_cfg.sh
diff --git a/buildsystem/cmake/scripts/Host/create_cmake_size_cfg.sh b/cmake/scripts/Host/create_cmake_size_cfg.sh
similarity index 100%
rename from buildsystem/cmake/scripts/Host/create_cmake_size_cfg.sh
rename to cmake/scripts/Host/create_cmake_size_cfg.sh
diff --git a/buildsystem/cmake/scripts/Linux/create_cmake_debug_cfg.sh b/cmake/scripts/Linux/create_cmake_debug_cfg.sh
similarity index 100%
rename from buildsystem/cmake/scripts/Linux/create_cmake_debug_cfg.sh
rename to cmake/scripts/Linux/create_cmake_debug_cfg.sh
diff --git a/buildsystem/cmake/scripts/Linux/create_cmake_release_cfg.sh b/cmake/scripts/Linux/create_cmake_release_cfg.sh
similarity index 100%
rename from buildsystem/cmake/scripts/Linux/create_cmake_release_cfg.sh
rename to cmake/scripts/Linux/create_cmake_release_cfg.sh
diff --git a/buildsystem/cmake/scripts/Linux/create_cmake_relwithdeb_cfg.sh b/cmake/scripts/Linux/create_cmake_relwithdeb_cfg.sh
similarity index 100%
rename from buildsystem/cmake/scripts/Linux/create_cmake_relwithdeb_cfg.sh
rename to cmake/scripts/Linux/create_cmake_relwithdeb_cfg.sh
diff --git a/buildsystem/cmake/scripts/Linux/create_cmake_size_cfg.sh b/cmake/scripts/Linux/create_cmake_size_cfg.sh
similarity index 100%
rename from buildsystem/cmake/scripts/Linux/create_cmake_size_cfg.sh
rename to cmake/scripts/Linux/create_cmake_size_cfg.sh
diff --git a/buildsystem/cmake/scripts/Q7S/create_cmake_debug_cfg.sh b/cmake/scripts/Q7S/create_cmake_debug_cfg.sh
similarity index 100%
rename from buildsystem/cmake/scripts/Q7S/create_cmake_debug_cfg.sh
rename to cmake/scripts/Q7S/create_cmake_debug_cfg.sh
diff --git a/buildsystem/cmake/scripts/Q7S/create_cmake_release_cfg.sh b/cmake/scripts/Q7S/create_cmake_release_cfg.sh
similarity index 100%
rename from buildsystem/cmake/scripts/Q7S/create_cmake_release_cfg.sh
rename to cmake/scripts/Q7S/create_cmake_release_cfg.sh
diff --git a/buildsystem/cmake/scripts/Q7S/create_cmake_relwithdeb_cfg.sh b/cmake/scripts/Q7S/create_cmake_relwithdeb_cfg.sh
similarity index 100%
rename from buildsystem/cmake/scripts/Q7S/create_cmake_relwithdeb_cfg.sh
rename to cmake/scripts/Q7S/create_cmake_relwithdeb_cfg.sh
diff --git a/buildsystem/cmake/scripts/RPi/create_cmake_debug_cfg.sh b/cmake/scripts/RPi/create_cmake_debug_cfg.sh
similarity index 100%
rename from buildsystem/cmake/scripts/RPi/create_cmake_debug_cfg.sh
rename to cmake/scripts/RPi/create_cmake_debug_cfg.sh
diff --git a/buildsystem/cmake/scripts/RPi/create_cmake_release_cfg.sh b/cmake/scripts/RPi/create_cmake_release_cfg.sh
similarity index 100%
rename from buildsystem/cmake/scripts/RPi/create_cmake_release_cfg.sh
rename to cmake/scripts/RPi/create_cmake_release_cfg.sh
diff --git a/buildsystem/cmake/scripts/RPi/create_cmake_relwithdeb_cfg.sh b/cmake/scripts/RPi/create_cmake_relwithdeb_cfg.sh
similarity index 100%
rename from buildsystem/cmake/scripts/RPi/create_cmake_relwithdeb_cfg.sh
rename to cmake/scripts/RPi/create_cmake_relwithdeb_cfg.sh
diff --git a/buildsystem/cmake/scripts/RPi/create_cmake_size_cfg.sh b/cmake/scripts/RPi/create_cmake_size_cfg.sh
similarity index 100%
rename from buildsystem/cmake/scripts/RPi/create_cmake_size_cfg.sh
rename to cmake/scripts/RPi/create_cmake_size_cfg.sh
diff --git a/buildsystem/cmake/scripts/RPi/rpi_path_helper.sh b/cmake/scripts/RPi/rpi_path_helper.sh
similarity index 100%
rename from buildsystem/cmake/scripts/RPi/rpi_path_helper.sh
rename to cmake/scripts/RPi/rpi_path_helper.sh
diff --git a/buildsystem/cmake/scripts/RPi/rpi_path_helper_win.sh b/cmake/scripts/RPi/rpi_path_helper_win.sh
similarity index 100%
rename from buildsystem/cmake/scripts/RPi/rpi_path_helper_win.sh
rename to cmake/scripts/RPi/rpi_path_helper_win.sh
diff --git a/buildsystem/cmake/scripts/cmake_build_config.py b/cmake/scripts/cmake_build_config.py
similarity index 100%
rename from buildsystem/cmake/scripts/cmake_build_config.py
rename to cmake/scripts/cmake_build_config.py