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/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/tmtc b/tmtc
index c843356c..b160f079 160000
--- a/tmtc
+++ b/tmtc
@@ -1 +1 @@
-Subproject commit c843356c8af22bf45a04c71c93813716c9d743ec
+Subproject commit b160f079b104be5f43b76f4fdcd7a4321d09b4a7