From 19f5ba62dee68247bb64b70104ebaa7a8214ddb0 Mon Sep 17 00:00:00 2001
From: Robin Mueller <robin.mueller.m@gmail.com>
Date: Tue, 23 Mar 2021 13:43:31 +0100
Subject: [PATCH 1/3] submodule update

---
 tmtccmd | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tmtccmd b/tmtccmd
index b52f701..d21a401 160000
--- a/tmtccmd
+++ b/tmtccmd
@@ -1 +1 @@
-Subproject commit b52f70179255695c47a4023f71745b4a67a9f286
+Subproject commit d21a401faa9f97fb49ce5f4718fe6e0052d0332e

From 74c61842c87e6a25751904116fdc82dd61a14333 Mon Sep 17 00:00:00 2001
From: Robin Mueller <robin.mueller.m@gmail.com>
Date: Tue, 23 Mar 2021 13:44:33 +0100
Subject: [PATCH 2/3] minor fixes

---
 config/hook_implementations.py | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/config/hook_implementations.py b/config/hook_implementations.py
index d939920..6734dab 100644
--- a/config/hook_implementations.py
+++ b/config/hook_implementations.py
@@ -2,13 +2,10 @@ import argparse
 from typing import Union, Dict, Tuple
 
 from tmtccmd.pus_tm.service_3_base import Service3Base
-
 from tmtccmd.pus_tm.base import PusTelemetry
-
 from tmtccmd.pus_tc.base import TcQueueT, PusTelecommand
-
-from com_if.com_interface_base import CommunicationInterface
-from core.backend import TmTcHandler
+from tmtccmd.com_if.com_interface_base import CommunicationInterface
+from tmtccmd.core.backend import TmTcHandler
 from tmtccmd.core.hook_base import TmTcHookBase
 from tmtccmd.utility.tmtc_printer import TmTcPrinter
 

From 8703aeea55621f2d1d45675ac52929e425f776eb Mon Sep 17 00:00:00 2001
From: Robin Mueller <robin.mueller.m@gmail.com>
Date: Sat, 10 Apr 2021 22:59:51 +0200
Subject: [PATCH 3/3] updated tmtc

---
 .idea/runConfigurations/tmtcc_Listener_Mode_UDP.xml      | 2 +-
 .idea/runConfigurations/tmtcc_Service_17_UDP.xml         | 4 ++--
 .idea/runConfigurations/tmtcc_Service_200_UDP.xml        | 4 ++--
 .idea/runConfigurations/tmtcc_Service_2_UDP.xml          | 4 ++--
 .idea/runConfigurations/tmtcc_Service_3_UDP.xml          | 4 ++--
 .idea/runConfigurations/tmtcc_Service_8_UDP.xml          | 4 ++--
 .idea/runConfigurations/tmtcc_Single_Command_UDP.xml     | 4 ++--
 .idea/runConfigurations/tmtcclient_ACU_Test_UDP.xml      | 4 ++--
 .idea/runConfigurations/tmtcclient_P60_Dock_Test_UDP.xml | 4 ++--
 .idea/runConfigurations/tmtcclient_PDU1_Test_UDP.xml     | 4 ++--
 .idea/runConfigurations/tmtcclient_PDU2_Test_UDP.xml     | 4 ++--
 config/custom_hooks.py                                   | 2 +-
 config/globals_config.py                                 | 5 +++--
 config/hook_implementations.py                           | 5 +++--
 pus_tc/acu.py                                            | 2 +-
 pus_tc/heater.py                                         | 2 +-
 pus_tc/p60dock.py                                        | 2 +-
 pus_tc/pdu1.py                                           | 2 +-
 pus_tc/pdu2.py                                           | 2 +-
 pus_tc/service_200_mode.py                               | 2 +-
 pus_tc/tc_packer_hook.py                                 | 2 +-
 pus_tc/tmp1075.py                                        | 2 +-
 pus_tm/factory_hook.py                                   | 2 +-
 tmtccmd                                                  | 2 +-
 24 files changed, 38 insertions(+), 36 deletions(-)

diff --git a/.idea/runConfigurations/tmtcc_Listener_Mode_UDP.xml b/.idea/runConfigurations/tmtcc_Listener_Mode_UDP.xml
index 7e1b3ab..c1c76dd 100644
--- a/.idea/runConfigurations/tmtcc_Listener_Mode_UDP.xml
+++ b/.idea/runConfigurations/tmtcc_Listener_Mode_UDP.xml
@@ -1,5 +1,5 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="tmtcc Listener Mode UDP" type="PythonConfigurationType" factoryName="Python" folderName="UDP">
+  <configuration default="false" name="tmtcc Listener Mode UDP" type="PythonConfigurationType" factoryName="Python" folderName="PUS">
     <module name="tmtc" />
     <option name="INTERPRETER_OPTIONS" value="" />
     <option name="PARENT_ENVS" value="true" />
diff --git a/.idea/runConfigurations/tmtcc_Service_17_UDP.xml b/.idea/runConfigurations/tmtcc_Service_17_UDP.xml
index 43b0d1a..3301325 100644
--- a/.idea/runConfigurations/tmtcc_Service_17_UDP.xml
+++ b/.idea/runConfigurations/tmtcc_Service_17_UDP.xml
@@ -1,5 +1,5 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="tmtcc Service 17 UDP" type="PythonConfigurationType" factoryName="Python" folderName="UDP">
+  <configuration default="false" name="tmtcc Service 17 UDP" type="PythonConfigurationType" factoryName="Python" folderName="PUS">
     <module name="tmtc" />
     <option name="INTERPRETER_OPTIONS" value="" />
     <option name="PARENT_ENVS" value="true" />
@@ -13,7 +13,7 @@
     <option name="ADD_SOURCE_ROOTS" value="true" />
     <EXTENSION ID="PythonCoverageRunConfigurationExtension" runner="coverage.py" />
     <option name="SCRIPT_NAME" value="$PROJECT_DIR$/tmtc_client_cli.py" />
-    <option name="PARAMETERS" value="-m 1 -c 2 -s 17 -t 3" />
+    <option name="PARAMETERS" value="-m seqcmd -c udp -s 17 -t 3" />
     <option name="SHOW_COMMAND_LINE" value="false" />
     <option name="EMULATE_TERMINAL" value="true" />
     <option name="MODULE_MODE" value="false" />
diff --git a/.idea/runConfigurations/tmtcc_Service_200_UDP.xml b/.idea/runConfigurations/tmtcc_Service_200_UDP.xml
index 8b7375d..1cce2c9 100644
--- a/.idea/runConfigurations/tmtcc_Service_200_UDP.xml
+++ b/.idea/runConfigurations/tmtcc_Service_200_UDP.xml
@@ -1,5 +1,5 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="tmtcc Service 200 UDP" type="PythonConfigurationType" factoryName="Python" folderName="UDP">
+  <configuration default="false" name="tmtcc Service 200 UDP" type="PythonConfigurationType" factoryName="Python" folderName="PUS">
     <module name="tmtc" />
     <option name="INTERPRETER_OPTIONS" value="" />
     <option name="PARENT_ENVS" value="true" />
@@ -13,7 +13,7 @@
     <option name="ADD_SOURCE_ROOTS" value="true" />
     <EXTENSION ID="PythonCoverageRunConfigurationExtension" runner="coverage.py" />
     <option name="SCRIPT_NAME" value="$PROJECT_DIR$/tmtc_client_cli.py" />
-    <option name="PARAMETERS" value="-m 1 -c 2 -s 200 -t 4" />
+    <option name="PARAMETERS" value="-m seqcmd -c udp -s 200 -t 4" />
     <option name="SHOW_COMMAND_LINE" value="false" />
     <option name="EMULATE_TERMINAL" value="true" />
     <option name="MODULE_MODE" value="false" />
diff --git a/.idea/runConfigurations/tmtcc_Service_2_UDP.xml b/.idea/runConfigurations/tmtcc_Service_2_UDP.xml
index 4010327..f45b13a 100644
--- a/.idea/runConfigurations/tmtcc_Service_2_UDP.xml
+++ b/.idea/runConfigurations/tmtcc_Service_2_UDP.xml
@@ -1,5 +1,5 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="tmtcc Service 2 UDP" type="PythonConfigurationType" factoryName="Python" folderName="UDP">
+  <configuration default="false" name="tmtcc Service 2 UDP" type="PythonConfigurationType" factoryName="Python" folderName="PUS">
     <module name="tmtc" />
     <option name="INTERPRETER_OPTIONS" value="" />
     <option name="PARENT_ENVS" value="true" />
@@ -13,7 +13,7 @@
     <option name="ADD_SOURCE_ROOTS" value="true" />
     <EXTENSION ID="PythonCoverageRunConfigurationExtension" runner="coverage.py" />
     <option name="SCRIPT_NAME" value="$PROJECT_DIR$/tmtc_client_cli.py" />
-    <option name="PARAMETERS" value="-m 1 -c 2 -s 2 -t 4" />
+    <option name="PARAMETERS" value="-m seqcmd -c udp -s 2 -t 4" />
     <option name="SHOW_COMMAND_LINE" value="false" />
     <option name="EMULATE_TERMINAL" value="false" />
     <option name="MODULE_MODE" value="false" />
diff --git a/.idea/runConfigurations/tmtcc_Service_3_UDP.xml b/.idea/runConfigurations/tmtcc_Service_3_UDP.xml
index 0cbae49..7aacc07 100644
--- a/.idea/runConfigurations/tmtcc_Service_3_UDP.xml
+++ b/.idea/runConfigurations/tmtcc_Service_3_UDP.xml
@@ -1,5 +1,5 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="tmtcc Service 3 UDP" type="PythonConfigurationType" factoryName="Python" folderName="UDP">
+  <configuration default="false" name="tmtcc Service 3 UDP" type="PythonConfigurationType" factoryName="Python" folderName="PUS">
     <module name="tmtc" />
     <option name="INTERPRETER_OPTIONS" value="" />
     <option name="PARENT_ENVS" value="true" />
@@ -13,7 +13,7 @@
     <option name="ADD_SOURCE_ROOTS" value="true" />
     <EXTENSION ID="PythonCoverageRunConfigurationExtension" runner="coverage.py" />
     <option name="SCRIPT_NAME" value="$PROJECT_DIR$/tmtc_client_cli.py" />
-    <option name="PARAMETERS" value="-m 1 -c 2 -s 3 -p --hk" />
+    <option name="PARAMETERS" value="-m seqcmd -c udp -s 3 -p --hk" />
     <option name="SHOW_COMMAND_LINE" value="false" />
     <option name="EMULATE_TERMINAL" value="true" />
     <option name="MODULE_MODE" value="false" />
diff --git a/.idea/runConfigurations/tmtcc_Service_8_UDP.xml b/.idea/runConfigurations/tmtcc_Service_8_UDP.xml
index f49a410..ab11182 100644
--- a/.idea/runConfigurations/tmtcc_Service_8_UDP.xml
+++ b/.idea/runConfigurations/tmtcc_Service_8_UDP.xml
@@ -1,5 +1,5 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="tmtcc Service 8 UDP" type="PythonConfigurationType" factoryName="Python" folderName="UDP">
+  <configuration default="false" name="tmtcc Service 8 UDP" type="PythonConfigurationType" factoryName="Python" folderName="PUS">
     <module name="tmtc" />
     <option name="INTERPRETER_OPTIONS" value="" />
     <option name="PARENT_ENVS" value="true" />
@@ -13,7 +13,7 @@
     <option name="ADD_SOURCE_ROOTS" value="true" />
     <EXTENSION ID="PythonCoverageRunConfigurationExtension" runner="coverage.py" />
     <option name="SCRIPT_NAME" value="$PROJECT_DIR$/tmtc_client_cli.py" />
-    <option name="PARAMETERS" value="-m 1 -c 2 -s 8 -t 8" />
+    <option name="PARAMETERS" value="-m seqcmd -c udp -s 8 -t 8" />
     <option name="SHOW_COMMAND_LINE" value="false" />
     <option name="EMULATE_TERMINAL" value="true" />
     <option name="MODULE_MODE" value="false" />
diff --git a/.idea/runConfigurations/tmtcc_Single_Command_UDP.xml b/.idea/runConfigurations/tmtcc_Single_Command_UDP.xml
index 41a6c88..e73b866 100644
--- a/.idea/runConfigurations/tmtcc_Single_Command_UDP.xml
+++ b/.idea/runConfigurations/tmtcc_Single_Command_UDP.xml
@@ -1,5 +1,5 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="tmtcc Single Command UDP" type="PythonConfigurationType" factoryName="Python" folderName="UDP">
+  <configuration default="false" name="tmtcc Single Command UDP" type="PythonConfigurationType" factoryName="Python" folderName="PUS">
     <module name="tmtc" />
     <option name="INTERPRETER_OPTIONS" value="" />
     <option name="PARENT_ENVS" value="true" />
@@ -13,7 +13,7 @@
     <option name="ADD_SOURCE_ROOTS" value="true" />
     <EXTENSION ID="PythonCoverageRunConfigurationExtension" runner="coverage.py" />
     <option name="SCRIPT_NAME" value="$PROJECT_DIR$/tmtc_core/tmtcc_runner.py" />
-    <option name="PARAMETERS" value="-m 0 -c 2 --boardIP=127.0.0.1" />
+    <option name="PARAMETERS" value="-m listener -c udp" />
     <option name="SHOW_COMMAND_LINE" value="false" />
     <option name="EMULATE_TERMINAL" value="false" />
     <option name="MODULE_MODE" value="false" />
diff --git a/.idea/runConfigurations/tmtcclient_ACU_Test_UDP.xml b/.idea/runConfigurations/tmtcclient_ACU_Test_UDP.xml
index b682cd2..ce26d1c 100644
--- a/.idea/runConfigurations/tmtcclient_ACU_Test_UDP.xml
+++ b/.idea/runConfigurations/tmtcclient_ACU_Test_UDP.xml
@@ -1,5 +1,5 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="tmtcclient ACU Test UDP" type="PythonConfigurationType" factoryName="Python" folderName="UDP">
+  <configuration default="false" name="tmtcclient ACU Test UDP" type="PythonConfigurationType" factoryName="Python" folderName="Devices">
     <module name="tmtc" />
     <option name="INTERPRETER_OPTIONS" value="" />
     <option name="PARENT_ENVS" value="true" />
@@ -13,7 +13,7 @@
     <option name="ADD_SOURCE_ROOTS" value="true" />
     <EXTENSION ID="PythonCoverageRunConfigurationExtension" runner="coverage.py" />
     <option name="SCRIPT_NAME" value="$PROJECT_DIR$/tmtc_client_cli.py" />
-    <option name="PARAMETERS" value="-m 1 -c 2 -s acu --boardIP 192.168.133.10 --clientIP 192.168.133.4 -l" />
+    <option name="PARAMETERS" value="-m seqcmd -c udp -s acu --boardIP 192.168.133.10 --clientIP 192.168.133.4 -l" />
     <option name="SHOW_COMMAND_LINE" value="false" />
     <option name="EMULATE_TERMINAL" value="true" />
     <option name="MODULE_MODE" value="false" />
diff --git a/.idea/runConfigurations/tmtcclient_P60_Dock_Test_UDP.xml b/.idea/runConfigurations/tmtcclient_P60_Dock_Test_UDP.xml
index 5c504b1..0755537 100644
--- a/.idea/runConfigurations/tmtcclient_P60_Dock_Test_UDP.xml
+++ b/.idea/runConfigurations/tmtcclient_P60_Dock_Test_UDP.xml
@@ -1,5 +1,5 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="tmtcclient P60 Dock Test UDP" type="PythonConfigurationType" factoryName="Python" folderName="UDP">
+  <configuration default="false" name="tmtcclient P60 Dock Test UDP" type="PythonConfigurationType" factoryName="Python" folderName="Devices">
     <module name="tmtc" />
     <option name="INTERPRETER_OPTIONS" value="" />
     <option name="PARENT_ENVS" value="true" />
@@ -13,7 +13,7 @@
     <option name="ADD_SOURCE_ROOTS" value="true" />
     <EXTENSION ID="PythonCoverageRunConfigurationExtension" runner="coverage.py" />
     <option name="SCRIPT_NAME" value="$PROJECT_DIR$/tmtc_client_cli.py" />
-    <option name="PARAMETERS" value="-m 1 -c 2 -s p60dock --boardIP 192.168.133.10 --clientIP 192.168.133.4 -l" />
+    <option name="PARAMETERS" value="-m seqcmd -c udp -s p60dock --boardIP 192.168.133.10 --clientIP 192.168.133.4 -l" />
     <option name="SHOW_COMMAND_LINE" value="false" />
     <option name="EMULATE_TERMINAL" value="true" />
     <option name="MODULE_MODE" value="false" />
diff --git a/.idea/runConfigurations/tmtcclient_PDU1_Test_UDP.xml b/.idea/runConfigurations/tmtcclient_PDU1_Test_UDP.xml
index a95898b..c268a80 100644
--- a/.idea/runConfigurations/tmtcclient_PDU1_Test_UDP.xml
+++ b/.idea/runConfigurations/tmtcclient_PDU1_Test_UDP.xml
@@ -1,5 +1,5 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="tmtcclient PDU1 Test UDP" type="PythonConfigurationType" factoryName="Python" folderName="UDP">
+  <configuration default="false" name="tmtcclient PDU1 Test UDP" type="PythonConfigurationType" factoryName="Python" folderName="Devices">
     <module name="tmtc" />
     <option name="INTERPRETER_OPTIONS" value="" />
     <option name="PARENT_ENVS" value="true" />
@@ -13,7 +13,7 @@
     <option name="ADD_SOURCE_ROOTS" value="true" />
     <EXTENSION ID="PythonCoverageRunConfigurationExtension" runner="coverage.py" />
     <option name="SCRIPT_NAME" value="$PROJECT_DIR$/tmtc_client_cli.py" />
-    <option name="PARAMETERS" value="-m 1 -c 2 -s pdu1 --boardIP 192.168.133.10 --clientIP 192.168.133.4 -l" />
+    <option name="PARAMETERS" value="-m seqcmd -c udp -s pdu1 --boardIP 192.168.133.10 --clientIP 192.168.133.4 -l" />
     <option name="SHOW_COMMAND_LINE" value="false" />
     <option name="EMULATE_TERMINAL" value="true" />
     <option name="MODULE_MODE" value="false" />
diff --git a/.idea/runConfigurations/tmtcclient_PDU2_Test_UDP.xml b/.idea/runConfigurations/tmtcclient_PDU2_Test_UDP.xml
index cbbc2b0..cb32038 100644
--- a/.idea/runConfigurations/tmtcclient_PDU2_Test_UDP.xml
+++ b/.idea/runConfigurations/tmtcclient_PDU2_Test_UDP.xml
@@ -1,5 +1,5 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="tmtcclient PDU2 Test UDP" type="PythonConfigurationType" factoryName="Python" folderName="UDP">
+  <configuration default="false" name="tmtcclient PDU2 Test UDP" type="PythonConfigurationType" factoryName="Python" folderName="Devices">
     <module name="tmtc" />
     <option name="INTERPRETER_OPTIONS" value="" />
     <option name="PARENT_ENVS" value="true" />
@@ -13,7 +13,7 @@
     <option name="ADD_SOURCE_ROOTS" value="true" />
     <EXTENSION ID="PythonCoverageRunConfigurationExtension" runner="coverage.py" />
     <option name="SCRIPT_NAME" value="$PROJECT_DIR$/tmtc_client_cli.py" />
-    <option name="PARAMETERS" value="-m 1 -c 2 -s pdu2 --boardIP 192.168.133.10 --clientIP 192.168.133.4 -l -t 4" />
+    <option name="PARAMETERS" value="-m seqcmd -c udp -s pdu2 --boardIP 192.168.133.10 --clientIP 192.168.133.4 -l -t 4" />
     <option name="SHOW_COMMAND_LINE" value="false" />
     <option name="EMULATE_TERMINAL" value="true" />
     <option name="MODULE_MODE" value="false" />
diff --git a/config/custom_hooks.py b/config/custom_hooks.py
index 11ee0bd..35405b4 100644
--- a/config/custom_hooks.py
+++ b/config/custom_hooks.py
@@ -3,7 +3,7 @@
 @details    Template configuration file. Copy this folder to the TMTC commander root and adapt
             it to your needs.
 """
-from tmtccmd.pus_tc.base import PusTelecommand
+from tmtccmd.ecss.tc import PusTelecommand
 
 
 def command_preparation_hook() -> PusTelecommand:
diff --git a/config/globals_config.py b/config/globals_config.py
index 3bb5df7..586aca7 100644
--- a/config/globals_config.py
+++ b/config/globals_config.py
@@ -36,8 +36,9 @@ def set_globals_pre_args_parsing(gui: bool = False):
 
 def add_globals_post_args_parsing(args: argparse.Namespace):
     set_default_globals_post_args_parsing(
-        args=args, custom_service_list=CustomServiceList, custom_mode_list=CustomModeList,
-        custom_com_if_list=None
+        args=args, custom_services_list=[CustomServiceList],
+        custom_modes_list=[CustomModeList],
+        custom_com_ifs_lists=None
     )
 
 
diff --git a/config/hook_implementations.py b/config/hook_implementations.py
index 6734dab..1005812 100644
--- a/config/hook_implementations.py
+++ b/config/hook_implementations.py
@@ -2,8 +2,9 @@ import argparse
 from typing import Union, Dict, Tuple
 
 from tmtccmd.pus_tm.service_3_base import Service3Base
-from tmtccmd.pus_tm.base import PusTelemetry
-from tmtccmd.pus_tc.base import TcQueueT, PusTelecommand
+from tmtccmd.ecss.tm import PusTelemetry
+from tmtccmd.ecss.tc import PusTelecommand
+from tmtccmd.pus_tc.definitions import TcQueueT
 from tmtccmd.com_if.com_interface_base import CommunicationInterface
 from tmtccmd.core.backend import TmTcHandler
 from tmtccmd.core.hook_base import TmTcHookBase
diff --git a/pus_tc/acu.py b/pus_tc/acu.py
index 557cfe9..8af2a0e 100644
--- a/pus_tc/acu.py
+++ b/pus_tc/acu.py
@@ -7,7 +7,7 @@
 """
 
 from tmtccmd.pus_tc.packer import TcQueueT
-from tmtccmd.pus_tc.base import PusTelecommand
+from tmtccmd.ecss.tc import PusTelecommand
 from tmtccmd.core.definitions import QueueCommands
 from gomspace.gomspace_common import *
 from pus_tc.p60dock import P60DockConfigTable
diff --git a/pus_tc/heater.py b/pus_tc/heater.py
index c94fc94..1fff68c 100644
--- a/pus_tc/heater.py
+++ b/pus_tc/heater.py
@@ -7,7 +7,7 @@
 """
 from tmtccmd.core.definitions import QueueCommands
 from tmtccmd.pus_tc.packer import TcQueueT
-from tmtccmd.pus_tc.base import PusTelecommand
+from tmtccmd.ecss.tc import PusTelecommand
 
 
 class SwitchNumbers:
diff --git a/pus_tc/p60dock.py b/pus_tc/p60dock.py
index afc5a13..1fce2dd 100644
--- a/pus_tc/p60dock.py
+++ b/pus_tc/p60dock.py
@@ -7,7 +7,7 @@
 """
 from tmtccmd.core.definitions import QueueCommands
 from tmtccmd.pus_tc.packer import TcQueueT
-from tmtccmd.pus_tc.base import PusTelecommand
+from tmtccmd.ecss.tc import PusTelecommand
 from gomspace.gomspace_common import *
 
 
diff --git a/pus_tc/pdu1.py b/pus_tc/pdu1.py
index 98c29f4..e95b80e 100644
--- a/pus_tc/pdu1.py
+++ b/pus_tc/pdu1.py
@@ -8,7 +8,7 @@
 from tmtccmd.core.definitions import QueueCommands
 
 from tmtccmd.pus_tc.packer import TcQueueT
-from tmtccmd.pus_tc.base import PusTelecommand
+from tmtccmd.ecss.tc import PusTelecommand
 from gomspace.gomspace_common import *
 from pus_tc.p60dock import P60DockConfigTable
 from gomspace.gomspace_pdu_definitions import *
diff --git a/pus_tc/pdu2.py b/pus_tc/pdu2.py
index f4a80ea..48ee1c1 100644
--- a/pus_tc/pdu2.py
+++ b/pus_tc/pdu2.py
@@ -7,7 +7,7 @@
 """
 from tmtccmd.core.definitions import QueueCommands
 from tmtccmd.pus_tc.packer import TcQueueT
-from tmtccmd.pus_tc.base import PusTelecommand
+from tmtccmd.ecss.tc import PusTelecommand
 from gomspace.gomspace_common import *
 from gomspace.gomspace_pdu_definitions import *
 from pus_tc.p60dock import P60DockConfigTable
diff --git a/pus_tc/service_200_mode.py b/pus_tc/service_200_mode.py
index 95c8109..e4ec905 100644
--- a/pus_tc/service_200_mode.py
+++ b/pus_tc/service_200_mode.py
@@ -6,7 +6,7 @@
 @date   02.05.2020
 """
 from tmtccmd.core.definitions import QueueCommands
-from tmtccmd.pus_tc.base import PusTelecommand
+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 config.object_ids import TEST_DEVICE_ID
diff --git a/pus_tc/tc_packer_hook.py b/pus_tc/tc_packer_hook.py
index 576ecf4..ed88b19 100644
--- a/pus_tc/tc_packer_hook.py
+++ b/pus_tc/tc_packer_hook.py
@@ -10,7 +10,7 @@ from typing import Union
 
 from tmtccmd.core.definitions import CoreServiceList
 from tmtccmd.utility.tmtcc_logger import get_logger
-from tmtccmd.pus_tc.base import TcQueueT
+from tmtccmd.pus_tc.definitions import TcQueueT
 from tmtccmd.pus_tc.service_5_event import pack_generic_service5_test_into
 from tmtccmd.pus_tc.service_17_test import pack_service17_ping_command
 from tmtccmd.core.object_id_manager import get_object_id
diff --git a/pus_tc/tmp1075.py b/pus_tc/tmp1075.py
index 9dba368..7b667cb 100644
--- a/pus_tc/tmp1075.py
+++ b/pus_tc/tmp1075.py
@@ -8,7 +8,7 @@
 from tmtccmd.core.definitions import QueueCommands
 
 from tmtccmd.pus_tc.packer import TcQueueT
-from tmtccmd.pus_tc.base import PusTelecommand
+from tmtccmd.ecss.tc import PusTelecommand
 from pus_tc.service_200_mode import pack_mode_data
 
 
diff --git a/pus_tm/factory_hook.py b/pus_tm/factory_hook.py
index 008e449..74e1631 100644
--- a/pus_tm/factory_hook.py
+++ b/pus_tm/factory_hook.py
@@ -4,7 +4,7 @@
             it to your needs.
 """
 from tmtccmd.pus_tm.service_8_functional_cmd import Service8TM
-from tmtccmd.pus_tm.base import PusTelemetry
+from tmtccmd.ecss.tm import PusTelemetry
 from tmtccmd.utility.tmtcc_logger import get_logger
 
 from tmtccmd.pus_tm.service_1_verification import Service1TM
diff --git a/tmtccmd b/tmtccmd
index d21a401..563603d 160000
--- a/tmtccmd
+++ b/tmtccmd
@@ -1 +1 @@
-Subproject commit d21a401faa9f97fb49ce5f4718fe6e0052d0332e
+Subproject commit 563603d0a1b03115e473768ccd203a21ebaac50c