diff --git a/bsp_q7s/core/ObjectFactory.cpp b/bsp_q7s/core/ObjectFactory.cpp
index c7e170d2..3a15d403 100644
--- a/bsp_q7s/core/ObjectFactory.cpp
+++ b/bsp_q7s/core/ObjectFactory.cpp
@@ -12,6 +12,7 @@
 #include "devices/addresses.h"
 #include "devices/gpioIds.h"
 #include "devices/powerSwitcherList.h"
+#include "eive/definitions.h"
 #include "fsfw/ipc/QueueFactory.h"
 #include "linux/ObjectFactory.h"
 #include "linux/boardtest/I2cTestClass.h"
@@ -40,7 +41,6 @@
 #include "mission/system/fdir/RtdFdir.h"
 #include "mission/system/fdir/SusFdir.h"
 #include "mission/system/fdir/SyrlinksFdir.h"
-#include "eive/definitions.h"
 #include "tmtc/pusIds.h"
 #if OBSW_TEST_LIBGPIOD == 1
 #include "linux/boardtest/LibgpiodTest.h"
diff --git a/bsp_q7s/em/emObjectFactory.cpp b/bsp_q7s/em/emObjectFactory.cpp
index 9301f6d3..d1e9ba56 100644
--- a/bsp_q7s/em/emObjectFactory.cpp
+++ b/bsp_q7s/em/emObjectFactory.cpp
@@ -4,8 +4,8 @@
 #include "bsp_q7s/core/CoreController.h"
 #include "bsp_q7s/core/ObjectFactory.h"
 #include "busConf.h"
-#include "commonObjects.h"
 #include "devConf.h"
+#include "eive/objects.h"
 #include "fsfw_hal/linux/gpio/LinuxLibgpioIF.h"
 #include "linux/ObjectFactory.h"
 #include "linux/callbacks/gpioCallbacks.h"
diff --git a/bsp_q7s/fmObjectFactory.cpp b/bsp_q7s/fmObjectFactory.cpp
index acce5dfb..89f4990e 100644
--- a/bsp_q7s/fmObjectFactory.cpp
+++ b/bsp_q7s/fmObjectFactory.cpp
@@ -2,8 +2,8 @@
 #include "bsp_q7s/core/CoreController.h"
 #include "bsp_q7s/core/ObjectFactory.h"
 #include "busConf.h"
-#include "commonObjects.h"
 #include "devConf.h"
+#include "eive/objects.h"
 #include "fsfw_hal/linux/gpio/LinuxLibgpioIF.h"
 #include "linux/ObjectFactory.h"
 #include "linux/callbacks/gpioCallbacks.h"
diff --git a/bsp_q7s/fs/FilesystemHelper.h b/bsp_q7s/fs/FilesystemHelper.h
index 8233d4db..ea1b5703 100644
--- a/bsp_q7s/fs/FilesystemHelper.h
+++ b/bsp_q7s/fs/FilesystemHelper.h
@@ -3,7 +3,7 @@
 
 #include <string>
 
-#include "commonClassIds.h"
+#include "eive/resultClassIds.h"
 #include "fsfw/returnvalues/returnvalue.h"
 
 /**
diff --git a/bsp_q7s/fs/SdCardManager.cpp b/bsp_q7s/fs/SdCardManager.cpp
index 2a835806..95abc6aa 100644
--- a/bsp_q7s/fs/SdCardManager.cpp
+++ b/bsp_q7s/fs/SdCardManager.cpp
@@ -11,7 +11,7 @@
 
 #include "OBSWConfig.h"
 #include "bsp_q7s/memory/scratchApi.h"
-#include "common/config/commonObjects.h"
+#include "eive/objects.h"
 #include "fsfw/ipc/MutexFactory.h"
 #include "fsfw/serviceinterface/ServiceInterface.h"
 #include "linux/utility/utility.h"
diff --git a/common/config/commonConfig.cpp b/common/config/commonConfig.cpp
index f76817f4..56388f8b 100644
--- a/common/config/commonConfig.cpp
+++ b/common/config/commonConfig.cpp
@@ -1,7 +1,7 @@
 #include "commonConfig.h"
 
-#include "fsfw/tmtcpacket/ccsds/defs.h"
 #include "eive/definitions.h"
+#include "fsfw/tmtcpacket/ccsds/defs.h"
 
 const fsfw::Version common::OBSW_VERSION{OBSW_VERSION_MAJOR, OBSW_VERSION_MINOR,
                                          OBSW_VERSION_REVISION, OBSW_VERSION_CST_GIT_SHA1};
diff --git a/common/config/eive/definitions.h b/common/config/eive/definitions.h
index 8ed59251..0786cdb3 100644
--- a/common/config/eive/definitions.h
+++ b/common/config/eive/definitions.h
@@ -24,8 +24,6 @@ static constexpr uint8_t LIVE_TM = 0;
 static constexpr uint32_t MAX_PATH_SIZE = 100;
 static constexpr uint32_t MAX_FILENAME_SIZE = 50;
 
-
-
 }  // namespace config
 
 #endif /* COMMON_CONFIG_DEFINITIONS_H_ */
diff --git a/common/config/commonSubsystemIds.h b/common/config/eive/eventSubsystemIds.h
similarity index 100%
rename from common/config/commonSubsystemIds.h
rename to common/config/eive/eventSubsystemIds.h
diff --git a/common/config/commonObjects.h b/common/config/eive/objects.h
similarity index 100%
rename from common/config/commonObjects.h
rename to common/config/eive/objects.h
diff --git a/common/config/commonClassIds.h b/common/config/eive/resultClassIds.h
similarity index 100%
rename from common/config/commonClassIds.h
rename to common/config/eive/resultClassIds.h
diff --git a/linux/devices/GPSHyperionLinuxController.h b/linux/devices/GPSHyperionLinuxController.h
index 35ce0a63..a4c12e57 100644
--- a/linux/devices/GPSHyperionLinuxController.h
+++ b/linux/devices/GPSHyperionLinuxController.h
@@ -1,7 +1,7 @@
 #ifndef MISSION_DEVICES_GPSHYPERIONHANDLER_H_
 #define MISSION_DEVICES_GPSHYPERIONHANDLER_H_
 
-#include "commonSubsystemIds.h"
+#include "eive/eventSubsystemIds.h"
 #include "fsfw/FSFW.h"
 #include "fsfw/controller/ExtendedControllerBase.h"
 #include "fsfw/devicehandlers/DeviceHandlerBase.h"
diff --git a/linux/fsfwconfig/events/subsystemIdRanges.h b/linux/fsfwconfig/events/subsystemIdRanges.h
index f0a0316c..6b7a1c1d 100644
--- a/linux/fsfwconfig/events/subsystemIdRanges.h
+++ b/linux/fsfwconfig/events/subsystemIdRanges.h
@@ -3,7 +3,7 @@
 
 #include <cstdint>
 
-#include "common/config/commonSubsystemIds.h"
+#include "eive/eventSubsystemIds.h"
 #include "fsfw/events/fwSubsystemIdRanges.h"
 
 /**
diff --git a/linux/fsfwconfig/objects/systemObjectList.h b/linux/fsfwconfig/objects/systemObjectList.h
index 669fcc9f..4a84e77f 100644
--- a/linux/fsfwconfig/objects/systemObjectList.h
+++ b/linux/fsfwconfig/objects/systemObjectList.h
@@ -5,7 +5,7 @@
 
 #include <cstdint>
 
-#include "commonObjects.h"
+#include "eive/objects.h"
 
 // The objects will be instantiated in the ID order
 // For naming scheme see flight manual
diff --git a/linux/fsfwconfig/returnvalues/classIds.h b/linux/fsfwconfig/returnvalues/classIds.h
index ecfc8ca9..abd8f785 100644
--- a/linux/fsfwconfig/returnvalues/classIds.h
+++ b/linux/fsfwconfig/returnvalues/classIds.h
@@ -1,9 +1,10 @@
 #ifndef FSFWCONFIG_RETURNVALUES_CLASSIDS_H_
 #define FSFWCONFIG_RETURNVALUES_CLASSIDS_H_
 
-#include <common/config/commonClassIds.h>
 #include <fsfw/returnvalues/FwClassIds.h>
 
+#include "eive/resultClassIds.h"
+
 /**
  * Source IDs starts at 73 for now
  * Framework IDs for ReturnValues run from 0 to 56
diff --git a/mission/controller/AcsController.h b/mission/controller/AcsController.h
index 14b710a2..c20ae94d 100644
--- a/mission/controller/AcsController.h
+++ b/mission/controller/AcsController.h
@@ -1,10 +1,10 @@
 #ifndef MISSION_CONTROLLER_ACSCONTROLLER_H_
 #define MISSION_CONTROLLER_ACSCONTROLLER_H_
 
-#include <commonObjects.h>
 #include <fsfw/controller/ExtendedControllerBase.h>
 
 #include "controllerdefinitions/AcsCtrlDefinitions.h"
+#include "eive/objects.h"
 #include "fsfw_hal/devicehandlers/MgmLIS3MDLHandler.h"
 #include "fsfw_hal/devicehandlers/MgmRM3100Handler.h"
 #include "mission/devices/devicedefinitions/IMTQHandlerDefinitions.h"
diff --git a/mission/core/GenericFactory.cpp b/mission/core/GenericFactory.cpp
index 90fed322..99324e4c 100644
--- a/mission/core/GenericFactory.cpp
+++ b/mission/core/GenericFactory.cpp
@@ -77,7 +77,8 @@ void ObjectFactory::produceGenericObjects(HealthTableIF** healthTable_) {
     new PoolManager(objects::IPC_STORE, poolCfg);
   }
 
-  auto* ccsdsDistrib = new CcsdsDistributor(config::EIVE_PUS_APID, objects::CCSDS_PACKET_DISTRIBUTOR);
+  auto* ccsdsDistrib =
+      new CcsdsDistributor(config::EIVE_PUS_APID, objects::CCSDS_PACKET_DISTRIBUTOR);
   new PusDistributor(config::EIVE_PUS_APID, objects::PUS_PACKET_DISTRIBUTOR, ccsdsDistrib);
 
   uint8_t vc = 0;
@@ -95,8 +96,8 @@ void ObjectFactory::produceGenericObjects(HealthTableIF** healthTable_) {
   new Service3Housekeeping(objects::PUS_SERVICE_3_HOUSEKEEPING, config::EIVE_PUS_APID,
                            pus::PUS_SERVICE_3);
   new Service5EventReporting(
-      PsbParams(objects::PUS_SERVICE_5_EVENT_REPORTING, config::EIVE_PUS_APID, pus::PUS_SERVICE_5), 15,
-      45);
+      PsbParams(objects::PUS_SERVICE_5_EVENT_REPORTING, config::EIVE_PUS_APID, pus::PUS_SERVICE_5),
+      15, 45);
   new Service8FunctionManagement(objects::PUS_SERVICE_8_FUNCTION_MGMT, config::EIVE_PUS_APID,
                                  pus::PUS_SERVICE_8, 16, 60);
   new Service9TimeManagement(
@@ -105,7 +106,8 @@ void ObjectFactory::produceGenericObjects(HealthTableIF** healthTable_) {
   new Service11TelecommandScheduling<common::OBSW_MAX_SCHEDULED_TCS>(
       PsbParams(objects::PUS_SERVICE_11_TC_SCHEDULER, config::EIVE_PUS_APID, pus::PUS_SERVICE_11),
       ccsdsDistrib);
-  new Service17Test(PsbParams(objects::PUS_SERVICE_17_TEST, config::EIVE_PUS_APID, pus::PUS_SERVICE_17));
+  new Service17Test(
+      PsbParams(objects::PUS_SERVICE_17_TEST, config::EIVE_PUS_APID, pus::PUS_SERVICE_17));
   new Service20ParameterManagement(objects::PUS_SERVICE_20_PARAMETERS, config::EIVE_PUS_APID,
                                    pus::PUS_SERVICE_20);
   new CService200ModeCommanding(objects::PUS_SERVICE_200_MODE_MGMT, config::EIVE_PUS_APID,
diff --git a/mission/devices/GomspaceDeviceHandler.cpp b/mission/devices/GomspaceDeviceHandler.cpp
index 412f2e46..254b6993 100644
--- a/mission/devices/GomspaceDeviceHandler.cpp
+++ b/mission/devices/GomspaceDeviceHandler.cpp
@@ -1,6 +1,5 @@
 #include "GomspaceDeviceHandler.h"
 
-#include <common/config/commonObjects.h>
 #include <fsfw/datapool/PoolReadGuard.h>
 #include <fsfw/globalfunctions/arrayprinter.h>
 
@@ -8,6 +7,7 @@
 
 #include "devicedefinitions/GomSpacePackets.h"
 #include "devicedefinitions/powerDefinitions.h"
+#include "eive/objects.h"
 
 using namespace GOMSPACE;
 
diff --git a/mission/devices/P60DockHandler.h b/mission/devices/P60DockHandler.h
index fcad350f..b91907a8 100644
--- a/mission/devices/P60DockHandler.h
+++ b/mission/devices/P60DockHandler.h
@@ -4,7 +4,7 @@
 #include <mission/devices/devicedefinitions/GomspaceDefinitions.h>
 
 #include "GomspaceDeviceHandler.h"
-#include "commonSubsystemIds.h"
+#include "eive/eventSubsystemIds.h"
 
 /**
  * @brief   Device handler for the P60Dock. The P60Dock serves as carrier for the ACU, PDU1 and
diff --git a/mission/devices/devicedefinitions/SyrlinksDefinitions.h b/mission/devices/devicedefinitions/SyrlinksDefinitions.h
index 447b5cce..96ea1157 100644
--- a/mission/devices/devicedefinitions/SyrlinksDefinitions.h
+++ b/mission/devices/devicedefinitions/SyrlinksDefinitions.h
@@ -1,8 +1,7 @@
 #ifndef MISSION_DEVICES_DEVICEDEFINITIONS_SYRLINKSDEFINITIONS_H_
 #define MISSION_DEVICES_DEVICEDEFINITIONS_SYRLINKSDEFINITIONS_H_
 
-#include <commonSubsystemIds.h>
-
+#include "eive/eventSubsystemIds.h"
 #include "fsfw/devicehandlers/DeviceHandlerBase.h"
 
 namespace syrlinks {
diff --git a/mission/devices/devicedefinitions/powerDefinitions.h b/mission/devices/devicedefinitions/powerDefinitions.h
index 9060c3b9..8d1b5578 100644
--- a/mission/devices/devicedefinitions/powerDefinitions.h
+++ b/mission/devices/devicedefinitions/powerDefinitions.h
@@ -1,9 +1,10 @@
 #ifndef MISSION_DEVICES_DEVICEDEFINITIONS_POWERDEFINITIONS_H_
 #define MISSION_DEVICES_DEVICEDEFINITIONS_POWERDEFINITIONS_H_
 
-#include <common/config/commonSubsystemIds.h>
 #include <fsfw/events/Event.h>
 
+#include "eive/eventSubsystemIds.h"
+
 namespace power {
 
 static constexpr uint8_t SUBSYSTEM_ID = SUBSYSTEM_ID::PCDU_HANDLER;
diff --git a/mission/system/AcsBoardAssembly.h b/mission/system/AcsBoardAssembly.h
index 412cb273..820060ce 100644
--- a/mission/system/AcsBoardAssembly.h
+++ b/mission/system/AcsBoardAssembly.h
@@ -1,13 +1,13 @@
 #ifndef MISSION_SYSTEM_ACSBOARDASSEMBLY_H_
 #define MISSION_SYSTEM_ACSBOARDASSEMBLY_H_
 
-#include <common/config/commonSubsystemIds.h>
 #include <devices/powerSwitcherList.h>
 #include <fsfw/objectmanager/frameworkObjects.h>
 #include <fsfw_hal/common/gpio/gpioDefinitions.h>
 
 #include "DualLaneAssemblyBase.h"
 #include "DualLanePowerStateMachine.h"
+#include "eive/eventSubsystemIds.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/fdir/AcsBoardFdir.cpp
index 931f43c0..5e97c377 100644
--- a/mission/system/fdir/AcsBoardFdir.cpp
+++ b/mission/system/fdir/AcsBoardFdir.cpp
@@ -1,6 +1,6 @@
 #include "AcsBoardFdir.h"
 
-#include <common/config/commonObjects.h>
+#include "eive/objects.h"
 
 AcsBoardFdir::AcsBoardFdir(object_id_t sensorId)
     : DeviceHandlerFailureIsolation(sensorId, objects::ACS_BOARD_ASS) {}
diff --git a/mission/system/fdir/RtdFdir.cpp b/mission/system/fdir/RtdFdir.cpp
index f4f9806e..008dc405 100644
--- a/mission/system/fdir/RtdFdir.cpp
+++ b/mission/system/fdir/RtdFdir.cpp
@@ -1,6 +1,6 @@
 #include "RtdFdir.h"
 
-#include <common/config/commonObjects.h>
+#include "eive/objects.h"
 
 RtdFdir::RtdFdir(object_id_t sensorId)
     : DeviceHandlerFailureIsolation(sensorId, objects::TCS_BOARD_ASS) {}
diff --git a/mission/system/fdir/SusFdir.cpp b/mission/system/fdir/SusFdir.cpp
index a2e0aff4..894b92cb 100644
--- a/mission/system/fdir/SusFdir.cpp
+++ b/mission/system/fdir/SusFdir.cpp
@@ -1,6 +1,6 @@
 #include "SusFdir.h"
 
-#include <common/config/commonObjects.h>
+#include "eive/objects.h"
 
 SusFdir::SusFdir(object_id_t sensorId)
     : DeviceHandlerFailureIsolation(sensorId, objects::SUS_BOARD_ASS) {}