some cleaning up

pus_tc/procedure_packer.py

@@ -32,14 +32,14 @@ from pus_tc.devs.tmp1075 import pack_tmp1075_test_into
 from pus_tc.devs.heater import pack_heater_cmds
 from tmtc.acs.reaction_wheels import pack_single_rw_test_into, pack_rw_ass_cmds
 from pus_tc.devs.rad_sensor import pack_rad_sensor_test_into
-from tmtc.ploc_memory_dumper import pack_ploc_memory_dumper_cmd
+from tmtc.payload.ploc_memory_dumper import pack_ploc_memory_dumper_cmd
 from pus_tc.devs.ccsds_handler import pack_ccsds_handler_test
 from pus_tc.system.core import pack_core_commands
 from pus_tc.devs.star_tracker import pack_star_tracker_commands
 from pus_tc.devs.syrlinks_hk_handler import pack_syrlinks_command
 from pus_tc.devs.gps import pack_gps_command
-from tmtc.acs_board import pack_acs_command
+from tmtc.acs.acs_board import pack_acs_command
-from tmtc.sus_board import pack_sus_cmds
+from tmtc.acs.sus_board import pack_sus_cmds
 from pus_tc.devs.plpcdu import pack_pl_pcdu_commands
 from pus_tc.devs.str_img_helper import pack_str_img_helper_command
 from pus_tc.system.tcs import pack_tcs_sys_commands

pus_tc/system/proc.py

@@ -34,8 +34,8 @@ from pus_tc.devs.sus import SetIds
 from pus_tc.devs.star_tracker import SetIds as StrSetIds
 from tmtc.acs.reaction_wheels import RwSetIds, rw_speed_up_cmd_consec
 from pus_tc.system.controllers import pack_cmd_ctrl_to_off, pack_cmd_ctrl_to_nml
-from tmtc.acs_board import pack_acs_command
+from tmtc.acs.acs_board import pack_acs_command
-from tmtc.sus_board import pack_sus_cmds
+from tmtc.acs.sus_board import pack_sus_cmds
 from tmtc.acs.imtq import pack_imtq_test_into, pack_dipole_command
 from pus_tc.devs.star_tracker import pack_star_tracker_commands
 from tmtc.acs.reaction_wheels import pack_rw_ass_cmds, pack_set_speed_command

pus_tm/action_reply_handler.py

@@ -2,8 +2,8 @@ import struct
 from config.object_ids import *
 from tmtc.acs.imtq import ImtqActionIds
 from pus_tm.defs import PrintWrapper
-from tmtc.ploc_mpsoc import PlocReplyIds
+from tmtc.payload.ploc_mpsoc import PlocReplyIds
-from tmtc.ploc_supervisor import SupvActionIds
+from tmtc.payload.ploc_supervisor import SupvActionIds
 from pus_tc.devs.star_tracker import StarTrackerActionIds
 from tmtc.power.tm import handle_get_param_data_reply
 from tmtccmd.logging import get_console_logger

pus_tm/event_handler.py

@@ -4,7 +4,7 @@ from datetime import datetime
 from config.object_ids import get_object_ids
 from pus_tm.defs import PrintWrapper
 from pus_tm.verification_handler import generic_retval_printout
-from tmtc.acs_subsystem import AcsModes
+from tmtc.acs.acs_subsystem import AcsModes
 from tmtccmd.tc.pus_200_fsfw_modes import Modes
 
 from tmtccmd.tm import Service5Tm

pus_tm/hk_handling.py

@@ -1,11 +1,11 @@
 """HK Handling for EIVE OBSW"""
 # from pus_tm.tcp_server_objects import TCP_SEVER_SENSOR_TEMPERATURES
-from tmtc.acs_ctrl import handle_acs_ctrl_mgm_data
+from tmtc.acs.acs_ctrl import handle_acs_ctrl_mgm_data
 from pus_tm.devs.plpcdu import handle_plpcdu_hk
 from pus_tm.devs.rad_sensor import handle_rad_sensor_data
 from pus_tm.devs.sus import handle_sus_hk
 from pus_tm.system.tcs import handle_thermal_controller_hk_data
-from tmtc.ploc_supervisor import handle_supv_hk_data
+from tmtc.payload.ploc_supervisor import handle_supv_hk_data
 from tmtc.acs.reaction_wheels import handle_rw_hk_data
 from tmtccmd.tm.pus_3_fsfw_hk import (
     Service3Base,

tmtc/__init__.py

@@ -1,2 +1 @@
-from .acs_subsystem import add_acs_subsystem_cmds
 from .test import add_test_defs

tmtc/acs/acs_board.py

@@ -6,7 +6,7 @@ from tmtccmd.config.tmtc import (
     TmtcDefinitionWrapper,
     OpCodeEntry,
 )
-from tmtccmd.tc import DefaultPusQueueHelper, service_provider
+from tmtccmd.tc import service_provider
 from tmtccmd.tc.decorator import ServiceProviderParams
 from tmtccmd.tc.pus_200_fsfw_modes import Modes
 from config.object_ids import ACS_BOARD_ASS_ID

tmtc/acs/acs_subsystem.py

@@ -2,7 +2,7 @@ import enum
 from typing import Tuple, Dict
 
 from spacepackets.ecss import PusTelecommand
-from .common import pack_mode_cmd_with_info
+from tmtc.common import pack_mode_cmd_with_info
 from config.object_ids import ACS_SUBSYSTEM_ID
 from config.definitions import CustomServiceList
 from tmtccmd.config.tmtc import (

tmtc/acs/sus_board.py

@@ -1,6 +1,6 @@
 from config.definitions import CustomServiceList
 from config.object_ids import SUS_BOARD_ASS_ID
-from tmtc.acs_board import DualSideSubmodes
+from tmtc.acs.acs_board import DualSideSubmodes
 from tmtc.common import pack_mode_cmd_with_info
 from tmtccmd.config.tmtc import (
     tmtc_definitions_provider,