diff --git a/mission/controller/CMakeLists.txt b/mission/controller/CMakeLists.txt
index 84ff7f9e..463e6a5d 100644
--- a/mission/controller/CMakeLists.txt
+++ b/mission/controller/CMakeLists.txt
@@ -2,3 +2,5 @@ if(TGT_BSP MATCHES "arm/q7s" OR TGT_BSP MATCHES "")
   target_sources(${LIB_EIVE_MISSION} PRIVATE ThermalController.cpp
                                              AcsController.cpp)
 endif()
+
+add_subdirectory(acs)
\ No newline at end of file
diff --git a/mission/controller/acs/CMakeLists.txt b/mission/controller/acs/CMakeLists.txt
new file mode 100644
index 00000000..c949a067
--- /dev/null
+++ b/mission/controller/acs/CMakeLists.txt
@@ -0,0 +1,14 @@
+target_sources(
+  ${LIB_EIVE_MISSION}
+  PRIVATE AcsParameters.cpp
+  		  ActuatorCmd.cpp
+  		  Guidance.cpp
+  		  Igrf13Model.cpp
+  		  MultiplicativeKalmanFilter.cpp
+  		  Navigation.cpp
+  		  OutputValues.cpp
+  		  SensorProcessing.cpp
+  		  SensorValues.cpp
+  		  SusConverter.cpp)
+  		  
+add_subdirectory(control)
diff --git a/mission/controller/acs/control/CMakeLists.txt b/mission/controller/acs/control/CMakeLists.txt
new file mode 100644
index 00000000..dc540435
--- /dev/null
+++ b/mission/controller/acs/control/CMakeLists.txt
@@ -0,0 +1,5 @@
+target_sources(
+  ${LIB_EIVE_MISSION}
+  PRIVATE Detumble.cpp
+  		  PtgCtrl.cpp
+  		  SafeCtrl.cpp)
\ No newline at end of file