diff --git a/eive_tmtc/pus_tc/procedure_packer.py b/eive_tmtc/pus_tc/procedure_packer.py
index 8110470..795742c 100644
--- a/eive_tmtc/pus_tc/procedure_packer.py
+++ b/eive_tmtc/pus_tc/procedure_packer.py
@@ -22,7 +22,7 @@ from tmtccmd.tc.pus_5_event import (
     pack_generic_service_5_test_into,
 )
 
-from eive_tmtc.pus_tc.s200_test import pack_service_200_test_into
+from eive_tmtc.tmtc.misc.s200_test import pack_service_200_test_into
 from eive_tmtc.tmtc.power.p60dock import pack_p60dock_cmds
 from eive_tmtc.tmtc.power.pdu2 import pack_pdu2_commands
 from eive_tmtc.tmtc.power.pdu1 import pack_pdu1_commands
diff --git a/eive_tmtc/tmtc/payload/rad_sensor.py b/eive_tmtc/tmtc/payload/rad_sensor.py
index 14319d0..78c82c3 100644
--- a/eive_tmtc/tmtc/payload/rad_sensor.py
+++ b/eive_tmtc/tmtc/payload/rad_sensor.py
@@ -11,10 +11,10 @@ from eive_tmtc.config.definitions import CustomServiceList
 from eive_tmtc.pus_tm.defs import PrintWrapper
 
 from spacepackets.ecss.tc import PusTelecommand
-from eive_tmtc.pus_tc.s200_test import pack_mode_data, Mode
 from tmtccmd.config import TmtcDefinitionWrapper, OpCodeEntry
 from tmtccmd.config.tmtc import tmtc_definitions_provider
 from tmtccmd.tc import DefaultPusQueueHelper
+from tmtccmd.tc.pus_200_fsfw_mode import Mode, pack_mode_data
 from tmtccmd.tc.pus_3_fsfw_hk import generate_one_hk_command, make_sid
 from tmtccmd.util import ObjectIdU32
 from tmtccmd.util.tmtc_printer import FsfwTmTcPrinter
diff --git a/eive_tmtc/tmtc/tcs/tmp1075.py b/eive_tmtc/tmtc/tcs/tmp1075.py
index fb686ff..f73629a 100644
--- a/eive_tmtc/tmtc/tcs/tmp1075.py
+++ b/eive_tmtc/tmtc/tcs/tmp1075.py
@@ -8,9 +8,8 @@
 import enum
 
 from spacepackets.ecss.tc import PusTelecommand
-from eive_tmtc.pus_tc.s200_test import pack_mode_data
 from tmtccmd.tc import DefaultPusQueueHelper
-from tmtccmd.tc.pus_200_fsfw_mode import Mode
+from tmtccmd.tc.pus_200_fsfw_mode import Mode, pack_mode_data
 from tmtccmd.pus.s8_fsfw_funccmd import make_action_id
 from tmtccmd.util import ObjectIdU32