diff --git a/bsp_hosted/fsfwconfig/events/translateEvents.cpp b/bsp_hosted/fsfwconfig/events/translateEvents.cpp
index dde0dd34..44e53931 100644
--- a/bsp_hosted/fsfwconfig/events/translateEvents.cpp
+++ b/bsp_hosted/fsfwconfig/events/translateEvents.cpp
@@ -212,7 +212,8 @@ const char *SIDE_SWITCH_TRANSITION_NOT_ALLOWED_STRING = "SIDE_SWITCH_TRANSITION_
 const char *TRANSITION_OTHER_SIDE_FAILED_12900_STRING = "TRANSITION_OTHER_SIDE_FAILED_12900";
 const char *NOT_ENOUGH_DEVICES_DUAL_MODE_12901_STRING = "NOT_ENOUGH_DEVICES_DUAL_MODE_12901";
 const char *POWER_STATE_MACHINE_TIMEOUT_12902_STRING = "POWER_STATE_MACHINE_TIMEOUT_12902";
-const char *SIDE_SWITCH_TRANSITION_NOT_ALLOWED_12903_STRING = "SIDE_SWITCH_TRANSITION_NOT_ALLOWED_12903";
+const char *SIDE_SWITCH_TRANSITION_NOT_ALLOWED_12903_STRING =
+    "SIDE_SWITCH_TRANSITION_NOT_ALLOWED_12903";
 const char *CHILDREN_LOST_MODE_STRING = "CHILDREN_LOST_MODE";
 const char *GPS_FIX_CHANGE_STRING = "GPS_FIX_CHANGE";
 const char *CANT_GET_FIX_STRING = "CANT_GET_FIX";
diff --git a/bsp_q7s/callbacks/rwSpiCallback.cpp b/bsp_q7s/callbacks/rwSpiCallback.cpp
index fa36744e..311b843e 100644
--- a/bsp_q7s/callbacks/rwSpiCallback.cpp
+++ b/bsp_q7s/callbacks/rwSpiCallback.cpp
@@ -6,7 +6,7 @@
 #include "fsfw/serviceinterface/ServiceInterface.h"
 #include "fsfw_hal/linux/UnixFileGuard.h"
 #include "fsfw_hal/linux/spi/SpiCookie.h"
-#include "mission/devices/RwHandler.h"
+#include "mission/acs/RwHandler.h"
 
 namespace rwSpiCallback {
 
diff --git a/bsp_q7s/core/ObjectFactory.cpp b/bsp_q7s/core/ObjectFactory.cpp
index cd4fb0db..c1f7391f 100644
--- a/bsp_q7s/core/ObjectFactory.cpp
+++ b/bsp_q7s/core/ObjectFactory.cpp
@@ -1,17 +1,17 @@
 #include "ObjectFactory.h"
 
 #include <fsfw/subsystem/Subsystem.h>
+#include <linux/com/SyrlinksComHandler.h>
 #include <linux/devices/AcsBoardPolling.h>
 #include <linux/devices/ImtqPollingTask.h>
 #include <linux/devices/RwPollingTask.h>
-#include <linux/com/SyrlinksComHandler.h>
 #include <linux/devices/startracker/StrComHandler.h>
-#include <mission/devices/GyrL3gCustomHandler.h>
-#include <mission/devices/MgmLis3CustomHandler.h>
-#include <mission/devices/MgmRm3100CustomHandler.h>
+#include <mission/acs/GyrL3gCustomHandler.h>
+#include <mission/acs/MgmLis3CustomHandler.h>
+#include <mission/acs/MgmRm3100CustomHandler.h>
+#include <mission/system/acs/ImtqAssembly.h>
 #include <mission/system/fdir/StrFdir.h>
 #include <mission/system/objects/CamSwitcher.h>
-#include <mission/system/objects/ImtqAssembly.h>
 #include <mission/system/objects/StrAssembly.h>
 #include <mission/system/objects/SyrlinksAssembly.h>
 #include <mission/tmtc/LiveTmTask.h>
@@ -52,18 +52,18 @@
 #include "linux/ipcore/PdecHandler.h"
 #include "linux/ipcore/Ptme.h"
 #include "linux/ipcore/PtmeConfig.h"
-#include "mission/com/SyrlinksFdir.h"
-#include "mission/com/comModeTree.h"
 #include "mission/config/configfile.h"
 #include "mission/csp/CspCookie.h"
-#include "mission/system/fdir/AcsBoardFdir.h"
+#include "mission/system/acs/AcsBoardFdir.h"
+#include "mission/system/acs/AcsSubsystem.h"
+#include "mission/system/acs/RwAssembly.h"
+#include "mission/system/acs/SusFdir.h"
+#include "mission/system/acs/acsModeTree.h"
+#include "mission/system/com/SyrlinksFdir.h"
+#include "mission/system/com/comModeTree.h"
 #include "mission/system/fdir/GomspacePowerFdir.h"
 #include "mission/system/fdir/RtdFdir.h"
-#include "mission/system/fdir/SusFdir.h"
-#include "mission/system/objects/AcsSubsystem.h"
-#include "mission/system/objects/RwAssembly.h"
 #include "mission/system/objects/TcsBoardAssembly.h"
-#include "mission/system/tree/acsModeTree.h"
 #include "mission/system/tree/payloadModeTree.h"
 #include "mission/system/tree/tcsModeTree.h"
 #include "mission/tmtc/tmFilters.h"
@@ -75,13 +75,13 @@ using gpio::Levels;
 #if OBSW_TEST_LIBGPIOD == 1
 #include "linux/boardtest/LibgpiodTest.h"
 #endif
+#include <mission/acs/GyrAdis1650XHandler.h>
+#include <mission/acs/ImtqHandler.h>
+#include <mission/acs/rwHelpers.h>
 #include <mission/com/SyrlinksHandler.h>
-#include <mission/devices/GyrAdis1650XHandler.h>
-#include <mission/devices/ImtqHandler.h>
 #include <mission/devices/PcduHandler.h>
 #include <mission/devices/Pdu1Handler.h>
 #include <mission/devices/Pdu2Handler.h>
-#include <mission/devices/devicedefinitions/rwHelpers.h>
 #include <mission/tmtc/VirtualChannelWithQueue.h>
 
 #include <sstream>
@@ -102,6 +102,7 @@ using gpio::Levels;
 #include "fsfw_hal/linux/serial/SerialCookie.h"
 #include "fsfw_hal/linux/spi/SpiComIF.h"
 #include "fsfw_hal/linux/spi/SpiCookie.h"
+#include "mission/acs/RwHandler.h"
 #include "mission/com/CcsdsIpCoreHandler.h"
 #include "mission/com/syrlinksDefs.h"
 #include "mission/core/GenericFactory.h"
@@ -112,14 +113,13 @@ using gpio::Levels;
 #include "mission/devices/P60DockHandler.h"
 #include "mission/devices/PayloadPcduHandler.h"
 #include "mission/devices/RadiationSensorHandler.h"
-#include "mission/devices/RwHandler.h"
 #include "mission/devices/SolarArrayDeploymentHandler.h"
 #include "mission/devices/Tmp1075Handler.h"
 #include "mission/devices/devicedefinitions/GomspaceDefinitions.h"
 #include "mission/devices/devicedefinitions/Max31865Definitions.h"
 #include "mission/devices/devicedefinitions/RadSensorDefinitions.h"
 #include "mission/devices/devicedefinitions/payloadPcduDefinitions.h"
-#include "mission/system/objects/AcsBoardAssembly.h"
+#include "mission/system/acs/AcsBoardAssembly.h"
 #include "mission/tmtc/TmFunnelHandler.h"
 
 ResetArgs RESET_ARGS_GNSS;
diff --git a/bsp_q7s/obsw.cpp b/bsp_q7s/obsw.cpp
index 8f1ea3fd..d2d640f3 100644
--- a/bsp_q7s/obsw.cpp
+++ b/bsp_q7s/obsw.cpp
@@ -14,7 +14,7 @@
 #include "core/scheduling.h"
 #include "fsfw/tasks/TaskFactory.h"
 #include "fsfw/version.h"
-#include "mission/acsDefs.h"
+#include "mission/acs/defs.h"
 #include "mission/com/defs.h"
 #include "mission/system/tree/system.h"
 #include "q7sConfig.h"
diff --git a/dummies/GyroAdisDummy.cpp b/dummies/GyroAdisDummy.cpp
index c7c40a1a..1caace7a 100644
--- a/dummies/GyroAdisDummy.cpp
+++ b/dummies/GyroAdisDummy.cpp
@@ -1,6 +1,6 @@
 #include "GyroAdisDummy.h"
 
-#include <mission/devices/devicedefinitions/gyroAdisHelpers.h>
+#include <mission/acs/gyroAdisHelpers.h>
 
 GyroAdisDummy::GyroAdisDummy(object_id_t objectId, object_id_t comif, CookieIF *comCookie)
     : DeviceHandlerBase(objectId, comif, comCookie), dataset(this) {}
diff --git a/dummies/GyroAdisDummy.h b/dummies/GyroAdisDummy.h
index 21de1eeb..03c69baa 100644
--- a/dummies/GyroAdisDummy.h
+++ b/dummies/GyroAdisDummy.h
@@ -2,7 +2,7 @@
 #define DUMMIES_GYROADISDUMMY_H_
 
 #include <fsfw/devicehandlers/DeviceHandlerBase.h>
-#include <mission/devices/devicedefinitions/gyroAdisHelpers.h>
+#include <mission/acs/gyroAdisHelpers.h>
 
 class GyroAdisDummy : public DeviceHandlerBase {
  public:
diff --git a/dummies/ImtqDummy.cpp b/dummies/ImtqDummy.cpp
index 01ec6457..fc99d321 100644
--- a/dummies/ImtqDummy.cpp
+++ b/dummies/ImtqDummy.cpp
@@ -1,6 +1,6 @@
 #include "ImtqDummy.h"
 
-#include <mission/devices/devicedefinitions/imtqHelpers.h>
+#include <mission/acs/imtqHelpers.h>
 
 ImtqDummy::ImtqDummy(object_id_t objectId, object_id_t comif, CookieIF *comCookie)
     : DeviceHandlerBase(objectId, comif, comCookie) {}
diff --git a/dummies/RwDummy.cpp b/dummies/RwDummy.cpp
index d90f3f7c..afc3a54f 100644
--- a/dummies/RwDummy.cpp
+++ b/dummies/RwDummy.cpp
@@ -1,6 +1,6 @@
 #include "RwDummy.h"
 
-#include <mission/devices/devicedefinitions/rwHelpers.h>
+#include <mission/acs/rwHelpers.h>
 
 RwDummy::RwDummy(object_id_t objectId, object_id_t comif, CookieIF *comCookie)
     : DeviceHandlerBase(objectId, comif, comCookie) {}
diff --git a/dummies/helpers.cpp b/dummies/helpers.cpp
index 628d148a..0ec1d070 100644
--- a/dummies/helpers.cpp
+++ b/dummies/helpers.cpp
@@ -25,18 +25,18 @@
 #include <dummies/SusDummy.h>
 #include <dummies/SyrlinksDummy.h>
 #include <fsfw_hal/common/gpio/GpioIF.h>
+#include <mission/system/acs/ImtqAssembly.h>
 #include <mission/system/objects/CamSwitcher.h>
-#include <mission/system/objects/ImtqAssembly.h>
 #include <mission/system/objects/StrAssembly.h>
 #include <mission/system/objects/TcsBoardAssembly.h>
 
 #include "TemperatureSensorInserter.h"
 #include "dummies/Max31865Dummy.h"
 #include "dummies/Tmp1075Dummy.h"
-#include "mission/com/comModeTree.h"
 #include "mission/core/GenericFactory.h"
 #include "mission/devices/devicedefinitions/GomspaceDefinitions.h"
-#include "mission/system/tree/acsModeTree.h"
+#include "mission/system/acs/acsModeTree.h"
+#include "mission/system/com/comModeTree.h"
 #include "mission/system/tree/payloadModeTree.h"
 #include "mission/system/tree/tcsModeTree.h"
 
diff --git a/linux/ObjectFactory.cpp b/linux/ObjectFactory.cpp
index 2a788898..21888726 100644
--- a/linux/ObjectFactory.cpp
+++ b/linux/ObjectFactory.cpp
@@ -11,15 +11,14 @@
 #include <linux/callbacks/gpioCallbacks.h>
 #include <linux/devices/Max31865RtdPolling.h>
 #include <linux/devices/SusPolling.h>
+#include <mission/acs/SusHandler.h>
 #include <mission/controller/AcsController.h>
 #include <mission/core/GenericFactory.h>
-#include <mission/devices/LegacySusHandler.h>
 #include <mission/devices/Max31865EiveHandler.h>
 #include <mission/devices/ScexDeviceHandler.h>
-#include <mission/devices/SusHandler.h>
+#include <mission/system/acs/SusAssembly.h>
+#include <mission/system/acs/SusFdir.h>
 #include <mission/system/fdir/RtdFdir.h>
-#include <mission/system/fdir/SusFdir.h>
-#include <mission/system/objects/SusAssembly.h>
 #include <mission/system/objects/TcsBoardAssembly.h>
 
 #include "OBSWConfig.h"
@@ -27,7 +26,7 @@
 #include "devices/addresses.h"
 #include "devices/gpioIds.h"
 #include "eive/definitions.h"
-#include "mission/system/tree/acsModeTree.h"
+#include "mission/system/acs/acsModeTree.h"
 #include "mission/system/tree/payloadModeTree.h"
 #include "mission/system/tree/tcsModeTree.h"
 
diff --git a/linux/devices/AcsBoardPolling.cpp b/linux/devices/AcsBoardPolling.cpp
index 04fe92df..1013f24b 100644
--- a/linux/devices/AcsBoardPolling.cpp
+++ b/linux/devices/AcsBoardPolling.cpp
@@ -10,7 +10,7 @@
 #include <fsfw_hal/linux/UnixFileGuard.h>
 #include <fsfw_hal/linux/spi/SpiCookie.h>
 #include <fsfw_hal/linux/utility.h>
-#include <mission/devices/devicedefinitions/gyroAdisHelpers.h>
+#include <mission/acs/gyroAdisHelpers.h>
 #include <sys/ioctl.h>
 
 #include "devices/gpioIds.h"
diff --git a/linux/devices/AcsBoardPolling.h b/linux/devices/AcsBoardPolling.h
index 73195527..794c9c47 100644
--- a/linux/devices/AcsBoardPolling.h
+++ b/linux/devices/AcsBoardPolling.h
@@ -7,8 +7,8 @@
 #include <fsfw/tasks/SemaphoreIF.h>
 #include <fsfw_hal/devicehandlers/devicedefinitions/mgmRm3100Helpers.h>
 #include <fsfw_hal/linux/spi/SpiComIF.h>
-#include <mission/devices/devicedefinitions/acsPolling.h>
-#include <mission/devices/devicedefinitions/gyroAdisHelpers.h>
+#include <mission/acs/acsBoardPolling.h>
+#include <mission/acs/gyroAdisHelpers.h>
 
 class AcsBoardPolling : public SystemObject,
                         public ExecutableObjectIF,
diff --git a/linux/devices/ImtqPollingTask.h b/linux/devices/ImtqPollingTask.h
index 32497753..50778ffa 100644
--- a/linux/devices/ImtqPollingTask.h
+++ b/linux/devices/ImtqPollingTask.h
@@ -9,7 +9,7 @@
 #include "fsfw/devicehandlers/DeviceCommunicationIF.h"
 #include "fsfw/objectmanager/SystemObject.h"
 #include "fsfw/tasks/ExecutableObjectIF.h"
-#include "mission/devices/devicedefinitions/imtqHelpers.h"
+#include "mission/acs/imtqHelpers.h"
 
 class ImtqPollingTask : public SystemObject,
                         public ExecutableObjectIF,
diff --git a/linux/devices/RwPollingTask.cpp b/linux/devices/RwPollingTask.cpp
index 45528178..07958d8b 100644
--- a/linux/devices/RwPollingTask.cpp
+++ b/linux/devices/RwPollingTask.cpp
@@ -11,7 +11,7 @@
 #include <unistd.h>
 
 #include "devConf.h"
-#include "mission/devices/devicedefinitions/rwHelpers.h"
+#include "mission/acs/rwHelpers.h"
 
 RwPollingTask::RwPollingTask(object_id_t objectId, const char* spiDev, GpioIF& gpioIF)
     : SystemObject(objectId), spiDev(spiDev), gpioIF(gpioIF) {
diff --git a/linux/devices/RwPollingTask.h b/linux/devices/RwPollingTask.h
index 0131f2b4..5fb25d1d 100644
--- a/linux/devices/RwPollingTask.h
+++ b/linux/devices/RwPollingTask.h
@@ -9,7 +9,7 @@
 #include <fsfw_hal/linux/spi/SpiComIF.h>
 #include <fsfw_hal/linux/spi/SpiCookie.h>
 
-#include "mission/devices/devicedefinitions/rwHelpers.h"
+#include "mission/acs/rwHelpers.h"
 
 class RwCookie : public SpiCookie {
   friend class RwPollingTask;
diff --git a/linux/devices/SusPolling.h b/linux/devices/SusPolling.h
index e9bcf59d..470f11d5 100644
--- a/linux/devices/SusPolling.h
+++ b/linux/devices/SusPolling.h
@@ -8,7 +8,7 @@
 #include <fsfw_hal/linux/spi/SpiComIF.h>
 
 #include "devices/addresses.h"
-#include "mission/devices/devicedefinitions/acsPolling.h"
+#include "mission/acs/acsBoardPolling.h"
 
 class SusPolling : public SystemObject, public ExecutableObjectIF, public DeviceCommunicationIF {
  public:
diff --git a/linux/fsfwconfig/events/translateEvents.cpp b/linux/fsfwconfig/events/translateEvents.cpp
index dde0dd34..44e53931 100644
--- a/linux/fsfwconfig/events/translateEvents.cpp
+++ b/linux/fsfwconfig/events/translateEvents.cpp
@@ -212,7 +212,8 @@ const char *SIDE_SWITCH_TRANSITION_NOT_ALLOWED_STRING = "SIDE_SWITCH_TRANSITION_
 const char *TRANSITION_OTHER_SIDE_FAILED_12900_STRING = "TRANSITION_OTHER_SIDE_FAILED_12900";
 const char *NOT_ENOUGH_DEVICES_DUAL_MODE_12901_STRING = "NOT_ENOUGH_DEVICES_DUAL_MODE_12901";
 const char *POWER_STATE_MACHINE_TIMEOUT_12902_STRING = "POWER_STATE_MACHINE_TIMEOUT_12902";
-const char *SIDE_SWITCH_TRANSITION_NOT_ALLOWED_12903_STRING = "SIDE_SWITCH_TRANSITION_NOT_ALLOWED_12903";
+const char *SIDE_SWITCH_TRANSITION_NOT_ALLOWED_12903_STRING =
+    "SIDE_SWITCH_TRANSITION_NOT_ALLOWED_12903";
 const char *CHILDREN_LOST_MODE_STRING = "CHILDREN_LOST_MODE";
 const char *GPS_FIX_CHANGE_STRING = "GPS_FIX_CHANGE";
 const char *CANT_GET_FIX_STRING = "CANT_GET_FIX";
diff --git a/mission/CMakeLists.txt b/mission/CMakeLists.txt
index e23af51f..f1495899 100644
--- a/mission/CMakeLists.txt
+++ b/mission/CMakeLists.txt
@@ -11,5 +11,4 @@ add_subdirectory(csp)
 add_subdirectory(cfdp)
 add_subdirectory(config)
 
-target_sources(${LIB_EIVE_MISSION} PRIVATE acsDefs.cpp payloadDefs.cpp
-                                           trace.cpp)
+target_sources(${LIB_EIVE_MISSION} PRIVATE payloadDefs.cpp trace.cpp)
diff --git a/mission/acs/CMakeLists.txt b/mission/acs/CMakeLists.txt
index e69de29b..3702df28 100644
--- a/mission/acs/CMakeLists.txt
+++ b/mission/acs/CMakeLists.txt
@@ -0,0 +1,13 @@
+target_sources(
+  ${LIB_EIVE_MISSION}
+  PRIVATE GyrAdis1650XHandler.cpp
+          GyrL3gCustomHandler.cpp
+          ImtqHandler.cpp
+          MgmLis3CustomHandler.cpp
+          MgmRm3100CustomHandler.cpp
+          RwHandler.cpp
+          SusHandler.cpp
+          gyroAdisHelpers.cpp
+          imtqHelpers.cpp
+          rwHelpers.cpp
+          defs.cpp)
diff --git a/mission/devices/GyrAdis1650XHandler.cpp b/mission/acs/GyrAdis1650XHandler.cpp
similarity index 98%
rename from mission/devices/GyrAdis1650XHandler.cpp
rename to mission/acs/GyrAdis1650XHandler.cpp
index 7d576238..dd30775e 100644
--- a/mission/devices/GyrAdis1650XHandler.cpp
+++ b/mission/acs/GyrAdis1650XHandler.cpp
@@ -1,8 +1,8 @@
-#include "mission/devices/GyrAdis1650XHandler.h"
+#include "GyrAdis1650XHandler.h"
 
 #include "fsfw/action/HasActionsIF.h"
 #include "fsfw/datapool/PoolReadGuard.h"
-#include "mission/devices/devicedefinitions/acsPolling.h"
+#include "mission/acs/acsBoardPolling.h"
 
 GyrAdis1650XHandler::GyrAdis1650XHandler(object_id_t objectId, object_id_t deviceCommunication,
                                          CookieIF *comCookie, adis1650x::Type type)
diff --git a/mission/devices/GyrAdis1650XHandler.h b/mission/acs/GyrAdis1650XHandler.h
similarity index 95%
rename from mission/devices/GyrAdis1650XHandler.h
rename to mission/acs/GyrAdis1650XHandler.h
index 020dcd6e..5a2a2842 100644
--- a/mission/devices/GyrAdis1650XHandler.h
+++ b/mission/acs/GyrAdis1650XHandler.h
@@ -1,8 +1,8 @@
 #ifndef MISSION_DEVICES_GYROADIS16507HANDLER_H_
 #define MISSION_DEVICES_GYROADIS16507HANDLER_H_
 
-#include <mission/devices/devicedefinitions/acsPolling.h>
-#include <mission/devices/devicedefinitions/gyroAdisHelpers.h>
+#include <mission/acs/acsBoardPolling.h>
+#include <mission/acs/gyroAdisHelpers.h>
 
 #include "FSFWConfig.h"
 #include "OBSWConfig.h"
diff --git a/mission/devices/GyrL3gCustomHandler.cpp b/mission/acs/GyrL3gCustomHandler.cpp
similarity index 98%
rename from mission/devices/GyrL3gCustomHandler.cpp
rename to mission/acs/GyrL3gCustomHandler.cpp
index d3624bdf..b235a2ef 100644
--- a/mission/devices/GyrL3gCustomHandler.cpp
+++ b/mission/acs/GyrL3gCustomHandler.cpp
@@ -1,10 +1,10 @@
 
-#include <mission/devices/GyrL3gCustomHandler.h>
+#include <mission/acs/GyrL3gCustomHandler.h>
+#include <mission/acs/acsBoardPolling.h>
 
 #include <cmath>
 
 #include "fsfw/datapool/PoolReadGuard.h"
-#include "mission/devices/devicedefinitions/acsPolling.h"
 
 GyrL3gCustomHandler::GyrL3gCustomHandler(object_id_t objectId, object_id_t deviceCommunication,
                                          CookieIF *comCookie, uint32_t transitionDelayMs)
diff --git a/mission/devices/GyrL3gCustomHandler.h b/mission/acs/GyrL3gCustomHandler.h
similarity index 98%
rename from mission/devices/GyrL3gCustomHandler.h
rename to mission/acs/GyrL3gCustomHandler.h
index 5f840cfc..44ddd826 100644
--- a/mission/devices/GyrL3gCustomHandler.h
+++ b/mission/acs/GyrL3gCustomHandler.h
@@ -4,7 +4,7 @@
 #include <fsfw/devicehandlers/DeviceHandlerBase.h>
 #include <fsfw/globalfunctions/PeriodicOperationDivider.h>
 #include <fsfw_hal/devicehandlers/devicedefinitions/gyroL3gHelpers.h>
-#include <mission/devices/devicedefinitions/acsPolling.h>
+#include <mission/acs/acsBoardPolling.h>
 
 /**
  * @brief 	Device Handler for the L3GD20H gyroscope sensor
diff --git a/mission/devices/ImtqHandler.cpp b/mission/acs/ImtqHandler.cpp
similarity index 99%
rename from mission/devices/ImtqHandler.cpp
rename to mission/acs/ImtqHandler.cpp
index 46a2c53a..f5791abd 100644
--- a/mission/devices/ImtqHandler.cpp
+++ b/mission/acs/ImtqHandler.cpp
@@ -20,7 +20,7 @@
 #include <fsfw/tasks/TaskFactory.h>
 #include <fsfw/timemanager/Countdown.h>
 #include <fsfw/timemanager/clockDefinitions.h>
-#include <mission/devices/ImtqHandler.h>
+#include <mission/acs/ImtqHandler.h>
 
 #include <cmath>
 #include <fsfw/datapoollocal/LocalPoolVariable.tpp>
diff --git a/mission/devices/ImtqHandler.h b/mission/acs/ImtqHandler.h
similarity index 99%
rename from mission/devices/ImtqHandler.h
rename to mission/acs/ImtqHandler.h
index e337f40c..c276d166 100644
--- a/mission/devices/ImtqHandler.h
+++ b/mission/acs/ImtqHandler.h
@@ -2,7 +2,7 @@
 #define MISSION_DEVICES_IMTQHANDLER_H_
 
 #include <fsfw/devicehandlers/DeviceHandlerBase.h>
-#include <mission/devices/devicedefinitions/imtqHelpers.h>
+#include <mission/acs/imtqHelpers.h>
 #include <string.h>
 
 #include "events/subsystemIdRanges.h"
diff --git a/mission/devices/MgmLis3CustomHandler.cpp b/mission/acs/MgmLis3CustomHandler.cpp
similarity index 99%
rename from mission/devices/MgmLis3CustomHandler.cpp
rename to mission/acs/MgmLis3CustomHandler.cpp
index 151d321d..f081cd7e 100644
--- a/mission/devices/MgmLis3CustomHandler.cpp
+++ b/mission/acs/MgmLis3CustomHandler.cpp
@@ -1,4 +1,4 @@
-#include <mission/devices/MgmLis3CustomHandler.h>
+#include "MgmLis3CustomHandler.h"
 
 #include <cmath>
 
diff --git a/mission/devices/MgmLis3CustomHandler.h b/mission/acs/MgmLis3CustomHandler.h
similarity index 98%
rename from mission/devices/MgmLis3CustomHandler.h
rename to mission/acs/MgmLis3CustomHandler.h
index 15c87e0f..06ab6d73 100644
--- a/mission/devices/MgmLis3CustomHandler.h
+++ b/mission/acs/MgmLis3CustomHandler.h
@@ -5,7 +5,7 @@
 
 #include "fsfw/devicehandlers/DeviceHandlerBase.h"
 #include "fsfw/globalfunctions/PeriodicOperationDivider.h"
-#include "mission/devices/devicedefinitions/acsPolling.h"
+#include "mission/acs/acsBoardPolling.h"
 
 class PeriodicOperationDivider;
 
diff --git a/mission/devices/MgmRm3100CustomHandler.cpp b/mission/acs/MgmRm3100CustomHandler.cpp
similarity index 98%
rename from mission/devices/MgmRm3100CustomHandler.cpp
rename to mission/acs/MgmRm3100CustomHandler.cpp
index f6f86950..891fad0f 100644
--- a/mission/devices/MgmRm3100CustomHandler.cpp
+++ b/mission/acs/MgmRm3100CustomHandler.cpp
@@ -1,4 +1,4 @@
-#include <mission/devices/MgmRm3100CustomHandler.h>
+#include "MgmRm3100CustomHandler.h"
 
 #include "fsfw/datapool/PoolReadGuard.h"
 #include "fsfw/devicehandlers/DeviceHandlerMessage.h"
diff --git a/mission/devices/MgmRm3100CustomHandler.h b/mission/acs/MgmRm3100CustomHandler.h
similarity index 98%
rename from mission/devices/MgmRm3100CustomHandler.h
rename to mission/acs/MgmRm3100CustomHandler.h
index 4c0c98b3..3cb4559e 100644
--- a/mission/devices/MgmRm3100CustomHandler.h
+++ b/mission/acs/MgmRm3100CustomHandler.h
@@ -5,7 +5,7 @@
 
 #include "fsfw/devicehandlers/DeviceHandlerBase.h"
 #include "fsfw/globalfunctions/PeriodicOperationDivider.h"
-#include "mission/devices/devicedefinitions/acsPolling.h"
+#include "mission/acs/acsBoardPolling.h"
 
 /**
  * @brief 	Device Handler for the RM3100 geomagnetic magnetometer sensor
diff --git a/mission/devices/RwHandler.cpp b/mission/acs/RwHandler.cpp
similarity index 100%
rename from mission/devices/RwHandler.cpp
rename to mission/acs/RwHandler.cpp
diff --git a/mission/devices/RwHandler.h b/mission/acs/RwHandler.h
similarity index 98%
rename from mission/devices/RwHandler.h
rename to mission/acs/RwHandler.h
index cdb72de1..0537ef8c 100644
--- a/mission/devices/RwHandler.h
+++ b/mission/acs/RwHandler.h
@@ -3,7 +3,7 @@
 
 #include <fsfw/devicehandlers/DeviceHandlerBase.h>
 #include <fsfw_hal/common/gpio/gpioDefinitions.h>
-#include <mission/devices/devicedefinitions/rwHelpers.h>
+#include <mission/acs/rwHelpers.h>
 #include <string.h>
 
 #include "events/subsystemIdRanges.h"
diff --git a/mission/devices/SusHandler.cpp b/mission/acs/SusHandler.cpp
similarity index 100%
rename from mission/devices/SusHandler.cpp
rename to mission/acs/SusHandler.cpp
diff --git a/mission/devices/SusHandler.h b/mission/acs/SusHandler.h
similarity index 97%
rename from mission/devices/SusHandler.h
rename to mission/acs/SusHandler.h
index 6eb781db..340a1c4c 100644
--- a/mission/devices/SusHandler.h
+++ b/mission/acs/SusHandler.h
@@ -6,7 +6,7 @@
 
 #include "fsfw/devicehandlers/DeviceHandlerBase.h"
 #include "fsfw/globalfunctions/PeriodicOperationDivider.h"
-#include "mission/devices/devicedefinitions/acsPolling.h"
+#include "mission/acs/acsBoardPolling.h"
 #include "mission/devices/devicedefinitions/susMax1227Helpers.h"
 
 class SusHandler : public DeviceHandlerBase {
diff --git a/mission/devices/devicedefinitions/acsPolling.h b/mission/acs/acsBoardPolling.h
similarity index 100%
rename from mission/devices/devicedefinitions/acsPolling.h
rename to mission/acs/acsBoardPolling.h
diff --git a/mission/devices/GPSHyperionHandler.cpp b/mission/acs/archive/GPSHyperionHandler.cpp
similarity index 100%
rename from mission/devices/GPSHyperionHandler.cpp
rename to mission/acs/archive/GPSHyperionHandler.cpp
diff --git a/mission/devices/GPSHyperionHandler.h b/mission/acs/archive/GPSHyperionHandler.h
similarity index 100%
rename from mission/devices/GPSHyperionHandler.h
rename to mission/acs/archive/GPSHyperionHandler.h
diff --git a/mission/devices/LegacySusHandler.cpp b/mission/acs/archive/LegacySusHandler.cpp
similarity index 100%
rename from mission/devices/LegacySusHandler.cpp
rename to mission/acs/archive/LegacySusHandler.cpp
diff --git a/mission/devices/LegacySusHandler.h b/mission/acs/archive/LegacySusHandler.h
similarity index 100%
rename from mission/devices/LegacySusHandler.h
rename to mission/acs/archive/LegacySusHandler.h
diff --git a/mission/acsDefs.cpp b/mission/acs/defs.cpp
similarity index 97%
rename from mission/acsDefs.cpp
rename to mission/acs/defs.cpp
index 4027896c..f90df9a3 100644
--- a/mission/acsDefs.cpp
+++ b/mission/acs/defs.cpp
@@ -1,4 +1,4 @@
-#include "acsDefs.h"
+#include "defs.h"
 
 const char* acs::getModeStr(AcsMode mode) {
   static const char* modeStr = "UNKNOWN";
diff --git a/mission/acsDefs.h b/mission/acs/defs.h
similarity index 100%
rename from mission/acsDefs.h
rename to mission/acs/defs.h
diff --git a/mission/devices/devicedefinitions/gyroAdisHelpers.cpp b/mission/acs/gyroAdisHelpers.cpp
similarity index 100%
rename from mission/devices/devicedefinitions/gyroAdisHelpers.cpp
rename to mission/acs/gyroAdisHelpers.cpp
diff --git a/mission/devices/devicedefinitions/gyroAdisHelpers.h b/mission/acs/gyroAdisHelpers.h
similarity index 100%
rename from mission/devices/devicedefinitions/gyroAdisHelpers.h
rename to mission/acs/gyroAdisHelpers.h
diff --git a/mission/devices/devicedefinitions/imtqHelpers.cpp b/mission/acs/imtqHelpers.cpp
similarity index 100%
rename from mission/devices/devicedefinitions/imtqHelpers.cpp
rename to mission/acs/imtqHelpers.cpp
diff --git a/mission/devices/devicedefinitions/imtqHelpers.h b/mission/acs/imtqHelpers.h
similarity index 100%
rename from mission/devices/devicedefinitions/imtqHelpers.h
rename to mission/acs/imtqHelpers.h
diff --git a/mission/devices/devicedefinitions/rwHelpers.cpp b/mission/acs/rwHelpers.cpp
similarity index 100%
rename from mission/devices/devicedefinitions/rwHelpers.cpp
rename to mission/acs/rwHelpers.cpp
diff --git a/mission/devices/devicedefinitions/rwHelpers.h b/mission/acs/rwHelpers.h
similarity index 100%
rename from mission/devices/devicedefinitions/rwHelpers.h
rename to mission/acs/rwHelpers.h
diff --git a/mission/com/CMakeLists.txt b/mission/com/CMakeLists.txt
index 14a45987..94d3e7f0 100644
--- a/mission/com/CMakeLists.txt
+++ b/mission/com/CMakeLists.txt
@@ -1,4 +1,2 @@
-target_sources(
-  ${LIB_EIVE_MISSION}
-  PRIVATE SyrlinksHandler.cpp ComSubsystem.cpp SyrlinksFdir.cpp comModeTree.cpp
-          CcsdsIpCoreHandler.cpp SyrlinksAssembly.cpp)
+target_sources(${LIB_EIVE_MISSION} PRIVATE SyrlinksHandler.cpp
+                                           CcsdsIpCoreHandler.cpp)
diff --git a/mission/controller/AcsController.cpp b/mission/controller/AcsController.cpp
index 4b865ee3..6db48340 100644
--- a/mission/controller/AcsController.cpp
+++ b/mission/controller/AcsController.cpp
@@ -1,7 +1,7 @@
 #include "AcsController.h"
 
 #include <fsfw/datapool/PoolReadGuard.h>
-#include <mission/acsDefs.h>
+#include <mission/acs/defs.h>
 #include <mission/config/torquer.h>
 
 AcsController::AcsController(object_id_t objectId)
diff --git a/mission/controller/AcsController.h b/mission/controller/AcsController.h
index fd17d606..1215c1ea 100644
--- a/mission/controller/AcsController.h
+++ b/mission/controller/AcsController.h
@@ -9,8 +9,8 @@
 #include <fsfw/parameters/ReceivesParameterMessagesIF.h>
 #include <fsfw_hal/devicehandlers/MgmLIS3MDLHandler.h>
 #include <fsfw_hal/devicehandlers/MgmRM3100Handler.h>
-#include <mission/devices/devicedefinitions/imtqHelpers.h>
-#include <mission/devices/devicedefinitions/rwHelpers.h>
+#include <mission/acs/imtqHelpers.h>
+#include <mission/acs/rwHelpers.h>
 #include <mission/devices/devicedefinitions/susMax1227Helpers.h>
 #include <mission/trace.h>
 
diff --git a/mission/controller/ThermalController.cpp b/mission/controller/ThermalController.cpp
index 285628e8..3879339d 100644
--- a/mission/controller/ThermalController.cpp
+++ b/mission/controller/ThermalController.cpp
@@ -3,16 +3,16 @@
 #include <bsp_q7s/core/CoreDefinitions.h>
 #include <fsfw/datapool/PoolReadGuard.h>
 #include <fsfw/thermal/ThermalComponentIF.h>
+#include <fsfw_hal/devicehandlers/devicedefinitions/gyroL3gHelpers.h>
 #include <fsfw_hal/devicehandlers/devicedefinitions/mgmLis3Helpers.h>
 #include <linux/devices/devicedefinitions/StarTrackerDefinitions.h>
+#include <mission/acs/gyroAdisHelpers.h>
+#include <mission/acs/imtqHelpers.h>
+#include <mission/acs/rwHelpers.h>
 #include <mission/com/syrlinksDefs.h>
 #include <mission/devices/devicedefinitions/BpxBatteryDefinitions.h>
 #include <mission/devices/devicedefinitions/GomspaceDefinitions.h>
-#include <mission/devices/devicedefinitions/GyroL3GD20Definitions.h>
-#include <mission/devices/devicedefinitions/gyroAdisHelpers.h>
-#include <mission/devices/devicedefinitions/imtqHelpers.h>
 #include <mission/devices/devicedefinitions/payloadPcduDefinitions.h>
-#include <mission/devices/devicedefinitions/rwHelpers.h>
 #include <objects/systemObjectList.h>
 
 ThermalController::ThermalController(object_id_t objectId, HeaterHandler& heater)
diff --git a/mission/controller/ThermalController.h b/mission/controller/ThermalController.h
index b162d71b..e091042b 100644
--- a/mission/controller/ThermalController.h
+++ b/mission/controller/ThermalController.h
@@ -8,15 +8,15 @@
 #include <fsfw_hal/devicehandlers/devicedefinitions/gyroL3gHelpers.h>
 #include <fsfw_hal/devicehandlers/devicedefinitions/mgmLis3Helpers.h>
 #include <linux/devices/devicedefinitions/StarTrackerDefinitions.h>
+#include <mission/acs/gyroAdisHelpers.h>
+#include <mission/acs/imtqHelpers.h>
+#include <mission/acs/rwHelpers.h>
 #include <mission/com/syrlinksDefs.h>
 #include <mission/controller/controllerdefinitions/ThermalControllerDefinitions.h>
 #include <mission/devices/devicedefinitions/BpxBatteryDefinitions.h>
 #include <mission/devices/devicedefinitions/Max31865Definitions.h>
 #include <mission/devices/devicedefinitions/Tmp1075Definitions.h>
-#include <mission/devices/devicedefinitions/gyroAdisHelpers.h>
-#include <mission/devices/devicedefinitions/imtqHelpers.h>
 #include <mission/devices/devicedefinitions/payloadPcduDefinitions.h>
-#include <mission/devices/devicedefinitions/rwHelpers.h>
 #include <mission/devices/devicedefinitions/susMax1227Helpers.h>
 
 #include <list>
diff --git a/mission/controller/acs/SensorValues.h b/mission/controller/acs/SensorValues.h
index 25946d0b..03bc22c4 100644
--- a/mission/controller/acs/SensorValues.h
+++ b/mission/controller/acs/SensorValues.h
@@ -3,12 +3,12 @@
 
 #include <fsfw_hal/devicehandlers/MgmLIS3MDLHandler.h>
 #include <fsfw_hal/devicehandlers/MgmRM3100Handler.h>
+#include <fsfw_hal/devicehandlers/devicedefinitions/gyroL3gHelpers.h>
 #include <linux/devices/devicedefinitions/StarTrackerDefinitions.h>
+#include <mission/acs/gyroAdisHelpers.h>
+#include <mission/acs/imtqHelpers.h>
+#include <mission/acs/rwHelpers.h>
 #include <mission/devices/devicedefinitions/GPSDefinitions.h>
-#include <mission/devices/devicedefinitions/GyroL3GD20Definitions.h>
-#include <mission/devices/devicedefinitions/gyroAdisHelpers.h>
-#include <mission/devices/devicedefinitions/imtqHelpers.h>
-#include <mission/devices/devicedefinitions/rwHelpers.h>
 #include <mission/devices/devicedefinitions/susMax1227Helpers.h>
 
 namespace ACS {
diff --git a/mission/core/GenericFactory.cpp b/mission/core/GenericFactory.cpp
index 53ca6904..433b4191 100644
--- a/mission/core/GenericFactory.cpp
+++ b/mission/core/GenericFactory.cpp
@@ -29,9 +29,9 @@
 #include <mission/devices/HeaterHandler.h>
 #include <mission/devices/devicedefinitions/GomspaceDefinitions.h>
 #include <mission/persistentTmStoreDefs.h>
-#include <mission/system/objects/AcsBoardAssembly.h>
-#include <mission/system/objects/RwAssembly.h>
-#include <mission/system/objects/SusAssembly.h>
+#include <mission/system/acs/AcsBoardAssembly.h>
+#include <mission/system/acs/RwAssembly.h>
+#include <mission/system/acs/SusAssembly.h>
 #include <mission/system/objects/TcsBoardAssembly.h>
 #include <mission/tmtc/CfdpTmFunnel.h>
 #include <mission/tmtc/PersistentTmStore.h>
@@ -46,8 +46,8 @@
 #include "eive/definitions.h"
 #include "fsfw/pus/Service11TelecommandScheduling.h"
 #include "mission/cfdp/Config.h"
-#include "mission/system/objects/RwAssembly.h"
-#include "mission/system/tree/acsModeTree.h"
+#include "mission/system/acs/RwAssembly.h"
+#include "mission/system/acs/acsModeTree.h"
 #include "mission/system/tree/tcsModeTree.h"
 #include "mission/tmtc/tmFilters.h"
 #include "objects/systemObjectList.h"
diff --git a/mission/core/pollingSeqTables.cpp b/mission/core/pollingSeqTables.cpp
index 1b8f6e89..13506a8c 100644
--- a/mission/core/pollingSeqTables.cpp
+++ b/mission/core/pollingSeqTables.cpp
@@ -4,7 +4,7 @@
 #include <fsfw/objectmanager/ObjectManagerIF.h>
 #include <fsfw/serviceinterface/ServiceInterfaceStream.h>
 #include <fsfw/tasks/FixedTimeslotTaskIF.h>
-#include <mission/devices/devicedefinitions/imtqHelpers.h>
+#include <mission/acs/imtqHelpers.h>
 
 #include "OBSWConfig.h"
 #include "eive/definitions.h"
diff --git a/mission/devices/CMakeLists.txt b/mission/devices/CMakeLists.txt
index a9ce70b8..1c1717e4 100644
--- a/mission/devices/CMakeLists.txt
+++ b/mission/devices/CMakeLists.txt
@@ -8,18 +8,10 @@ target_sources(
           Pdu1Handler.cpp
           Pdu2Handler.cpp
           ACUHandler.cpp
-          Max31865PT1000Handler.cpp
           Max31865EiveHandler.cpp
-          ImtqHandler.cpp
           HeaterHandler.cpp
           RadiationSensorHandler.cpp
-          GyrAdis1650XHandler.cpp
-          GyrL3gCustomHandler.cpp
-          MgmRm3100CustomHandler.cpp
-          MgmLis3CustomHandler.cpp
-          RwHandler.cpp
           max1227.cpp
-          SusHandler.cpp
           PayloadPcduHandler.cpp
           SolarArrayDeploymentHandler.cpp
           ScexDeviceHandler.cpp)
diff --git a/mission/devices/PayloadPcduHandler.h b/mission/devices/PayloadPcduHandler.h
index 0fd78887..ea98b0ff 100644
--- a/mission/devices/PayloadPcduHandler.h
+++ b/mission/devices/PayloadPcduHandler.h
@@ -11,8 +11,8 @@
 #include "fsfw_hal/common/gpio/GpioIF.h"
 #include "mission/devices/devicedefinitions/payloadPcduDefinitions.h"
 #include "mission/memory/SdCardMountedIF.h"
-#include "mission/system/objects/DualLanePowerStateMachine.h"
-#include "mission/system/objects/definitions.h"
+#include "mission/powerDefs.h"
+#include "mission/system/DualLanePowerStateMachine.h"
 
 #ifdef FSFW_OSAL_LINUX
 class SpiComIF;
diff --git a/mission/devices/devicedefinitions/CMakeLists.txt b/mission/devices/devicedefinitions/CMakeLists.txt
index eab4d4cb..0ecd64e6 100644
--- a/mission/devices/devicedefinitions/CMakeLists.txt
+++ b/mission/devices/devicedefinitions/CMakeLists.txt
@@ -1,2 +1 @@
-target_sources(${LIB_EIVE_MISSION} PRIVATE ScexDefinitions.cpp rwHelpers.cpp
-                                           imtqHelpers.cpp gyroAdisHelpers.cpp)
+target_sources(${LIB_EIVE_MISSION} PRIVATE ScexDefinitions.cpp)
diff --git a/mission/devices/devicedefinitions/GyroL3GD20Definitions.h b/mission/devices/devicedefinitions/GyroL3GD20Definitions.h
deleted file mode 100644
index 43783c82..00000000
--- a/mission/devices/devicedefinitions/GyroL3GD20Definitions.h
+++ /dev/null
@@ -1,130 +0,0 @@
-#ifndef MISSION_DEVICES_DEVICEDEFINITIONS_GYROL3GD20DEFINITIONS_H_
-#define MISSION_DEVICES_DEVICEDEFINITIONS_GYROL3GD20DEFINITIONS_H_
-
-#include <fsfw/datapoollocal/StaticLocalDataSet.h>
-#include <fsfw/devicehandlers/DeviceHandlerIF.h>
-
-#include <cstdint>
-
-namespace l3gd20h {
-
-/* Actual size is 15 but we round up a bit */
-static constexpr size_t MAX_BUFFER_SIZE = 16;
-
-static constexpr uint8_t READ_MASK = 0b1000'0000;
-
-static constexpr uint8_t AUTO_INCREMENT_MASK = 0b0100'0000;
-
-static constexpr uint8_t WHO_AM_I_REG = 0b0000'1111;
-static constexpr uint8_t WHO_AM_I_VAL = 0b1101'0111;
-
-/*------------------------------------------------------------------------*/
-/* Control registers */
-/*------------------------------------------------------------------------*/
-static constexpr uint8_t CTRL_REG_1 = 0b0010'0000;
-static constexpr uint8_t CTRL_REG_2 = 0b0010'0001;
-static constexpr uint8_t CTRL_REG_3 = 0b0010'0010;
-static constexpr uint8_t CTRL_REG_4 = 0b0010'0011;
-static constexpr uint8_t CTRL_REG_5 = 0b0010'0100;
-
-/* Register 1 */
-static constexpr uint8_t SET_DR_1 = 1 << 7;
-static constexpr uint8_t SET_DR_0 = 1 << 6;
-static constexpr uint8_t SET_BW_1 = 1 << 5;
-static constexpr uint8_t SET_BW_0 = 1 << 4;
-static constexpr uint8_t SET_POWER_NORMAL_MODE = 1 << 3;
-static constexpr uint8_t SET_Z_ENABLE = 1 << 2;
-static constexpr uint8_t SET_X_ENABLE = 1 << 1;
-static constexpr uint8_t SET_Y_ENABLE = 1;
-
-static constexpr uint8_t CTRL_REG_1_VAL =
-    SET_POWER_NORMAL_MODE | SET_Z_ENABLE | SET_Y_ENABLE | SET_X_ENABLE;
-
-/* Register 2 */
-static constexpr uint8_t EXTERNAL_EDGE_ENB = 1 << 7;
-static constexpr uint8_t LEVEL_SENSITIVE_TRIGGER = 1 << 6;
-static constexpr uint8_t SET_HPM_1 = 1 << 5;
-static constexpr uint8_t SET_HPM_0 = 1 << 4;
-static constexpr uint8_t SET_HPCF_3 = 1 << 3;
-static constexpr uint8_t SET_HPCF_2 = 1 << 2;
-static constexpr uint8_t SET_HPCF_1 = 1 << 1;
-static constexpr uint8_t SET_HPCF_0 = 1;
-
-static constexpr uint8_t CTRL_REG_2_VAL = 0b0000'0000;
-
-/* Register 3 */
-static constexpr uint8_t CTRL_REG_3_VAL = 0b0000'0000;
-
-/* Register 4 */
-static constexpr uint8_t SET_BNU = 1 << 7;
-static constexpr uint8_t SET_BLE = 1 << 6;
-static constexpr uint8_t SET_FS_1 = 1 << 5;
-static constexpr uint8_t SET_FS_0 = 1 << 4;
-static constexpr uint8_t SET_IMP_ENB = 1 << 3;
-static constexpr uint8_t SET_SELF_TEST_ENB_1 = 1 << 2;
-static constexpr uint8_t SET_SELF_TEST_ENB_0 = 1 << 1;
-static constexpr uint8_t SET_SPI_IF_SELECT = 1;
-
-/* Enable big endian data format */
-static constexpr uint8_t CTRL_REG_4_VAL = SET_BLE;
-
-/* Register 5 */
-static constexpr uint8_t SET_REBOOT_MEM = 1 << 7;
-static constexpr uint8_t SET_FIFO_ENB = 1 << 6;
-
-static constexpr uint8_t CTRL_REG_5_VAL = 0b0000'0000;
-
-/* Possible range values in degrees per second (DPS). */
-static constexpr uint16_t RANGE_DPS_00 = 245;
-static constexpr uint16_t RANGE_DPS_01 = 500;
-static constexpr uint16_t RANGE_DPS_11 = 2000;
-
-static constexpr uint8_t READ_START = CTRL_REG_1;
-static constexpr size_t READ_LEN = 14;
-
-/* Indexing */
-static constexpr uint8_t REFERENCE_IDX = 6;
-static constexpr uint8_t TEMPERATURE_IDX = 7;
-static constexpr uint8_t STATUS_IDX = 8;
-static constexpr uint8_t OUT_X_H = 9;
-static constexpr uint8_t OUT_X_L = 10;
-static constexpr uint8_t OUT_Y_H = 11;
-static constexpr uint8_t OUT_Y_L = 12;
-static constexpr uint8_t OUT_Z_H = 13;
-static constexpr uint8_t OUT_Z_L = 14;
-
-/*------------------------------------------------------------------------*/
-/* Device Handler specific */
-/*------------------------------------------------------------------------*/
-static constexpr DeviceCommandId_t READ_REGS = 0;
-static constexpr DeviceCommandId_t CONFIGURE_CTRL_REGS = 1;
-static constexpr DeviceCommandId_t READ_CTRL_REGS = 2;
-
-static constexpr uint32_t GYRO_DATASET_ID = READ_REGS;
-
-enum GyroPoolIds : lp_id_t { ANG_VELOC_X, ANG_VELOC_Y, ANG_VELOC_Z, TEMPERATURE };
-
-}  // namespace l3gd20h
-
-class GyroPrimaryDataset : public StaticLocalDataSet<5> {
- public:
-  /** Constructor  for data users like controllers */
-  GyroPrimaryDataset(object_id_t mgmId)
-      : StaticLocalDataSet(sid_t(mgmId, l3gd20h::GYRO_DATASET_ID)) {
-    setAllVariablesReadOnly();
-  }
-
-  /* Angular velocities in degrees per second (DPS) */
-  lp_var_t<float> angVelocX = lp_var_t<float>(sid.objectId, l3gd20h::ANG_VELOC_X, this);
-  lp_var_t<float> angVelocY = lp_var_t<float>(sid.objectId, l3gd20h::ANG_VELOC_Y, this);
-  lp_var_t<float> angVelocZ = lp_var_t<float>(sid.objectId, l3gd20h::ANG_VELOC_Z, this);
-  lp_var_t<float> temperature = lp_var_t<float>(sid.objectId, l3gd20h::TEMPERATURE, this);
-
- private:
-  friend class GyroHandlerL3GD20H;
-  /** Constructor  for the data creator */
-  GyroPrimaryDataset(HasLocalDataPoolIF* hkOwner)
-      : StaticLocalDataSet(hkOwner, l3gd20h::GYRO_DATASET_ID) {}
-};
-
-#endif /* MISSION_DEVICES_DEVICEDEFINITIONS_GYROL3GD20DEFINITIONS_H_ */
diff --git a/mission/system/objects/definitions.h b/mission/powerDefs.h
similarity index 100%
rename from mission/system/objects/definitions.h
rename to mission/powerDefs.h
diff --git a/mission/sysDefs.h b/mission/sysDefs.h
index 1d1db0a8..70ff8138 100644
--- a/mission/sysDefs.h
+++ b/mission/sysDefs.h
@@ -1,7 +1,8 @@
 #ifndef MISSION_SYSDEFS_H_
 #define MISSION_SYSDEFS_H_
 
-#include "acsDefs.h"
+#include "acs/defs.h"
+
 namespace satsystem {
 
 enum Mode : Mode_t { BOOT = 5, SAFE = acs::AcsMode::SAFE, PTG_IDLE = acs::AcsMode::PTG_IDLE };
diff --git a/mission/system/CMakeLists.txt b/mission/system/CMakeLists.txt
index 617e2765..f278bbc9 100644
--- a/mission/system/CMakeLists.txt
+++ b/mission/system/CMakeLists.txt
@@ -1,3 +1,7 @@
 add_subdirectory(objects)
 add_subdirectory(tree)
+add_subdirectory(acs)
+add_subdirectory(com)
 add_subdirectory(fdir)
+
+target_sources(${LIB_EIVE_MISSION} PRIVATE DualLanePowerStateMachine.cpp)
diff --git a/mission/system/objects/DualLanePowerStateMachine.cpp b/mission/system/DualLanePowerStateMachine.cpp
similarity index 100%
rename from mission/system/objects/DualLanePowerStateMachine.cpp
rename to mission/system/DualLanePowerStateMachine.cpp
diff --git a/mission/system/objects/DualLanePowerStateMachine.h b/mission/system/DualLanePowerStateMachine.h
similarity index 95%
rename from mission/system/objects/DualLanePowerStateMachine.h
rename to mission/system/DualLanePowerStateMachine.h
index 7a6f29b6..7db99c83 100644
--- a/mission/system/objects/DualLanePowerStateMachine.h
+++ b/mission/system/DualLanePowerStateMachine.h
@@ -5,7 +5,7 @@
 #include <fsfw/modes/HasModesIF.h>
 #include <mission/system/objects/PowerStateMachineBase.h>
 
-#include "definitions.h"
+#include "mission/powerDefs.h"
 
 class AssemblyBase;
 class PowerSwitchIF;
diff --git a/mission/system/objects/AcsBoardAssembly.cpp b/mission/system/acs/AcsBoardAssembly.cpp
similarity index 100%
rename from mission/system/objects/AcsBoardAssembly.cpp
rename to mission/system/acs/AcsBoardAssembly.cpp
diff --git a/mission/system/objects/AcsBoardAssembly.h b/mission/system/acs/AcsBoardAssembly.h
similarity index 98%
rename from mission/system/objects/AcsBoardAssembly.h
rename to mission/system/acs/AcsBoardAssembly.h
index a07431fe..7427e808 100644
--- a/mission/system/objects/AcsBoardAssembly.h
+++ b/mission/system/acs/AcsBoardAssembly.h
@@ -6,8 +6,8 @@
 #include <fsfw_hal/common/gpio/gpioDefinitions.h>
 
 #include "DualLaneAssemblyBase.h"
-#include "DualLanePowerStateMachine.h"
 #include "eive/eventSubsystemIds.h"
+#include "mission/system/DualLanePowerStateMachine.h"
 
 struct AcsBoardHelper {
   AcsBoardHelper(object_id_t mgm0Id, object_id_t mgm1Id, object_id_t mgm2Id, object_id_t mgm3Id,
diff --git a/mission/system/fdir/AcsBoardFdir.cpp b/mission/system/acs/AcsBoardFdir.cpp
similarity index 100%
rename from mission/system/fdir/AcsBoardFdir.cpp
rename to mission/system/acs/AcsBoardFdir.cpp
diff --git a/mission/system/fdir/AcsBoardFdir.h b/mission/system/acs/AcsBoardFdir.h
similarity index 100%
rename from mission/system/fdir/AcsBoardFdir.h
rename to mission/system/acs/AcsBoardFdir.h
diff --git a/mission/system/objects/AcsSubsystem.cpp b/mission/system/acs/AcsSubsystem.cpp
similarity index 95%
rename from mission/system/objects/AcsSubsystem.cpp
rename to mission/system/acs/AcsSubsystem.cpp
index 873d88cf..2b1d9ef6 100644
--- a/mission/system/objects/AcsSubsystem.cpp
+++ b/mission/system/acs/AcsSubsystem.cpp
@@ -4,7 +4,7 @@
 #include <fsfw/ipc/QueueFactory.h>
 
 #include "fsfw/modes/ModeMessage.h"
-#include "mission/acsDefs.h"
+#include "mission/acs/defs.h"
 
 AcsSubsystem::AcsSubsystem(object_id_t setObjectId, uint32_t maxNumberOfSequences,
                            uint32_t maxNumberOfTables)
diff --git a/mission/system/objects/AcsSubsystem.h b/mission/system/acs/AcsSubsystem.h
similarity index 100%
rename from mission/system/objects/AcsSubsystem.h
rename to mission/system/acs/AcsSubsystem.h
diff --git a/mission/system/acs/CMakeLists.txt b/mission/system/acs/CMakeLists.txt
new file mode 100644
index 00000000..70e11e59
--- /dev/null
+++ b/mission/system/acs/CMakeLists.txt
@@ -0,0 +1,11 @@
+target_sources(
+  ${LIB_EIVE_MISSION}
+  PRIVATE AcsBoardAssembly.cpp
+          AcsSubsystem.cpp
+          DualLaneAssemblyBase.cpp
+          ImtqAssembly.cpp
+          RwAssembly.cpp
+          SusAssembly.cpp
+          AcsBoardFdir.cpp
+          acsModeTree.cpp
+          SusFdir.cpp)
diff --git a/mission/system/objects/DualLaneAssemblyBase.cpp b/mission/system/acs/DualLaneAssemblyBase.cpp
similarity index 100%
rename from mission/system/objects/DualLaneAssemblyBase.cpp
rename to mission/system/acs/DualLaneAssemblyBase.cpp
diff --git a/mission/system/objects/DualLaneAssemblyBase.h b/mission/system/acs/DualLaneAssemblyBase.h
similarity index 98%
rename from mission/system/objects/DualLaneAssemblyBase.h
rename to mission/system/acs/DualLaneAssemblyBase.h
index 929ef3f9..c71810d6 100644
--- a/mission/system/objects/DualLaneAssemblyBase.h
+++ b/mission/system/acs/DualLaneAssemblyBase.h
@@ -2,7 +2,7 @@
 #define MISSION_SYSTEM_DUALLANEASSEMBLYBASE_H_
 
 #include <fsfw/devicehandlers/AssemblyBase.h>
-#include <mission/system/objects/DualLanePowerStateMachine.h>
+#include <mission/system/DualLanePowerStateMachine.h>
 
 /**
  * @brief   Encapsulates assemblies which are also responsible for dual lane power switching
diff --git a/mission/system/objects/ImtqAssembly.cpp b/mission/system/acs/ImtqAssembly.cpp
similarity index 100%
rename from mission/system/objects/ImtqAssembly.cpp
rename to mission/system/acs/ImtqAssembly.cpp
diff --git a/mission/system/objects/ImtqAssembly.h b/mission/system/acs/ImtqAssembly.h
similarity index 100%
rename from mission/system/objects/ImtqAssembly.h
rename to mission/system/acs/ImtqAssembly.h
diff --git a/mission/system/objects/RwAssembly.cpp b/mission/system/acs/RwAssembly.cpp
similarity index 100%
rename from mission/system/objects/RwAssembly.cpp
rename to mission/system/acs/RwAssembly.cpp
diff --git a/mission/system/objects/RwAssembly.h b/mission/system/acs/RwAssembly.h
similarity index 100%
rename from mission/system/objects/RwAssembly.h
rename to mission/system/acs/RwAssembly.h
diff --git a/mission/system/objects/SusAssembly.cpp b/mission/system/acs/SusAssembly.cpp
similarity index 100%
rename from mission/system/objects/SusAssembly.cpp
rename to mission/system/acs/SusAssembly.cpp
diff --git a/mission/system/objects/SusAssembly.h b/mission/system/acs/SusAssembly.h
similarity index 100%
rename from mission/system/objects/SusAssembly.h
rename to mission/system/acs/SusAssembly.h
diff --git a/mission/system/fdir/SusFdir.cpp b/mission/system/acs/SusFdir.cpp
similarity index 100%
rename from mission/system/fdir/SusFdir.cpp
rename to mission/system/acs/SusFdir.cpp
diff --git a/mission/system/fdir/SusFdir.h b/mission/system/acs/SusFdir.h
similarity index 100%
rename from mission/system/fdir/SusFdir.h
rename to mission/system/acs/SusFdir.h
diff --git a/mission/system/tree/acsModeTree.cpp b/mission/system/acs/acsModeTree.cpp
similarity index 99%
rename from mission/system/tree/acsModeTree.cpp
rename to mission/system/acs/acsModeTree.cpp
index 9b0c573a..cee5445d 100644
--- a/mission/system/tree/acsModeTree.cpp
+++ b/mission/system/acs/acsModeTree.cpp
@@ -9,9 +9,9 @@
 #include <optional>
 
 #include "eive/objects.h"
-#include "mission/acsDefs.h"
-#include "mission/system/objects/definitions.h"
-#include "util.h"
+#include "mission/acs/defs.h"
+#include "mission/powerDefs.h"
+#include "mission/system/tree/util.h"
 
 AcsSubsystem satsystem::acs::ACS_SUBSYSTEM(objects::ACS_SUBSYSTEM, 12, 24);
 
diff --git a/mission/system/tree/acsModeTree.h b/mission/system/acs/acsModeTree.h
similarity index 74%
rename from mission/system/tree/acsModeTree.h
rename to mission/system/acs/acsModeTree.h
index 27236fba..da0374e6 100644
--- a/mission/system/tree/acsModeTree.h
+++ b/mission/system/acs/acsModeTree.h
@@ -1,4 +1,4 @@
-#include <mission/system/objects/AcsSubsystem.h>
+#include <mission/system/acs/AcsSubsystem.h>
 
 namespace satsystem {
 namespace acs {
diff --git a/mission/system/com/CMakeLists.txt b/mission/system/com/CMakeLists.txt
new file mode 100644
index 00000000..6d31da88
--- /dev/null
+++ b/mission/system/com/CMakeLists.txt
@@ -0,0 +1,3 @@
+target_sources(
+  ${LIB_EIVE_MISSION} PRIVATE comModeTree.cpp ComSubsystem.cpp
+                              SyrlinksAssembly.cpp SyrlinksFdir.cpp)
diff --git a/mission/com/ComSubsystem.cpp b/mission/system/com/ComSubsystem.cpp
similarity index 100%
rename from mission/com/ComSubsystem.cpp
rename to mission/system/com/ComSubsystem.cpp
diff --git a/mission/com/ComSubsystem.h b/mission/system/com/ComSubsystem.h
similarity index 100%
rename from mission/com/ComSubsystem.h
rename to mission/system/com/ComSubsystem.h
diff --git a/mission/com/SyrlinksAssembly.cpp b/mission/system/com/SyrlinksAssembly.cpp
similarity index 100%
rename from mission/com/SyrlinksAssembly.cpp
rename to mission/system/com/SyrlinksAssembly.cpp
diff --git a/mission/com/SyrlinksAssembly.h b/mission/system/com/SyrlinksAssembly.h
similarity index 100%
rename from mission/com/SyrlinksAssembly.h
rename to mission/system/com/SyrlinksAssembly.h
diff --git a/mission/com/SyrlinksFdir.cpp b/mission/system/com/SyrlinksFdir.cpp
similarity index 100%
rename from mission/com/SyrlinksFdir.cpp
rename to mission/system/com/SyrlinksFdir.cpp
diff --git a/mission/com/SyrlinksFdir.h b/mission/system/com/SyrlinksFdir.h
similarity index 100%
rename from mission/com/SyrlinksFdir.h
rename to mission/system/com/SyrlinksFdir.h
diff --git a/mission/com/comModeTree.cpp b/mission/system/com/comModeTree.cpp
similarity index 99%
rename from mission/com/comModeTree.cpp
rename to mission/system/com/comModeTree.cpp
index c400ea95..9501262d 100644
--- a/mission/com/comModeTree.cpp
+++ b/mission/system/com/comModeTree.cpp
@@ -1,7 +1,8 @@
+#include "comModeTree.h"
+
 #include <fsfw/modes/HasModesIF.h>
 #include <fsfw/returnvalues/returnvalue.h>
 #include <fsfw/subsystem/Subsystem.h>
-#include <mission/com/comModeTree.h>
 
 #include "eive/objects.h"
 #include "mission/com/defs.h"
diff --git a/mission/com/comModeTree.h b/mission/system/com/comModeTree.h
similarity index 94%
rename from mission/com/comModeTree.h
rename to mission/system/com/comModeTree.h
index 5adecf8e..bf03bfb4 100644
--- a/mission/com/comModeTree.h
+++ b/mission/system/com/comModeTree.h
@@ -2,7 +2,8 @@
 #define MISSION_SYSTEM_TREE_COMMODETREE_H_
 
 #include <fsfw/devicehandlers/DeviceHandlerIF.h>
-#include <mission/com/ComSubsystem.h>
+
+#include "ComSubsystem.h"
 
 namespace satsystem {
 
diff --git a/mission/system/fdir/CMakeLists.txt b/mission/system/fdir/CMakeLists.txt
index ae93ed91..fb737a3f 100644
--- a/mission/system/fdir/CMakeLists.txt
+++ b/mission/system/fdir/CMakeLists.txt
@@ -1,3 +1,2 @@
-target_sources(
-  ${LIB_EIVE_MISSION} PRIVATE AcsBoardFdir.cpp RtdFdir.cpp StrFdir.cpp
-                              SusFdir.cpp GomspacePowerFdir.cpp)
+target_sources(${LIB_EIVE_MISSION} PRIVATE RtdFdir.cpp StrFdir.cpp
+                                           GomspacePowerFdir.cpp)
diff --git a/mission/system/fdir/StrFdir.cpp b/mission/system/fdir/StrFdir.cpp
index 7d0947a9..97a4162a 100644
--- a/mission/system/fdir/StrFdir.cpp
+++ b/mission/system/fdir/StrFdir.cpp
@@ -1,6 +1,6 @@
 #include "StrFdir.h"
 
-#include "mission/acsDefs.h"
+#include "mission/acs/defs.h"
 
 StrFdir::StrFdir(object_id_t strObject)
     : DeviceHandlerFailureIsolation(strObject, objects::NO_OBJECT) {}
diff --git a/mission/system/objects/CMakeLists.txt b/mission/system/objects/CMakeLists.txt
index bc53b600..e23a82c7 100644
--- a/mission/system/objects/CMakeLists.txt
+++ b/mission/system/objects/CMakeLists.txt
@@ -2,16 +2,9 @@ target_sources(
   ${LIB_EIVE_MISSION}
   PRIVATE EiveSystem.cpp
           CamSwitcher.cpp
-          AcsSubsystem.cpp
           TcsSubsystem.cpp
           PayloadSubsystem.cpp
-          AcsBoardAssembly.cpp
-          ImtqAssembly.cpp
           Stack5VHandler.cpp
-          SusAssembly.cpp
-          RwAssembly.cpp
-          DualLanePowerStateMachine.cpp
           StrAssembly.cpp
           PowerStateMachineBase.cpp
-          DualLaneAssemblyBase.cpp
           TcsBoardAssembly.cpp)
diff --git a/mission/system/objects/EiveSystem.cpp b/mission/system/objects/EiveSystem.cpp
index bb2a229d..22af5fb2 100644
--- a/mission/system/objects/EiveSystem.cpp
+++ b/mission/system/objects/EiveSystem.cpp
@@ -3,7 +3,7 @@
 #include <eive/objects.h>
 #include <fsfw/events/EventManager.h>
 #include <fsfw/ipc/QueueFactory.h>
-#include <mission/acsDefs.h>
+#include <mission/acs/defs.h>
 
 EiveSystem::EiveSystem(object_id_t setObjectId, uint32_t maxNumberOfSequences,
                        uint32_t maxNumberOfTables)
diff --git a/mission/system/objects/PowerStateMachineBase.h b/mission/system/objects/PowerStateMachineBase.h
index 12e72b60..25af577b 100644
--- a/mission/system/objects/PowerStateMachineBase.h
+++ b/mission/system/objects/PowerStateMachineBase.h
@@ -5,7 +5,7 @@
 #include <fsfw/power/PowerSwitchIF.h>
 #include <fsfw/timemanager/Countdown.h>
 
-#include "definitions.h"
+#include "mission/powerDefs.h"
 
 class PowerStateMachineBase {
  public:
diff --git a/mission/system/tree/CMakeLists.txt b/mission/system/tree/CMakeLists.txt
index 9a48af42..a6764013 100644
--- a/mission/system/tree/CMakeLists.txt
+++ b/mission/system/tree/CMakeLists.txt
@@ -1,2 +1,2 @@
-target_sources(${LIB_EIVE_MISSION} PRIVATE acsModeTree.cpp payloadModeTree.cpp
-                                           tcsModeTree.cpp system.cpp util.cpp)
+target_sources(${LIB_EIVE_MISSION} PRIVATE payloadModeTree.cpp tcsModeTree.cpp
+                                           system.cpp util.cpp)
diff --git a/mission/system/tree/payloadModeTree.cpp b/mission/system/tree/payloadModeTree.cpp
index 0f955929..283cd761 100644
--- a/mission/system/tree/payloadModeTree.cpp
+++ b/mission/system/tree/payloadModeTree.cpp
@@ -8,8 +8,8 @@
 #include "eive/objects.h"
 #include "mission/devices/devicedefinitions/payloadPcduDefinitions.h"
 #include "mission/payloadDefs.h"
+#include "mission/powerDefs.h"
 #include "mission/system/objects/PayloadSubsystem.h"
-#include "mission/system/objects/definitions.h"
 #include "util.h"
 
 namespace {
diff --git a/mission/system/tree/system.cpp b/mission/system/tree/system.cpp
index 2ae82802..6e3b3f72 100644
--- a/mission/system/tree/system.cpp
+++ b/mission/system/tree/system.cpp
@@ -2,13 +2,13 @@
 
 #include <fsfw/devicehandlers/DeviceHandlerIF.h>
 #include <fsfw/subsystem/Subsystem.h>
-#include <mission/acsDefs.h>
-#include <mission/com/comModeTree.h>
+#include <mission/acs/defs.h>
 #include <mission/sysDefs.h>
+#include <mission/system/com/comModeTree.h>
 
-#include "acsModeTree.h"
 #include "eive/objects.h"
 #include "mission/com/defs.h"
+#include "mission/system/acs/acsModeTree.h"
 #include "payloadModeTree.h"
 #include "tcsModeTree.h"
 #include "util.h"