diff --git a/config/tmtcc_user_code.py b/config/tmtcc_user_code.py
index 1f2f325deff87cf66d9e67f4690f46d502b9f06e..1620a3f77b377a3edc625c353cff7270e6c99bd7 100644
--- a/config/tmtcc_user_code.py
+++ b/config/tmtcc_user_code.py
@@ -2,7 +2,7 @@
 User defined code can be added here.
 """
 from typing import Union, Tuple
-from tmtc_core.tc.obsw_pus_tc_base import PusTcInfo
+from tmtc_core.tc.tmtcc_pus_tc_base import PusTcInfo
 from tmtc_core.tmtc_core_definitions import ComInterfaces
 from enum import Enum
 
@@ -26,7 +26,7 @@ def command_preparation_hook() -> Tuple[bytearray, Union[None, PusTcInfo]]:
 
 
 def prepare_robins_commands():
-    from tmtc_core.tc.obsw_pus_tc_base import PusTelecommand
+    from tmtc_core.tc.tmtcc_pus_tc_base import PusTelecommand
     command = PusTelecommand(service=17, subservice=1, ssc=20)
     return command.pack_command_tuple()
 
diff --git a/core/tmtc_backend.py b/core/tmtc_backend.py
index 4e8860fc2126543b88af249a65926e1c9ed6fe5c..de830bfc45f74b9a092c3f2ae3c957073a559504 100644
--- a/core/tmtc_backend.py
+++ b/core/tmtc_backend.py
@@ -12,7 +12,7 @@ from config.tmtcc_user_code import command_preparation_hook
 
 from tmtc_core.tmtc_core_definitions import ComInterfaces
 from tmtc_core.utility.obsw_logger import get_logger
-from tmtc_core.tc.obsw_pus_tc_base import PusTcInfo
+from tmtc_core.tc.tmtcc_pus_tc_base import PusTcInfo
 from tmtc_core.sendreceive.obsw_single_command_sender_receiver import SingleCommandSenderReceiver
 from tmtc_core.sendreceive.obsw_sequential_sender_receiver import SequentialCommandSenderReceiver
 from tmtc_core.sendreceive.obsw_tm_listener import TmListener
diff --git a/core/tmtc_client_core.py b/core/tmtc_client_core.py
index 4fbee70b4b9a4a4406505b06cab79ab9e0e8ea5f..4ef4aec1e4c29b5f9bcd5bfb7c4ef317b40fdff7 100755
--- a/core/tmtc_client_core.py
+++ b/core/tmtc_client_core.py
@@ -5,7 +5,6 @@
 @manual
 @author     R. Mueller
 """
-import json
 import sys
 
 from config.tmtcc_version import SW_VERSION, SW_SUBVERSION
diff --git a/core/tmtc_frontend.py b/core/tmtc_frontend.py
index 054b1dd64a9694b61b6a70f57e6fe931f84a1e5d..c867c918ca567ef5ca9180e642a184ddf83dfec4 100644
--- a/core/tmtc_frontend.py
+++ b/core/tmtc_frontend.py
@@ -17,7 +17,7 @@ from core.tmtc_backend import TmTcHandler
 from config import tmtcc_config
 
 from tmtc_core.tmtc_core_definitions import ComInterfaces
-from tmtc_core.tc.obsw_pus_tc_base import PusTelecommand
+from tmtc_core.tc.tmtcc_pus_tc_base import PusTelecommand
 from tmtc_core.utility.obsw_logger import get_logger
 
 LOGGER = get_logger()
@@ -128,7 +128,7 @@ class TmTcFrontend(QMainWindow):
         pixmap = QPixmap("SOURCEbadge.png")  # QPixmap is the class, easy to put pic on screen
         label.setGeometry(720, 15, 110, 110)
         label.setPixmap(pixmap)
-        self.setWindowIcon(QIcon("SOURCEbadge.png"));
+        self.setWindowIcon(QIcon("SOURCEbadge.png"))
         label.setScaledContents(True)
         row = 0
         grid.addWidget(QLabel("Configuration:"), row, 0, 1, 2)
@@ -209,25 +209,25 @@ class TmTcFrontend(QMainWindow):
         row += 1
         # com if configuration
         grid.addWidget(QLabel("Communication Interface:"), row, 0, 1, 1)
-        com_if_comboBox = QComboBox()
+        com_if_combo_box = QComboBox()
         # add all possible ComIFs to the comboBox
         for comIf in tmtcc_config.ComInterfaces:
-            com_if_comboBox.addItem(comIf.name)
-        com_if_comboBox.setCurrentIndex(tmtcc_config.G_COM_IF.value)
-        com_if_comboBox.currentIndexChanged.connect(com_if_index_changed)
-        grid.addWidget(com_if_comboBox, row, 1, 1, 1)
+            com_if_combo_box.addItem(comIf.name)
+        com_if_combo_box.setCurrentIndex(tmtcc_config.G_COM_IF.value)
+        com_if_combo_box.currentIndexChanged.connect(com_if_index_changed)
+        grid.addWidget(com_if_combo_box, row, 1, 1, 1)
         row += 1
 
         # service test mode gui
         grid.addWidget(QLabel("Service Test Mode:"), row, 0, 1, 2)
         row += 1
 
-        comboBox = QComboBox()
+        combo_box = QComboBox()
         for service in self.serviceList:
-            comboBox.addItem("Service - " + str(service))
-        comboBox.setCurrentIndex(self.serviceList.index(tmtcc_config.G_SERVICE))
-        comboBox.currentIndexChanged.connect(self.service_index_changed)
-        grid.addWidget(comboBox, row, 0, 1, 1)
+            combo_box.addItem("Service - " + str(service))
+        combo_box.setCurrentIndex(self.serviceList.index(tmtcc_config.G_SERVICE))
+        combo_box.currentIndexChanged.connect(self.service_index_changed)
+        grid.addWidget(combo_box, row, 0, 1, 1)
 
         self.service_test_button = QPushButton()
         self.service_test_button.setText("Start Service Test")
diff --git a/tc/obsw_image_handler.py b/tc/obsw_image_handler.py
index 57967f2dd2f3b043b8b38286e0da09a1ccb811b7..b8baeee5c077775e6515f96b5b39a867f14e51f4 100644
--- a/tc/obsw_image_handler.py
+++ b/tc/obsw_image_handler.py
@@ -1,7 +1,7 @@
 from typing import Union
 
-from tmtc_core.tc.obsw_pus_tc_base import PusTelecommand, Deque
-from tc.obsw_tc_service8 import make_action_id
+from tmtc_core.tc.tmtcc_pus_tc_base import PusTelecommand, Deque
+from tmtc_core.tc.tmtcc_tc_service8 import make_action_id
 from tc.obsw_tc_service20 import pack_boolean_parameter_setting
 from tmtc_core.utility.obsw_logger import get_logger
 from config.tmtcc_config import SW_IMAGE_HANDLER_ID
diff --git a/tc/obsw_pus_tc_frame_packer.py b/tc/obsw_pus_tc_frame_packer.py
index 12447d34e9288af1fcff012337ac936c21d9e0ff..c437ecf9ddca350e32533332a145d393f7d9599f 100644
--- a/tc/obsw_pus_tc_frame_packer.py
+++ b/tc/obsw_pus_tc_frame_packer.py
@@ -2,7 +2,7 @@
 @brief  Helper module to pack telecommand frames.
 """
 from typing import List, Tuple
-from tmtc_core.tc.obsw_pus_tc_base import PusTelecommand, PusTcInfo
+from tmtc_core.tc.tmtcc_pus_tc_base import PusTelecommand, PusTcInfo
 from tmtc_core.utility.obsw_logger import get_logger
 
 LOGGER = get_logger()
diff --git a/tc/obsw_pus_tc_packer.py b/tc/obsw_pus_tc_packer.py
index 58f58e172b2d039d0bd97534fe863e3ee6494d00..efa958faab1af4f0b9fdab4d49c1c569891e8cee 100644
--- a/tc/obsw_pus_tc_packer.py
+++ b/tc/obsw_pus_tc_packer.py
@@ -9,7 +9,7 @@ Contains the sevice packet which can pack specific service queues (hardcoded for
 """
 import os
 
-from tmtc_core.tc.obsw_pus_tc_base import PusTelecommand, TcQueueT
+from tmtc_core.tc.tmtcc_pus_tc_base import PusTelecommand, TcQueueT
 from tc.obsw_tc_service2 import pack_service2_test_into
 from tc.obsw_tc_service3 import pack_service3_test_into
 from tc.obsw_tc_service8 import pack_service8_test_into
diff --git a/tc/obsw_tc_core.py b/tc/obsw_tc_core.py
index 58ec190d84db791f1b09ed163916a3787a9c9dcd..b0cdb3edd1cc6030150ad2922c74e8a85b45b1a8 100644
--- a/tc/obsw_tc_core.py
+++ b/tc/obsw_tc_core.py
@@ -1,8 +1,8 @@
 from typing import Deque
 
 from config.tmtcc_config import CORE_CONTROLLER_ID
-from tc.obsw_tc_service8 import make_action_id
-from tmtc_core.tc.obsw_pus_tc_base import PusTelecommand
+from tmtc_core.tc.tmtcc_tc_service8 import make_action_id
+from tmtc_core.tc.tmtcc_pus_tc_base import PusTelecommand
 
 
 def pack_core_command(tc_queue: Deque, op_code, ssc: int = 0):
diff --git a/tc/obsw_tc_service2.py b/tc/obsw_tc_service2.py
index 4872fb7b9fe67d5c36ec5334ef0cd60121817b4a..281498e89607b9ec2027199433847b687a117de6 100644
--- a/tc/obsw_tc_service2.py
+++ b/tc/obsw_tc_service2.py
@@ -8,7 +8,7 @@
 import struct
 
 import config.tmtcc_config as g
-from tmtc_core.tc.obsw_pus_tc_base import PusTelecommand, Deque
+from tmtc_core.tc.tmtcc_pus_tc_base import PusTelecommand, Deque
 from tc.obsw_tc_service200 import pack_mode_data
 
 
diff --git a/tc/obsw_tc_service20.py b/tc/obsw_tc_service20.py
index 65b1d32e93d7f5df43c09e1c9eb6ee2b5efbbc0f..9cca1ae29b4b7e615f8d9dbb41f03dfca67959ef 100644
--- a/tc/obsw_tc_service20.py
+++ b/tc/obsw_tc_service20.py
@@ -9,7 +9,7 @@ import struct
 from typing import Deque
 
 import config.tmtcc_config as g
-from tmtc_core.tc.obsw_pus_tc_base import PusTelecommand, TcQueueT
+from tmtc_core.tc.tmtcc_pus_tc_base import PusTelecommand, TcQueueT
 from tmtc_core.utility.obsw_logger import get_logger
 from tc.obsw_tc_service200 import pack_mode_data
 
@@ -52,9 +52,9 @@ def pack_boolean_parameter_setting(object_id: bytearray, domain_id: int,
 
 def pack_service20_test_into(tc_queue: Deque, called_externally: bool = False) -> Deque:
     # parameter IDs
-    parameterID0 = 0
-    parameterID1 = 256
-    parameterID2 = 512
+    parameter_id0 = 0
+    parameter_id1 = 256
+    parameter_id2 = 512
 
     if called_externally is False:
         tc_queue.appendleft(("print", "Testing Service 20"))
@@ -68,7 +68,7 @@ def pack_service20_test_into(tc_queue: Deque, called_externally: bool = False) -
 
     # test checking Load for uint32_t
     tc_queue.appendleft(("print", "Testing Service 20: Load uint32_t"))
-    parameter_id = struct.pack(">I", parameterID0)
+    parameter_id = struct.pack(">I", parameter_id0)
     type_and_matrix_data = pack_type_and_matrix_data(3, 14, 1, 1)
     parameter_data = struct.pack(">I", 42)
     payload = object_id + parameter_id + type_and_matrix_data + parameter_data
@@ -77,14 +77,14 @@ def pack_service20_test_into(tc_queue: Deque, called_externally: bool = False) -
 
     # test checking Dump for uint32_t
     tc_queue.appendleft(("print", "Testing Service 20: Dump uint32_t"))
-    parameter_id = struct.pack(">I", parameterID0)
+    parameter_id = struct.pack(">I", parameter_id0)
     payload = object_id + parameter_id
     command = PusTelecommand(service=20, subservice=129, ssc=2020, app_data=payload)
     tc_queue.appendleft(command.pack_command_tuple())
 
     # test checking Load for int32_t
     tc_queue.appendleft(("print", "Testing Service 20: Load int32_t"))
-    parameter_id = struct.pack(">I", parameterID1)
+    parameter_id = struct.pack(">I", parameter_id1)
     type_and_matrix_data = pack_type_and_matrix_data(4, 14, 1, 1)
     parameter_data = struct.pack(">i", -42)
     payload = object_id + parameter_id + type_and_matrix_data + parameter_data
@@ -93,14 +93,14 @@ def pack_service20_test_into(tc_queue: Deque, called_externally: bool = False) -
 
     # test checking Dump for int32_t
     tc_queue.appendleft(("print", "Testing Service 20: Dump int32_t"))
-    parameter_id = struct.pack(">I", parameterID1)
+    parameter_id = struct.pack(">I", parameter_id1)
     payload = object_id + parameter_id
     command = PusTelecommand(service=20, subservice=129, ssc=2040, app_data=payload)
     tc_queue.appendleft(command.pack_command_tuple())
 
     # test checking Load for float
     tc_queue.appendleft(("print", "Testing Service 20: Load float"))
-    parameter_id = struct.pack(">I", parameterID2)
+    parameter_id = struct.pack(">I", parameter_id2)
     type_and_matrix_data = pack_type_and_matrix_data(5, 1, 1, 1)
     parameter_data = struct.pack(">f", 4.2)
     payload = object_id + parameter_id + type_and_matrix_data + parameter_data
@@ -109,7 +109,7 @@ def pack_service20_test_into(tc_queue: Deque, called_externally: bool = False) -
 
     # test checking Dump for float
     tc_queue.appendleft(("print", "Testing Service 20: Dump float"))
-    parameter_id = struct.pack(">I", parameterID2)
+    parameter_id = struct.pack(">I", parameter_id2)
     payload = object_id + parameter_id
     command = PusTelecommand(service=20, subservice=129, ssc=2060, app_data=payload)
     tc_queue.appendleft(command.pack_command_tuple())
diff --git a/tc/obsw_tc_service200.py b/tc/obsw_tc_service200.py
index a66d66299dee49ba33f233d85fee9ee3f940c305..c2686d4b2598866b0b4101b523e33b0af23bd6e0 100644
--- a/tc/obsw_tc_service200.py
+++ b/tc/obsw_tc_service200.py
@@ -5,7 +5,7 @@
 @author R. Mueller
 @date   02.05.2020
 """
-from tmtc_core.tc.obsw_pus_tc_base import PusTelecommand
+from tmtc_core.tc.tmtcc_pus_tc_base import PusTelecommand
 from tc.obsw_pus_tc_packer import TcQueueT
 import config.tmtcc_config as g
 import struct
diff --git a/tc/obsw_tc_service23_sdcard.py b/tc/obsw_tc_service23_sdcard.py
index 9770a4076ea29af1e0054da74918c46b8f018916..379d24dca42ddff857894024f40b180600dfc74f 100644
--- a/tc/obsw_tc_service23_sdcard.py
+++ b/tc/obsw_tc_service23_sdcard.py
@@ -8,7 +8,7 @@ import config.tmtcc_config as g
 from typing import Deque, Union
 
 from tc.obsw_pus_tc_packer import PusTelecommand, TcQueueT
-from tc.obsw_tc_service8 import make_action_id
+from tmtc_core.tc.tmtcc_tc_service8 import make_action_id
 from tmtc_core.utility.obsw_logger import get_logger
 
 LOGGER = get_logger()
diff --git a/tc/obsw_tc_service3.py b/tc/obsw_tc_service3.py
index 758d702156d9930fe4f2b0af4e1584b5b68b9381..3e873ac6e9e4718a0c76cdcc88a7a2a8dfef76e9 100644
--- a/tc/obsw_tc_service3.py
+++ b/tc/obsw_tc_service3.py
@@ -7,7 +7,7 @@
 """
 import struct
 from typing import Deque, Union
-from tmtc_core.tc.obsw_pus_tc_base import PusTelecommand
+from tmtc_core.tc.tmtcc_pus_tc_base import PusTelecommand
 import config.tmtcc_config as g
 
 
diff --git a/tc/obsw_tc_service8.py b/tc/obsw_tc_service8.py
index ec14574ceb2390392599569c9779648d3d665eae..db8687496219a777a9dd45c742b4cb8b9ef3958a 100644
--- a/tc/obsw_tc_service8.py
+++ b/tc/obsw_tc_service8.py
@@ -5,11 +5,10 @@
 @author R. Mueller
 @date   01.11.2019
 """
-import struct
 from typing import Deque
 
 import config.tmtcc_config as g
-from tmtc_core.tc.obsw_pus_tc_base import PusTelecommand
+from tmtc_core.tc.tmtcc_pus_tc_base import PusTelecommand
 from tc.obsw_tc_service200 import pack_mode_data
 
 
@@ -64,13 +63,3 @@ def pack_service8_test_into(tc_queue: Deque, called_externally: bool = False) ->
         tc_queue.appendleft(("export", "log/tmtc_log_service8.txt"))
     return tc_queue
 
-
-def generate_action_command(object_id: bytearray, action_id: int, data: bytearray = bytearray([]),
-                            ssc: int = 0):
-    data_to_pack = bytearray(object_id)
-    data_to_pack += make_action_id(action_id) + data
-    return PusTelecommand(service=8, subservice=128, ssc=ssc, app_data=data_to_pack)
-
-
-def make_action_id(action_id: int) -> bytearray:
-    return bytearray(struct.pack('!I', action_id))
diff --git a/tc/obsw_tc_utility.py b/tc/obsw_tc_utility.py
index 7d0dc5414bae196727d34d30757a9417f88e324c..c5f09ad22d9f55aea1d123bac9dbbb0937ffb2e1 100644
--- a/tc/obsw_tc_utility.py
+++ b/tc/obsw_tc_utility.py
@@ -1,7 +1,7 @@
 from typing import Union
 
-from tmtc_core.tc.obsw_pus_tc_base import TcQueueT
-from tc.obsw_tc_service8 import generate_action_command
+from tmtc_core.tc.tmtcc_pus_tc_base import TcQueueT
+from tmtc_core.tc.tmtcc_tc_service8 import generate_action_command
 from config.tmtcc_config import LED_TASK_ID
 
 
diff --git a/test/obsw_module_test.py b/test/obsw_module_test.py
index 6cc58c6854fe24678ffc1347e39d6b762aecc080..138b00a3004167705fe69f55ac3de9e98ff3229f 100644
--- a/test/obsw_module_test.py
+++ b/test/obsw_module_test.py
@@ -46,10 +46,10 @@ from typing import Deque
 
 from config import tmtcc_config as g
 from tc.obsw_pus_tc_packer import pack_dummy_device_test_into
-from tmtc_core.tc.obsw_pus_tc_base import PusTcInfoQueueT, TcDictionaryKeys
-from tm.obsw_tm_service_1 import PusPacketInfoService1T
-from tmtc_core.tm.obsw_pus_tm_base import TmDictionaryKeys
-from tmtc_core.tm.obsw_pus_tm_factory import PusTmInfoQueueT, PusTmInfoT
+from tmtc_core.tc.tmtcc_pus_tc_base import PusTcInfoQueueT, TcDictionaryKeys
+from tmtc_core.tm.tmtcc_tm_service_1 import PusPacketInfoService1T
+from tmtc_core.tm.tmtcc_pus_tm_base import TmDictionaryKeys
+from tmtc_core.tm.tmtcc_pus_tm_factory import PusTmInfoQueueT, PusTmInfoT
 from tmtc_core.sendreceive.obsw_multiple_commands_sender_receiver import MultipleCommandSenderReceiver
 from tmtc_core.utility.obsw_logger import get_logger
 
diff --git a/test/obsw_pus_service_test.py b/test/obsw_pus_service_test.py
index 080ef2f285d56a7ad20ae10f0683bc20980ee1e4..4b5be68f7403e45ccbc305ca07083ff163881ae9 100644
--- a/test/obsw_pus_service_test.py
+++ b/test/obsw_pus_service_test.py
@@ -9,9 +9,10 @@ import unittest
 from typing import Deque
 
 from test.obsw_module_test import TestService, PusTmInfoQueueT, TmDictionaryKeys, AssertionDictKeys
-from tmtc_core.tc.obsw_pus_tc_base import PusTcInfoQueueT
+from tmtc_core.tc.tmtcc_pus_tc_base import PusTcInfoQueueT
 from tc.obsw_pus_tc_packer import pack_service17_test_into, pack_service5_test_into, \
-    pack_service2_test_into, pack_service8_test_into, pack_service200_test_into, pack_service20_test_into
+    pack_service2_test_into, pack_service8_test_into, pack_service200_test_into, \
+    pack_service20_test_into
 import config.tmtcc_config as g
 from tmtc_core.utility.obsw_logger import get_logger
 
diff --git a/tm/obsw_pus_tm_factory_hook.py b/tm/obsw_pus_tm_factory_hook.py
index 94359cf02de06f448c37c09b620af0f6d13944a1..f30b4fa2ae29150c0bec13b1ac3f73bf92aaef5b 100644
--- a/tm/obsw_pus_tm_factory_hook.py
+++ b/tm/obsw_pus_tm_factory_hook.py
@@ -1,11 +1,11 @@
 import struct
 
-from tmtc_core.tm.obsw_pus_tm_base import PusTelemetry
+from tmtc_core.tm.tmtcc_pus_tm_base import PusTelemetry
 from tmtc_core.utility.obsw_logger import get_logger
 
-from tm.obsw_tm_service_1 import Service1TM
+from tmtc_core.tm.tmtcc_tm_service_1 import Service1TM
 from tm.obsw_tm_service_3 import Service3TM
-from tm.obsw_tm_service_5 import Service5TM
+from tmtc_core.tm.tmtcc_tm_service_5 import Service5TM
 from tm.obsw_tm_service_20 import Service20TM
 from tm.obsw_tm_service_23 import Service23TM
 
diff --git a/tm/obsw_tm_service_1.py b/tm/obsw_tm_service_1.py
deleted file mode 100644
index 2cfa94cc4e5bcb82de71ad01012368fd09fa9da8..0000000000000000000000000000000000000000
--- a/tm/obsw_tm_service_1.py
+++ /dev/null
@@ -1,132 +0,0 @@
-# -*- coding: utf-8 -*-
-"""
-Program: obsw_tm_service_1.py
-Date: 30.12.2019
-Description: Deserialize Pus Verification TM
-Author: R. Mueller
-"""
-import struct
-from typing import Dict
-
-from tmtc_core.tm.obsw_pus_tm_base import PusTelemetry, TmDictionaryKeys
-from tmtc_core.tm.obsw_pus_tm_creator import PusTelemetryCreator
-from tmtc_core.utility.obsw_logger import get_logger
-
-LOGGER = get_logger()
-PusPacketInfoService1T = Dict[TmDictionaryKeys, any]
-
-
-class Service1TM(PusTelemetry):
-    """
-    Service 1 TM class representation. Can be used to deserialize raw service 1 packets.
-    """
-    def __init__(self, byte_array: bytearray):
-        super().__init__(byte_array)
-        self.has_tc_error_code = False
-        self.is_step_reply = False
-        # Failure Reports with error code
-        self.err_code = 0
-        self.step_number = 0
-        self.error_param1 = 0
-        self.error_param2 = 0
-        self.tc_packet_id = self._tm_data[0] << 8 | self._tm_data[1]
-        self.tc_ssc = ((self._tm_data[2] & 0x3F) << 8) | self._tm_data[3]
-        if self.get_subservice() % 2 == 0:
-            self.__handle_failure_verification()
-        else:
-            self.__handle_success_verification()
-
-    def append_telemetry_content(self, content_list: list):
-        super().append_telemetry_content(content_list)
-        content_list.append(str(hex(self.tc_packet_id)))
-        content_list.append(str(self.tc_ssc))
-        if self.has_tc_error_code:
-            if self.is_step_reply:
-                content_list.append(str(self.step_number))
-            content_list.append(str(hex(self.err_code)))
-            content_list.append(str(hex(self.error_param1)) + ", " + str(self.error_param1))
-            content_list.append(str(hex(self.error_param2)) + ", " + str(self.error_param2))
-        elif self.is_step_reply:
-            content_list.append(str(self.step_number))
-
-    def append_telemetry_column_headers(self, header_list: list):
-        super().append_telemetry_column_headers(header_list)
-        header_list.append("TC Packet ID")
-        header_list.append("TC SSC")
-        if self.has_tc_error_code:
-            if self.is_step_reply:
-                header_list.append("Step Number")
-            header_list.append("Return Value")
-            header_list.append("Error Param 1")
-            header_list.append("Error Param 2")
-        elif self.is_step_reply:
-            header_list.append("Step Number")
-
-    def __handle_failure_verification(self):
-        self.specify_packet_info("Failure Verficiation")
-        self.has_tc_error_code = True
-        if self.get_subservice() == 2:
-            self.append_packet_info(" : Acceptance failure")
-        elif self.get_subservice() == 4:
-            self.append_packet_info(" : Start failure")
-        elif self.get_subservice() == 6:
-            self.is_step_reply = True
-            self.append_packet_info(" : Step Failure")
-            self.step_number = struct.unpack('>B', self._tm_data[4:5])[0]
-            self.err_code = struct.unpack('>H', self._tm_data[5:7])[0]
-            self.error_param1 = struct.unpack('>I', self._tm_data[7:11])[0]
-            self.error_param2 = struct.unpack('>I', self._tm_data[11:15])[0]
-        elif self.get_subservice() == 8:
-            self.err_code = struct.unpack('>H', self._tm_data[4:6])[0]
-            self.error_param1 = struct.unpack('>I', self._tm_data[6:10])[0]
-            self.error_param2 = struct.unpack('>I', self._tm_data[10:14])[0]
-        else:
-            LOGGER.error("Service1TM: Invalid subservice")
-
-    def __handle_success_verification(self):
-        self.specify_packet_info("Success Verification")
-        if self.get_subservice() == 1:
-            self.append_packet_info(" : Acceptance success")
-        elif self.get_subservice() == 3:
-            self.append_packet_info(" : Start success")
-        elif self.get_subservice() == 5:
-            self.is_step_reply = True
-            self.append_packet_info(" : Step Success")
-            self.step_number = struct.unpack('>B', self._tm_data[4:5])[0]
-        elif self.get_subservice() == 7:
-            self.append_packet_info(" : Completion success")
-        else:
-            LOGGER.error("Service1TM: Invalid subservice")
-
-    def pack_tm_information(self) -> PusPacketInfoService1T:
-        tm_information = super().pack_tm_information()
-        add_information = {
-            TmDictionaryKeys.TC_PACKET_ID: self.tc_packet_id,
-            TmDictionaryKeys.TC_SSC: self.tc_ssc,
-        }
-        tm_information.update(add_information)
-        if self.has_tc_error_code:
-            tm_information.update({TmDictionaryKeys.ERROR_CODE: self.err_code})
-        if self.is_step_reply:
-            tm_information.update({TmDictionaryKeys.STEP_NUMBER: self.step_number})
-        return tm_information
-
-    def get_tc_ssc(self):
-        return self.tc_ssc
-
-
-class Service1TmPacked(PusTelemetryCreator):
-    """
-    Class representation for Service 1 TM creation.
-    """
-    def __init__(self, subservice: int, ssc: int = 0, tc_packet_id: int = 0, tc_ssc: int = 0):
-        source_data = bytearray()
-        source_data.append((tc_packet_id & 0xFF00) >> 8)
-        source_data.append(tc_packet_id & 0xFF)
-        tc_psc = (tc_ssc & 0x3FFF) | (0b11 << 16)
-        source_data.append((tc_psc & 0xFF00) >> 8)
-        source_data.append(tc_psc & 0xFF)
-        super().__init__(service=1, subservice=subservice, ssc=ssc, source_data=source_data)
-
-    def pack(self) -> bytearray:
-        return super().pack()
diff --git a/tm/obsw_tm_service_20.py b/tm/obsw_tm_service_20.py
index f3c1badb35b1682c2484765110c1d00a5f15c666..4a3f6fe340c48d0e1ffee36f2c6f280fa49b7278 100644
--- a/tm/obsw_tm_service_20.py
+++ b/tm/obsw_tm_service_20.py
@@ -1,6 +1,6 @@
 import struct
 
-from tmtc_core.tm.obsw_pus_tm_base import PusTelemetry, TmDictionaryKeys, PusTmInfoT
+from tmtc_core.tm.tmtcc_pus_tm_base import PusTelemetry, TmDictionaryKeys, PusTmInfoT
 from tmtc_core.utility.obsw_logger import get_logger
 
 LOGGER = get_logger()
diff --git a/tm/obsw_tm_service_23.py b/tm/obsw_tm_service_23.py
index b4668c332ff5c583f286129cbed23a6e5a5dafd3..6a34463673dd88b687e8729254a50c12d53cc107 100644
--- a/tm/obsw_tm_service_23.py
+++ b/tm/obsw_tm_service_23.py
@@ -1,6 +1,6 @@
 import struct
 
-from tmtc_core.tm.obsw_pus_tm_base import PusTelemetry
+from tmtc_core.tm.tmtcc_pus_tm_base import PusTelemetry
 from tmtc_core.utility.obsw_logger import get_logger
 
 LOGGER = get_logger()
diff --git a/tm/obsw_tm_service_3.py b/tm/obsw_tm_service_3.py
index 732cadf02362b0c8c3cb568b43e28479e1c281b0..749af44391d94acc6490ecf2d28b435a134fd1fa 100644
--- a/tm/obsw_tm_service_3.py
+++ b/tm/obsw_tm_service_3.py
@@ -6,7 +6,7 @@ Description: Deserialize Housekeeping TM
 Author: R. Mueller
 """
 
-from tmtc_core.tm.obsw_pus_tm_base import PusTelemetry
+from tmtc_core.tm.tmtcc_pus_tm_base import PusTelemetry
 from typing import Type
 from tmtc_core.utility.obsw_logger import get_logger
 import struct
diff --git a/tm/obsw_tm_service_5.py b/tm/obsw_tm_service_5.py
deleted file mode 100644
index a25c4b203b1ead83dc653251995cebb656ffdf03..0000000000000000000000000000000000000000
--- a/tm/obsw_tm_service_5.py
+++ /dev/null
@@ -1,54 +0,0 @@
-# -*- coding: utf-8 -*-
-"""
-Program: obsw_tm_service_5.py
-Date: 30.12.2019
-Description: Deserialize PUS Event Report
-Author: R. Mueller
-"""
-
-from tmtc_core.tm.obsw_pus_tm_base import PusTelemetry, TmDictionaryKeys
-from tmtc_core.tm.obsw_pus_tm_factory import PusTmInfoT
-import struct
-
-
-class Service5TM(PusTelemetry):
-    def __init__(self, byte_array):
-        super().__init__(byte_array)
-        self.specify_packet_info("Event")
-        if self.get_subservice() == 1:
-            self.append_packet_info(" Info")
-        elif self.get_subservice() == 2:
-            self.append_packet_info(" Error Low Severity")
-        elif self.get_subservice() == 3:
-            self.append_packet_info(" Error Med Severity")
-        elif self.get_subservice() == 4:
-            self.append_packet_info(" Error High Severity")
-        self.eventId = struct.unpack('>H', self._tm_data[0:2])[0]
-        self.objectId = struct.unpack('>I', self._tm_data[2:6])[0]
-        self.param1 = struct.unpack('>I', self._tm_data[6:10])[0]
-        self.param2 = struct.unpack('>I', self._tm_data[10:14])[0]
-
-    def append_telemetry_content(self, array):
-        super().append_telemetry_content(array)
-        array.append(str(self.eventId))
-        array.append(hex(self.objectId))
-        array.append(str(hex(self.param1)) + ", " + str(self.param1))
-        array.append(str(hex(self.param2)) + ", " + str(self.param2))
-
-    def append_telemetry_column_headers(self, array):
-        super().append_telemetry_column_headers(array)
-        array.append("Event ID")
-        array.append("Reporter ID")
-        array.append("Parameter 1")
-        array.append("Parameter 2")
-
-    def pack_tm_information(self) -> PusTmInfoT:
-        tm_information = super().pack_tm_information()
-        add_information = {
-            TmDictionaryKeys.REPORTER_ID: self.objectId,
-            TmDictionaryKeys.EVENT_ID: self.eventId,
-            TmDictionaryKeys.EVENT_PARAM_1: self.param1,
-            TmDictionaryKeys.EVENT_PARAM_2: self.param2
-        }
-        tm_information.update(add_information)
-        return tm_information
diff --git a/tmtc_core b/tmtc_core
index d550621a799b9836f8bbb1c0760ef3a20cac99af..c74f0dcf3edc005210de65fa744e2ec12fabe38c 160000
--- a/tmtc_core
+++ b/tmtc_core
@@ -1 +1 @@
-Subproject commit d550621a799b9836f8bbb1c0760ef3a20cac99af
+Subproject commit c74f0dcf3edc005210de65fa744e2ec12fabe38c
diff --git a/utility/tmtcc_binary_uploader.py b/utility/tmtcc_binary_uploader.py
index d3a054ccf993062f057900079f72ee8940c13f90..73bbb6fa05f59c542f1bf03489897fda6f6e2019 100644
--- a/utility/tmtcc_binary_uploader.py
+++ b/utility/tmtcc_binary_uploader.py
@@ -12,12 +12,10 @@ import tkinter as tk
 from tkinter import filedialog
 from collections import deque
 from glob import glob
-from typing import Deque, List
 
-from tm.obsw_tm_service_1 import Service1TM
+from tmtc_core.tm.tmtcc_tm_service_1 import Service1TM
 from tmtc_core.comIF.obsw_com_interface import CommunicationInterface
-from tmtc_core.tc.obsw_pus_tc_base import TcQueueT, PusTcTupleT, TcDictionaryKeys
-from tmtc_core.tm.obsw_pus_tm_factory import PusTmQueueT
+from tmtc_core.tc.tmtcc_pus_tc_base import TcQueueT, TcDictionaryKeys
 from utility.tmtcc_file_transfer_helper import FileTransferHelper
 import config.tmtcc_config as g
 from tmtc_core.utility.obsw_tmtc_printer import TmTcPrinter, DisplayMode
diff --git a/utility/tmtcc_file_transfer_helper.py b/utility/tmtcc_file_transfer_helper.py
index 20ca7be2f7656533ebcfe4078305922b7c75242b..a3b62558ad269558bafc63dbf2805ea677593664 100644
--- a/utility/tmtcc_file_transfer_helper.py
+++ b/utility/tmtcc_file_transfer_helper.py
@@ -2,7 +2,7 @@ from enum import Enum
 import math
 
 from config.tmtcc_config import SD_CARD_HANDLER_ID
-from tmtc_core.tc.obsw_pus_tc_base import TcQueueT, PusTelecommand
+from tmtc_core.tc.tmtcc_pus_tc_base import TcQueueT, PusTelecommand
 from tc.obsw_tc_service23_sdcard import \
     calculate_allowed_file_data_size, generate_rm_file_srv23_2_packet, \
     generate_create_file_srv23_1_packet, generate_finish_append_to_file_srv23_131_packet, \