diff --git a/bsp_q7s/core/ObjectFactory.cpp b/bsp_q7s/core/ObjectFactory.cpp
index 750ebe9c..782f112b 100644
--- a/bsp_q7s/core/ObjectFactory.cpp
+++ b/bsp_q7s/core/ObjectFactory.cpp
@@ -31,7 +31,6 @@
 #include "linux/boardtest/UartTestClass.h"
 #include "linux/csp/CspComIF.h"
 #include "linux/csp/CspCookie.h"
-#include "linux/devices/SolarArrayDeploymentHandler.h"
 #include "tmtc/apid.h"
 #include "tmtc/pusIds.h"
 #if OBSW_TEST_LIBGPIOD == 1
@@ -55,10 +54,16 @@
 #include "fsfw_hal/linux/spi/SpiCookie.h"
 #include "fsfw_hal/linux/uart/UartComIF.h"
 #include "fsfw_hal/linux/uart/UartCookie.h"
+#include "linux/boardtest/SpiTestClass.h"
+#include "linux/csp/CspComIF.h"
+#include "linux/csp/CspCookie.h"
+#include "mission/devices/SolarArrayDeploymentHandler.h"
+#include "mission/devices/SusHandler.h"
+#include "mission/devices/devicedefinitions/SusDefinitions.h"
 #include "mission/core/GenericFactory.h"
 #include "mission/devices/ACUHandler.h"
 #include "mission/devices/BpxBatteryHandler.h"
-#include "mission/devices/GPSHyperionLinuxController.h"
+#include "linux/devices/GPSHyperionLinuxController.h"
 #include "mission/devices/GyroADIS1650XHandler.h"
 #include "mission/devices/HeaterHandler.h"
 #include "mission/devices/IMTQHandler.h"
diff --git a/linux/devices/CMakeLists.txt b/linux/devices/CMakeLists.txt
index e50b7626..66d1083f 100644
--- a/linux/devices/CMakeLists.txt
+++ b/linux/devices/CMakeLists.txt
@@ -1,3 +1,3 @@
 target_sources(${OBSW_NAME} PRIVATE
-	SolarArrayDeploymentHandler.cpp
+	GPSHyperionLinuxController.cpp
 )
diff --git a/mission/devices/GPSHyperionLinuxController.cpp b/linux/devices/GPSHyperionLinuxController.cpp
similarity index 99%
rename from mission/devices/GPSHyperionLinuxController.cpp
rename to linux/devices/GPSHyperionLinuxController.cpp
index c47414a8..fa1f8f02 100644
--- a/mission/devices/GPSHyperionLinuxController.cpp
+++ b/linux/devices/GPSHyperionLinuxController.cpp
@@ -1,8 +1,5 @@
 #include "GPSHyperionLinuxController.h"
 
-#include <cmath>
-
-#include "devicedefinitions/GPSDefinitions.h"
 #include "fsfw/datapool/PoolReadGuard.h"
 #include "fsfw/timemanager/Clock.h"
 
@@ -10,6 +7,7 @@
 #include <filesystem>
 #include <fstream>
 #endif
+#include <cmath>
 
 GPSHyperionLinuxController::GPSHyperionLinuxController(object_id_t objectId, object_id_t parentId,
                                                        bool debugHyperionGps)
diff --git a/mission/devices/GPSHyperionLinuxController.h b/linux/devices/GPSHyperionLinuxController.h
similarity index 96%
rename from mission/devices/GPSHyperionLinuxController.h
rename to linux/devices/GPSHyperionLinuxController.h
index 57da40e6..5e9793a8 100644
--- a/mission/devices/GPSHyperionLinuxController.h
+++ b/linux/devices/GPSHyperionLinuxController.h
@@ -1,8 +1,8 @@
 #ifndef MISSION_DEVICES_GPSHYPERIONHANDLER_H_
 #define MISSION_DEVICES_GPSHYPERIONHANDLER_H_
 
-#include "devicedefinitions/GPSDefinitions.h"
 #include "fsfw/FSFW.h"
+#include "mission/devices/devicedefinitions/GPSDefinitions.h"
 #include "fsfw/controller/ExtendedControllerBase.h"
 #include "fsfw/devicehandlers/DeviceHandlerBase.h"
 
diff --git a/mission/devices/CMakeLists.txt b/mission/devices/CMakeLists.txt
index dc4b6308..ebd603d5 100644
--- a/mission/devices/CMakeLists.txt
+++ b/mission/devices/CMakeLists.txt
@@ -1,5 +1,4 @@
 target_sources(${LIB_EIVE_MISSION} PRIVATE
-    GPSHyperionLinuxController.cpp
     GomspaceDeviceHandler.cpp
     BpxBatteryHandler.cpp
     Tmp1075Handler.cpp
@@ -18,4 +17,5 @@ target_sources(${LIB_EIVE_MISSION} PRIVATE
     RwHandler.cpp
     max1227.cpp
     SusHandler.cpp
+    SolarArrayDeploymentHandler.cpp
 )
diff --git a/linux/devices/SolarArrayDeploymentHandler.cpp b/mission/devices/SolarArrayDeploymentHandler.cpp
similarity index 98%
rename from linux/devices/SolarArrayDeploymentHandler.cpp
rename to mission/devices/SolarArrayDeploymentHandler.cpp
index fed3992b..13b46171 100644
--- a/linux/devices/SolarArrayDeploymentHandler.cpp
+++ b/mission/devices/SolarArrayDeploymentHandler.cpp
@@ -21,8 +21,9 @@ SolarArrayDeploymentHandler::SolarArrayDeploymentHandler(object_id_t setObjectId
       deplSA2(deplSA2),
       burnTimeMs(burnTimeMs),
       actionHelper(this, nullptr) {
+  auto mqArgs = MqArgs(setObjectId_, static_cast<void*>(this));
   commandQueue = QueueFactory::instance()->createMessageQueue(
-      cmdQueueSize, MessageQueueMessage::MAX_MESSAGE_SIZE);
+      cmdQueueSize, MessageQueueMessage::MAX_MESSAGE_SIZE, &mqArgs);
 }
 
 SolarArrayDeploymentHandler::~SolarArrayDeploymentHandler() {}
diff --git a/linux/devices/SolarArrayDeploymentHandler.h b/mission/devices/SolarArrayDeploymentHandler.h
similarity index 100%
rename from linux/devices/SolarArrayDeploymentHandler.h
rename to mission/devices/SolarArrayDeploymentHandler.h