diff --git a/eive_tmtc/pus_tc/procedure_packer.py b/eive_tmtc/pus_tc/procedure_packer.py
index 79592a0..7bed4ef 100644
--- a/eive_tmtc/pus_tc/procedure_packer.py
+++ b/eive_tmtc/pus_tc/procedure_packer.py
@@ -9,7 +9,7 @@ from eive_tmtc.pus_tc.system.controllers import (
     pack_cmd_ctrl_to_prompted_mode,
     get_object_from_op_code,
 )
-from eive_tmtc.tmtc.tcs import pack_tcs_sys_commands
+from eive_tmtc.tmtc.tcs.subsystem import pack_tcs_sys_commands
 from tmtccmd import DefaultProcedureInfo, TcHandlerBase
 from tmtccmd.config import CoreServiceList
 from tmtccmd.logging import get_console_logger
@@ -29,7 +29,7 @@ from eive_tmtc.tmtc.power.pdu1 import pack_pdu1_commands
 from eive_tmtc.tmtc.power.acu import pack_acu_commands
 from eive_tmtc.tmtc.acs.imtq import pack_imtq_test_into
 from eive_tmtc.pus_tc.devs.tmp1075 import pack_tmp1075_test_into
-from eive_tmtc.pus_tc.devs.heater import pack_heater_cmds
+from eive_tmtc.tmtc.tcs.heater import pack_heater_cmds
 from eive_tmtc.tmtc.acs.reaction_wheels import (
     pack_single_rw_test_into,
     pack_rw_ass_cmds,
diff --git a/eive_tmtc/pus_tc/system/proc.py b/eive_tmtc/pus_tc/system/proc.py
index 3886ca5..2611c2b 100644
--- a/eive_tmtc/pus_tc/system/proc.py
+++ b/eive_tmtc/pus_tc/system/proc.py
@@ -17,7 +17,8 @@ from tmtccmd.pus.s11_tc_sched import (
 from tmtccmd.tc.pus_3_fsfw_hk import *
 
 import eive_tmtc.config.object_ids as oids
-from eive_tmtc.tmtc.tcs import OpCodeAssy as TcsOpCodes, pack_tcs_sys_commands
+from eive_tmtc.tmtc.tcs.brd_assy import OpCodeAssy as TcsOpCodes
+from eive_tmtc.tmtc.tcs.subsystem import pack_tcs_sys_commands
 from eive_tmtc.pus_tc.devs.bpx_batt import BpxSetId
 from eive_tmtc.tmtc.core import SetId as CoreSetIds
 from eive_tmtc.tmtc.power.common_power import SetId as GsSetIds
diff --git a/eive_tmtc/tmtc/tcs/__init__.py b/eive_tmtc/tmtc/tcs/__init__.py
index e69de29..51c7de7 100644
--- a/eive_tmtc/tmtc/tcs/__init__.py
+++ b/eive_tmtc/tmtc/tcs/__init__.py
@@ -0,0 +1 @@
+from .tm import *  # noqa
diff --git a/eive_tmtc/tmtc/tcs/subsystem.py b/eive_tmtc/tmtc/tcs/subsystem.py
index ebaad19..295b032 100644
--- a/eive_tmtc/tmtc/tcs/subsystem.py
+++ b/eive_tmtc/tmtc/tcs/subsystem.py
@@ -2,7 +2,7 @@ from .defs import CtrlSetId
 from eive_tmtc.config.definitions import CustomServiceList
 from eive_tmtc.config.object_ids import TCS_CONTROLLER, TCS_SUBSYSTEM_ID
 from eive_tmtc.tmtc.common import pack_mode_cmd_with_info
-from eive_tmtc.tmtc.tcs import pack_tcs_ass_cmds
+from eive_tmtc.tmtc.tcs.brd_assy import pack_tcs_ass_cmds
 from tmtccmd.config.tmtc import (
     tmtc_definitions_provider,
     TmtcDefinitionWrapper,