From 7c700a9e19e6b101a61de0aaf60ce455e0c9a583 Mon Sep 17 00:00:00 2001
From: Robin Mueller <robin.mueller.m@gmail.com>
Date: Sun, 26 Mar 2023 16:13:54 +0200
Subject: [PATCH] clean up power code

---
 bsp_q7s/callbacks/pcduSwitchCb.h               |  4 ++--
 bsp_q7s/core/CoreController.h                  |  2 +-
 bsp_q7s/core/ObjectFactory.cpp                 | 14 +++++++-------
 bsp_q7s/em/emObjectFactory.cpp                 |  2 +-
 bsp_q7s/fmObjectFactory.cpp                    |  2 +-
 common/config/devices/powerSwitcherList.h      |  2 +-
 dummies/AcuDummy.cpp                           |  2 +-
 dummies/BpxDummy.cpp                           |  2 +-
 dummies/GpsCtrlDummy.h                         |  2 +-
 dummies/GpsDhbDummy.cpp                        |  2 +-
 dummies/P60DockDummy.cpp                       |  2 +-
 dummies/PcduHandlerDummy.cpp                   |  2 +-
 dummies/PduDummy.cpp                           |  2 +-
 dummies/PduDummy.h                             |  3 +--
 dummies/PlPcduDummy.cpp                        |  2 +-
 dummies/helpers.cpp                            |  2 +-
 linux/acs/GpsHyperionLinuxController.h         |  3 ++-
 linux/boardtest/I2cTestClass.h                 |  3 +--
 linux/csp/CspComIF.cpp                         |  2 +-
 mission/CMakeLists.txt                         |  1 +
 .../archive}/GPSDefinitions.h                  |  6 +++---
 mission/acs/archive/GPSHyperionHandler.cpp     |  3 ++-
 mission/acs/archive/GPSHyperionHandler.h       |  3 ++-
 mission/controller/ThermalController.cpp       |  4 ++--
 mission/controller/ThermalController.h         |  4 ++--
 mission/controller/acs/SensorValues.h          |  2 +-
 mission/core/GenericFactory.cpp                |  2 +-
 mission/csp/CspCookie.h                        |  3 +--
 mission/devices/CMakeLists.txt                 |  9 +--------
 mission/devices/PayloadPcduHandler.h           |  2 +-
 mission/devices/RadiationSensorHandler.cpp     |  2 +-
 .../ACUHandler.cpp => power/AcuHandler.cpp}    |  2 +-
 .../ACUHandler.h => power/AcuHandler.h}        | 10 +++++-----
 .../{devices => power}/BpxBatteryHandler.cpp   |  3 +--
 mission/{devices => power}/BpxBatteryHandler.h |  8 ++++----
 mission/power/CMakeLists.txt                   |  9 +++++++++
 .../GomSpacePackets.h                          |  8 ++++----
 .../GomspaceDeviceHandler.cpp                  |  8 +++-----
 .../{devices => power}/GomspaceDeviceHandler.h | 10 +++++-----
 mission/{devices => power}/P60DockHandler.cpp  |  3 +--
 mission/{devices => power}/P60DockHandler.h    | 10 +++++-----
 mission/{devices => power}/PcduHandler.cpp     |  4 ++--
 mission/{devices => power}/PcduHandler.h       | 13 ++++++-------
 mission/{devices => power}/Pdu1Handler.cpp     |  4 ++--
 mission/{devices => power}/Pdu1Handler.h       |  4 ++--
 mission/{devices => power}/Pdu2Handler.cpp     |  4 ++--
 mission/{devices => power}/Pdu2Handler.h       | 11 +++++------
 .../bpxBattDefs.h}                             |  6 +++---
 .../powerDefinitions.h => power/defs.h}        | 18 +++++++++++++++---
 .../GomspaceDefinitions.h => power/gsDefs.h}   |  8 ++++----
 .../gomspaceDefines.h => power/gsLibDefs.h}    |  6 +++---
 mission/powerDefs.h                            | 16 ----------------
 mission/system/DualLanePowerStateMachine.h     |  2 +-
 mission/system/acs/acsModeTree.cpp             |  2 +-
 mission/system/fdir/GomspacePowerFdir.cpp      |  2 +-
 mission/system/objects/PowerStateMachineBase.h |  2 +-
 mission/system/objects/Stack5VHandler.h        |  3 +--
 mission/system/tree/payloadModeTree.cpp        |  2 +-
 58 files changed, 133 insertions(+), 141 deletions(-)
 rename mission/{devices/devicedefinitions => acs/archive}/GPSDefinitions.h (94%)
 rename mission/{devices/ACUHandler.cpp => power/AcuHandler.cpp} (99%)
 rename mission/{devices/ACUHandler.h => power/AcuHandler.h} (87%)
 rename mission/{devices => power}/BpxBatteryHandler.cpp (99%)
 rename mission/{devices => power}/BpxBatteryHandler.h (92%)
 create mode 100644 mission/power/CMakeLists.txt
 rename mission/{devices/devicedefinitions => power}/GomSpacePackets.h (97%)
 rename mission/{devices => power}/GomspaceDeviceHandler.cpp (99%)
 rename mission/{devices => power}/GomspaceDeviceHandler.h (96%)
 rename mission/{devices => power}/P60DockHandler.cpp (99%)
 rename mission/{devices => power}/P60DockHandler.h (92%)
 rename mission/{devices => power}/PcduHandler.cpp (99%)
 rename mission/{devices => power}/PcduHandler.h (95%)
 rename mission/{devices => power}/Pdu1Handler.cpp (98%)
 rename mission/{devices => power}/Pdu1Handler.h (96%)
 rename mission/{devices => power}/Pdu2Handler.cpp (98%)
 rename mission/{devices => power}/Pdu2Handler.h (89%)
 rename mission/{devices/devicedefinitions/BpxBatteryDefinitions.h => power/bpxBattDefs.h} (97%)
 rename mission/{devices/devicedefinitions/powerDefinitions.h => power/defs.h} (68%)
 rename mission/{devices/devicedefinitions/GomspaceDefinitions.h => power/gsDefs.h} (99%)
 rename mission/{devices/devicedefinitions/gomspaceDefines.h => power/gsLibDefs.h} (80%)
 delete mode 100644 mission/powerDefs.h

diff --git a/bsp_q7s/callbacks/pcduSwitchCb.h b/bsp_q7s/callbacks/pcduSwitchCb.h
index d0f2b748..4c006978 100644
--- a/bsp_q7s/callbacks/pcduSwitchCb.h
+++ b/bsp_q7s/callbacks/pcduSwitchCb.h
@@ -1,9 +1,9 @@
 #ifndef BSP_Q7S_CALLBACKS_PCDUSWITCHCB_H_
 #define BSP_Q7S_CALLBACKS_PCDUSWITCHCB_H_
 
-#include <cstdint>
+#include <mission/power/gsDefs.h>
 
-#include "mission/devices/devicedefinitions/GomspaceDefinitions.h"
+#include <cstdint>
 
 namespace pcdu {
 
diff --git a/bsp_q7s/core/CoreController.h b/bsp_q7s/core/CoreController.h
index aaaba8ac..b95298ee 100644
--- a/bsp_q7s/core/CoreController.h
+++ b/bsp_q7s/core/CoreController.h
@@ -5,6 +5,7 @@
 #include <fsfw/container/SimpleRingBuffer.h>
 #include <fsfw/globalfunctions/PeriodicOperationDivider.h>
 #include <libxiphos.h>
+#include <mission/acs/archive/GPSDefinitions.h>
 
 #include <atomic>
 #include <cstddef>
@@ -14,7 +15,6 @@
 #include "bsp_q7s/fs/SdCardManager.h"
 #include "events/subsystemIdRanges.h"
 #include "fsfw/controller/ExtendedControllerBase.h"
-#include "mission/devices/devicedefinitions/GPSDefinitions.h"
 #include "mission/trace.h"
 
 class Timer;
diff --git a/bsp_q7s/core/ObjectFactory.cpp b/bsp_q7s/core/ObjectFactory.cpp
index ba7a0c99..06f02e1e 100644
--- a/bsp_q7s/core/ObjectFactory.cpp
+++ b/bsp_q7s/core/ObjectFactory.cpp
@@ -79,9 +79,13 @@ using gpio::Levels;
 #include <mission/acs/ImtqHandler.h>
 #include <mission/acs/rwHelpers.h>
 #include <mission/com/SyrlinksHandler.h>
-#include <mission/devices/PcduHandler.h>
-#include <mission/devices/Pdu1Handler.h>
-#include <mission/devices/Pdu2Handler.h>
+#include <mission/power/AcuHandler.h>
+#include <mission/power/BpxBatteryHandler.h>
+#include <mission/power/P60DockHandler.h>
+#include <mission/power/PcduHandler.h>
+#include <mission/power/Pdu1Handler.h>
+#include <mission/power/Pdu2Handler.h>
+#include <mission/power/gsDefs.h>
 #include <mission/tmtc/VirtualChannelWithQueue.h>
 
 #include <sstream>
@@ -106,16 +110,12 @@ using gpio::Levels;
 #include "mission/com/CcsdsIpCoreHandler.h"
 #include "mission/com/syrlinksDefs.h"
 #include "mission/core/GenericFactory.h"
-#include "mission/devices/ACUHandler.h"
-#include "mission/devices/BpxBatteryHandler.h"
 #include "mission/devices/HeaterHandler.h"
 #include "mission/devices/Max31865PT1000Handler.h"
-#include "mission/devices/P60DockHandler.h"
 #include "mission/devices/PayloadPcduHandler.h"
 #include "mission/devices/RadiationSensorHandler.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"
diff --git a/bsp_q7s/em/emObjectFactory.cpp b/bsp_q7s/em/emObjectFactory.cpp
index 87237916..153926d0 100644
--- a/bsp_q7s/em/emObjectFactory.cpp
+++ b/bsp_q7s/em/emObjectFactory.cpp
@@ -4,7 +4,7 @@
 #include <fsfw/health/HealthTableIF.h>
 #include <fsfw/power/DummyPowerSwitcher.h>
 #include <fsfw_hal/common/gpio/GpioCookie.h>
-#include <mission/devices/devicedefinitions/GomspaceDefinitions.h>
+#include <mission/power/gsDefs.h>
 #include <mission/system/tree/system.h>
 #include <mission/utility/DummySdCardManager.h>
 
diff --git a/bsp_q7s/fmObjectFactory.cpp b/bsp_q7s/fmObjectFactory.cpp
index f3ce12e1..cb1ea118 100644
--- a/bsp_q7s/fmObjectFactory.cpp
+++ b/bsp_q7s/fmObjectFactory.cpp
@@ -1,7 +1,7 @@
 #include <bsp_q7s/callbacks/q7sGpioCallbacks.h>
 #include <fsfw/storagemanager/LocalPool.h>
 #include <fsfw/storagemanager/PoolManager.h>
-#include <mission/devices/devicedefinitions/GomspaceDefinitions.h>
+#include <mission/power/gsDefs.h>
 
 #include "OBSWConfig.h"
 #include "bsp_q7s/core/CoreController.h"
diff --git a/common/config/devices/powerSwitcherList.h b/common/config/devices/powerSwitcherList.h
index d032428b..940d5581 100644
--- a/common/config/devices/powerSwitcherList.h
+++ b/common/config/devices/powerSwitcherList.h
@@ -1,6 +1,6 @@
 #ifndef FSFWCONFIG_DEVICES_POWERSWITCHERLIST_H_
 #define FSFWCONFIG_DEVICES_POWERSWITCHERLIST_H_
 
-#include "mission/devices/devicedefinitions/GomspaceDefinitions.h"
+#include <mission/power/gsDefs.h>
 
 #endif /* FSFWCONFIG_DEVICES_POWERSWITCHERLIST_H_ */
diff --git a/dummies/AcuDummy.cpp b/dummies/AcuDummy.cpp
index aa33a068..7c18f6bf 100644
--- a/dummies/AcuDummy.cpp
+++ b/dummies/AcuDummy.cpp
@@ -1,6 +1,6 @@
 #include "AcuDummy.h"
 
-#include <mission/devices/devicedefinitions/GomspaceDefinitions.h>
+#include <mission/power/gsDefs.h>
 
 AcuDummy::AcuDummy(object_id_t objectId, object_id_t comif, CookieIF *comCookie)
     : DeviceHandlerBase(objectId, comif, comCookie) {}
diff --git a/dummies/BpxDummy.cpp b/dummies/BpxDummy.cpp
index 0770e9fc..ca546285 100644
--- a/dummies/BpxDummy.cpp
+++ b/dummies/BpxDummy.cpp
@@ -1,6 +1,6 @@
 #include "BpxDummy.h"
 
-#include <mission/devices/devicedefinitions/BpxBatteryDefinitions.h>
+#include <mission/power/bpxBattDefs.h>
 
 BpxDummy::BpxDummy(object_id_t objectId, object_id_t comif, CookieIF *comCookie)
     : DeviceHandlerBase(objectId, comif, comCookie) {}
diff --git a/dummies/GpsCtrlDummy.h b/dummies/GpsCtrlDummy.h
index 4b7fc1bf..18b990fb 100644
--- a/dummies/GpsCtrlDummy.h
+++ b/dummies/GpsCtrlDummy.h
@@ -2,7 +2,7 @@
 #define DUMMIES_GPSCTRLDUMMY_H_
 
 #include <fsfw/controller/ExtendedControllerBase.h>
-#include <mission/devices/devicedefinitions/GPSDefinitions.h>
+#include <mission/acs/archive/GPSDefinitions.h>
 
 class GpsCtrlDummy : public ExtendedControllerBase {
  public:
diff --git a/dummies/GpsDhbDummy.cpp b/dummies/GpsDhbDummy.cpp
index d46e6265..4e385ec5 100644
--- a/dummies/GpsDhbDummy.cpp
+++ b/dummies/GpsDhbDummy.cpp
@@ -1,5 +1,5 @@
 #include <dummies/GpsDhbDummy.h>
-#include <mission/devices/devicedefinitions/GPSDefinitions.h>
+#include <mission/acs/archive/GPSDefinitions.h>
 
 GpsDhbDummy::GpsDhbDummy(object_id_t objectId, object_id_t comif, CookieIF *comCookie)
     : DeviceHandlerBase(objectId, comif, comCookie) {}
diff --git a/dummies/P60DockDummy.cpp b/dummies/P60DockDummy.cpp
index f4e4f9bb..17c48e8c 100644
--- a/dummies/P60DockDummy.cpp
+++ b/dummies/P60DockDummy.cpp
@@ -1,6 +1,6 @@
 #include "P60DockDummy.h"
 
-#include <mission/devices/devicedefinitions/GomspaceDefinitions.h>
+#include <mission/power/gsDefs.h>
 
 P60DockDummy::P60DockDummy(object_id_t objectId, object_id_t comif, CookieIF *comCookie)
     : DeviceHandlerBase(objectId, comif, comCookie) {}
diff --git a/dummies/PcduHandlerDummy.cpp b/dummies/PcduHandlerDummy.cpp
index 15529fcf..e3331c8d 100644
--- a/dummies/PcduHandlerDummy.cpp
+++ b/dummies/PcduHandlerDummy.cpp
@@ -1,6 +1,6 @@
 #include "PcduHandlerDummy.h"
 
-#include <mission/devices/devicedefinitions/GomspaceDefinitions.h>
+#include <mission/power/gsDefs.h>
 
 PcduHandlerDummy::PcduHandlerDummy(object_id_t objectId, object_id_t comif, CookieIF *comCookie)
     : DeviceHandlerBase(objectId, comif, comCookie), dummySwitcher(objectId, 18, 18, false) {}
diff --git a/dummies/PduDummy.cpp b/dummies/PduDummy.cpp
index 4b1efff8..2e3079ef 100644
--- a/dummies/PduDummy.cpp
+++ b/dummies/PduDummy.cpp
@@ -1,6 +1,6 @@
 #include "PduDummy.h"
 
-#include <mission/devices/devicedefinitions/GomspaceDefinitions.h>
+#include <mission/power/gsDefs.h>
 
 PduDummy::PduDummy(object_id_t objectId, object_id_t comif, CookieIF *comCookie)
     : DeviceHandlerBase(objectId, comif, comCookie),
diff --git a/dummies/PduDummy.h b/dummies/PduDummy.h
index 751896cd..5d62978c 100644
--- a/dummies/PduDummy.h
+++ b/dummies/PduDummy.h
@@ -2,8 +2,7 @@
 #define DUMMIES_PDUDUMMY_H_
 
 #include <fsfw/devicehandlers/DeviceHandlerBase.h>
-
-#include "mission/devices/devicedefinitions/GomspaceDefinitions.h"
+#include <mission/power/gsDefs.h>
 
 class PduDummy : public DeviceHandlerBase {
  public:
diff --git a/dummies/PlPcduDummy.cpp b/dummies/PlPcduDummy.cpp
index 1366f63e..6bfc271f 100644
--- a/dummies/PlPcduDummy.cpp
+++ b/dummies/PlPcduDummy.cpp
@@ -1,6 +1,6 @@
 #include "PlPcduDummy.h"
 
-#include <mission/devices/devicedefinitions/GomspaceDefinitions.h>
+#include <mission/power/gsDefs.h>
 
 PlPcduDummy::PlPcduDummy(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 0ec1d070..00439355 100644
--- a/dummies/helpers.cpp
+++ b/dummies/helpers.cpp
@@ -25,6 +25,7 @@
 #include <dummies/SusDummy.h>
 #include <dummies/SyrlinksDummy.h>
 #include <fsfw_hal/common/gpio/GpioIF.h>
+#include <mission/power/gsDefs.h>
 #include <mission/system/acs/ImtqAssembly.h>
 #include <mission/system/objects/CamSwitcher.h>
 #include <mission/system/objects/StrAssembly.h>
@@ -34,7 +35,6 @@
 #include "dummies/Max31865Dummy.h"
 #include "dummies/Tmp1075Dummy.h"
 #include "mission/core/GenericFactory.h"
-#include "mission/devices/devicedefinitions/GomspaceDefinitions.h"
 #include "mission/system/acs/acsModeTree.h"
 #include "mission/system/com/comModeTree.h"
 #include "mission/system/tree/payloadModeTree.h"
diff --git a/linux/acs/GpsHyperionLinuxController.h b/linux/acs/GpsHyperionLinuxController.h
index f00724bd..082853f8 100644
--- a/linux/acs/GpsHyperionLinuxController.h
+++ b/linux/acs/GpsHyperionLinuxController.h
@@ -1,11 +1,12 @@
 #ifndef MISSION_DEVICES_GPSHYPERIONHANDLER_H_
 #define MISSION_DEVICES_GPSHYPERIONHANDLER_H_
 
+#include <mission/acs/archive/GPSDefinitions.h>
+
 #include "eive/eventSubsystemIds.h"
 #include "fsfw/FSFW.h"
 #include "fsfw/controller/ExtendedControllerBase.h"
 #include "fsfw/devicehandlers/DeviceHandlerBase.h"
-#include "mission/devices/devicedefinitions/GPSDefinitions.h"
 #include "mission/trace.h"
 
 #ifdef FSFW_OSAL_LINUX
diff --git a/linux/boardtest/I2cTestClass.h b/linux/boardtest/I2cTestClass.h
index 1a578363..299d74c5 100644
--- a/linux/boardtest/I2cTestClass.h
+++ b/linux/boardtest/I2cTestClass.h
@@ -1,13 +1,12 @@
 #ifndef LINUX_BOARDTEST_I2CTESTCLASS_H_
 #define LINUX_BOARDTEST_I2CTESTCLASS_H_
 
+#include <mission/power/bpxBattDefs.h>
 #include <test/TestTask.h>
 
 #include <array>
 #include <string>
 
-#include "mission/devices/devicedefinitions/BpxBatteryDefinitions.h"
-
 class I2cTestClass : public TestTask {
  public:
   I2cTestClass(object_id_t objectId, std::string i2cdev);
diff --git a/linux/csp/CspComIF.cpp b/linux/csp/CspComIF.cpp
index 554ecba0..d24ebc2e 100644
--- a/linux/csp/CspComIF.cpp
+++ b/linux/csp/CspComIF.cpp
@@ -3,7 +3,7 @@
 #include <csp/drivers/can_socketcan.h>
 #include <fsfw/serialize/SerializeAdapter.h>
 #include <fsfw/serviceinterface/ServiceInterfaceStream.h>
-#include <mission/devices/devicedefinitions/GomspaceDefinitions.h>
+#include <mission/power/gsDefs.h>
 #include <p60acu.h>
 #include <p60dock.h>
 #include <p60pdu.h>
diff --git a/mission/CMakeLists.txt b/mission/CMakeLists.txt
index f1495899..f6435ad8 100644
--- a/mission/CMakeLists.txt
+++ b/mission/CMakeLists.txt
@@ -7,6 +7,7 @@ add_subdirectory(tmtc)
 add_subdirectory(system)
 add_subdirectory(com)
 add_subdirectory(acs)
+add_subdirectory(power)
 add_subdirectory(csp)
 add_subdirectory(cfdp)
 add_subdirectory(config)
diff --git a/mission/devices/devicedefinitions/GPSDefinitions.h b/mission/acs/archive/GPSDefinitions.h
similarity index 94%
rename from mission/devices/devicedefinitions/GPSDefinitions.h
rename to mission/acs/archive/GPSDefinitions.h
index 80e2861a..d9f93173 100644
--- a/mission/devices/devicedefinitions/GPSDefinitions.h
+++ b/mission/acs/archive/GPSDefinitions.h
@@ -1,5 +1,5 @@
-#ifndef MISSION_DEVICES_DEVICEDEFINITIONS_GPSDEFINITIONS_H_
-#define MISSION_DEVICES_DEVICEDEFINITIONS_GPSDEFINITIONS_H_
+#ifndef MISSION_ACS_ARCHIVE_GPSDEFINITIONS_H_
+#define MISSION_ACS_ARCHIVE_GPSDEFINITIONS_H_
 
 #include "eive/eventSubsystemIds.h"
 #include "fsfw/datapoollocal/StaticLocalDataSet.h"
@@ -72,4 +72,4 @@ class GpsPrimaryDataset : public StaticLocalDataSet<18> {
       : StaticLocalDataSet(hkOwner, GpsHyperion::DATASET_ID) {}
 };
 
-#endif /* MISSION_DEVICES_DEVICEDEFINITIONS_GPSDEFINITIONS_H_ */
+#endif /* MISSION_ACS_ARCHIVE_GPSDEFINITIONS_H_ */
diff --git a/mission/acs/archive/GPSHyperionHandler.cpp b/mission/acs/archive/GPSHyperionHandler.cpp
index 1bc34959..16451ae3 100644
--- a/mission/acs/archive/GPSHyperionHandler.cpp
+++ b/mission/acs/archive/GPSHyperionHandler.cpp
@@ -1,6 +1,7 @@
 #include "GPSHyperionHandler.h"
 
-#include "devicedefinitions/GPSDefinitions.h"
+#include <mission/acs/archive/GPSDefinitions.h>
+
 #include "fsfw/datapool/PoolReadGuard.h"
 #include "fsfw/timemanager/Clock.h"
 #include "lwgps/lwgps.h"
diff --git a/mission/acs/archive/GPSHyperionHandler.h b/mission/acs/archive/GPSHyperionHandler.h
index b5734f23..cbc36fb6 100644
--- a/mission/acs/archive/GPSHyperionHandler.h
+++ b/mission/acs/archive/GPSHyperionHandler.h
@@ -1,7 +1,8 @@
 #ifndef MISSION_DEVICES_GPSHYPERIONHANDLER_H_
 #define MISSION_DEVICES_GPSHYPERIONHANDLER_H_
 
-#include "devicedefinitions/GPSDefinitions.h"
+#include <mission/acs/archive/GPSDefinitions.h>
+
 #include "fsfw/FSFW.h"
 #include "fsfw/devicehandlers/DeviceHandlerBase.h"
 #include "lwgps/lwgps.h"
diff --git a/mission/controller/ThermalController.cpp b/mission/controller/ThermalController.cpp
index 9f86254b..03addc23 100644
--- a/mission/controller/ThermalController.cpp
+++ b/mission/controller/ThermalController.cpp
@@ -10,9 +10,9 @@
 #include <mission/acs/rwHelpers.h>
 #include <mission/acs/str/strHelpers.h>
 #include <mission/com/syrlinksDefs.h>
-#include <mission/devices/devicedefinitions/BpxBatteryDefinitions.h>
-#include <mission/devices/devicedefinitions/GomspaceDefinitions.h>
 #include <mission/devices/devicedefinitions/payloadPcduDefinitions.h>
+#include <mission/power/bpxBattDefs.h>
+#include <mission/power/gsDefs.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 543353d8..6eddfd76 100644
--- a/mission/controller/ThermalController.h
+++ b/mission/controller/ThermalController.h
@@ -13,16 +13,16 @@
 #include <mission/acs/str/strHelpers.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/payloadPcduDefinitions.h>
 #include <mission/devices/devicedefinitions/susMax1227Helpers.h>
+#include <mission/power/bpxBattDefs.h>
+#include <mission/power/gsDefs.h>
 
 #include <list>
 
 #include "mission/devices/HeaterHandler.h"
-#include "mission/devices/devicedefinitions/GomspaceDefinitions.h"
 #include "mission/trace.h"
 
 /**
diff --git a/mission/controller/acs/SensorValues.h b/mission/controller/acs/SensorValues.h
index a0473ae2..177354e2 100644
--- a/mission/controller/acs/SensorValues.h
+++ b/mission/controller/acs/SensorValues.h
@@ -4,11 +4,11 @@
 #include <fsfw_hal/devicehandlers/MgmLIS3MDLHandler.h>
 #include <fsfw_hal/devicehandlers/MgmRM3100Handler.h>
 #include <fsfw_hal/devicehandlers/devicedefinitions/gyroL3gHelpers.h>
+#include <mission/acs/archive/GPSDefinitions.h>
 #include <mission/acs/gyroAdisHelpers.h>
 #include <mission/acs/imtqHelpers.h>
 #include <mission/acs/rwHelpers.h>
 #include <mission/acs/str/strHelpers.h>
-#include <mission/devices/devicedefinitions/GPSDefinitions.h>
 #include <mission/devices/devicedefinitions/susMax1227Helpers.h>
 
 namespace ACS {
diff --git a/mission/core/GenericFactory.cpp b/mission/core/GenericFactory.cpp
index 433b4191..9e18061c 100644
--- a/mission/core/GenericFactory.cpp
+++ b/mission/core/GenericFactory.cpp
@@ -27,8 +27,8 @@
 #include <fsfw_hal/host/HostFilesystem.h>
 #include <mission/controller/ThermalController.h>
 #include <mission/devices/HeaterHandler.h>
-#include <mission/devices/devicedefinitions/GomspaceDefinitions.h>
 #include <mission/persistentTmStoreDefs.h>
+#include <mission/power/gsDefs.h>
 #include <mission/system/acs/AcsBoardAssembly.h>
 #include <mission/system/acs/RwAssembly.h>
 #include <mission/system/acs/SusAssembly.h>
diff --git a/mission/csp/CspCookie.h b/mission/csp/CspCookie.h
index 9eb0a639..a77de5d3 100644
--- a/mission/csp/CspCookie.h
+++ b/mission/csp/CspCookie.h
@@ -2,12 +2,11 @@
 #define LINUX_CSP_CSPCOOKIE_H_
 
 #include <fsfw/devicehandlers/CookieIF.h>
+#include <mission/power/gsDefs.h>
 
 #include <cstddef>
 #include <cstdint>
 
-#include "mission/devices/devicedefinitions/GomspaceDefinitions.h"
-
 /**
  * @brief	This is the cookie for devices supporting the CSP (CubeSat Space
  * 			Protocol).
diff --git a/mission/devices/CMakeLists.txt b/mission/devices/CMakeLists.txt
index 1c1717e4..42a2c69a 100644
--- a/mission/devices/CMakeLists.txt
+++ b/mission/devices/CMakeLists.txt
@@ -1,13 +1,6 @@
 target_sources(
   ${LIB_EIVE_MISSION}
-  PRIVATE GomspaceDeviceHandler.cpp
-          BpxBatteryHandler.cpp
-          Tmp1075Handler.cpp
-          PcduHandler.cpp
-          P60DockHandler.cpp
-          Pdu1Handler.cpp
-          Pdu2Handler.cpp
-          ACUHandler.cpp
+  PRIVATE Tmp1075Handler.cpp
           Max31865EiveHandler.cpp
           HeaterHandler.cpp
           RadiationSensorHandler.cpp
diff --git a/mission/devices/PayloadPcduHandler.h b/mission/devices/PayloadPcduHandler.h
index ea98b0ff..2f86ebf9 100644
--- a/mission/devices/PayloadPcduHandler.h
+++ b/mission/devices/PayloadPcduHandler.h
@@ -11,7 +11,7 @@
 #include "fsfw_hal/common/gpio/GpioIF.h"
 #include "mission/devices/devicedefinitions/payloadPcduDefinitions.h"
 #include "mission/memory/SdCardMountedIF.h"
-#include "mission/powerDefs.h"
+#include "mission/power/defs.h"
 #include "mission/system/DualLanePowerStateMachine.h"
 
 #ifdef FSFW_OSAL_LINUX
diff --git a/mission/devices/RadiationSensorHandler.cpp b/mission/devices/RadiationSensorHandler.cpp
index 0520daec..f6500ec2 100644
--- a/mission/devices/RadiationSensorHandler.cpp
+++ b/mission/devices/RadiationSensorHandler.cpp
@@ -2,8 +2,8 @@
 #include <devices/gpioIds.h>
 #include <fsfw/datapool/PoolReadGuard.h>
 #include <mission/devices/RadiationSensorHandler.h>
-#include <mission/devices/devicedefinitions/GomspaceDefinitions.h>
 #include <mission/devices/max1227.h>
+#include <mission/power/gsDefs.h>
 
 RadiationSensorHandler::RadiationSensorHandler(object_id_t objectId, object_id_t comIF,
                                                CookieIF *comCookie, GpioIF *gpioIF,
diff --git a/mission/devices/ACUHandler.cpp b/mission/power/AcuHandler.cpp
similarity index 99%
rename from mission/devices/ACUHandler.cpp
rename to mission/power/AcuHandler.cpp
index 2a8ffe8b..c7156742 100644
--- a/mission/devices/ACUHandler.cpp
+++ b/mission/power/AcuHandler.cpp
@@ -1,4 +1,4 @@
-#include "ACUHandler.h"
+#include <mission/power/AcuHandler.h>
 
 #include "OBSWConfig.h"
 
diff --git a/mission/devices/ACUHandler.h b/mission/power/AcuHandler.h
similarity index 87%
rename from mission/devices/ACUHandler.h
rename to mission/power/AcuHandler.h
index ef4feab0..83d0609c 100644
--- a/mission/devices/ACUHandler.h
+++ b/mission/power/AcuHandler.h
@@ -1,9 +1,9 @@
-#ifndef MISSION_DEVICES_ACUHANDLER_H_
-#define MISSION_DEVICES_ACUHANDLER_H_
+#ifndef MISSION_POWER_ACUHANDLER_H_
+#define MISSION_POWER_ACUHANDLER_H_
 
-#include <mission/devices/devicedefinitions/GomspaceDefinitions.h>
+#include <mission/power/GomspaceDeviceHandler.h>
+#include <mission/power/gsDefs.h>
 
-#include "GomspaceDeviceHandler.h"
 #include "fsfw/datapool/PoolReadGuard.h"
 
 /**
@@ -53,4 +53,4 @@ class ACUHandler : public GomspaceDeviceHandler {
   void printChannelStats();
 };
 
-#endif /* MISSION_DEVICES_ACUHANDLER_H_ */
+#endif /* MISSION_POWER_ACUHANDLER_H_ */
diff --git a/mission/devices/BpxBatteryHandler.cpp b/mission/power/BpxBatteryHandler.cpp
similarity index 99%
rename from mission/devices/BpxBatteryHandler.cpp
rename to mission/power/BpxBatteryHandler.cpp
index b4bdc307..668b4fb2 100644
--- a/mission/devices/BpxBatteryHandler.cpp
+++ b/mission/power/BpxBatteryHandler.cpp
@@ -1,6 +1,5 @@
-#include "BpxBatteryHandler.h"
-
 #include <fsfw/datapool/PoolReadGuard.h>
+#include <mission/power/BpxBatteryHandler.h>
 
 BpxBatteryHandler::BpxBatteryHandler(object_id_t objectId, object_id_t comIF, CookieIF* comCookie)
     : DeviceHandlerBase(objectId, comIF, comCookie), hkSet(this), cfgSet(this) {}
diff --git a/mission/devices/BpxBatteryHandler.h b/mission/power/BpxBatteryHandler.h
similarity index 92%
rename from mission/devices/BpxBatteryHandler.h
rename to mission/power/BpxBatteryHandler.h
index c42ed7fd..9f27ce34 100644
--- a/mission/devices/BpxBatteryHandler.h
+++ b/mission/power/BpxBatteryHandler.h
@@ -1,9 +1,9 @@
-#ifndef MISSION_DEVICES_BPXBATTERYHANDLER_H_
-#define MISSION_DEVICES_BPXBATTERYHANDLER_H_
+#ifndef MISSION_POWER_BPXBATTERYHANDLER_H_
+#define MISSION_POWER_BPXBATTERYHANDLER_H_
 
 #include <fsfw/devicehandlers/DeviceHandlerBase.h>
+#include <mission/power/bpxBattDefs.h>
 
-#include "devicedefinitions/BpxBatteryDefinitions.h"
 #include "mission/trace.h"
 
 class BpxBatteryHandler : public DeviceHandlerBase {
@@ -63,4 +63,4 @@ class BpxBatteryHandler : public DeviceHandlerBase {
                                         LocalDataPoolManager& poolManager) override;
 };
 
-#endif /* MISSION_DEVICES_BPXBATTERYHANDLER_H_ */
+#endif /* MISSION_POWER_BPXBATTERYHANDLER_H_ */
diff --git a/mission/power/CMakeLists.txt b/mission/power/CMakeLists.txt
new file mode 100644
index 00000000..d18daf96
--- /dev/null
+++ b/mission/power/CMakeLists.txt
@@ -0,0 +1,9 @@
+target_sources(
+  ${LIB_EIVE_MISSION}
+  PRIVATE Pdu1Handler.cpp
+          Pdu2Handler.cpp
+          AcuHandler.cpp
+          P60DockHandler.cpp
+          PcduHandler.cpp
+          GomspaceDeviceHandler.cpp
+          BpxBatteryHandler.cpp)
diff --git a/mission/devices/devicedefinitions/GomSpacePackets.h b/mission/power/GomSpacePackets.h
similarity index 97%
rename from mission/devices/devicedefinitions/GomSpacePackets.h
rename to mission/power/GomSpacePackets.h
index 650fa763..ad90eca9 100644
--- a/mission/devices/devicedefinitions/GomSpacePackets.h
+++ b/mission/power/GomSpacePackets.h
@@ -1,11 +1,11 @@
-#ifndef MISSION_DEVICES_DEVICEDEFINITIONS_GOMSPACEPACKETS_H_
-#define MISSION_DEVICES_DEVICEDEFINITIONS_GOMSPACEPACKETS_H_
+#ifndef MISSION_POWER_GOMSPACEPACKETS_H_
+#define MISSION_POWER_GOMSPACEPACKETS_H_
 
 #include <fsfw/serialize/SerialBufferAdapter.h>
 #include <fsfw/serialize/SerialFixedArrayListAdapter.h>
 #include <fsfw/serialize/SerialLinkedListAdapter.h>
 #include <fsfw/serialize/SerializeElement.h>
-#include <mission/devices/devicedefinitions/GomspaceDefinitions.h>
+#include <mission/power/gsDefs.h>
 
 class CspParamRequestBase : public SerialLinkedListAdapter<SerializeIF> {
  public:
@@ -381,4 +381,4 @@ class GetParamMessageUnpacker : public SerialLinkedListAdapter<SerializeIF> {
   SerializeElement<uint8_t> parameterSize;
 };
 
-#endif /* MISSION_DEVICES_DEVICEDEFINITIONS_GOMSPACEPACKETS_H_ */
+#endif /* MISSION_POWER_GOMSPACEPACKETS_H_ */
diff --git a/mission/devices/GomspaceDeviceHandler.cpp b/mission/power/GomspaceDeviceHandler.cpp
similarity index 99%
rename from mission/devices/GomspaceDeviceHandler.cpp
rename to mission/power/GomspaceDeviceHandler.cpp
index 389b08c7..bdb0a5d1 100644
--- a/mission/devices/GomspaceDeviceHandler.cpp
+++ b/mission/power/GomspaceDeviceHandler.cpp
@@ -1,12 +1,10 @@
-#include "GomspaceDeviceHandler.h"
-
 #include <fsfw/datapool/PoolReadGuard.h>
 #include <fsfw/globalfunctions/arrayprinter.h>
-
+#include <mission/power/defs.h>
+#include <mission/power/GomSpacePackets.h>
+#include <mission/power/GomspaceDeviceHandler.h>
 #include <cassert>
 
-#include "devicedefinitions/GomSpacePackets.h"
-#include "devicedefinitions/powerDefinitions.h"
 #include "eive/objects.h"
 
 using namespace GOMSPACE;
diff --git a/mission/devices/GomspaceDeviceHandler.h b/mission/power/GomspaceDeviceHandler.h
similarity index 96%
rename from mission/devices/GomspaceDeviceHandler.h
rename to mission/power/GomspaceDeviceHandler.h
index af9d3411..03e9a534 100644
--- a/mission/devices/GomspaceDeviceHandler.h
+++ b/mission/power/GomspaceDeviceHandler.h
@@ -1,11 +1,11 @@
-#ifndef MISSION_DEVICES_GOMSPACEDEVICEHANDLER_H_
-#define MISSION_DEVICES_GOMSPACEDEVICEHANDLER_H_
+#ifndef MISSION_POWER_GOMSPACEDEVICEHANDLER_H_
+#define MISSION_POWER_GOMSPACEDEVICEHANDLER_H_
 
 #include <mission/csp/CspCookie.h>
-#include <mission/devices/devicedefinitions/GomSpacePackets.h>
+#include <mission/power/GomSpacePackets.h>
+#include <mission/power/gsDefs.h>
 
 #include "fsfw/devicehandlers/DeviceHandlerBase.h"
-#include "mission/devices/devicedefinitions/GomspaceDefinitions.h"
 #include "returnvalues/classIds.h"
 
 struct TableConfig {
@@ -180,4 +180,4 @@ inline T GomspaceDeviceHandler::as(const uint8_t *ptr) {
   return *(reinterpret_cast<const T *>(ptr));
 }
 
-#endif /* MISSION_DEVICES_GOMSPACEDEVICEHANDLER_H_ */
+#endif /* MISSION_POWER_GOMSPACEDEVICEHANDLER_H_ */
diff --git a/mission/devices/P60DockHandler.cpp b/mission/power/P60DockHandler.cpp
similarity index 99%
rename from mission/devices/P60DockHandler.cpp
rename to mission/power/P60DockHandler.cpp
index 8c768847..587a184e 100644
--- a/mission/devices/P60DockHandler.cpp
+++ b/mission/power/P60DockHandler.cpp
@@ -1,6 +1,5 @@
-#include "P60DockHandler.h"
-
 #include <fsfw/datapool/PoolReadGuard.h>
+#include <mission/power/P60DockHandler.h>
 
 #include "OBSWConfig.h"
 
diff --git a/mission/devices/P60DockHandler.h b/mission/power/P60DockHandler.h
similarity index 92%
rename from mission/devices/P60DockHandler.h
rename to mission/power/P60DockHandler.h
index b91907a8..359edf20 100644
--- a/mission/devices/P60DockHandler.h
+++ b/mission/power/P60DockHandler.h
@@ -1,9 +1,9 @@
-#ifndef MISSION_DEVICES_P60DOCKHANDLER_H_
-#define MISSION_DEVICES_P60DOCKHANDLER_H_
+#ifndef MISSION_POWER_P60DOCKHANDLER_H_
+#define MISSION_POWER_P60DOCKHANDLER_H_
 
-#include <mission/devices/devicedefinitions/GomspaceDefinitions.h>
+#include <mission/power/GomspaceDeviceHandler.h>
+#include <mission/power/gsDefs.h>
 
-#include "GomspaceDeviceHandler.h"
 #include "eive/eventSubsystemIds.h"
 
 /**
@@ -71,4 +71,4 @@ class P60DockHandler : public GomspaceDeviceHandler {
   void parseHkTableReply(const uint8_t* packet);
 };
 
-#endif /* MISSION_DEVICES_P60DOCKHANDLER_H_ */
+#endif /* MISSION_POWER_P60DOCKHANDLER_H_ */
diff --git a/mission/devices/PcduHandler.cpp b/mission/power/PcduHandler.cpp
similarity index 99%
rename from mission/devices/PcduHandler.cpp
rename to mission/power/PcduHandler.cpp
index 4c2f742c..8968110e 100644
--- a/mission/devices/PcduHandler.cpp
+++ b/mission/power/PcduHandler.cpp
@@ -4,8 +4,8 @@
 #include <fsfw/housekeeping/HousekeepingSnapshot.h>
 #include <fsfw/ipc/MutexFactory.h>
 #include <fsfw/ipc/QueueFactory.h>
-#include <mission/devices/PcduHandler.h>
-#include <mission/devices/devicedefinitions/GomSpacePackets.h>
+#include <mission/power/GomSpacePackets.h>
+#include <mission/power/PcduHandler.h>
 
 PcduHandler::PcduHandler(object_id_t setObjectId, size_t cmdQueueSize)
     : SystemObject(setObjectId),
diff --git a/mission/devices/PcduHandler.h b/mission/power/PcduHandler.h
similarity index 95%
rename from mission/devices/PcduHandler.h
rename to mission/power/PcduHandler.h
index 170c27f2..2144227a 100644
--- a/mission/devices/PcduHandler.h
+++ b/mission/power/PcduHandler.h
@@ -1,5 +1,5 @@
-#ifndef MISSION_DEVICES_PCDUHANDLER_H_
-#define MISSION_DEVICES_PCDUHANDLER_H_
+#ifndef MISSION_POWER_PCDUHANDLER_H_
+#define MISSION_POWER_PCDUHANDLER_H_
 
 #include <devices/powerSwitcherList.h>
 #include <fsfw/datapool/PoolEntry.h>
@@ -8,10 +8,9 @@
 #include <fsfw/power/PowerSwitchIF.h>
 #include <fsfw/tasks/ExecutableObjectIF.h>
 #include <fsfw/timemanager/CCSDSTime.h>
-#include <mission/devices/GomspaceDeviceHandler.h>
-
-#include "devicedefinitions/GomspaceDefinitions.h"
-#include "devicedefinitions/powerDefinitions.h"
+#include <mission/power/defs.h>
+#include <mission/power/GomspaceDeviceHandler.h>
+#include <mission/power/gsDefs.h>
 
 /**
  * @brief	The PCDUHandler provides a compact interface to handle all devices related to the
@@ -141,4 +140,4 @@ class PcduHandler : public PowerSwitchIF,
   void checkAndUpdatePduSwitch(GOMSPACE::Pdu pdu, pcdu::Switches switchIdx, uint8_t setValue);
 };
 
-#endif /* MISSION_DEVICES_PCDUHANDLER_H_ */
+#endif /* MISSION_POWER_PCDUHANDLER_H_ */
diff --git a/mission/devices/Pdu1Handler.cpp b/mission/power/Pdu1Handler.cpp
similarity index 98%
rename from mission/devices/Pdu1Handler.cpp
rename to mission/power/Pdu1Handler.cpp
index 25f14c76..80b10d85 100644
--- a/mission/devices/Pdu1Handler.cpp
+++ b/mission/power/Pdu1Handler.cpp
@@ -1,6 +1,6 @@
 #include <fsfw/datapool/PoolReadGuard.h>
-#include <mission/devices/Pdu1Handler.h>
-#include <mission/devices/devicedefinitions/GomSpacePackets.h>
+#include <mission/power/GomSpacePackets.h>
+#include <mission/power/Pdu1Handler.h>
 
 #include "devices/powerSwitcherList.h"
 
diff --git a/mission/devices/Pdu1Handler.h b/mission/power/Pdu1Handler.h
similarity index 96%
rename from mission/devices/Pdu1Handler.h
rename to mission/power/Pdu1Handler.h
index b81f647e..b3e59229 100644
--- a/mission/devices/Pdu1Handler.h
+++ b/mission/power/Pdu1Handler.h
@@ -1,8 +1,8 @@
 #ifndef MISSION_DEVICES_PDU1Handler_H_
 #define MISSION_DEVICES_PDU1Handler_H_
 
-#include "GomspaceDeviceHandler.h"
-#include "devicedefinitions/GomspaceDefinitions.h"
+#include <mission/power/GomspaceDeviceHandler.h>
+#include <mission/power/gsDefs.h>
 
 /**
  * @brief	This is the device handler for the PDU1.
diff --git a/mission/devices/Pdu2Handler.cpp b/mission/power/Pdu2Handler.cpp
similarity index 98%
rename from mission/devices/Pdu2Handler.cpp
rename to mission/power/Pdu2Handler.cpp
index 363c5f51..bf945849 100644
--- a/mission/devices/Pdu2Handler.cpp
+++ b/mission/power/Pdu2Handler.cpp
@@ -1,6 +1,6 @@
 #include <fsfw/datapool/PoolReadGuard.h>
-#include <mission/devices/Pdu2Handler.h>
-#include <mission/devices/devicedefinitions/GomSpacePackets.h>
+#include <mission/power/GomSpacePackets.h>
+#include <mission/power/Pdu2Handler.h>
 
 #include "devices/powerSwitcherList.h"
 
diff --git a/mission/devices/Pdu2Handler.h b/mission/power/Pdu2Handler.h
similarity index 89%
rename from mission/devices/Pdu2Handler.h
rename to mission/power/Pdu2Handler.h
index acb229dc..f0756cb9 100644
--- a/mission/devices/Pdu2Handler.h
+++ b/mission/power/Pdu2Handler.h
@@ -1,9 +1,8 @@
-#ifndef MISSION_DEVICES_PDU2HANDLER_H_
-#define MISSION_DEVICES_PDU2HANDLER_H_
+#ifndef MISSION_POWER_PDU2HANDLER_H_
+#define MISSION_POWER_PDU2HANDLER_H_
 
-#include <mission/devices/devicedefinitions/GomspaceDefinitions.h>
-
-#include "GomspaceDeviceHandler.h"
+#include <mission/power/GomspaceDeviceHandler.h>
+#include <mission/power/gsDefs.h>
 
 /**
  * @brief	This is the device handler for the PDU2.
@@ -56,4 +55,4 @@ class Pdu2Handler : public GomspaceDeviceHandler {
   void parseHkTableReply(const uint8_t* packet);
 };
 
-#endif /* MISSION_DEVICES_PDU2HANDLER_H_ */
+#endif /* MISSION_POWER_PDU2HANDLER_H_ */
diff --git a/mission/devices/devicedefinitions/BpxBatteryDefinitions.h b/mission/power/bpxBattDefs.h
similarity index 97%
rename from mission/devices/devicedefinitions/BpxBatteryDefinitions.h
rename to mission/power/bpxBattDefs.h
index eb19529b..1808c94a 100644
--- a/mission/devices/devicedefinitions/BpxBatteryDefinitions.h
+++ b/mission/power/bpxBattDefs.h
@@ -1,5 +1,5 @@
-#ifndef MISSION_DEVICES_DEVICEDEFINITIONS_BPXBATTERYDEFINITIONS_H_
-#define MISSION_DEVICES_DEVICEDEFINITIONS_BPXBATTERYDEFINITIONS_H_
+#ifndef MISSION_POWER_BPXBATTDEFS_H_
+#define MISSION_POWER_BPXBATTDEFS_H_
 
 #include <fsfw/datapoollocal/StaticLocalDataSet.h>
 #include <fsfw/serialize/SerialLinkedListAdapter.h>
@@ -248,4 +248,4 @@ class BpxBatteryCfg : public StaticLocalDataSet<BpxBattery::CFG_ENTRIES> {
       : StaticLocalDataSet(hkOwner, BpxBattery::CFG_SET_ID) {}
 };
 
-#endif /* MISSION_DEVICES_DEVICEDEFINITIONS_BPXBATTERYDEFINITIONS_H_ */
+#endif /* MISSION_POWER_BPXBATTDEFS_H_ */
diff --git a/mission/devices/devicedefinitions/powerDefinitions.h b/mission/power/defs.h
similarity index 68%
rename from mission/devices/devicedefinitions/powerDefinitions.h
rename to mission/power/defs.h
index 8d1b5578..2aadc361 100644
--- a/mission/devices/devicedefinitions/powerDefinitions.h
+++ b/mission/power/defs.h
@@ -1,7 +1,8 @@
-#ifndef MISSION_DEVICES_DEVICEDEFINITIONS_POWERDEFINITIONS_H_
-#define MISSION_DEVICES_DEVICEDEFINITIONS_POWERDEFINITIONS_H_
+#ifndef MISSION_POWER_DEFS_H_
+#define MISSION_POWER_DEFS_H_
 
 #include <fsfw/events/Event.h>
+#include <fsfw/modes/ModeMessage.h>
 
 #include "eive/eventSubsystemIds.h"
 
@@ -18,6 +19,17 @@ static constexpr Event SWITCHING_Q7S_DENIED = event::makeEvent(SUBSYSTEM_ID, 2,
 
 static constexpr Event FDIR_REACTION_IGNORED = event::makeEvent(SUBSYSTEM_ID, 3, severity::MEDIUM);
 
+
+enum class States { IDLE, SWITCHING_POWER, CHECKING_POWER, MODE_COMMANDING };
+enum class OpCodes { NONE, TO_OFF_DONE, TO_NOT_OFF_DONE, TIMEOUT_OCCURED };
+
 }  // namespace power
 
-#endif /* MISSION_DEVICES_DEVICEDEFINITIONS_POWERDEFINITIONS_H_ */
+
+namespace duallane {
+
+enum Submodes : Submode_t { A_SIDE = 0, B_SIDE = 1, DUAL_MODE = 2 };
+
+}
+
+#endif /* MISSION_POWER_DEFS_H_ */
diff --git a/mission/devices/devicedefinitions/GomspaceDefinitions.h b/mission/power/gsDefs.h
similarity index 99%
rename from mission/devices/devicedefinitions/GomspaceDefinitions.h
rename to mission/power/gsDefs.h
index 75a81d8f..e1ffe6d3 100644
--- a/mission/devices/devicedefinitions/GomspaceDefinitions.h
+++ b/mission/power/gsDefs.h
@@ -1,16 +1,16 @@
-#ifndef MISSION_DEVICES_DEVICEDEFINITIONS_GOMSPACEDEFINITIONS_H_
-#define MISSION_DEVICES_DEVICEDEFINITIONS_GOMSPACEDEFINITIONS_H_
+#ifndef MISSION_POWER_GSDEFS_H_
+#define MISSION_POWER_GSDEFS_H_
 
 #include <fsfw/datapoollocal/LocalPoolVariable.h>
 #include <fsfw/datapoollocal/StaticLocalDataSet.h>
 #include <fsfw/devicehandlers/DeviceHandlerIF.h>
 #include <fsfw/power/definitions.h>
+#include <mission/power/gsLibDefs.h>
 
 #include <cstdint>
 
 #include "devices/powerSwitcherList.h"
 #include "fsfw/platform.h"
-#include "gomspaceDefines.h"
 
 namespace GOMSPACE {
 
@@ -774,4 +774,4 @@ class SwitcherStates : public StaticLocalDataSet<NUMBER_OF_SWITCHES> {
 };
 
 }  // namespace pcdu
-#endif /* MISSION_DEVICES_DEVICEDEFINITIONS_GOMSPACEDEFINITIONS_H_ */
+#endif /* MISSION_POWER_GSDEFS_H_ */
diff --git a/mission/devices/devicedefinitions/gomspaceDefines.h b/mission/power/gsLibDefs.h
similarity index 80%
rename from mission/devices/devicedefinitions/gomspaceDefines.h
rename to mission/power/gsLibDefs.h
index ddd346d7..cc9fc121 100644
--- a/mission/devices/devicedefinitions/gomspaceDefines.h
+++ b/mission/power/gsLibDefs.h
@@ -1,5 +1,5 @@
-#ifndef MISSION_DEVICES_DEVICEDEFINITIONS_GOMSPACEDEFINES_H_
-#define MISSION_DEVICES_DEVICEDEFINITIONS_GOMSPACEDEFINES_H_
+#ifndef MISSION_POWER_GSLIBDEFS_H_
+#define MISSION_POWER_GSLIBDEFS_H_
 
 #include "fsfw/platform.h"
 
@@ -30,4 +30,4 @@ static constexpr uint32_t P60ACU_PARAM_SIZE = 0x1B;
 
 }  // namespace gsConstants
 
-#endif /* MISSION_DEVICES_DEVICEDEFINITIONS_GOMSPACEDEFINES_H_ */
+#endif /* MISSION_POWER_GSLIBDEFS_H_ */
diff --git a/mission/powerDefs.h b/mission/powerDefs.h
deleted file mode 100644
index 9e0176d9..00000000
--- a/mission/powerDefs.h
+++ /dev/null
@@ -1,16 +0,0 @@
-#pragma once
-
-#include <fsfw/modes/ModeMessage.h>
-
-namespace power {
-
-enum class States { IDLE, SWITCHING_POWER, CHECKING_POWER, MODE_COMMANDING };
-enum class OpCodes { NONE, TO_OFF_DONE, TO_NOT_OFF_DONE, TIMEOUT_OCCURED };
-
-}  // namespace power
-
-namespace duallane {
-
-enum Submodes : Submode_t { A_SIDE = 0, B_SIDE = 1, DUAL_MODE = 2 };
-
-}  // namespace duallane
diff --git a/mission/system/DualLanePowerStateMachine.h b/mission/system/DualLanePowerStateMachine.h
index 7db99c83..d3f596f7 100644
--- a/mission/system/DualLanePowerStateMachine.h
+++ b/mission/system/DualLanePowerStateMachine.h
@@ -5,7 +5,7 @@
 #include <fsfw/modes/HasModesIF.h>
 #include <mission/system/objects/PowerStateMachineBase.h>
 
-#include "mission/powerDefs.h"
+#include "mission/power/defs.h"
 
 class AssemblyBase;
 class PowerSwitchIF;
diff --git a/mission/system/acs/acsModeTree.cpp b/mission/system/acs/acsModeTree.cpp
index cee5445d..85d2ea45 100644
--- a/mission/system/acs/acsModeTree.cpp
+++ b/mission/system/acs/acsModeTree.cpp
@@ -10,7 +10,7 @@
 
 #include "eive/objects.h"
 #include "mission/acs/defs.h"
-#include "mission/powerDefs.h"
+#include "mission/power/defs.h"
 #include "mission/system/tree/util.h"
 
 AcsSubsystem satsystem::acs::ACS_SUBSYSTEM(objects::ACS_SUBSYSTEM, 12, 24);
diff --git a/mission/system/fdir/GomspacePowerFdir.cpp b/mission/system/fdir/GomspacePowerFdir.cpp
index 5d35ca24..7cec4815 100644
--- a/mission/system/fdir/GomspacePowerFdir.cpp
+++ b/mission/system/fdir/GomspacePowerFdir.cpp
@@ -1,3 +1,4 @@
+#include <mission/power/defs.h>
 #include "GomspacePowerFdir.h"
 
 #include "fsfw/devicehandlers/DeviceHandlerIF.h"
@@ -7,7 +8,6 @@
 #include "fsfw/power/Fuse.h"
 #include "fsfw/serviceinterface/ServiceInterfaceStream.h"
 #include "fsfw/thermal/ThermalComponentIF.h"
-#include "mission/devices/devicedefinitions/powerDefinitions.h"
 
 GomspacePowerFdir::GomspacePowerFdir(object_id_t devId, object_id_t parentId)
     : DeviceHandlerFailureIsolation(devId, parentId) {}
diff --git a/mission/system/objects/PowerStateMachineBase.h b/mission/system/objects/PowerStateMachineBase.h
index 25af577b..bc917b23 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 "mission/powerDefs.h"
+#include "mission/power/defs.h"
 
 class PowerStateMachineBase {
  public:
diff --git a/mission/system/objects/Stack5VHandler.h b/mission/system/objects/Stack5VHandler.h
index 364d744b..17b9ed1e 100644
--- a/mission/system/objects/Stack5VHandler.h
+++ b/mission/system/objects/Stack5VHandler.h
@@ -2,8 +2,7 @@
 #define MISSION_SYSTEM_OBJECTS_STACK5VHANDLER_H_
 
 #include <fsfw/power/PowerSwitchIF.h>
-
-#include "mission/devices/devicedefinitions/GomspaceDefinitions.h"
+#include <mission/power/gsDefs.h>
 
 enum class StackCommander { RAD_SENSOR = 0, PL_PCDU = 1 };
 enum class HandlerState { SWITCH_PENDING, IDLE };
diff --git a/mission/system/tree/payloadModeTree.cpp b/mission/system/tree/payloadModeTree.cpp
index 283cd761..511cf5f1 100644
--- a/mission/system/tree/payloadModeTree.cpp
+++ b/mission/system/tree/payloadModeTree.cpp
@@ -8,7 +8,7 @@
 #include "eive/objects.h"
 #include "mission/devices/devicedefinitions/payloadPcduDefinitions.h"
 #include "mission/payloadDefs.h"
-#include "mission/powerDefs.h"
+#include "mission/power/defs.h"
 #include "mission/system/objects/PayloadSubsystem.h"
 #include "util.h"