From 27c1da4f7708b8ef38e0126e6e7555cd46f534d0 Mon Sep 17 00:00:00 2001
From: Robin Mueller <robin.mueller.m@gmail.com>
Date: Fri, 19 Mar 2021 17:39:52 +0100
Subject: [PATCH] moved EIVE to new tmtc commander

---
 .../tmtcc_Listener_Mode_UDP.xml               |   2 +-
 .../tmtcc_Service_17_UDP.xml                  |   2 +-
 .../tmtcc_Service_200_UDP.xml                 |   2 +-
 .../runConfigurations/tmtcc_Service_2_UDP.xml |   2 +-
 .../runConfigurations/tmtcc_Service_3_UDP.xml |   2 +-
 .../runConfigurations/tmtcc_Service_8_UDP.xml |   2 +-
 .../tmtcc_Single_Command_UDP.xml              |   2 +-
 .../tmtcclient_ACU_Test_UDP.xml               |   2 +-
 .../tmtcclient_P60_Dock_Test_UDP.xml          |   2 +-
 .../tmtcclient_PDU1_Test_UDP.xml              |   2 +-
 .../tmtcclient_PDU2_Test_UDP.xml              |   2 +-
 config/{tmtcc_hooks.py => custom_hooks.py}    |   2 +-
 config/custom_mode_op.py                      |  19 ++
 config/definitions.py                         |  18 ++
 config/globals_config.py                      |  64 +++++
 config/hook_implementations.py                |  75 ++++++
 config/object_ids.py                          |  53 ++++
 config/tmtcc_com_config.py                    |  18 --
 config/tmtcc_definitions.py                   |  49 ----
 config/tmtcc_globals.py                       | 232 ------------------
 config/tmtcc_object_ids.py                    |  43 ----
 config/tmtcc_user_mode_op.py                  |  20 --
 config/tmtcc_version.py                       |   8 -
 config/version.py                             |   4 +
 pus_tc/{tmtcc_tc_acu.py => acu.py}            |  12 +-
 pus_tc/{tmtcc_tc_heater.py => heater.py}      |   8 +-
 pus_tc/{tmtcc_tc_p60dock.py => p60dock.py}    |   6 +-
 pus_tc/{tmtcc_tc_pdu1.py => pdu1.py}          |   6 +-
 pus_tc/{tmtcc_tc_pdu2.py => pdu2.py}          |   8 +-
 ...service200_mode.py => service_200_mode.py} |  21 +-
 ...cc_tc_packer_hook.py => tc_packer_hook.py} |  49 ++--
 pus_tc/{tmtcc_tc_tmp1075.py => tmp1075.py}    |   6 +-
 ...pus_tm_factory_hook.py => factory_hook.py} |  14 +-
 ...mtcc_pus_hk_handling.py => hk_handling.py} |   7 +-
 ...us_service_8_hook.py => service_8_hook.py} |   6 +-
 tmtc_client_cli.py                            |   2 +-
 tmtc_client_gui.py                            |   2 +-
 tmtccmd                                       |   2 +-
 ...tcc_user_args_parser.py => args_parser.py} |   7 +-
 39 files changed, 317 insertions(+), 466 deletions(-)
 rename config/{tmtcc_hooks.py => custom_hooks.py} (87%)
 create mode 100644 config/custom_mode_op.py
 create mode 100644 config/definitions.py
 create mode 100644 config/globals_config.py
 create mode 100644 config/hook_implementations.py
 create mode 100644 config/object_ids.py
 delete mode 100644 config/tmtcc_com_config.py
 delete mode 100644 config/tmtcc_definitions.py
 delete mode 100644 config/tmtcc_globals.py
 delete mode 100644 config/tmtcc_object_ids.py
 delete mode 100644 config/tmtcc_user_mode_op.py
 delete mode 100644 config/tmtcc_version.py
 create mode 100644 config/version.py
 rename pus_tc/{tmtcc_tc_acu.py => acu.py} (94%)
 rename pus_tc/{tmtcc_tc_heater.py => heater.py} (89%)
 rename pus_tc/{tmtcc_tc_p60dock.py => p60dock.py} (97%)
 rename pus_tc/{tmtcc_tc_pdu1.py => pdu1.py} (91%)
 rename pus_tc/{tmtcc_tc_pdu2.py => pdu2.py} (96%)
 rename pus_tc/{tmtcc_tc_service200_mode.py => service_200_mode.py} (73%)
 rename pus_tc/{tmtcc_tc_packer_hook.py => tc_packer_hook.py} (59%)
 rename pus_tc/{tmtcc_tc_tmp1075.py => tmp1075.py} (92%)
 rename pus_tm/{tmtcc_pus_tm_factory_hook.py => factory_hook.py} (64%)
 rename pus_tm/{tmtcc_pus_hk_handling.py => hk_handling.py} (84%)
 rename pus_tm/{tmtcc_pus_service_8_hook.py => service_8_hook.py} (85%)
 rename utility/{tmtcc_user_args_parser.py => args_parser.py} (55%)

diff --git a/.idea/runConfigurations/tmtcc_Listener_Mode_UDP.xml b/.idea/runConfigurations/tmtcc_Listener_Mode_UDP.xml
index 1662a86..7e1b3ab 100644
--- a/.idea/runConfigurations/tmtcc_Listener_Mode_UDP.xml
+++ b/.idea/runConfigurations/tmtcc_Listener_Mode_UDP.xml
@@ -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 --hk" />
+    <option name="PARAMETERS" value="-m 2 -c 2 --hk" />
     <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_17_UDP.xml b/.idea/runConfigurations/tmtcc_Service_17_UDP.xml
index e8250e7..43b0d1a 100644
--- a/.idea/runConfigurations/tmtcc_Service_17_UDP.xml
+++ b/.idea/runConfigurations/tmtcc_Service_17_UDP.xml
@@ -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 3 -c 2 -s 17 -t 3" />
+    <option name="PARAMETERS" value="-m 1 -c 2 -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 d904828..8b7375d 100644
--- a/.idea/runConfigurations/tmtcc_Service_200_UDP.xml
+++ b/.idea/runConfigurations/tmtcc_Service_200_UDP.xml
@@ -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 3 -c 2 -s 200 -t 4" />
+    <option name="PARAMETERS" value="-m 1 -c 2 -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 5d5c4d8..4010327 100644
--- a/.idea/runConfigurations/tmtcc_Service_2_UDP.xml
+++ b/.idea/runConfigurations/tmtcc_Service_2_UDP.xml
@@ -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 3 -c 2 -s 2 -t 4" />
+    <option name="PARAMETERS" value="-m 1 -c 2 -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 27e94a2..0cbae49 100644
--- a/.idea/runConfigurations/tmtcc_Service_3_UDP.xml
+++ b/.idea/runConfigurations/tmtcc_Service_3_UDP.xml
@@ -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 3 -c 2 -s 3 -p --hk" />
+    <option name="PARAMETERS" value="-m 1 -c 2 -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 72e39dd..f49a410 100644
--- a/.idea/runConfigurations/tmtcc_Service_8_UDP.xml
+++ b/.idea/runConfigurations/tmtcc_Service_8_UDP.xml
@@ -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 3 -c 2 -s 8 -t 8" />
+    <option name="PARAMETERS" value="-m 1 -c 2 -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 7ad4723..41a6c88 100644
--- a/.idea/runConfigurations/tmtcc_Single_Command_UDP.xml
+++ b/.idea/runConfigurations/tmtcc_Single_Command_UDP.xml
@@ -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 2 -c 2 --boardIP=127.0.0.1" />
+    <option name="PARAMETERS" value="-m 0 -c 2 --boardIP=127.0.0.1" />
     <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 f936f0f..b682cd2 100644
--- a/.idea/runConfigurations/tmtcclient_ACU_Test_UDP.xml
+++ b/.idea/runConfigurations/tmtcclient_ACU_Test_UDP.xml
@@ -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 3 -c 2 -s ACU --boardIP 192.168.133.10 --clientIP 192.168.133.4 -l" />
+    <option name="PARAMETERS" value="-m 1 -c 2 -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 38bc875..5c504b1 100644
--- a/.idea/runConfigurations/tmtcclient_P60_Dock_Test_UDP.xml
+++ b/.idea/runConfigurations/tmtcclient_P60_Dock_Test_UDP.xml
@@ -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 3 -c 2 -s P60DOCK --boardIP 192.168.133.10 --clientIP 192.168.133.4 -l" />
+    <option name="PARAMETERS" value="-m 1 -c 2 -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 eb1e7fc..a95898b 100644
--- a/.idea/runConfigurations/tmtcclient_PDU1_Test_UDP.xml
+++ b/.idea/runConfigurations/tmtcclient_PDU1_Test_UDP.xml
@@ -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 3 -c 2 -s PDU1 --boardIP 192.168.133.10 --clientIP 192.168.133.4 -l" />
+    <option name="PARAMETERS" value="-m 1 -c 2 -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 0c202a0..cbbc2b0 100644
--- a/.idea/runConfigurations/tmtcclient_PDU2_Test_UDP.xml
+++ b/.idea/runConfigurations/tmtcclient_PDU2_Test_UDP.xml
@@ -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 3 -c 2 -s PDU2 --boardIP 192.168.133.10 --clientIP 192.168.133.4 -l -t 4" />
+    <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="SHOW_COMMAND_LINE" value="false" />
     <option name="EMULATE_TERMINAL" value="true" />
     <option name="MODULE_MODE" value="false" />
diff --git a/config/tmtcc_hooks.py b/config/custom_hooks.py
similarity index 87%
rename from config/tmtcc_hooks.py
rename to config/custom_hooks.py
index 5e8a564..11ee0bd 100644
--- a/config/tmtcc_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 tmtc_core.pus_tc.tmtcc_pus_tc_base import PusTelecommand
+from tmtccmd.pus_tc.base import PusTelecommand
 
 
 def command_preparation_hook() -> PusTelecommand:
diff --git a/config/custom_mode_op.py b/config/custom_mode_op.py
new file mode 100644
index 0000000..51c15d7
--- /dev/null
+++ b/config/custom_mode_op.py
@@ -0,0 +1,19 @@
+"""
+@brief      This file transfers control of custom mode handling to the user.
+@details    Template configuration file. Copy this folder to the TMTC commander root and adapt
+            it to your needs.
+"""
+import enum
+
+from tmtccmd.core.backend import TmTcHandler
+from tmtccmd.utility.tmtcc_logger import get_logger
+
+LOGGER = get_logger()
+
+
+class CustomModeList(enum.IntEnum):
+    pass
+
+
+def custom_mode_operation(tmtc_backend: TmTcHandler, mode: int):
+    pass
\ No newline at end of file
diff --git a/config/definitions.py b/config/definitions.py
new file mode 100644
index 0000000..ecedaf3
--- /dev/null
+++ b/config/definitions.py
@@ -0,0 +1,18 @@
+"""
+@brief      This file transfers control of the custom definitions like modes to the user.
+@details    Template configuration file. Copy this folder to the TMTC commander root and adapt
+            it to your needs.
+"""
+
+import enum
+
+
+class CustomServiceList(enum.IntEnum):
+    P60DOCK = "p60dock"
+    PDU1 = "pdu1"
+    PDU2 = "pdu2"
+    ACU = "acu"
+    TMP1075_1 = "tmp1075_1"
+    TMP1075_2 = "tmp1075_2"
+    HEATER = "heater"
+
diff --git a/config/globals_config.py b/config/globals_config.py
new file mode 100644
index 0000000..a1da801
--- /dev/null
+++ b/config/globals_config.py
@@ -0,0 +1,64 @@
+"""
+@brief      This file transfers definitions of global variables to the user.
+@details    Template configuration file. Copy this folder to the TMTC commander root and adapt
+            it to your needs.
+"""
+
+import enum
+import argparse
+
+
+# All globals can be added here and will be part of a globals dictionary.
+from config.definitions import CustomServiceList
+from config.custom_mode_op import CustomModeList
+from tmtccmd.core.definitions import CoreComInterfaces
+from tmtccmd.defaults.globals_setup import set_default_globals_pre_args_parsing, \
+    set_default_globals_post_args_parsing
+from tmtccmd.core.globals_manager import update_global
+from tmtccmd.core.definitions import CoreGlobalIds
+from tmtccmd.utility.tmtcc_logger import get_logger
+
+LOGGER = get_logger()
+
+
+class CustomGlobalIds(enum.Enum):
+    from enum import auto
+    pass
+
+
+def add_globals_pre_args_parsing(gui: bool = False):
+
+    set_default_globals_pre_args_parsing(apid=0x65, com_if_id=CoreComInterfaces.EthernetUDP)
+
+    servicelist = dict()
+    servicelist[CustomServiceList.SERVICE_2] = ["Service 2 Raw Commanding"]
+    servicelist[CustomServiceList.SERVICE_3] = ["Service 3 Housekeeping"]
+    servicelist[CustomServiceList.SERVICE_5] = ["Service 5 Event"]
+    servicelist[CustomServiceList.SERVICE_8] = ["Service 8 Functional Commanding"]
+    servicelist[CustomServiceList.SERVICE_9] = ["Service 9 Time"]
+    servicelist[CustomServiceList.SERVICE_17] = ["Service 17 Test"]
+    servicelist[CustomServiceList.SERVICE_20] = ["Service 20 Parameters"]
+    servicelist[CustomServiceList.SERVICE_23] = ["Service 23 File Management"]
+    servicelist[CustomServiceList.SERVICE_200] = ["Service 200 Mode Management"]
+    update_global(CoreGlobalIds.SERVICE, CustomServiceList.SERVICE_17)
+    update_global(CoreGlobalIds.SERVICELIST, servicelist)
+
+
+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
+    )
+
+
+def set_up_serial_cfg(com_if: CoreComInterfaces):
+    from tmtccmd.defaults.com_setup import default_serial_cfg_setup
+    default_serial_cfg_setup(com_if=com_if)
+
+
+def set_up_ethernet_cfg():
+    from tmtccmd.defaults.com_setup import default_tcpip_udp_cfg_setup
+    default_tcpip_udp_cfg_setup()
+
+
+
diff --git a/config/hook_implementations.py b/config/hook_implementations.py
new file mode 100644
index 0000000..b7d58e1
--- /dev/null
+++ b/config/hook_implementations.py
@@ -0,0 +1,75 @@
+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.core.hook_base import TmTcHookBase
+from tmtccmd.utility.tmtc_printer import TmTcPrinter
+
+
+class SourceHookBase(TmTcHookBase):
+
+    def get_version(self) -> str:
+        from config.version import SW_NAME, VERSION_MAJOR, VERSION_MINOR, VERSION_SUBMINOR
+        return f"{SW_NAME} {VERSION_MAJOR}.{VERSION_MINOR}.{VERSION_SUBMINOR}"
+
+    def add_globals_pre_args_parsing(self, gui: bool = False):
+        from config.globals_config import add_globals_pre_args_parsing
+        add_globals_pre_args_parsing(gui)
+
+    def add_globals_post_args_parsing(self, args: argparse.Namespace):
+        from config.globals_config import add_globals_post_args_parsing
+        add_globals_post_args_parsing(args)
+
+    def assign_communication_interface(self, com_if: int, tmtc_printer: TmTcPrinter) -> \
+            Union[CommunicationInterface, None]:
+        from tmtccmd.defaults.com_setup import create_communication_interface_default
+        return create_communication_interface_default(com_if=com_if, tmtc_printer=tmtc_printer)
+
+    def perform_mode_operation(self, tmtc_backend: TmTcHandler, mode: int):
+        from config.custom_mode_op import custom_mode_operation
+        custom_mode_operation(mode=mode, tmtc_backend=tmtc_backend)
+
+    def pack_service_queue(self, service: int, op_code: str, service_queue: TcQueueT):
+        from pus_tc.tc_packer_hook import pack_service_queue_user
+        pack_service_queue_user(service=service, op_code=op_code, service_queue=service_queue)
+
+    def tm_user_factory_hook(self, raw_tm_packet: bytearray) -> PusTelemetry:
+        from pus_tm.factory_hook import tm_user_factory_hook
+        return tm_user_factory_hook(raw_tm_packet=raw_tm_packet)
+
+    def set_object_ids(self) -> Dict[int, bytearray]:
+        from config.object_ids import set_object_ids
+        return set_object_ids()
+
+    def pack_total_service_queue(self) -> Union[None, TcQueueT]:
+        from pus_tc.tc_packer_hook import create_total_tc_queue_user
+        return create_total_tc_queue_user()
+
+    def command_preparation_hook(self) -> Union[None, PusTelecommand]:
+        from custom_hooks import command_preparation_hook
+        return command_preparation_hook()
+
+    @staticmethod
+    def handle_service_8_telemetry(
+            object_id: int, action_id: int, custom_data: bytearray
+    ) -> Tuple[list, list]:
+        from pus_tm.service_8_hook import user_analyze_service_8_data
+        return user_analyze_service_8_data(
+            object_id=object_id, action_id=action_id, custom_data=custom_data
+        )
+
+    @staticmethod
+    def handle_service_3_housekeeping(
+        object_id: int, set_id: int, hk_data: bytearray, service3_packet: Service3Base
+    ) -> Tuple[list, list, bytearray, int]:
+        from pus_tm.hk_handling import handle_user_hk_packet
+        return handle_user_hk_packet(
+            object_id=object_id, set_id=set_id, hk_data=hk_data, service3_packet=service3_packet
+        )
\ No newline at end of file
diff --git a/config/object_ids.py b/config/object_ids.py
new file mode 100644
index 0000000..9c54650
--- /dev/null
+++ b/config/object_ids.py
@@ -0,0 +1,53 @@
+"""
+@brief      This file transfers control of the object IDs to the user.
+@details    Template configuration file. Copy this folder to the TMTC commander root and adapt
+            it to your needs.
+"""
+
+import enum
+from typing import Dict
+
+PUS_SERVICE_17 = bytearray([0x53, 0x00, 0x00, 0x17])
+TEST_DEVICE = bytearray([0x44, 0x00, 0xAF, 0xFE])
+P60_DOCK_HANDLER = bytearray([0x44, 0x00, 0x00, 0x1])
+PDU_1_HANDLER = bytearray([0x44, 0x00, 0x00, 0x2])
+PDU_2_HANDLER = bytearray([0x44, 0x00, 0x00, 0x3])
+ACU_HANDLER = bytearray([0x44, 0x00, 0x00, 0x4])
+TMP_1075_1_HANDLER = bytearray([0x44, 0x00, 0x00, 0x5])
+TMP_1075_2_HANDLER = bytearray([0x44, 0x00, 0x00, 0x6])
+HEATER = bytearray([0x54, 0x00, 0x00, 0x1])
+PCDU_HANDLER = bytearray([0x44, 0x00, 0x10, 0x00])
+SOLAR_ARRAY_DEPLOYMENT = bytearray([0x44, 0x00, 0x10, 0x01])
+
+
+class ObjectIds(enum.IntEnum):
+    from enum import auto
+    PUS_SERVICE_17 = 0
+    TEST_DEVICE = 1
+    P60DOCK_HANDLER_ID = 2
+    PDU1_HANDLER_ID = 3
+    PDU2_HANDLER_ID = 4
+    PCDU_HANDLER = 5
+    ACU_HANDLER_ID = 6
+    TMP1075_1_HANDLER_ID = 7
+    TMP1075_2_HANDLER_ID = 8
+    HEATER = 9
+    SOLAR_ARRAY_DEPLOYMENT = 10
+
+
+def set_object_ids() -> Dict[int, bytearray]:
+    o_ids = ObjectIds
+    object_id_dict = ({
+         o_ids.PUS_SERVICE_17: PUS_SERVICE_17,
+         o_ids.TEST_DEVICE: TEST_DEVICE,
+         o_ids.P60DOCK_HANDLER_ID: P60_DOCK_HANDLER,
+         o_ids.PDU1_HANDLER_ID: PDU_1_HANDLER,
+         o_ids.PDU2_HANDLER_ID: PDU_2_HANDLER,
+         o_ids.ACU_HANDLER_ID: ACU_HANDLER,
+         o_ids.TMP1075_1_HANDLER_ID: TMP_1075_1_HANDLER,
+         o_ids.TMP1075_2_HANDLER_ID: TMP_1075_2_HANDLER,
+         o_ids.HEATER: HEATER,
+         o_ids.PCDU_HANDLER: PCDU_HANDLER,
+         o_ids.SOLAR_ARRAY_DEPLOYMENT: SOLAR_ARRAY_DEPLOYMENT,
+    })
+    return object_id_dict
diff --git a/config/tmtcc_com_config.py b/config/tmtcc_com_config.py
deleted file mode 100644
index 015f139..0000000
--- a/config/tmtcc_com_config.py
+++ /dev/null
@@ -1,18 +0,0 @@
-"""
-@brief      This file transfers control of communication interface setup to the user.
-@details    Template configuration file. Copy this folder to the TMTC commander root and adapt
-            it to your needs.
-"""
-from typing import Union
-
-from tmtc_core.com_if.tmtcc_com_interface_base import CommunicationInterface
-from tmtc_core.core.tmtc_core_definitions import ComInterfaces
-from tmtc_core.core.tmtcc_com_if_setup import create_communication_interface_default
-from tmtc_core.utility.tmtcc_tmtc_printer import TmTcPrinter
-
-
-def create_communication_interface_user(com_if: ComInterfaces, tmtc_printer: TmTcPrinter) -> \
-        Union[CommunicationInterface, None]:
-    return create_communication_interface_default(com_if, tmtc_printer)
-
-
diff --git a/config/tmtcc_definitions.py b/config/tmtcc_definitions.py
deleted file mode 100644
index 62a3b77..0000000
--- a/config/tmtcc_definitions.py
+++ /dev/null
@@ -1,49 +0,0 @@
-"""
-@brief      This file transfers control of the custom definitions like modes to the user.
-@details    Template configuration file. Copy this folder to the TMTC commander root and adapt
-            it to your needs.
-"""
-
-import enum
-from enum import auto
-
-
-# Mode options, set by args parser
-class ModeList(enum.Enum):
-    Idle = 0
-    ListenerMode = 1
-    SingleCommandMode = 2
-    ServiceTestMode = 3
-    SoftwareTestMode = 4
-    PromptMode = 32
-
-
-class ServiceList(enum.Enum):
-    SERVICE_2 = 0
-    SERVICE_3 = auto()
-    SERVICE_5 = auto()
-    SERVICE_8 = auto()
-    SERVICE_9 = auto()
-    SERVICE_17 = auto()
-    SERVICE_20 = auto()
-    SERVICE_23 = auto()
-    SERVICE_200 = auto()
-    P60DOCK = auto()
-    PDU1 = auto()
-    PDU2 = auto()
-    ACU = auto()
-    TMP1075_1 = auto()
-    TMP1075_2 = auto()
-    HEATER = auto()
-
-
-class SerialConfig(enum.Enum):
-    SERIAL_PORT = auto()
-    SERIAL_BAUD_RATE = auto()
-    SERIAL_TIMEOUT = auto()
-    SERIAL_COMM_TYPE = auto()
-
-
-class EthernetConfig(enum.Enum):
-    SEND_ADDRESS = auto()
-    RECV_ADDRESS = auto()
diff --git a/config/tmtcc_globals.py b/config/tmtcc_globals.py
deleted file mode 100644
index 28119d7..0000000
--- a/config/tmtcc_globals.py
+++ /dev/null
@@ -1,232 +0,0 @@
-"""
-@brief      This file transfers definitions of global variables to the user.
-@details    Template configuration file. Copy this folder to the TMTC commander root and adapt
-            it to your needs.
-"""
-
-import enum
-import argparse
-
-
-# All globals can be added here and will be part of a globals dictionary.
-from config.tmtcc_definitions import ServiceList, ModeList
-
-from tmtc_core.com_if.tmtcc_serial_com_if import SerialCommunicationType
-from tmtc_core.com_if.tmtcc_serial_utilities import determine_com_port
-from tmtc_core.core.tmtc_core_definitions import ComInterfaces
-from tmtc_core.utility.tmtcc_logger import get_logger
-
-
-class GlobalIds(enum.Enum):
-    from enum import auto
-    # Generic parameters
-    APID = auto()
-    MODE = auto()
-    SERVICE = auto()
-    SERVICELIST = auto()
-    COM_IF = auto()
-    OP_CODE = auto()
-    TM_TIMEOUT = auto()
-
-    # Miscellaneous
-    DISPLAY_MODE = auto()
-    USE_LISTENER_AFTER_OP = auto()
-    PRINT_HK = auto()
-    PRINT_TM = auto()
-    PRINT_RAW_TM = auto()
-    PRINT_TO_FILE = auto()
-    RESEND_TC = auto()
-    TC_SEND_TIMEOUT_FACTOR = auto()
-
-    # Config dictionaries
-    USE_SERIAL = auto()
-    SERIAL_CONFIG = auto()
-    USE_ETHERNET = auto()
-    ETHERNET_CONFIG = auto()
-
-    # Object handles
-    PRETTY_PRINTER = auto()
-    TM_LISTENER_HANDLE = auto()
-    COM_INTERFACE_HANDLE = auto()
-    TMTC_PRINTER_HANDLE = auto()
-
-
-def add_globals_pre_args_parsing(gui: bool = False):
-    from tmtc_core.core.tmtcc_globals_manager import update_global
-    import pprint
-
-    update_global(GlobalIds.APID, 0x65)
-    update_global(GlobalIds.COM_IF, ComInterfaces.EthernetUDP)
-    update_global(GlobalIds.TC_SEND_TIMEOUT_FACTOR, 2)
-    update_global(GlobalIds.TM_TIMEOUT, 4)
-    update_global(GlobalIds.DISPLAY_MODE, "long")
-    update_global(GlobalIds.PRINT_TO_FILE, True)
-
-    update_global(GlobalIds.SERIAL_CONFIG, dict())
-    update_global(GlobalIds.ETHERNET_CONFIG, dict())
-    pp = pprint.PrettyPrinter()
-    update_global(GlobalIds.PRETTY_PRINTER, pp)
-    update_global(GlobalIds.TM_LISTENER_HANDLE, None)
-    update_global(GlobalIds.COM_INTERFACE_HANDLE, None)
-    update_global(GlobalIds.TMTC_PRINTER_HANDLE, None)
-    update_global(GlobalIds.PRINT_RAW_TM, False)
-    update_global(GlobalIds.RESEND_TC, False)
-
-    update_global(GlobalIds.OP_CODE, "0")
-    update_global(GlobalIds.MODE, ModeList.ListenerMode)
-
-    if gui:
-        set_up_ethernet_cfg()
-
-    servicelist = dict()
-    servicelist[ServiceList.SERVICE_2] = ["Service 2 Raw Commanding"]
-    servicelist[ServiceList.SERVICE_3] = ["Service 3 Housekeeping"]
-    servicelist[ServiceList.SERVICE_5] = ["Service 5 Event"]
-    servicelist[ServiceList.SERVICE_8] = ["Service 8 Functional Commanding"]
-    servicelist[ServiceList.SERVICE_9] = ["Service 9 Time"]
-    servicelist[ServiceList.SERVICE_17] = ["Service 17 Test"]
-    servicelist[ServiceList.SERVICE_20] = ["Service 20 Parameters"]
-    servicelist[ServiceList.SERVICE_23] = ["Service 23 File Management"]
-    servicelist[ServiceList.SERVICE_200] = ["Service 200 Mode Management"]
-    update_global(GlobalIds.SERVICE, ServiceList.SERVICE_17)
-    update_global(GlobalIds.SERVICELIST, servicelist)
-
-
-def add_globals_post_args_parsing(args: argparse.Namespace):
-    from tmtc_core.core.tmtcc_globals_manager import update_global
-    from config.tmtcc_definitions import ModeList
-    logger = get_logger()
-
-    mode_param = ModeList.ListenerMode
-    if 0 <= args.mode <= 6:
-        if args.mode == 0:
-            mode_param = ModeList.GUIMode
-        elif args.mode == 1:
-            mode_param = ModeList.ListenerMode
-        elif args.mode == 2:
-            mode_param = ModeList.SingleCommandMode
-        elif args.mode == 3:
-            mode_param = ModeList.ServiceTestMode
-        elif args.mode == 4:
-            mode_param = ModeList.SoftwareTestMode
-    update_global(GlobalIds.MODE, mode_param)
-
-    if args.com_if == ComInterfaces.EthernetUDP.value:
-        com_if = ComInterfaces.EthernetUDP
-    elif args.com_if == ComInterfaces.Serial.value:
-        com_if = ComInterfaces.Serial
-    elif args.com_if == ComInterfaces.Dummy.value:
-        com_if = ComInterfaces.Dummy
-    elif args.com_if == ComInterfaces.QEMU.value:
-        com_if = ComInterfaces.QEMU
-    else:
-        com_if = ComInterfaces.Serial
-    update_global(GlobalIds.COM_IF, com_if)
-
-    if args.short_display_mode:
-        display_mode_param = "short"
-    else:
-        display_mode_param = "long"
-    update_global(GlobalIds.DISPLAY_MODE, display_mode_param)
-
-    service = str(args.service).lower()
-    if service == "2":
-        service = ServiceList.SERVICE_2
-    elif service == "3":
-        service = ServiceList.SERVICE_3
-    elif service == "5":
-        service = ServiceList.SERVICE_5
-    elif service == "8":
-        service = ServiceList.SERVICE_8
-    elif service == "9":
-        service = ServiceList.SERVICE_9
-    elif service == "17":
-        service = ServiceList.SERVICE_17
-    elif service == "20":
-        service = ServiceList.SERVICE_20
-    elif service == "23":
-        service = ServiceList.SERVICE_23
-    elif service == "p60dock":
-        service = ServiceList.P60DOCK
-    elif service == "pdu1":
-        service = ServiceList.PDU1
-    elif service == "pdu2":
-        service = ServiceList.PDU2
-    elif service == "acu":
-        service = ServiceList.ACU
-    elif service == "tmp1075_1":
-        service = ServiceList.TMP1075_1
-    elif service == "tmp1075_2":
-        service = ServiceList.TMP1075_2
-    elif service == "heater":
-        service = ServiceList.HEATER
-    else:
-        logger.warning("Service not known! Setting standard service 17")
-        service = ServiceList.SERVICE_17
-
-    update_global(GlobalIds.SERVICE, service)
-
-    if args.op_code is None:
-        op_code = 0
-    else:
-        op_code = str(args.op_code).lower()
-    update_global(GlobalIds.OP_CODE, op_code)
-
-    update_global(GlobalIds.USE_LISTENER_AFTER_OP, args.listener)
-    update_global(GlobalIds.TM_TIMEOUT, args.tm_timeout)
-    update_global(GlobalIds.PRINT_HK, args.print_hk)
-    update_global(GlobalIds.PRINT_TM, args.print_tm)
-    update_global(GlobalIds.PRINT_RAW_TM, args.raw_data_print)
-    update_global(GlobalIds.PRINT_TO_FILE, args.print_log)
-    update_global(GlobalIds.RESEND_TC, args.resend_tc)
-    update_global(GlobalIds.TC_SEND_TIMEOUT_FACTOR, 3)
-
-    use_serial_cfg = False
-    if com_if == ComInterfaces.Serial or com_if == ComInterfaces.QEMU:
-        use_serial_cfg = True
-    if use_serial_cfg:
-        set_up_serial_cfg(com_if)
-
-    use_ethernet_cfg = False
-    if com_if == ComInterfaces.EthernetUDP:
-        use_ethernet_cfg = True
-    if use_ethernet_cfg:
-        # TODO: Port and IP address can also be passed as CLI parameters. Use them here if applicable
-        set_up_ethernet_cfg()
-
-
-def set_up_serial_cfg(com_if: ComInterfaces):
-    from tmtc_core.core.tmtcc_globals_manager import update_global
-    update_global(GlobalIds.USE_SERIAL, True)
-    from tmtc_core.core.tmtcc_globals_manager import get_global
-    from config.tmtcc_definitions import SerialConfig
-    serial_cfg_dict = get_global(GlobalIds.SERIAL_CONFIG)
-    if com_if == ComInterfaces.Serial:
-        com_port = determine_com_port()
-    else:
-        com_port = ""
-    serial_cfg_dict.update({SerialConfig.SERIAL_PORT: com_port})
-    serial_cfg_dict.update({SerialConfig.SERIAL_BAUD_RATE: 115200})
-    serial_cfg_dict.update({SerialConfig.SERIAL_TIMEOUT: 0.01})
-    serial_cfg_dict.update({SerialConfig.SERIAL_COMM_TYPE: SerialCommunicationType.DLE_ENCODING})
-    serial_cfg_dict.update({SerialConfig.SERIAL_FRAME_SIZE: 256})
-    serial_cfg_dict.update({SerialConfig.SERIAL_DLE_QUEUE_LEN: 25})
-    serial_cfg_dict.update({SerialConfig.SERIAL_DLE_MAX_FRAME_SIZE: 1024})
-    update_global(GlobalIds.SERIAL_CONFIG, serial_cfg_dict)
-
-
-def set_up_ethernet_cfg():
-    from tmtc_core.core.tmtcc_globals_manager import update_global
-    update_global(GlobalIds.USE_ETHERNET, True)
-    from tmtc_core.core.tmtcc_globals_manager import get_global
-    from config.tmtcc_definitions import EthernetConfig
-    from tmtc_core.com_if.tmtcc_ethernet_utilities import determine_ip_addresses
-    ethernet_cfg_dict = get_global(GlobalIds.ETHERNET_CONFIG)
-    # This will either load the addresses from a JSON file or prompt them from the user.
-    send_addr, rcv_addr = determine_ip_addresses()
-    ethernet_cfg_dict.update({EthernetConfig.SEND_ADDRESS: send_addr})
-    ethernet_cfg_dict.update({EthernetConfig.RECV_ADDRESS: rcv_addr})
-    update_global(GlobalIds.ETHERNET_CONFIG, ethernet_cfg_dict)
-
-
-
diff --git a/config/tmtcc_object_ids.py b/config/tmtcc_object_ids.py
deleted file mode 100644
index 99fa0d0..0000000
--- a/config/tmtcc_object_ids.py
+++ /dev/null
@@ -1,43 +0,0 @@
-"""
-@brief      This file transfers control of the object IDs to the user.
-@details    Template configuration file. Copy this folder to the TMTC commander root and adapt
-            it to your needs.
-"""
-
-import enum
-from typing import Dict
-
-
-class ObjectIds(enum.Enum):
-    from enum import auto
-    INVALID = auto()
-    PUS_SERVICE_17 = auto()
-    TEST_DEVICE = auto()
-    P60DOCK_HANDLER_ID = auto()
-    PDU1_HANDLER_ID = auto()
-    PDU2_HANDLER_ID = auto()
-    PCDU_HANDLER = auto()
-    ACU_HANDLER_ID = auto()
-    TMP1075_1_HANDLER_ID = auto()
-    TMP1075_2_HANDLER_ID = auto()
-    HEATER = auto()
-    SOLAR_ARRAY_DEPLOYMENT = auto()
-
-
-def set_object_ids(object_id_dict: Dict[ObjectIds, bytearray]):
-    o_ids = ObjectIds
-    object_id_dict.update(
-        {o_ids.PUS_SERVICE_17: bytearray([0x53, 0x00, 0x00, 0x17]),
-         o_ids.TEST_DEVICE: bytearray([0x44, 0x00, 0xAF, 0xFE]),
-         o_ids.P60DOCK_HANDLER_ID: bytearray([0x44, 0x00, 0x00, 0x1]),
-         o_ids.PDU1_HANDLER_ID: bytearray([0x44, 0x00, 0x00, 0x2]),
-         o_ids.PDU2_HANDLER_ID: bytearray([0x44, 0x00, 0x00, 0x3]),
-         o_ids.ACU_HANDLER_ID: bytearray([0x44, 0x00, 0x00, 0x4]),
-         o_ids.TMP1075_1_HANDLER_ID: bytearray([0x44, 0x00, 0x00, 0x5]),
-         o_ids.TMP1075_2_HANDLER_ID: bytearray([0x44, 0x00, 0x00, 0x6]),
-         o_ids.HEATER: bytearray([0x54, 0x00, 0x00, 0x1]),
-         o_ids.PCDU_HANDLER: bytearray([0x44, 0x00, 0x10, 0x00]),
-         o_ids.SOLAR_ARRAY_DEPLOYMENT: bytearray([0x44, 0x00, 0x10, 0x01]),
-         o_ids.INVALID: bytearray([0xFF, 0xFF, 0xFF, 0xFF]),
-         }
-    )
\ No newline at end of file
diff --git a/config/tmtcc_user_mode_op.py b/config/tmtcc_user_mode_op.py
deleted file mode 100644
index 5998a40..0000000
--- a/config/tmtcc_user_mode_op.py
+++ /dev/null
@@ -1,20 +0,0 @@
-"""
-@brief      This file transfers control of custom mode handling to the user.
-@details    Template configuration file. Copy this folder to the TMTC commander root and adapt
-            it to your needs.
-"""
-import sys
-
-from config.tmtcc_definitions import ModeList
-from tmtc_core.core.tmtcc_backend import TmTcHandler
-from tmtc_core.utility.tmtcc_logger import get_logger
-
-LOGGER = get_logger()
-
-
-def perform_mode_operation_user(tmtc_backend: TmTcHandler, mode: ModeList):
-    """
-    Custom modes can be implemented here
-    """
-    LOGGER.error(f"Unknown mode {mode}, Configuration error !")
-    sys.exit()
diff --git a/config/tmtcc_version.py b/config/tmtcc_version.py
deleted file mode 100644
index 02f0eac..0000000
--- a/config/tmtcc_version.py
+++ /dev/null
@@ -1,8 +0,0 @@
-"""
-@brief      This file transfers control of versioning to the user.
-@details    Template configuration file. Copy this folder to the TMTC commander root and adapt
-            it to your needs.
-"""
-SW_NAME = "eive"
-SW_VERSION = 1
-SW_SUBVERSION = 1
diff --git a/config/version.py b/config/version.py
new file mode 100644
index 0000000..20118ef
--- /dev/null
+++ b/config/version.py
@@ -0,0 +1,4 @@
+SW_NAME = "eive"
+VERSION_MAJOR = 1
+VERSION_MINOR = 2
+VERSION_SUBMINOR = 0
diff --git a/pus_tc/tmtcc_tc_acu.py b/pus_tc/acu.py
similarity index 94%
rename from pus_tc/tmtcc_tc_acu.py
rename to pus_tc/acu.py
index e143e2a..cb638ac 100644
--- a/pus_tc/tmtcc_tc_acu.py
+++ b/pus_tc/acu.py
@@ -6,13 +6,13 @@
 @date   21.12.2020
 """
 
-from tmtc_core.pus_tc.tmtcc_pus_tc_packer import TcQueueT
-from tmtc_core.pus_tc.tmtcc_pus_tc_base import PusTelecommand
-from tmtc_core.core.tmtc_core_definitions import QueueCommands
+from tmtccmd.pus_tc.packer import TcQueueT
+from tmtccmd.pus_tc.base import PusTelecommand
+from tmtccmd.core.definitions import QueueCommands
 from gomspace.gomspace_common import *
-from pus_tc.tmtcc_tc_p60dock import P60DockConfigTable
-from config.tmtcc_object_ids import ObjectIds
-from tmtc_core.core.tmtcc_object_id_manager import get_object_id
+from pus_tc.p60dock import P60DockConfigTable
+from config.object_ids import ObjectIds
+from tmtccmd.core.object_id_manager import get_object_id
 
 
 class ACUTestProcedure:
diff --git a/pus_tc/tmtcc_tc_heater.py b/pus_tc/heater.py
similarity index 89%
rename from pus_tc/tmtcc_tc_heater.py
rename to pus_tc/heater.py
index 1168f9a..c94fc94 100644
--- a/pus_tc/tmtcc_tc_heater.py
+++ b/pus_tc/heater.py
@@ -5,9 +5,9 @@
 @author J. Meier
 @date   30.01.2021
 """
-from tmtc_core.core.tmtc_core_definitions import QueueCommands
-from tmtc_core.pus_tc.tmtcc_pus_tc_packer import TcQueueT
-from tmtc_core.pus_tc.tmtcc_pus_tc_base import PusTelecommand
+from tmtccmd.core.definitions import QueueCommands
+from tmtccmd.pus_tc.packer import TcQueueT
+from tmtccmd.pus_tc.base import PusTelecommand
 
 
 class SwitchNumbers:
@@ -26,7 +26,7 @@ class ActionIds:
     SWITCH_HEATER = bytearray([0x0, 0x0, 0x0, 0x0])
 
 
-def pack_heater_test_into(object_id: bytearray, tc_queue: TcQueueT) -> TcQueueT:
+def pack_heater_test_into(object_id: bytearray, tc_queue: TcQueueT):
     tc_queue.appendleft((QueueCommands.PRINT, "Testing Heater Switching"))
 
     heater_number = int(input("Type number of heater to switch: "))
diff --git a/pus_tc/tmtcc_tc_p60dock.py b/pus_tc/p60dock.py
similarity index 97%
rename from pus_tc/tmtcc_tc_p60dock.py
rename to pus_tc/p60dock.py
index b240305..afc5a13 100644
--- a/pus_tc/tmtcc_tc_p60dock.py
+++ b/pus_tc/p60dock.py
@@ -5,9 +5,9 @@
 @author J. Meier
 @date   13.12.2020
 """
-from tmtc_core.core.tmtc_core_definitions import QueueCommands
-from tmtc_core.pus_tc.tmtcc_pus_tc_packer import TcQueueT
-from tmtc_core.pus_tc.tmtcc_pus_tc_base import PusTelecommand
+from tmtccmd.core.definitions import QueueCommands
+from tmtccmd.pus_tc.packer import TcQueueT
+from tmtccmd.pus_tc.base import PusTelecommand
 from gomspace.gomspace_common import *
 
 
diff --git a/pus_tc/tmtcc_tc_pdu1.py b/pus_tc/pdu1.py
similarity index 91%
rename from pus_tc/tmtcc_tc_pdu1.py
rename to pus_tc/pdu1.py
index ddc6b68..562c7ce 100644
--- a/pus_tc/tmtcc_tc_pdu1.py
+++ b/pus_tc/pdu1.py
@@ -6,10 +6,10 @@
 @date   17.12.2020
 """
 
-from tmtc_core.pus_tc.tmtcc_pus_tc_packer import TcQueueT
-from tmtc_core.pus_tc.tmtcc_pus_tc_base import PusTelecommand
+from tmtccmd.pus_tc.packer import TcQueueT
+from tmtccmd.pus_tc.base import PusTelecommand
 from gomspace.gomspace_common import *
-from pus_tc.tmtcc_tc_p60dock import P60DockConfigTable
+from pus_tc.p60dock import P60DockConfigTable
 from gomspace.gomspace_pdu_definitions import *
 
 
diff --git a/pus_tc/tmtcc_tc_pdu2.py b/pus_tc/pdu2.py
similarity index 96%
rename from pus_tc/tmtcc_tc_pdu2.py
rename to pus_tc/pdu2.py
index eeb1cb4..caeb00b 100644
--- a/pus_tc/tmtcc_tc_pdu2.py
+++ b/pus_tc/pdu2.py
@@ -5,12 +5,12 @@
 @author J. Meier
 @date   17.12.2020
 """
-from tmtc_core.core.tmtc_core_definitions import QueueCommands
-from tmtc_core.pus_tc.tmtcc_pus_tc_packer import TcQueueT
-from tmtc_core.pus_tc.tmtcc_pus_tc_base import PusTelecommand
+from tmtccmd.core.definitions import QueueCommands
+from tmtccmd.pus_tc.packer import TcQueueT
+from tmtccmd.pus_tc.base import PusTelecommand
 from gomspace.gomspace_common import *
 from gomspace.gomspace_pdu_definitions import *
-from pus_tc.tmtcc_tc_p60dock import P60DockConfigTable
+from pus_tc.p60dock import P60DockConfigTable
 
 
 class PDU2TestProcedure:
diff --git a/pus_tc/tmtcc_tc_service200_mode.py b/pus_tc/service_200_mode.py
similarity index 73%
rename from pus_tc/tmtcc_tc_service200_mode.py
rename to pus_tc/service_200_mode.py
index 11d81fe..2e5e608 100644
--- a/pus_tc/tmtcc_tc_service200_mode.py
+++ b/pus_tc/service_200_mode.py
@@ -5,11 +5,12 @@
 @author R. Mueller
 @date   02.05.2020
 """
-from tmtc_core.core.tmtc_core_definitions import QueueCommands
-from tmtc_core.pus_tc.tmtcc_pus_tc_base import PusTelecommand
-from tmtc_core.pus_tc.tmtcc_pus_tc_packer import TcQueueT
-from tmtc_core.core.tmtcc_object_id_manager import get_object_id
-from config.tmtcc_object_ids import ObjectIds
+from tmtccmd.core.definitions import QueueCommands
+from tmtccmd.pus_tc.base import PusTelecommand
+from tmtccmd.pus_tc.packer import TcQueueT
+from tmtccmd.core.object_id_manager import get_object_id
+from tmtccmd.pus_tc.service_200_mode import pack_mode_data
+from config.object_ids import ObjectIds
 import struct
 
 TEST_DEVICE_ID = get_object_id(ObjectIds.TEST_DEVICE)
@@ -41,13 +42,3 @@ def pack_service200_test_into(tc_queue: TcQueueT) -> TcQueueT:
     tc_queue.appendleft(command.pack_command_tuple())
     tc_queue.appendleft((QueueCommands.EXPORT_LOG, "log/tmtc_log_service200.txt"))
     return tc_queue
-
-
-# Mode 0: Off, Mode 1: Mode On, Mode 2: Mode Normal, Mode 3: Mode Raw
-def pack_mode_data(object_id: bytearray, mode_: int, submode_: int) -> bytearray:
-    # Normal mode
-    mode = struct.pack(">I", mode_)
-    # Submode default
-    submode = struct.pack('B', submode_)
-    mode_data = object_id + mode + submode
-    return mode_data
diff --git a/pus_tc/tmtcc_tc_packer_hook.py b/pus_tc/tc_packer_hook.py
similarity index 59%
rename from pus_tc/tmtcc_tc_packer_hook.py
rename to pus_tc/tc_packer_hook.py
index fc38260..9ecd916 100644
--- a/pus_tc/tmtcc_tc_packer_hook.py
+++ b/pus_tc/tc_packer_hook.py
@@ -6,50 +6,53 @@
 
 import os
 from collections import deque
+from typing import Union
+
+from tmtccmd.utility.tmtcc_logger import get_logger
+from tmtccmd.pus_tc.base 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
+
+from pus_tc.p60dock import pack_p60dock_test_into
+from pus_tc.pdu2 import pack_pdu2_test_into
+from pus_tc.pdu1 import pack_pdu1_test_into
+from pus_tc.acu import pack_acu_test_into
+from pus_tc.tmp1075 import pack_tmp1075_test_into
+from pus_tc.heater import pack_heater_test_into
+from config.definitions import CustomServiceList
+from config.object_ids import ObjectIds
 
-from config.tmtcc_definitions import ServiceList
-from tmtc_core.utility.tmtcc_logger import get_logger
-from tmtc_core.pus_tc.tmtcc_pus_tc_base import TcQueueT
-from tmtc_core.pus_tc.tmtcc_tc_service_5_event import pack_generic_service5_test_into
-from tmtc_core.pus_tc.tmtcc_tc_service_17_test import pack_service17_ping_command
-from pus_tc.tmtcc_tc_p60dock import pack_p60dock_test_into
-from pus_tc.tmtcc_tc_pdu2 import pack_pdu2_test_into
-from pus_tc.tmtcc_tc_pdu1 import pack_pdu1_test_into
-from pus_tc.tmtcc_tc_acu import pack_acu_test_into
-from tmtc_core.core.tmtcc_object_id_manager import get_object_id
-from config.tmtcc_object_ids import ObjectIds
-from pus_tc.tmtcc_tc_tmp1075 import pack_tmp1075_test_into
-from pus_tc.tmtcc_tc_heater import pack_heater_test_into
 
 LOGGER = get_logger()
 
 
-def pack_service_queue_user(service: ServiceList, op_code: str, service_queue: TcQueueT):
-    if service == ServiceList.SERVICE_5:
+def pack_service_queue_user(service: Union[str, int], op_code: str, service_queue: TcQueueT):
+    if service == CustomServiceList.SERVICE_5:
         return pack_generic_service5_test_into(service_queue)
-    if service == ServiceList.SERVICE_17:
+    if service == CustomServiceList.SERVICE_17:
         return service_queue.appendleft(pack_service17_ping_command(ssc=1700).pack_command_tuple())
-    if service == ServiceList.P60DOCK:
+    if service == CustomServiceList.P60DOCK.value:
         object_id = get_object_id(ObjectIds.P60DOCK_HANDLER_ID)
         return pack_p60dock_test_into(object_id, service_queue)
-    if service == ServiceList.PDU1:
+    if service == CustomServiceList.PDU1.value:
         pdu1_object_id = get_object_id(ObjectIds.PDU1_HANDLER_ID)
         p60dock_object_id = get_object_id(ObjectIds.P60DOCK_HANDLER_ID)
         return pack_pdu1_test_into(pdu1_object_id, p60dock_object_id, service_queue)
-    if service == ServiceList.PDU2:
+    if service == CustomServiceList.PDU2.value:
         pdu2_object_id = get_object_id(ObjectIds.PDU2_HANDLER_ID)
         p60dock_object_id = get_object_id(ObjectIds.P60DOCK_HANDLER_ID)
         return pack_pdu2_test_into(pdu2_object_id, p60dock_object_id, service_queue)
-    if service == ServiceList.ACU:
+    if service == CustomServiceList.ACU.value:
         object_id = get_object_id(ObjectIds.ACU_HANDLER_ID)
         return pack_acu_test_into(object_id, service_queue)
-    if service == ServiceList.TMP1075_1:
+    if service == CustomServiceList.TMP1075_1.value:
         object_id = get_object_id(ObjectIds.TMP1075_1_HANDLER_ID)
         return pack_tmp1075_test_into(object_id, service_queue)
-    if service == ServiceList.TMP1075_2:
+    if service == CustomServiceList.TMP1075_2.value:
         object_id = get_object_id(ObjectIds.TMP1075_2_HANDLER_ID)
         return pack_tmp1075_test_into(object_id, service_queue)
-    if service == ServiceList.HEATER:
+    if service == CustomServiceList.HEATER.value:
         object_id = get_object_id(ObjectIds.HEATER)
         return pack_heater_test_into(object_id, service_queue)
     LOGGER.warning("Invalid Service !")
diff --git a/pus_tc/tmtcc_tc_tmp1075.py b/pus_tc/tmp1075.py
similarity index 92%
rename from pus_tc/tmtcc_tc_tmp1075.py
rename to pus_tc/tmp1075.py
index ef20410..f0acfdb 100644
--- a/pus_tc/tmtcc_tc_tmp1075.py
+++ b/pus_tc/tmp1075.py
@@ -6,9 +6,9 @@
 @date   06.01.2021
 """
 
-from tmtc_core.pus_tc.tmtcc_pus_tc_packer import TcQueueT
-from tmtc_core.pus_tc.tmtcc_pus_tc_base import PusTelecommand
-from pus_tc.tmtcc_tc_service200_mode import pack_mode_data
+from tmtccmd.pus_tc.packer import TcQueueT
+from tmtccmd.pus_tc.base import PusTelecommand
+from pus_tc.service_200_mode import pack_mode_data
 
 
 class Tmp1075TestProcedure:
diff --git a/pus_tm/tmtcc_pus_tm_factory_hook.py b/pus_tm/factory_hook.py
similarity index 64%
rename from pus_tm/tmtcc_pus_tm_factory_hook.py
rename to pus_tm/factory_hook.py
index 1d26475..008e449 100644
--- a/pus_tm/tmtcc_pus_tm_factory_hook.py
+++ b/pus_tm/factory_hook.py
@@ -3,13 +3,13 @@
 @details    Template configuration file. Copy this folder to the TMTC commander root and adapt
             it to your needs.
 """
-from tmtc_core.pus_tm.tmtcc_pus_service_8 import Service8TM
-from tmtc_core.pus_tm.tmtcc_pus_tm_base import PusTelemetry
-from tmtc_core.utility.tmtcc_logger import get_logger
+from tmtccmd.pus_tm.service_8_functional_cmd import Service8TM
+from tmtccmd.pus_tm.base import PusTelemetry
+from tmtccmd.utility.tmtcc_logger import get_logger
 
-from tmtc_core.pus_tm.tmtcc_tm_service1 import Service1TM
-from tmtc_core.pus_tm.tmtcc_tm_service5 import Service5TM
-from tmtc_core.pus_tm.tmtcc_tm_service17 import Service17TM
+from tmtccmd.pus_tm.service_1_verification import Service1TM
+from tmtccmd.pus_tm.service_5_event import Service5TM
+from tmtccmd.pus_tm.service_17_test import Service17TM
 
 LOGGER = get_logger()
 
@@ -21,7 +21,7 @@ def tm_user_factory_hook(raw_tm_packet: bytearray) -> PusTelemetry:
     if service_type == 5:
         return Service5TM(raw_tm_packet)
     if service_type == 8:
-        service8tm = Service8TM(raw_tm_packet)
+        service_8_tm = Service8TM(raw_tm_packet)
         return Service8TM(raw_tm_packet)
     if service_type == 17:
         return Service17TM(raw_tm_packet)
diff --git a/pus_tm/tmtcc_pus_hk_handling.py b/pus_tm/hk_handling.py
similarity index 84%
rename from pus_tm/tmtcc_pus_hk_handling.py
rename to pus_tm/hk_handling.py
index b1eb4c7..f08f498 100644
--- a/pus_tm/tmtcc_pus_hk_handling.py
+++ b/pus_tm/hk_handling.py
@@ -6,14 +6,13 @@
 """
 from typing import Tuple
 
-from config.tmtcc_object_ids import ObjectIds
-from tmtc_core.pus_tm.tmtcc_pus_service_3 import Service3Base
-from tmtc_core.utility.tmtcc_logger import get_logger
+from tmtccmd.pus_tm.service_3_base import Service3Base
+from tmtccmd.utility.tmtcc_logger import get_logger
 
 LOGGER = get_logger()
 
 
-def handle_user_hk_packet(object_id: ObjectIds, set_id: int, hk_data: bytearray,
+def handle_user_hk_packet(object_id: int, set_id: int, hk_data: bytearray,
                           service3_packet: Service3Base) -> Tuple[list, list, bytearray, int]:
     """
     This function is called when a Service 3 Housekeeping packet is received.
diff --git a/pus_tm/tmtcc_pus_service_8_hook.py b/pus_tm/service_8_hook.py
similarity index 85%
rename from pus_tm/tmtcc_pus_service_8_hook.py
rename to pus_tm/service_8_hook.py
index 3502703..faf9e79 100644
--- a/pus_tm/tmtcc_pus_service_8_hook.py
+++ b/pus_tm/service_8_hook.py
@@ -1,9 +1,9 @@
 from typing import Tuple
-from config.tmtcc_object_ids import ObjectIds
+from config.object_ids import ObjectIds
 
 
 def user_analyze_service_8_data(
-        object_id: ObjectIds, action_id: int, custom_data: bytearray) -> Tuple[list, list]:
+        object_id: int, action_id: int, custom_data: bytearray) -> Tuple[list, list]:
     """
     This function is called by the TMTC core if a Service 8 data reply (subservice 130)
     is received. The user can return a tuple of two lists, where the first list
@@ -22,7 +22,7 @@ def user_analyze_service_8_data(
     @param custom_data:
     @return:
     """
-    if object_id.value == ObjectIds.PDU2_HANDLER_ID.value:
+    if object_id == ObjectIds.PDU2_HANDLER_ID.value:
         header_list = ['PDU2 Service 8 Reply']
 
         data_string = str()
diff --git a/tmtc_client_cli.py b/tmtc_client_cli.py
index abc492c..1e3bd1e 100644
--- a/tmtc_client_cli.py
+++ b/tmtc_client_cli.py
@@ -26,7 +26,7 @@ limitations under the License.
 
 @author     R. Mueller
 """
-from tmtc_core.tmtcc_runner import run_tmtc_client
+from tmtccmd.tmtcc_runner import run_tmtc_client
 
 
 def main():
diff --git a/tmtc_client_gui.py b/tmtc_client_gui.py
index db3d8a1..6be58d4 100644
--- a/tmtc_client_gui.py
+++ b/tmtc_client_gui.py
@@ -26,7 +26,7 @@ limitations under the License.
 
 @author     R. Mueller
 """
-from tmtc_core.tmtcc_runner import run_tmtc_client
+from tmtccmd.tmtcc_runner import run_tmtc_client
 
 
 def main():
diff --git a/tmtccmd b/tmtccmd
index 9fc674c..bef9dc2 160000
--- a/tmtccmd
+++ b/tmtccmd
@@ -1 +1 @@
-Subproject commit 9fc674cebea40bf6ebaf3b0f8b59dd51dda1d3b8
+Subproject commit bef9dc2b1bd046521f215901812fbbe8668a418c
diff --git a/utility/tmtcc_user_args_parser.py b/utility/args_parser.py
similarity index 55%
rename from utility/tmtcc_user_args_parser.py
rename to utility/args_parser.py
index fe79748..a7ad2b1 100644
--- a/utility/tmtcc_user_args_parser.py
+++ b/utility/args_parser.py
@@ -1,8 +1,3 @@
-"""
-@brief      This file transfers control of the command line argument parsing to the user.
-@details    Template configuration file. Copy this folder to the TMTC commander root and adapt
-            it to your needs.
-"""
 
 
 def parse_input_arguments_user(print_known_args: bool = False, print_unknown_args: bool = False):
@@ -10,6 +5,6 @@ def parse_input_arguments_user(print_known_args: bool = False, print_unknown_arg
     This function by default will build the default argument parser. A custom CLI parser can be
     built in this function if required.
     """
-    from tmtc_core.utility.tmtcc_core_args_parser import parse_default_input_arguments
+    from tmtccmd.defaults.args_parser import parse_default_input_arguments
     parse_default_input_arguments(print_known_args=print_known_args,
                                   print_unknown_args=print_unknown_args)