diff --git a/pus_tc/service_17_test.py b/pus_tc/service_17_test.py
index 0a290fa..be564b2 100644
--- a/pus_tc/service_17_test.py
+++ b/pus_tc/service_17_test.py
@@ -1,5 +1,5 @@
-from tmtccmd.pus_tc.definitions import TcQueueT
-from tmtccmd.pus_tc.service_17_test import pack_service17_ping_command, pack_generic_service17_test
+from tmtccmd.tc.definitions import TcQueueT
+from tmtccmd.tc.service_17_test import pack_service17_ping_command, pack_generic_service17_test
 
 
 def pack_service_17_commands(op_code: str, init_ssc: int, tc_queue: TcQueueT):
diff --git a/pus_tc/service_200_mode.py b/pus_tc/service_200_mode.py
index eac75a1..a9ddd40 100644
--- a/pus_tc/service_200_mode.py
+++ b/pus_tc/service_200_mode.py
@@ -7,8 +7,8 @@
 """
 from tmtccmd.config.definitions import QueueCommands
 from tmtccmd.ecss.tc import PusTelecommand
-from tmtccmd.pus_tc.packer import TcQueueT
-from tmtccmd.pus_tc.service_200_mode import pack_mode_data
+from tmtccmd.tc.packer import TcQueueT
+from tmtccmd.tc.service_200_mode import pack_mode_data
 
 from common_tmtc.config.object_ids import TEST_DEVICE_0_ID
 
diff --git a/pus_tc/service_2_raw_cmd.py b/pus_tc/service_2_raw_cmd.py
index 450bfd1..8db585d 100644
--- a/pus_tc/service_2_raw_cmd.py
+++ b/pus_tc/service_2_raw_cmd.py
@@ -9,8 +9,8 @@ import struct
 
 from tmtccmd.config.definitions import QueueCommands
 from tmtccmd.ecss.tc import PusTelecommand
-from tmtccmd.pus_tc.definitions import TcQueueT
-from common_tmtc.pus_tc.service_200_mode import pack_mode_data
+from tmtccmd.tc.definitions import TcQueueT
+from tmtccmd.tc.service_200_mode import pack_mode_data
 
 from common_tmtc import pus_tc as cmd_data
 from common_tmtc.config.object_ids import TEST_DEVICE_0_ID
diff --git a/pus_tc/service_3_housekeeping.py b/pus_tc/service_3_housekeeping.py
index 7c4268d..8f2ec3b 100644
--- a/pus_tc/service_3_housekeeping.py
+++ b/pus_tc/service_3_housekeeping.py
@@ -1,11 +1,11 @@
 from tmtccmd.config.definitions import QueueCommands
-from tmtccmd.pus_tc.service_200_mode import pack_mode_data
-from tmtccmd.pus_tc.service_20_parameter import pack_boolean_parameter_command
-from tmtccmd.pus_tc.service_3_housekeeping import make_sid, generate_one_hk_command, \
+from tmtccmd.tc.service_200_mode import pack_mode_data
+from tmtccmd.tc.service_20_parameter import pack_boolean_parameter_command
+from tmtccmd.tc.service_3_housekeeping import make_sid, generate_one_hk_command, \
     Srv3Subservice
 from tmtccmd.ecss.tc import PusTelecommand
-from tmtccmd.pus_tc.definitions import TcQueueT
-from tmtccmd.pus_tc.service_8_functional_cmd import generate_action_command
+from tmtccmd.tc.definitions import TcQueueT
+from tmtccmd.tc.service_8_functional_cmd import generate_action_command
 
 from common_tmtc.config.object_ids import TEST_DEVICE_0_ID, TEST_DEVICE_1_ID
 
diff --git a/pus_tc/service_8_func_cmd.py b/pus_tc/service_8_func_cmd.py
index 81a3f3c..6731f10 100644
--- a/pus_tc/service_8_func_cmd.py
+++ b/pus_tc/service_8_func_cmd.py
@@ -1,9 +1,10 @@
 from tmtccmd.config.definitions import QueueCommands
 from tmtccmd.ecss.tc import PusTelecommand
-from tmtccmd.pus_tc.definitions import TcQueueT
+from tmtccmd.tc.definitions import TcQueueT
+from tmtccmd.tc.service_200_mode import pack_mode_data
 
 from common_tmtc import pus_tc as cmd_data
-from common_tmtc.pus_tc.service_200_mode import pack_mode_data
+
 
 from common_tmtc.config.object_ids import TEST_DEVICE_0_ID
 
diff --git a/pus_tc/tc_packing.py b/pus_tc/tc_packing.py
index c4d1113..a531bc0 100644
--- a/pus_tc/tc_packing.py
+++ b/pus_tc/tc_packing.py
@@ -14,10 +14,10 @@ from common_tmtc.pus_tc.service_3_housekeeping import pack_service_3_commands_in
 from common_tmtc.pus_tc.service_17_test import pack_service_17_commands
 from common_tmtc.pus_tc.service_8_func_cmd import pack_service_8_commands_into
 from tmtccmd.utility.logger import get_console_logger
-from tmtccmd.pus_tc.definitions import TcQueueT
+from tmtccmd.tc.definitions import TcQueueT
 from tmtccmd.config.definitions import CoreServiceList
-from tmtccmd.pus_tc.service_5_event import pack_generic_service5_test_into
-from tmtccmd.pus_tc.service_17_test import pack_generic_service17_test
+from tmtccmd.tc.service_5_event import pack_generic_service5_test_into
+from tmtccmd.tc.service_17_test import pack_generic_service17_test
 from common_tmtc.pus_tc.service_200_mode import pack_service_200_commands_into
 
 LOGGER = get_console_logger()