diff --git a/config/hook_implementation.py b/config/hook_implementation.py
index 768ea8f..ac6c124 100644
--- a/config/hook_implementation.py
+++ b/config/hook_implementation.py
@@ -5,8 +5,8 @@ from tmtccmd.com_if.com_interface_base import CommunicationInterface
 from tmtccmd.config.definitions import ServiceOpCodeDictT
 from tmtccmd.config.hook import TmTcHookBase
 from tmtccmd.core.backend import TmTcHandler
-from tmtccmd.pus_tc.definitions import TcQueueT
-from tmtccmd.pus_tm.service_3_base import Service3Base
+from tmtccmd.tc.definitions import TcQueueT
+from tmtccmd.tm.service_3_base import Service3Base
 from tmtccmd.ecss.conf import PusVersion
 from tmtccmd.utility.tmtc_printer import TmTcPrinter
 
diff --git a/pus_tc/service_20_parameters.py b/pus_tc/service_20_parameters.py
index 3ee5564..e3dc221 100644
--- a/pus_tc/service_20_parameters.py
+++ b/pus_tc/service_20_parameters.py
@@ -2,10 +2,10 @@ import struct
 
 from tmtccmd.config.definitions import QueueCommands
 from tmtccmd.ecss.tc import PusTelecommand
-from tmtccmd.pus_tc.definitions import TcQueueT
-from tmtccmd.pus_tc.service_20_parameter import pack_type_and_matrix_data, \
+from tmtccmd.tc.definitions import TcQueueT
+from tmtccmd.tc.service_20_parameter import pack_type_and_matrix_data, \
     pack_parameter_id
-from tmtccmd.pus_tc.service_200_mode import pack_mode_data
+from tmtccmd.tc.service_200_mode import pack_mode_data
 from tmtccmd.utility.logger import get_console_logger
 
 from common_tmtc.config.object_ids import TEST_DEVICE_0_ID
diff --git a/pus_tm/factory_hook.py b/pus_tm/factory_hook.py
index 3bd23a3..df47cf7 100644
--- a/pus_tm/factory_hook.py
+++ b/pus_tm/factory_hook.py
@@ -6,14 +6,14 @@
 
 from tmtccmd.ecss.tm import PusTelemetry
 from tmtccmd.utility.logger import get_console_logger
-from tmtccmd.pus_tm.service_1_verification import Service1TM
-from tmtccmd.pus_tm.service_2_raw_cmd import Service2TM
-from tmtccmd.pus_tm.service_3_housekeeping import Service3TM
-from tmtccmd.pus_tm.service_5_event import Service5TM
-from tmtccmd.pus_tm.service_8_functional_cmd import Service8TM
-from tmtccmd.pus_tm.service_17_test import Service17TM
-from tmtccmd.pus_tm.service_20_parameters import Service20TM
-from tmtccmd.pus_tm.service_200_mode import Service200TM
+from tmtccmd.tm.service_1_verification import Service1TM
+from tmtccmd.tm.service_2_raw_cmd import Service2TM
+from tmtccmd.tm.service_3_housekeeping import Service3TM
+from tmtccmd.tm.service_5_event import Service5TM
+from tmtccmd.tm.service_8_functional_cmd import Service8TM
+from tmtccmd.tm.service_17_test import Service17TM
+from tmtccmd.tm.service_20_parameters import Service20TM
+from tmtccmd.tm.service_200_mode import Service200TM
 from tmtccmd.utility.tmtc_printer import TmTcPrinter
 
 from common_tmtc.config.definitions import PUS_APID
diff --git a/pus_tm/service_3_hk_handling.py b/pus_tm/service_3_hk_handling.py
index d9966f7..e4ae737 100644
--- a/pus_tm/service_3_hk_handling.py
+++ b/pus_tm/service_3_hk_handling.py
@@ -6,7 +6,7 @@
 """
 import struct
 from typing import Tuple
-from tmtccmd.pus_tm.service_3_housekeeping import Service3Base
+from tmtccmd.tm.service_3_housekeeping import Service3Base
 from tmtccmd.utility.logger import get_console_logger
 
 from common_tmtc.config.object_ids import TEST_DEVICE_0_ID, TEST_DEVICE_1_ID