diff --git a/.idea/runConfigurations/OBSW_UdpClient_Service_200_UDP.xml b/.idea/runConfigurations/OBSW_UdpClient_Service_200_UDP.xml
deleted file mode 100644
index 499ee35528cdc60331c75a21ea75177158176e97..0000000000000000000000000000000000000000
--- a/.idea/runConfigurations/OBSW_UdpClient_Service_200_UDP.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="OBSW_UdpClient Service 200 UDP" type="PythonConfigurationType" factoryName="Python" folderName="UDP Communication">
-    <module name="tmtc" />
-    <option name="INTERPRETER_OPTIONS" value="" />
-    <option name="PARENT_ENVS" value="true" />
-    <envs>
-      <env name="PYTHONUNBUFFERED" value="1" />
-    </envs>
-    <option name="SDK_HOME" value="" />
-    <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
-    <option name="IS_MODULE_SDK" value="true" />
-    <option name="ADD_CONTENT_ROOTS" value="true" />
-    <option name="ADD_SOURCE_ROOTS" value="true" />
-    <EXTENSION ID="PythonCoverageRunConfigurationExtension" runner="coverage.py" />
-    <option name="SCRIPT_NAME" value="C:\Users\Robin\NoSyncDokumente\sourceobsw\tmtc\obsw_tmtc_client.py" />
-    <option name="PARAMETERS" value="-m 3 -s 200 -p" />
-    <option name="SHOW_COMMAND_LINE" value="false" />
-    <option name="EMULATE_TERMINAL" value="true" />
-    <option name="MODULE_MODE" value="false" />
-    <option name="REDIRECT_INPUT" value="false" />
-    <option name="INPUT_FILE" value="" />
-    <method v="2" />
-  </configuration>
-</component>
\ No newline at end of file
diff --git a/.idea/runConfigurations/OBSW_UdpClient_Service_Dummy.xml b/.idea/runConfigurations/OBSW_UdpClient_Service_Dummy.xml
deleted file mode 100644
index fd420b59556813af31d008717163937e951ecd97..0000000000000000000000000000000000000000
--- a/.idea/runConfigurations/OBSW_UdpClient_Service_Dummy.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="OBSW_UdpClient Service Dummy" type="PythonConfigurationType" factoryName="Python" folderName="UDP Communication">
-    <module name="tmtc" />
-    <option name="INTERPRETER_OPTIONS" value="" />
-    <option name="PARENT_ENVS" value="true" />
-    <envs>
-      <env name="PYTHONUNBUFFERED" value="1" />
-    </envs>
-    <option name="SDK_HOME" value="" />
-    <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
-    <option name="IS_MODULE_SDK" value="true" />
-    <option name="ADD_CONTENT_ROOTS" value="true" />
-    <option name="ADD_SOURCE_ROOTS" value="true" />
-    <EXTENSION ID="PythonCoverageRunConfigurationExtension" runner="coverage.py" />
-    <option name="SCRIPT_NAME" value="C:\Users\Robin\NoSyncDokumente\sourceobsw\tmtc\obsw_tmtc_client.py" />
-    <option name="PARAMETERS" value="-m 3 -s Dummy -p" />
-    <option name="SHOW_COMMAND_LINE" value="false" />
-    <option name="EMULATE_TERMINAL" value="true" />
-    <option name="MODULE_MODE" value="false" />
-    <option name="REDIRECT_INPUT" value="false" />
-    <option name="INPUT_FILE" value="" />
-    <method v="2" />
-  </configuration>
-</component>
\ No newline at end of file
diff --git a/.idea/runConfigurations/OBSW_UdpClient_Unit_Test.xml b/.idea/runConfigurations/tmtcclient_Dummy_UDP.xml
similarity index 74%
rename from .idea/runConfigurations/OBSW_UdpClient_Unit_Test.xml
rename to .idea/runConfigurations/tmtcclient_Dummy_UDP.xml
index 04e8ecf8afc09a0be252cb7987da04cdafcdbce8..f591aac987e2c7e3c3038ad565a68c9404b06266 100644
--- a/.idea/runConfigurations/OBSW_UdpClient_Unit_Test.xml
+++ b/.idea/runConfigurations/tmtcclient_Dummy_UDP.xml
@@ -1,5 +1,5 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="OBSW_UdpClient Unit Test" type="PythonConfigurationType" factoryName="Python" folderName="UDP Communication">
+  <configuration default="false" name="tmtcclient Dummy UDP" type="PythonConfigurationType" factoryName="Python" folderName="UDP Communication">
     <module name="tmtc" />
     <option name="INTERPRETER_OPTIONS" value="" />
     <option name="PARENT_ENVS" value="true" />
@@ -12,8 +12,8 @@
     <option name="ADD_CONTENT_ROOTS" value="true" />
     <option name="ADD_SOURCE_ROOTS" value="true" />
     <EXTENSION ID="PythonCoverageRunConfigurationExtension" runner="coverage.py" />
-    <option name="SCRIPT_NAME" value="C:\Users\Robin\NoSyncDokumente\sourceobsw\tmtc\obsw_tmtc_client.py" />
-    <option name="PARAMETERS" value="-m 5 -p" />
+    <option name="SCRIPT_NAME" value="$PROJECT_DIR$/obsw_tmtc_client.py" />
+    <option name="PARAMETERS" value="-m 3 -c 3 -s Dummy -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/OBSW_UdpClient_GPS0.xml b/.idea/runConfigurations/tmtcclient_GPS0_UDP.xml
similarity index 80%
rename from .idea/runConfigurations/OBSW_UdpClient_GPS0.xml
rename to .idea/runConfigurations/tmtcclient_GPS0_UDP.xml
index 7410c2f86c050e98caa3bd2d31e28ee0a4dea23a..2a4cc8a663164f3e009e242e385976153b6a29ad 100644
--- a/.idea/runConfigurations/OBSW_UdpClient_GPS0.xml
+++ b/.idea/runConfigurations/tmtcclient_GPS0_UDP.xml
@@ -1,5 +1,5 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="OBSW_UdpClient GPS0" type="PythonConfigurationType" factoryName="Python" folderName="UDP Communication">
+  <configuration default="false" name="tmtcclient GPS0 UDP" type="PythonConfigurationType" factoryName="Python" folderName="UDP Communication">
     <module name="tmtc" />
     <option name="INTERPRETER_OPTIONS" value="" />
     <option name="PARENT_ENVS" value="true" />
@@ -12,8 +12,8 @@
     <option name="ADD_CONTENT_ROOTS" value="true" />
     <option name="ADD_SOURCE_ROOTS" value="true" />
     <EXTENSION ID="PythonCoverageRunConfigurationExtension" runner="coverage.py" />
-    <option name="SCRIPT_NAME" value="C:\Users\Robin\NoSyncDokumente\sourceobsw\tmtc\obsw_tmtc_client.py" />
-    <option name="PARAMETERS" value="-m 3 -s GPS0" />
+    <option name="SCRIPT_NAME" value="C:/Users/Robin/NoSyncDokumente/sourceobsw/tmtc/obsw_tmtc_client.py" />
+    <option name="PARAMETERS" value="-m 3 -c 3 -s GPS0" />
     <option name="SHOW_COMMAND_LINE" value="false" />
     <option name="EMULATE_TERMINAL" value="true" />
     <option name="MODULE_MODE" value="false" />
diff --git a/.idea/runConfigurations/OBSW_UdpClient_GPS1.xml b/.idea/runConfigurations/tmtcclient_GPS1_UDP.xml
similarity index 80%
rename from .idea/runConfigurations/OBSW_UdpClient_GPS1.xml
rename to .idea/runConfigurations/tmtcclient_GPS1_UDP.xml
index 8ea31179d37086fa4c7153c40d1dc8e9c3f3697f..4e3c16933abf6db6a03965bd75f8615a3da0f782 100644
--- a/.idea/runConfigurations/OBSW_UdpClient_GPS1.xml
+++ b/.idea/runConfigurations/tmtcclient_GPS1_UDP.xml
@@ -1,5 +1,5 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="OBSW_UdpClient GPS1" type="PythonConfigurationType" factoryName="Python" folderName="UDP Communication">
+  <configuration default="false" name="tmtcclient GPS1 UDP" type="PythonConfigurationType" factoryName="Python" folderName="UDP Communication">
     <module name="tmtc" />
     <option name="INTERPRETER_OPTIONS" value="" />
     <option name="PARENT_ENVS" value="true" />
@@ -12,8 +12,8 @@
     <option name="ADD_CONTENT_ROOTS" value="true" />
     <option name="ADD_SOURCE_ROOTS" value="true" />
     <EXTENSION ID="PythonCoverageRunConfigurationExtension" runner="coverage.py" />
-    <option name="SCRIPT_NAME" value="C:\Users\Robin\NoSyncDokumente\sourceobsw\tmtc\obsw_tmtc_client.py" />
-    <option name="PARAMETERS" value="-m 3 -s GPS1 -p" />
+    <option name="SCRIPT_NAME" value="C:/Users/Robin/NoSyncDokumente/sourceobsw/tmtc/obsw_tmtc_client.py" />
+    <option name="PARAMETERS" value="-m 3 -c 3 -s GPS1 -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/OBSW_UdpClient_Unit_Test_STM32.xml b/.idea/runConfigurations/tmtcclient_Service_200_UDP.xml
similarity index 73%
rename from .idea/runConfigurations/OBSW_UdpClient_Unit_Test_STM32.xml
rename to .idea/runConfigurations/tmtcclient_Service_200_UDP.xml
index b87037e36214827c896108496bf36e64784fd064..cf246a41cd1d20f0cbe32274fb3b4f554e659b60 100644
--- a/.idea/runConfigurations/OBSW_UdpClient_Unit_Test_STM32.xml
+++ b/.idea/runConfigurations/tmtcclient_Service_200_UDP.xml
@@ -1,5 +1,5 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="OBSW_UdpClient Unit Test STM32" type="PythonConfigurationType" factoryName="Python" folderName="UDP Communication">
+  <configuration default="false" name="tmtcclient Service 200 UDP" type="PythonConfigurationType" factoryName="Python" folderName="UDP Communication">
     <module name="tmtc" />
     <option name="INTERPRETER_OPTIONS" value="" />
     <option name="PARENT_ENVS" value="true" />
@@ -12,8 +12,8 @@
     <option name="ADD_CONTENT_ROOTS" value="true" />
     <option name="ADD_SOURCE_ROOTS" value="true" />
     <EXTENSION ID="PythonCoverageRunConfigurationExtension" runner="coverage.py" />
-    <option name="SCRIPT_NAME" value="C:\Users\Robin\NoSyncDokumente\sourceobsw\tmtc\obsw_tmtc_client.py" />
-    <option name="PARAMETERS" value="-m 5 -p -t 7" />
+    <option name="SCRIPT_NAME" value="$PROJECT_DIR$/obsw_tmtc_client.py" />
+    <option name="PARAMETERS" value="-m 3 -c 3 -s 200 -t 3" />
     <option name="SHOW_COMMAND_LINE" value="false" />
     <option name="EMULATE_TERMINAL" value="true" />
     <option name="MODULE_MODE" value="false" />