diff --git a/bsp_q7s/core/ObjectFactory.cpp b/bsp_q7s/core/ObjectFactory.cpp
index 313c7aa6..00e87330 100644
--- a/bsp_q7s/core/ObjectFactory.cpp
+++ b/bsp_q7s/core/ObjectFactory.cpp
@@ -23,7 +23,7 @@
 #include <mission/system/acs/ImtqAssembly.h>
 #include <mission/system/fdir/StrFdir.h>
 #include <mission/system/objects/CamSwitcher.h>
-#include <mission/system/objects/StrAssembly.h>
+#include <mission/system/acs/StrAssembly.h>
 #include <mission/system/objects/SyrlinksAssembly.h>
 #include <mission/tmtc/LiveTmTask.h>
 #include <mission/tmtc/PersistentLogTmStoreTask.h>
diff --git a/dummies/helpers.cpp b/dummies/helpers.cpp
index e0880ab9..1a541dfd 100644
--- a/dummies/helpers.cpp
+++ b/dummies/helpers.cpp
@@ -27,8 +27,8 @@
 #include <fsfw_hal/common/gpio/GpioIF.h>
 #include <mission/power/gsDefs.h>
 #include <mission/system/acs/ImtqAssembly.h>
+#include <mission/system/acs/StrAssembly.h>
 #include <mission/system/objects/CamSwitcher.h>
-#include <mission/system/objects/StrAssembly.h>
 #include <mission/system/objects/TcsBoardAssembly.h>
 
 #include "TemperatureSensorInserter.h"
diff --git a/mission/system/acs/CMakeLists.txt b/mission/system/acs/CMakeLists.txt
index 70e11e59..e5ef2cb8 100644
--- a/mission/system/acs/CMakeLists.txt
+++ b/mission/system/acs/CMakeLists.txt
@@ -2,6 +2,7 @@ target_sources(
   ${LIB_EIVE_MISSION}
   PRIVATE AcsBoardAssembly.cpp
           AcsSubsystem.cpp
+          StrAssembly.cpp
           DualLaneAssemblyBase.cpp
           ImtqAssembly.cpp
           RwAssembly.cpp
diff --git a/mission/system/objects/StrAssembly.cpp b/mission/system/acs/StrAssembly.cpp
similarity index 100%
rename from mission/system/objects/StrAssembly.cpp
rename to mission/system/acs/StrAssembly.cpp
diff --git a/mission/system/objects/StrAssembly.h b/mission/system/acs/StrAssembly.h
similarity index 100%
rename from mission/system/objects/StrAssembly.h
rename to mission/system/acs/StrAssembly.h
diff --git a/mission/system/objects/CMakeLists.txt b/mission/system/objects/CMakeLists.txt
index e23a82c7..53cc200d 100644
--- a/mission/system/objects/CMakeLists.txt
+++ b/mission/system/objects/CMakeLists.txt
@@ -5,6 +5,5 @@ target_sources(
           TcsSubsystem.cpp
           PayloadSubsystem.cpp
           Stack5VHandler.cpp
-          StrAssembly.cpp
           PowerStateMachineBase.cpp
           TcsBoardAssembly.cpp)