diff --git a/bsp_q7s/objectFactory.cpp b/bsp_q7s/objectFactory.cpp
index 0f61a51d..ccd52bd2 100644
--- a/bsp_q7s/objectFactory.cpp
+++ b/bsp_q7s/objectFactory.cpp
@@ -67,7 +67,7 @@
 #include "mission/system/acs/acsModeTree.h"
 #include "mission/system/com/SyrlinksFdir.h"
 #include "mission/system/com/comModeTree.h"
-#include "mission/system/payloadModeTree.h"
+#include "mission/system/payload/payloadModeTree.h"
 #include "mission/system/power/GomspacePowerFdir.h"
 #include "mission/system/tcs/RtdFdir.h"
 #include "mission/system/tcs/TcsBoardAssembly.h"
diff --git a/dummies/helperFactory.cpp b/dummies/helperFactory.cpp
index c3df5704..667ab620 100644
--- a/dummies/helperFactory.cpp
+++ b/dummies/helperFactory.cpp
@@ -40,7 +40,7 @@
 #include "mission/genericFactory.h"
 #include "mission/system/acs/acsModeTree.h"
 #include "mission/system/com/comModeTree.h"
-#include "mission/system/payloadModeTree.h"
+#include "mission/system/payload/payloadModeTree.h"
 #include "mission/system/tcs/tcsModeTree.h"
 #include "mission/tcs/defs.h"
 
diff --git a/linux/ObjectFactory.cpp b/linux/ObjectFactory.cpp
index 5626ee49..4a78d754 100644
--- a/linux/ObjectFactory.cpp
+++ b/linux/ObjectFactory.cpp
@@ -26,7 +26,7 @@
 #include "devConf.h"
 #include "devices/gpioIds.h"
 #include "mission/system/acs/acsModeTree.h"
-#include "mission/system/payloadModeTree.h"
+#include "mission/system/payload/payloadModeTree.h"
 #include "mission/system/power/epsModeTree.h"
 
 void ObjectFactory::createSunSensorComponents(GpioIF* gpioComIF, SpiComIF* spiComIF,
diff --git a/mission/system/CMakeLists.txt b/mission/system/CMakeLists.txt
index 6b63b706..403cb821 100644
--- a/mission/system/CMakeLists.txt
+++ b/mission/system/CMakeLists.txt
@@ -3,8 +3,9 @@ add_subdirectory(acs)
 add_subdirectory(tcs)
 add_subdirectory(com)
 add_subdirectory(power)
+add_subdirectory(payload)
 
 target_sources(
   ${LIB_EIVE_MISSION}
   PRIVATE systemTree.cpp DualLanePowerStateMachine.cpp EiveSystem.cpp
-          treeUtil.cpp SharedPowerAssemblyBase.cpp payloadModeTree.cpp)
+          treeUtil.cpp SharedPowerAssemblyBase.cpp)
diff --git a/mission/system/payload/CMakeLists.txt b/mission/system/payload/CMakeLists.txt
new file mode 100644
index 00000000..7b546846
--- /dev/null
+++ b/mission/system/payload/CMakeLists.txt
@@ -0,0 +1 @@
+target_sources(${LIB_EIVE_MISSION} PRIVATE payloadModeTree.cpp)
diff --git a/mission/system/payloadModeTree.cpp b/mission/system/payload/payloadModeTree.cpp
similarity index 100%
rename from mission/system/payloadModeTree.cpp
rename to mission/system/payload/payloadModeTree.cpp
diff --git a/mission/system/payloadModeTree.h b/mission/system/payload/payloadModeTree.h
similarity index 100%
rename from mission/system/payloadModeTree.h
rename to mission/system/payload/payloadModeTree.h
diff --git a/mission/system/systemTree.cpp b/mission/system/systemTree.cpp
index f636b248..ba44957b 100644
--- a/mission/system/systemTree.cpp
+++ b/mission/system/systemTree.cpp
@@ -10,7 +10,7 @@
 #include "mission/com/defs.h"
 #include "mission/sysDefs.h"
 #include "mission/system/acs/acsModeTree.h"
-#include "mission/system/payloadModeTree.h"
+#include "mission/system/payload/payloadModeTree.h"
 #include "mission/system/power/epsModeTree.h"
 #include "mission/system/tcs/tcsModeTree.h"
 #include "treeUtil.h"