diff --git a/bsp_q7s/core/CMakeLists.txt b/bsp_q7s/core/CMakeLists.txt
index 30538565..8731b7a3 100644
--- a/bsp_q7s/core/CMakeLists.txt
+++ b/bsp_q7s/core/CMakeLists.txt
@@ -1,5 +1,4 @@
 target_sources(${OBSW_NAME} PRIVATE
-    acsModeTree.cpp
     CoreController.cpp
     obsw.cpp
     InitMission.cpp
diff --git a/bsp_q7s/core/ObjectFactory.cpp b/bsp_q7s/core/ObjectFactory.cpp
index ecc88ede..a675ffc5 100644
--- a/bsp_q7s/core/ObjectFactory.cpp
+++ b/bsp_q7s/core/ObjectFactory.cpp
@@ -37,11 +37,11 @@
 #include "linux/obc/PdecHandler.h"
 #include "linux/obc/Ptme.h"
 #include "linux/obc/PtmeConfig.h"
-#include "mission/system/AcsBoardFdir.h"
-#include "mission/system/RtdFdir.h"
-#include "mission/system/SusAssembly.h"
-#include "mission/system/SusFdir.h"
-#include "mission/system/TcsBoardAssembly.h"
+#include "mission/system/objects/AcsBoardFdir.h"
+#include "mission/system/objects/RtdFdir.h"
+#include "mission/system/objects/SusAssembly.h"
+#include "mission/system/objects/SusFdir.h"
+#include "mission/system/objects/TcsBoardAssembly.h"
 #include "tmtc/apid.h"
 #include "tmtc/pusIds.h"
 
@@ -92,13 +92,13 @@
 #include "mission/devices/devicedefinitions/SusDefinitions.h"
 #include "mission/devices/devicedefinitions/SyrlinksDefinitions.h"
 #include "mission/devices/devicedefinitions/payloadPcduDefinitions.h"
-#include "mission/system/AcsBoardAssembly.h"
+#include "mission/system/objects/AcsBoardAssembly.h"
 #include "mission/tmtc/CCSDSHandler.h"
 #include "mission/tmtc/VirtualChannel.h"
 #include "mission/utility/TmFunnel.h"
 
-ResetArgs resetArgsGnss0;
-ResetArgs resetArgsGnss1;
+ResetArgs RESET_ARGS_GNSS_0;
+ResetArgs RESET_ARGS_GNSS_1;
 
 void ObjectFactory::setStatics() { Factory::setStaticFrameworkObjectIds(); }
 
@@ -537,15 +537,15 @@ void ObjectFactory::createAcsBoardComponents(LinuxLibgpioIF* gpioComIF, UartComI
 #if OBSW_DEBUG_GPS == 1
   debugGps = true;
 #endif
-  resetArgsGnss1.gnss1 = true;
-  resetArgsGnss1.gpioComIF = gpioComIF;
-  resetArgsGnss1.waitPeriodMs = 100;
-  resetArgsGnss0.gnss1 = false;
-  resetArgsGnss0.gpioComIF = gpioComIF;
-  resetArgsGnss0.waitPeriodMs = 100;
+  RESET_ARGS_GNSS_1.gnss1 = true;
+  RESET_ARGS_GNSS_1.gpioComIF = gpioComIF;
+  RESET_ARGS_GNSS_1.waitPeriodMs = 100;
+  RESET_ARGS_GNSS_0.gnss1 = false;
+  RESET_ARGS_GNSS_0.gpioComIF = gpioComIF;
+  RESET_ARGS_GNSS_0.waitPeriodMs = 100;
   auto gpsHandler0 =
       new GPSHyperionLinuxController(objects::GPS_CONTROLLER, objects::NO_OBJECT, debugGps);
-  gpsHandler0->setResetPinTriggerFunction(gps::triggerGpioResetPin, &resetArgsGnss0);
+  gpsHandler0->setResetPinTriggerFunction(gps::triggerGpioResetPin, &RESET_ARGS_GNSS_0);
 
   AcsBoardHelper acsBoardHelper = AcsBoardHelper(
       objects::MGM_0_LIS3_HANDLER, objects::MGM_1_RM3100_HANDLER, objects::MGM_2_LIS3_HANDLER,
diff --git a/linux/ObjectFactory.cpp b/linux/ObjectFactory.cpp
index 7811fdbe..6b86b128 100644
--- a/linux/ObjectFactory.cpp
+++ b/linux/ObjectFactory.cpp
@@ -9,10 +9,10 @@
 #include <linux/callbacks/gpioCallbacks.h>
 #include <mission/devices/Max31865PT1000Handler.h>
 #include <mission/devices/SusHandler.h>
-#include <mission/system/RtdFdir.h>
-#include <mission/system/SusAssembly.h>
-#include <mission/system/SusFdir.h>
-#include <mission/system/TcsBoardAssembly.h>
+#include <mission/system/objects/RtdFdir.h>
+#include <mission/system/objects/SusAssembly.h>
+#include <mission/system/objects/SusFdir.h>
+#include <mission/system/objects/TcsBoardAssembly.h>
 
 #include "OBSWConfig.h"
 #include "devConf.h"
diff --git a/mission/devices/PayloadPcduHandler.h b/mission/devices/PayloadPcduHandler.h
index dba5b4ef..d5d0f5b1 100644
--- a/mission/devices/PayloadPcduHandler.h
+++ b/mission/devices/PayloadPcduHandler.h
@@ -10,8 +10,8 @@
 #include "fsfw_hal/common/gpio/GpioIF.h"
 #include "mission/devices/devicedefinitions/payloadPcduDefinitions.h"
 #include "mission/memory/SdCardMountedIF.h"
-#include "mission/system/DualLanePowerStateMachine.h"
-#include "mission/system/definitions.h"
+#include "mission/system/objects/DualLanePowerStateMachine.h"
+#include "mission/system/objects/definitions.h"
 
 #ifdef FSFW_OSAL_LINUX
 class SpiComIF;
diff --git a/mission/system/CMakeLists.txt b/mission/system/CMakeLists.txt
index 59418a07..0e9ce773 100644
--- a/mission/system/CMakeLists.txt
+++ b/mission/system/CMakeLists.txt
@@ -1,17 +1,2 @@
-target_sources(${LIB_EIVE_MISSION} PRIVATE
-    EiveSystem.cpp
-    AcsSubsystem.cpp
-    ComSubsystem.cpp
-    PayloadSubsystem.cpp
-
-    AcsBoardAssembly.cpp
-    SusAssembly.cpp
-    DualLanePowerStateMachine.cpp
-    PowerStateMachineBase.cpp
-    DualLaneAssemblyBase.cpp
-    TcsBoardAssembly.cpp
-
-    AcsBoardFdir.cpp
-    SusFdir.cpp
-    RtdFdir.cpp
-)
\ No newline at end of file
+add_subdirectory(objects)
+add_subdirectory(tree)
diff --git a/mission/system/AcsBoardAssembly.cpp b/mission/system/objects/AcsBoardAssembly.cpp
similarity index 100%
rename from mission/system/AcsBoardAssembly.cpp
rename to mission/system/objects/AcsBoardAssembly.cpp
diff --git a/mission/system/AcsBoardAssembly.h b/mission/system/objects/AcsBoardAssembly.h
similarity index 100%
rename from mission/system/AcsBoardAssembly.h
rename to mission/system/objects/AcsBoardAssembly.h
diff --git a/mission/system/AcsBoardFdir.cpp b/mission/system/objects/AcsBoardFdir.cpp
similarity index 100%
rename from mission/system/AcsBoardFdir.cpp
rename to mission/system/objects/AcsBoardFdir.cpp
diff --git a/mission/system/AcsBoardFdir.h b/mission/system/objects/AcsBoardFdir.h
similarity index 100%
rename from mission/system/AcsBoardFdir.h
rename to mission/system/objects/AcsBoardFdir.h
diff --git a/mission/system/AcsSubsystem.cpp b/mission/system/objects/AcsSubsystem.cpp
similarity index 100%
rename from mission/system/AcsSubsystem.cpp
rename to mission/system/objects/AcsSubsystem.cpp
diff --git a/mission/system/AcsSubsystem.h b/mission/system/objects/AcsSubsystem.h
similarity index 100%
rename from mission/system/AcsSubsystem.h
rename to mission/system/objects/AcsSubsystem.h
diff --git a/mission/system/objects/CMakeLists.txt b/mission/system/objects/CMakeLists.txt
new file mode 100644
index 00000000..22fd63b7
--- /dev/null
+++ b/mission/system/objects/CMakeLists.txt
@@ -0,0 +1,17 @@
+target_sources(${LIB_EIVE_MISSION} PRIVATE
+    EiveSystem.cpp
+    AcsSubsystem.cpp
+    ComSubsystem.cpp
+    PayloadSubsystem.cpp
+
+    AcsBoardAssembly.cpp
+    SusAssembly.cpp
+    DualLanePowerStateMachine.cpp
+    PowerStateMachineBase.cpp
+    DualLaneAssemblyBase.cpp
+    TcsBoardAssembly.cpp
+
+    AcsBoardFdir.cpp
+    SusFdir.cpp
+    RtdFdir.cpp
+)
diff --git a/mission/system/ComSubsystem.cpp b/mission/system/objects/ComSubsystem.cpp
similarity index 100%
rename from mission/system/ComSubsystem.cpp
rename to mission/system/objects/ComSubsystem.cpp
diff --git a/mission/system/ComSubsystem.h b/mission/system/objects/ComSubsystem.h
similarity index 100%
rename from mission/system/ComSubsystem.h
rename to mission/system/objects/ComSubsystem.h
diff --git a/mission/system/DualLaneAssemblyBase.cpp b/mission/system/objects/DualLaneAssemblyBase.cpp
similarity index 100%
rename from mission/system/DualLaneAssemblyBase.cpp
rename to mission/system/objects/DualLaneAssemblyBase.cpp
diff --git a/mission/system/DualLaneAssemblyBase.h b/mission/system/objects/DualLaneAssemblyBase.h
similarity index 98%
rename from mission/system/DualLaneAssemblyBase.h
rename to mission/system/objects/DualLaneAssemblyBase.h
index 4233d860..7a8c7ac9 100644
--- a/mission/system/DualLaneAssemblyBase.h
+++ b/mission/system/objects/DualLaneAssemblyBase.h
@@ -2,7 +2,7 @@
 #define MISSION_SYSTEM_DUALLANEASSEMBLYBASE_H_
 
 #include <fsfw/devicehandlers/AssemblyBase.h>
-#include <mission/system/DualLanePowerStateMachine.h>
+#include <mission/system/objects/DualLanePowerStateMachine.h>
 
 /**
  * @brief   Encapsulates assemblies which are also responsible for dual lane power switching
diff --git a/mission/system/DualLanePowerStateMachine.cpp b/mission/system/objects/DualLanePowerStateMachine.cpp
similarity index 100%
rename from mission/system/DualLanePowerStateMachine.cpp
rename to mission/system/objects/DualLanePowerStateMachine.cpp
diff --git a/mission/system/DualLanePowerStateMachine.h b/mission/system/objects/DualLanePowerStateMachine.h
similarity index 91%
rename from mission/system/DualLanePowerStateMachine.h
rename to mission/system/objects/DualLanePowerStateMachine.h
index d2160c64..7a6f29b6 100644
--- a/mission/system/DualLanePowerStateMachine.h
+++ b/mission/system/objects/DualLanePowerStateMachine.h
@@ -3,7 +3,7 @@
 
 #include <devices/powerSwitcherList.h>
 #include <fsfw/modes/HasModesIF.h>
-#include <mission/system/PowerStateMachineBase.h>
+#include <mission/system/objects/PowerStateMachineBase.h>
 
 #include "definitions.h"
 
diff --git a/mission/system/EiveSystem.cpp b/mission/system/objects/EiveSystem.cpp
similarity index 100%
rename from mission/system/EiveSystem.cpp
rename to mission/system/objects/EiveSystem.cpp
diff --git a/mission/system/EiveSystem.h b/mission/system/objects/EiveSystem.h
similarity index 100%
rename from mission/system/EiveSystem.h
rename to mission/system/objects/EiveSystem.h
diff --git a/mission/system/PayloadSubsystem.cpp b/mission/system/objects/PayloadSubsystem.cpp
similarity index 100%
rename from mission/system/PayloadSubsystem.cpp
rename to mission/system/objects/PayloadSubsystem.cpp
diff --git a/mission/system/PayloadSubsystem.h b/mission/system/objects/PayloadSubsystem.h
similarity index 100%
rename from mission/system/PayloadSubsystem.h
rename to mission/system/objects/PayloadSubsystem.h
diff --git a/mission/system/PowerStateMachineBase.cpp b/mission/system/objects/PowerStateMachineBase.cpp
similarity index 100%
rename from mission/system/PowerStateMachineBase.cpp
rename to mission/system/objects/PowerStateMachineBase.cpp
diff --git a/mission/system/PowerStateMachineBase.h b/mission/system/objects/PowerStateMachineBase.h
similarity index 100%
rename from mission/system/PowerStateMachineBase.h
rename to mission/system/objects/PowerStateMachineBase.h
diff --git a/mission/system/RtdFdir.cpp b/mission/system/objects/RtdFdir.cpp
similarity index 100%
rename from mission/system/RtdFdir.cpp
rename to mission/system/objects/RtdFdir.cpp
diff --git a/mission/system/RtdFdir.h b/mission/system/objects/RtdFdir.h
similarity index 100%
rename from mission/system/RtdFdir.h
rename to mission/system/objects/RtdFdir.h
diff --git a/mission/system/SusAssembly.cpp b/mission/system/objects/SusAssembly.cpp
similarity index 100%
rename from mission/system/SusAssembly.cpp
rename to mission/system/objects/SusAssembly.cpp
diff --git a/mission/system/SusAssembly.h b/mission/system/objects/SusAssembly.h
similarity index 100%
rename from mission/system/SusAssembly.h
rename to mission/system/objects/SusAssembly.h
diff --git a/mission/system/SusFdir.cpp b/mission/system/objects/SusFdir.cpp
similarity index 100%
rename from mission/system/SusFdir.cpp
rename to mission/system/objects/SusFdir.cpp
diff --git a/mission/system/SusFdir.h b/mission/system/objects/SusFdir.h
similarity index 100%
rename from mission/system/SusFdir.h
rename to mission/system/objects/SusFdir.h
diff --git a/mission/system/TcsBoardAssembly.cpp b/mission/system/objects/TcsBoardAssembly.cpp
similarity index 100%
rename from mission/system/TcsBoardAssembly.cpp
rename to mission/system/objects/TcsBoardAssembly.cpp
diff --git a/mission/system/TcsBoardAssembly.h b/mission/system/objects/TcsBoardAssembly.h
similarity index 100%
rename from mission/system/TcsBoardAssembly.h
rename to mission/system/objects/TcsBoardAssembly.h
diff --git a/mission/system/definitions.h b/mission/system/objects/definitions.h
similarity index 100%
rename from mission/system/definitions.h
rename to mission/system/objects/definitions.h
diff --git a/mission/system/tree/CMakeLists.txt b/mission/system/tree/CMakeLists.txt
new file mode 100644
index 00000000..f88891d4
--- /dev/null
+++ b/mission/system/tree/CMakeLists.txt
@@ -0,0 +1,3 @@
+target_sources(${LIB_EIVE_MISSION} PRIVATE
+    acsModeTree.cpp
+)
diff --git a/bsp_q7s/core/acsModeTree.cpp b/mission/system/tree/acsModeTree.cpp
similarity index 100%
rename from bsp_q7s/core/acsModeTree.cpp
rename to mission/system/tree/acsModeTree.cpp
diff --git a/bsp_q7s/core/acsModeTree.h b/mission/system/tree/acsModeTree.h
similarity index 100%
rename from bsp_q7s/core/acsModeTree.h
rename to mission/system/tree/acsModeTree.h