diff --git a/.gitignore b/.gitignore
index 83e1518665dce88453afcc1a0d3f025daa293703..19779fb414fcb1b08afd24e7ccbde31449345dd3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,9 +8,6 @@ _dependencies
 
 .settings/*
 .settings
-
-.idea
-.idea/*
 __pycache__
 
 .project
@@ -24,4 +21,6 @@ __pycache__
 generators/*.csv
 
 *tmtc*.txt
-log
\ No newline at end of file
+log
+!.idea
+!.idea/*
\ No newline at end of file
diff --git a/config/PyCharm/ConfigurationFolder/deployment.xml b/.idea/deployment.xml
similarity index 100%
rename from config/PyCharm/ConfigurationFolder/deployment.xml
rename to .idea/deployment.xml
diff --git a/config/PyCharm/ConfigurationFolder/inspectionProfiles/profiles_settings.xml b/.idea/inspectionProfiles/profiles_settings.xml
similarity index 100%
rename from config/PyCharm/ConfigurationFolder/inspectionProfiles/profiles_settings.xml
rename to .idea/inspectionProfiles/profiles_settings.xml
diff --git a/config/PyCharm/ConfigurationFolder/misc.xml b/.idea/misc.xml
similarity index 100%
rename from config/PyCharm/ConfigurationFolder/misc.xml
rename to .idea/misc.xml
diff --git a/config/PyCharm/ConfigurationFolder/modules.xml b/.idea/modules.xml
similarity index 100%
rename from config/PyCharm/ConfigurationFolder/modules.xml
rename to .idea/modules.xml
diff --git a/.idea/runConfigurations/OBSW_UdpClient_GPS0.xml b/.idea/runConfigurations/OBSW_UdpClient_GPS0.xml
new file mode 100644
index 0000000000000000000000000000000000000000..995d1eb8cb063289c9da4af4753223fc449a69d5
--- /dev/null
+++ b/.idea/runConfigurations/OBSW_UdpClient_GPS0.xml
@@ -0,0 +1,24 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="OBSW_UdpClient GPS0" type="PythonConfigurationType" factoryName="Python" folderName="UDP">
+    <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="$PROJECT_DIR$/OBSW_UdpClient.py" />
+    <option name="PARAMETERS" value="-m 3 -s GPS0" />
+    <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_GPS0_Serial.xml b/.idea/runConfigurations/OBSW_UdpClient_GPS0_Serial.xml
new file mode 100644
index 0000000000000000000000000000000000000000..a178c018ba9bcdb5c6ec95d8f1d348b0da27f0c7
--- /dev/null
+++ b/.idea/runConfigurations/OBSW_UdpClient_GPS0_Serial.xml
@@ -0,0 +1,24 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="OBSW_UdpClient GPS0 Serial" type="PythonConfigurationType" factoryName="Python" folderName="Serial">
+    <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="$PROJECT_DIR$/OBSW_UdpClient.py" />
+    <option name="PARAMETERS" value="-m 3 -s GPS0 -c 1 --COM COM9" />
+    <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_GPS1.xml b/.idea/runConfigurations/OBSW_UdpClient_GPS1.xml
new file mode 100644
index 0000000000000000000000000000000000000000..bde50c107c1762928d9c30f8c4576c73dbe00676
--- /dev/null
+++ b/.idea/runConfigurations/OBSW_UdpClient_GPS1.xml
@@ -0,0 +1,24 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="OBSW_UdpClient GPS1" type="PythonConfigurationType" factoryName="Python" folderName="UDP">
+    <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="$PROJECT_DIR$/OBSW_UdpClient.py" />
+    <option name="PARAMETERS" value="-m 3 -s GPS1 -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_Listener_Mode_Serial.xml b/.idea/runConfigurations/OBSW_UdpClient_Listener_Mode_Serial.xml
new file mode 100644
index 0000000000000000000000000000000000000000..b3d68e8f664d4e7ba20fa5a489c382709231ee2c
--- /dev/null
+++ b/.idea/runConfigurations/OBSW_UdpClient_Listener_Mode_Serial.xml
@@ -0,0 +1,24 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="OBSW_UdpClient Listener Mode Serial" type="PythonConfigurationType" factoryName="Python" folderName="Serial">
+    <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="$PROJECT_DIR$/OBSW_UdpClient.py" />
+    <option name="PARAMETERS" value="-m 1 -c 1 --COM COM9" />
+    <option name="SHOW_COMMAND_LINE" value="false" />
+    <option name="EMULATE_TERMINAL" value="false" />
+    <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_Listener__Mode.xml b/.idea/runConfigurations/OBSW_UdpClient_Listener__Mode.xml
new file mode 100644
index 0000000000000000000000000000000000000000..8bf0647d98486b7d2d37128d69a77ea0fa1881e8
--- /dev/null
+++ b/.idea/runConfigurations/OBSW_UdpClient_Listener__Mode.xml
@@ -0,0 +1,24 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="OBSW_UdpClient Listener  Mode" type="PythonConfigurationType" factoryName="Python" folderName="UDP">
+    <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="$PROJECT_DIR$/OBSW_UdpClient.py" />
+    <option name="PARAMETERS" value="-m 1 --hk" />
+    <option name="SHOW_COMMAND_LINE" value="false" />
+    <option name="EMULATE_TERMINAL" value="false" />
+    <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_17_Test.xml b/.idea/runConfigurations/OBSW_UdpClient_Service_17_Test.xml
new file mode 100644
index 0000000000000000000000000000000000000000..299724998c0da4650110cdf87130dbd17c372d9f
--- /dev/null
+++ b/.idea/runConfigurations/OBSW_UdpClient_Service_17_Test.xml
@@ -0,0 +1,24 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="OBSW_UdpClient Service 17 Test" type="PythonConfigurationType" factoryName="Python" folderName="UDP">
+    <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="$PROJECT_DIR$/OBSW_UdpClient.py" />
+    <option name="PARAMETERS" value="-m 3 -s 17 -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_17_Test_Serial.xml b/.idea/runConfigurations/OBSW_UdpClient_Service_17_Test_Serial.xml
new file mode 100644
index 0000000000000000000000000000000000000000..8e499c367db9bd4882551d90b02c5032aef38334
--- /dev/null
+++ b/.idea/runConfigurations/OBSW_UdpClient_Service_17_Test_Serial.xml
@@ -0,0 +1,24 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="OBSW_UdpClient Service 17 Test Serial" type="PythonConfigurationType" factoryName="Python" folderName="Serial">
+    <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="$PROJECT_DIR$/OBSW_UdpClient.py" />
+    <option name="PARAMETERS" value="-m 3 -s 17 -c 1 -p --COM COM9" />
+    <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_200_UDP.xml b/.idea/runConfigurations/OBSW_UdpClient_Service_200_UDP.xml
new file mode 100644
index 0000000000000000000000000000000000000000..230ebc269b955d484c5292018bc5902bce939bf1
--- /dev/null
+++ b/.idea/runConfigurations/OBSW_UdpClient_Service_200_UDP.xml
@@ -0,0 +1,24 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="OBSW_UdpClient Service 200 UDP" type="PythonConfigurationType" factoryName="Python" folderName="UDP">
+    <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="$PROJECT_DIR$/OBSW_UdpClient.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_2_Serial.xml b/.idea/runConfigurations/OBSW_UdpClient_Service_2_Serial.xml
new file mode 100644
index 0000000000000000000000000000000000000000..976467f9aa22e3c1e831c01c45ad439eb2e4eddc
--- /dev/null
+++ b/.idea/runConfigurations/OBSW_UdpClient_Service_2_Serial.xml
@@ -0,0 +1,24 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="OBSW_UdpClient Service 2 Serial" type="PythonConfigurationType" factoryName="Python" folderName="Serial">
+    <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="$PROJECT_DIR$/OBSW_UdpClient.py" />
+    <option name="PARAMETERS" value="-m 3 -s 2 -p -c 1 --COM COM9" />
+    <option name="SHOW_COMMAND_LINE" value="false" />
+    <option name="EMULATE_TERMINAL" value="false" />
+    <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_2_Test.xml b/.idea/runConfigurations/OBSW_UdpClient_Service_2_Test.xml
new file mode 100644
index 0000000000000000000000000000000000000000..7c5a47821c3633f5d9d62e604d957436f6673e3a
--- /dev/null
+++ b/.idea/runConfigurations/OBSW_UdpClient_Service_2_Test.xml
@@ -0,0 +1,24 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="OBSW_UdpClient Service 2 Test" type="PythonConfigurationType" factoryName="Python" folderName="UDP">
+    <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="$PROJECT_DIR$/OBSW_UdpClient.py" />
+    <option name="PARAMETERS" value="-m 3 -s 2 -p" />
+    <option name="SHOW_COMMAND_LINE" value="false" />
+    <option name="EMULATE_TERMINAL" value="false" />
+    <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_3.xml b/.idea/runConfigurations/OBSW_UdpClient_Service_3.xml
new file mode 100644
index 0000000000000000000000000000000000000000..3a3fd7f701a1cb11d48afc5a5173447b250877a3
--- /dev/null
+++ b/.idea/runConfigurations/OBSW_UdpClient_Service_3.xml
@@ -0,0 +1,24 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="OBSW_UdpClient Service 3" type="PythonConfigurationType" factoryName="Python" folderName="UDP">
+    <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="$PROJECT_DIR$/OBSW_UdpClient.py" />
+    <option name="PARAMETERS" value="-m 3 -s 3 -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_3_Serial_.xml b/.idea/runConfigurations/OBSW_UdpClient_Service_3_Serial_.xml
new file mode 100644
index 0000000000000000000000000000000000000000..03a8c6a1c252cd633374d9bcaaef51e34693d295
--- /dev/null
+++ b/.idea/runConfigurations/OBSW_UdpClient_Service_3_Serial_.xml
@@ -0,0 +1,24 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="OBSW_UdpClient Service 3 Serial " type="PythonConfigurationType" factoryName="Python" folderName="Serial">
+    <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="$PROJECT_DIR$/OBSW_UdpClient.py" />
+    <option name="PARAMETERS" value="-m 3 -s 3 -p -c 1 --COM COM9" />
+    <option name="SHOW_COMMAND_LINE" value="false" />
+    <option name="EMULATE_TERMINAL" value="false" />
+    <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_5_Serial.xml b/.idea/runConfigurations/OBSW_UdpClient_Service_5_Serial.xml
new file mode 100644
index 0000000000000000000000000000000000000000..395910d5c1538ae1e4ca7cc6f4850250a9c3a48a
--- /dev/null
+++ b/.idea/runConfigurations/OBSW_UdpClient_Service_5_Serial.xml
@@ -0,0 +1,24 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="OBSW_UdpClient Service 5 Serial" type="PythonConfigurationType" factoryName="Python" folderName="Serial">
+    <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="$PROJECT_DIR$/OBSW_UdpClient.py" />
+    <option name="PARAMETERS" value="-m 3 -s 5 -c 1 -p --COM COM9" />
+    <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_8.xml b/.idea/runConfigurations/OBSW_UdpClient_Service_8.xml
new file mode 100644
index 0000000000000000000000000000000000000000..67d1b37908bb25b8eec679c2ce1ce54ed50936fc
--- /dev/null
+++ b/.idea/runConfigurations/OBSW_UdpClient_Service_8.xml
@@ -0,0 +1,24 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="OBSW_UdpClient Service 8" type="PythonConfigurationType" factoryName="Python" folderName="UDP">
+    <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="$PROJECT_DIR$/OBSW_UdpClient.py" />
+    <option name="PARAMETERS" value="-m 3 -s 8 -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_8_Serial.xml b/.idea/runConfigurations/OBSW_UdpClient_Service_8_Serial.xml
new file mode 100644
index 0000000000000000000000000000000000000000..e0efb6f2e67d0730fa53aaacdb092ddf10cfd932
--- /dev/null
+++ b/.idea/runConfigurations/OBSW_UdpClient_Service_8_Serial.xml
@@ -0,0 +1,24 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="OBSW_UdpClient Service 8 Serial" type="PythonConfigurationType" factoryName="Python" folderName="Serial">
+    <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="$PROJECT_DIR$/OBSW_UdpClient.py" />
+    <option name="PARAMETERS" value="-m 3 -s 8 -p -c 1 --COM COM9" />
+    <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
new file mode 100644
index 0000000000000000000000000000000000000000..001988f10371015ccecf86577dcecec7961c1889
--- /dev/null
+++ b/.idea/runConfigurations/OBSW_UdpClient_Service_Dummy.xml
@@ -0,0 +1,24 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="OBSW_UdpClient Service Dummy" type="PythonConfigurationType" factoryName="Python" folderName="UDP">
+    <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="$PROJECT_DIR$/OBSW_UdpClient.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_Single_Command.xml b/.idea/runConfigurations/OBSW_UdpClient_Single_Command.xml
new file mode 100644
index 0000000000000000000000000000000000000000..6707d9f3d005b2ba50195fdcc7b3eea004bf25e9
--- /dev/null
+++ b/.idea/runConfigurations/OBSW_UdpClient_Single_Command.xml
@@ -0,0 +1,24 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="OBSW_UdpClient Single Command" type="PythonConfigurationType" factoryName="Python" folderName="UDP">
+    <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="$PROJECT_DIR$/OBSW_UdpClient.py" />
+    <option name="PARAMETERS" value="-m 2 -p" />
+    <option name="SHOW_COMMAND_LINE" value="false" />
+    <option name="EMULATE_TERMINAL" value="false" />
+    <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_Single_Command_Serial.xml b/.idea/runConfigurations/OBSW_UdpClient_Single_Command_Serial.xml
new file mode 100644
index 0000000000000000000000000000000000000000..d65a9be4e269f015f2b456b9c066a95b4da4204d
--- /dev/null
+++ b/.idea/runConfigurations/OBSW_UdpClient_Single_Command_Serial.xml
@@ -0,0 +1,24 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="OBSW_UdpClient Single Command Serial" type="PythonConfigurationType" factoryName="Python" folderName="Serial">
+    <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="$PROJECT_DIR$/OBSW_UdpClient.py" />
+    <option name="PARAMETERS" value="-m 2 -c 1 --COM COM9" />
+    <option name="SHOW_COMMAND_LINE" value="false" />
+    <option name="EMULATE_TERMINAL" value="false" />
+    <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_Software_Testmode.xml b/.idea/runConfigurations/OBSW_UdpClient_Software_Testmode.xml
new file mode 100644
index 0000000000000000000000000000000000000000..e83a8361c1204ba4ed101ad4294705554f0c2b0d
--- /dev/null
+++ b/.idea/runConfigurations/OBSW_UdpClient_Software_Testmode.xml
@@ -0,0 +1,24 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="OBSW_UdpClient Software Testmode" type="PythonConfigurationType" factoryName="Python" folderName="UDP">
+    <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="$PROJECT_DIR$/OBSW_UdpClient.py" />
+    <option name="PARAMETERS" value="-m 4 -p" />
+    <option name="SHOW_COMMAND_LINE" value="false" />
+    <option name="EMULATE_TERMINAL" value="false" />
+    <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/OBSW_UdpClient_Unit_Test.xml
new file mode 100644
index 0000000000000000000000000000000000000000..dfae81d0a49be39ed081afe73297e852626ee0c5
--- /dev/null
+++ b/.idea/runConfigurations/OBSW_UdpClient_Unit_Test.xml
@@ -0,0 +1,24 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="OBSW_UdpClient Unit Test" type="PythonConfigurationType" factoryName="Python" folderName="UDP">
+    <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="$PROJECT_DIR$/OBSW_UdpClient.py" />
+    <option name="PARAMETERS" value="-m 5 -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_STM32.xml b/.idea/runConfigurations/OBSW_UdpClient_Unit_Test_STM32.xml
new file mode 100644
index 0000000000000000000000000000000000000000..8c76c616a89fa7c72a149d018c4dda72afff1cb6
--- /dev/null
+++ b/.idea/runConfigurations/OBSW_UdpClient_Unit_Test_STM32.xml
@@ -0,0 +1,24 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="OBSW_UdpClient Unit Test STM32" type="PythonConfigurationType" factoryName="Python" folderName="UDP">
+    <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="$PROJECT_DIR$/OBSW_UdpClient.py" />
+    <option name="PARAMETERS" value="-m 5 -p -t 7" />
+    <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_Serial.xml b/.idea/runConfigurations/OBSW_UdpClient_Unit_Test_Serial.xml
new file mode 100644
index 0000000000000000000000000000000000000000..47d9052e743c3b38c309dec2dec0910affbc4492
--- /dev/null
+++ b/.idea/runConfigurations/OBSW_UdpClient_Unit_Test_Serial.xml
@@ -0,0 +1,24 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="OBSW_UdpClient Unit Test Serial" type="PythonConfigurationType" factoryName="Python" folderName="Serial">
+    <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="$PROJECT_DIR$/OBSW_UdpClient.py" />
+    <option name="PARAMETERS" value="-m 5 -p -c 1 --COM COM9" />
+    <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/config/PyCharm/ConfigurationFolder/tmtc.iml b/.idea/tmtc.iml
similarity index 100%
rename from config/PyCharm/ConfigurationFolder/tmtc.iml
rename to .idea/tmtc.iml
diff --git a/config/PyCharm/ConfigurationFolder/vcs.xml b/.idea/vcs.xml
similarity index 100%
rename from config/PyCharm/ConfigurationFolder/vcs.xml
rename to .idea/vcs.xml
diff --git a/config/PyCharm/ConfigurationFolder/workspace.xml b/.idea/workspace.xml
similarity index 55%
rename from config/PyCharm/ConfigurationFolder/workspace.xml
rename to .idea/workspace.xml
index 85ecf317a2376de0128206204223a55ba084c96d..502484e8e017770d2ee4cd286158b09a4450e63a 100644
--- a/config/PyCharm/ConfigurationFolder/workspace.xml
+++ b/.idea/workspace.xml
@@ -1,7 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ChangeListManager">
-    <list default="true" id="8ef8d1f2-b212-4065-aebd-557195d815d1" name="Default Changelist" comment="" />
+    <list default="true" id="8ef8d1f2-b212-4065-aebd-557195d815d1" name="Default Changelist" comment="">
+      <change beforePath="$PROJECT_DIR$/../mission/init_mission.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/../mission/init_mission.cpp" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$" beforeDir="false" afterPath="$PROJECT_DIR$" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.gitignore" beforeDir="false" afterPath="$PROJECT_DIR$/.gitignore" afterDir="false" />
+    </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
     <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
@@ -41,7 +45,7 @@
   <component name="PropertiesComponent">
     <property name="RunOnceActivity.ShowReadmeOnStart" value="true" />
     <property name="WebServerToolWindowFactoryState" value="true" />
-    <property name="last_opened_file_path" value="$PROJECT_DIR$/../generators/packetContent" />
+    <property name="last_opened_file_path" value="$PROJECT_DIR$/config" />
     <property name="node.js.detected.package.eslint" value="true" />
     <property name="node.js.detected.package.tslint" value="true" />
     <property name="node.js.path.for.package.eslint" value="project" />
@@ -64,7 +68,7 @@
       <recent name="C:\Users\Robin\NoSyncDokumente\sourceobsw\generators\packetContent" />
     </key>
   </component>
-  <component name="RunManager" selected="Python.OBSW_UdpClient Service 3 Serial ">
+  <component name="RunManager" selected="Python.OBSW_UdpClient GPS1 Serial">
     <configuration name="MIB_Objects" type="PythonConfigurationType" factoryName="Python" temporary="true">
       <module name="generators" />
       <option name="INTERPRETER_OPTIONS" value="" />
@@ -153,7 +157,7 @@
       <option name="INPUT_FILE" value="" />
       <method v="2" />
     </configuration>
-    <configuration name="OBSW_UdpClient GPS0" type="PythonConfigurationType" factoryName="Python" folderName="UDP">
+    <configuration name="OBSW_UdpClient GPS1 Serial" type="PythonConfigurationType" factoryName="Python" folderName="Serial">
       <module name="tmtc" />
       <option name="INTERPRETER_OPTIONS" value="" />
       <option name="PARENT_ENVS" value="true" />
@@ -167,29 +171,7 @@
       <option name="ADD_SOURCE_ROOTS" value="true" />
       <EXTENSION ID="PythonCoverageRunConfigurationExtension" runner="coverage.py" />
       <option name="SCRIPT_NAME" value="$PROJECT_DIR$/OBSW_UdpClient.py" />
-      <option name="PARAMETERS" value="-m 3 -s GPS0" />
-      <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>
-    <configuration name="OBSW_UdpClient GPS1" type="PythonConfigurationType" factoryName="Python" folderName="UDP">
-      <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="$PROJECT_DIR$/OBSW_UdpClient.py" />
-      <option name="PARAMETERS" value="-m 3 -s GPS1 -p" />
+      <option name="PARAMETERS" value="-m 3 -s GPS1 -c 1 --COM COM9" />
       <option name="SHOW_COMMAND_LINE" value="false" />
       <option name="EMULATE_TERMINAL" value="true" />
       <option name="MODULE_MODE" value="false" />
@@ -219,402 +201,6 @@
       <option name="INPUT_FILE" value="" />
       <method v="2" />
     </configuration>
-    <configuration name="OBSW_UdpClient Listener  Mode" type="PythonConfigurationType" factoryName="Python" folderName="UDP">
-      <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="$PROJECT_DIR$/OBSW_UdpClient.py" />
-      <option name="PARAMETERS" value="-m 1 --hk" />
-      <option name="SHOW_COMMAND_LINE" value="false" />
-      <option name="EMULATE_TERMINAL" value="false" />
-      <option name="MODULE_MODE" value="false" />
-      <option name="REDIRECT_INPUT" value="false" />
-      <option name="INPUT_FILE" value="" />
-      <method v="2" />
-    </configuration>
-    <configuration name="OBSW_UdpClient Listener Mode Serial" type="PythonConfigurationType" factoryName="Python" folderName="Serial">
-      <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="$PROJECT_DIR$/OBSW_UdpClient.py" />
-      <option name="PARAMETERS" value="-m 1 -c 1 --COM COM9" />
-      <option name="SHOW_COMMAND_LINE" value="false" />
-      <option name="EMULATE_TERMINAL" value="false" />
-      <option name="MODULE_MODE" value="false" />
-      <option name="REDIRECT_INPUT" value="false" />
-      <option name="INPUT_FILE" value="" />
-      <method v="2" />
-    </configuration>
-    <configuration name="OBSW_UdpClient Service 17 Test Serial" type="PythonConfigurationType" factoryName="Python" folderName="Serial">
-      <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="$PROJECT_DIR$/OBSW_UdpClient.py" />
-      <option name="PARAMETERS" value="-m 3 -s 17 -c 1 -p --COM COM9" />
-      <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>
-    <configuration name="OBSW_UdpClient Service 17 Test" type="PythonConfigurationType" factoryName="Python" folderName="UDP">
-      <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="$PROJECT_DIR$/OBSW_UdpClient.py" />
-      <option name="PARAMETERS" value="-m 3 -s 17 -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>
-    <configuration name="OBSW_UdpClient Service 2 Serial" type="PythonConfigurationType" factoryName="Python" folderName="Serial">
-      <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="$PROJECT_DIR$/OBSW_UdpClient.py" />
-      <option name="PARAMETERS" value="-m 3 -s 2 -p -c 1 --COM COM9" />
-      <option name="SHOW_COMMAND_LINE" value="false" />
-      <option name="EMULATE_TERMINAL" value="false" />
-      <option name="MODULE_MODE" value="false" />
-      <option name="REDIRECT_INPUT" value="false" />
-      <option name="INPUT_FILE" value="" />
-      <method v="2" />
-    </configuration>
-    <configuration name="OBSW_UdpClient Service 2 Test" type="PythonConfigurationType" factoryName="Python" folderName="UDP">
-      <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="$PROJECT_DIR$/OBSW_UdpClient.py" />
-      <option name="PARAMETERS" value="-m 3 -s 2 -p" />
-      <option name="SHOW_COMMAND_LINE" value="false" />
-      <option name="EMULATE_TERMINAL" value="false" />
-      <option name="MODULE_MODE" value="false" />
-      <option name="REDIRECT_INPUT" value="false" />
-      <option name="INPUT_FILE" value="" />
-      <method v="2" />
-    </configuration>
-    <configuration name="OBSW_UdpClient Service 200 UDP" type="PythonConfigurationType" factoryName="Python" folderName="UDP">
-      <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="$PROJECT_DIR$/OBSW_UdpClient.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>
-    <configuration name="OBSW_UdpClient Service 3 Serial " type="PythonConfigurationType" factoryName="Python" folderName="Serial">
-      <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="$PROJECT_DIR$/OBSW_UdpClient.py" />
-      <option name="PARAMETERS" value="-m 3 -s 3 -p -c 1 --COM COM9" />
-      <option name="SHOW_COMMAND_LINE" value="false" />
-      <option name="EMULATE_TERMINAL" value="false" />
-      <option name="MODULE_MODE" value="false" />
-      <option name="REDIRECT_INPUT" value="false" />
-      <option name="INPUT_FILE" value="" />
-      <method v="2" />
-    </configuration>
-    <configuration name="OBSW_UdpClient Service 3" type="PythonConfigurationType" factoryName="Python" folderName="UDP">
-      <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="$PROJECT_DIR$/OBSW_UdpClient.py" />
-      <option name="PARAMETERS" value="-m 3 -s 3 -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>
-    <configuration name="OBSW_UdpClient Service 5 Serial" type="PythonConfigurationType" factoryName="Python" folderName="Serial">
-      <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="$PROJECT_DIR$/OBSW_UdpClient.py" />
-      <option name="PARAMETERS" value="-m 3 -s 5 -c 1 -p --COM COM9" />
-      <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>
-    <configuration name="OBSW_UdpClient Service 8 Serial" type="PythonConfigurationType" factoryName="Python" folderName="Serial">
-      <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="$PROJECT_DIR$/OBSW_UdpClient.py" />
-      <option name="PARAMETERS" value="-m 3 -s 8 -p -c 1 --COM COM9" />
-      <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>
-    <configuration name="OBSW_UdpClient Service 8" type="PythonConfigurationType" factoryName="Python" folderName="UDP">
-      <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="$PROJECT_DIR$/OBSW_UdpClient.py" />
-      <option name="PARAMETERS" value="-m 3 -s 8 -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>
-    <configuration name="OBSW_UdpClient Service Dummy" type="PythonConfigurationType" factoryName="Python" folderName="UDP">
-      <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="$PROJECT_DIR$/OBSW_UdpClient.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>
-    <configuration name="OBSW_UdpClient Single Command Serial" type="PythonConfigurationType" factoryName="Python" folderName="Serial">
-      <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="$PROJECT_DIR$/OBSW_UdpClient.py" />
-      <option name="PARAMETERS" value="-m 2 -c 1 --COM COM9" />
-      <option name="SHOW_COMMAND_LINE" value="false" />
-      <option name="EMULATE_TERMINAL" value="false" />
-      <option name="MODULE_MODE" value="false" />
-      <option name="REDIRECT_INPUT" value="false" />
-      <option name="INPUT_FILE" value="" />
-      <method v="2" />
-    </configuration>
-    <configuration name="OBSW_UdpClient Single Command" type="PythonConfigurationType" factoryName="Python" folderName="UDP">
-      <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="$PROJECT_DIR$/OBSW_UdpClient.py" />
-      <option name="PARAMETERS" value="-m 2 -p" />
-      <option name="SHOW_COMMAND_LINE" value="false" />
-      <option name="EMULATE_TERMINAL" value="false" />
-      <option name="MODULE_MODE" value="false" />
-      <option name="REDIRECT_INPUT" value="false" />
-      <option name="INPUT_FILE" value="" />
-      <method v="2" />
-    </configuration>
-    <configuration name="OBSW_UdpClient Software Testmode" type="PythonConfigurationType" factoryName="Python" folderName="UDP">
-      <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="$PROJECT_DIR$/OBSW_UdpClient.py" />
-      <option name="PARAMETERS" value="-m 4 -p" />
-      <option name="SHOW_COMMAND_LINE" value="false" />
-      <option name="EMULATE_TERMINAL" value="false" />
-      <option name="MODULE_MODE" value="false" />
-      <option name="REDIRECT_INPUT" value="false" />
-      <option name="INPUT_FILE" value="" />
-      <method v="2" />
-    </configuration>
-    <configuration name="OBSW_UdpClient Unit Test Serial" type="PythonConfigurationType" factoryName="Python" folderName="Serial">
-      <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="$PROJECT_DIR$/OBSW_UdpClient.py" />
-      <option name="PARAMETERS" value="-m 5 -p -c 1 --COM COM9" />
-      <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>
-    <configuration name="OBSW_UdpClient Unit Test" type="PythonConfigurationType" factoryName="Python" folderName="UDP">
-      <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="$PROJECT_DIR$/OBSW_UdpClient.py" />
-      <option name="PARAMETERS" value="-m 5 -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>
     <configuration name="Test Script" type="PythonConfigurationType" factoryName="Python">
       <module name="tmtc" />
       <option name="INTERPRETER_OPTIONS" value="" />
@@ -646,6 +232,8 @@
       <item itemvalue="Python.OBSW_UdpClient Service 8 Serial" />
       <item itemvalue="Python.OBSW_UdpClient Service 17 Test Serial" />
       <item itemvalue="Python.OBSW_UdpClient Unit Test Serial" />
+      <item itemvalue="Python.OBSW_UdpClient GPS0 Serial" />
+      <item itemvalue="Python.OBSW_UdpClient GPS1 Serial" />
       <item itemvalue="Python.OBSW_UdpClient Listener  Mode" />
       <item itemvalue="Python.OBSW_UdpClient Single Command" />
       <item itemvalue="Python.OBSW_UdpClient Software Testmode" />
@@ -655,6 +243,7 @@
       <item itemvalue="Python.OBSW_UdpClient Service 17 Test" />
       <item itemvalue="Python.OBSW_UdpClient Service 200 UDP" />
       <item itemvalue="Python.OBSW_UdpClient Unit Test" />
+      <item itemvalue="Python.OBSW_UdpClient Unit Test STM32" />
       <item itemvalue="Python.OBSW_UdpClient Service Dummy" />
       <item itemvalue="Python.OBSW_UdpClient GPS0" />
       <item itemvalue="Python.OBSW_UdpClient GPS1" />
@@ -713,7 +302,9 @@
       <workItem from="1578151471752" duration="6115000" />
       <workItem from="1578157599966" duration="94000" />
       <workItem from="1578157933959" duration="279000" />
-      <workItem from="1578158564857" duration="9096000" />
+      <workItem from="1578158564857" duration="11363000" />
+      <workItem from="1578175388003" duration="257000" />
+      <workItem from="1578175811117" duration="1347000" />
     </task>
     <servers />
   </component>
@@ -721,10 +312,14 @@
     <option name="version" value="1" />
   </component>
   <component name="WindowStateProjectService">
-    <state x="639" y="224" width="1089" height="712" key="#com.intellij.execution.impl.EditConfigurationsDialog" timestamp="1578171089849">
+    <state x="639" y="224" width="1089" height="740" key="#com.intellij.execution.impl.EditConfigurationsDialog" timestamp="1578177157897">
+      <screen x="0" y="0" width="2048" height="1112" />
+    </state>
+    <state x="639" y="224" width="1089" height="740" key="#com.intellij.execution.impl.EditConfigurationsDialog/0.0.2048.1112@0.0.2048.1112" timestamp="1578177157897" />
+    <state x="964" y="286" key="#com.intellij.ide.macro.MacrosDialog" timestamp="1578177112345">
       <screen x="0" y="0" width="2048" height="1112" />
     </state>
-    <state x="639" y="224" width="1089" height="712" key="#com.intellij.execution.impl.EditConfigurationsDialog/0.0.2048.1112@0.0.2048.1112" timestamp="1578171089849" />
+    <state x="964" y="286" key="#com.intellij.ide.macro.MacrosDialog/0.0.2048.1112@0.0.2048.1112" timestamp="1578177112345" />
     <state x="830" y="272" key="#com.intellij.ide.util.MemberChooser" timestamp="1576433060697">
       <screen x="0" y="0" width="2048" height="1112" />
     </state>
@@ -741,6 +336,10 @@
       <screen x="0" y="0" width="2048" height="1112" />
     </state>
     <state x="759" y="317" key="EnvironmentVariablesDialog/0.0.2048.1112@0.0.2048.1112" timestamp="1576351737993" />
+    <state x="805" y="299" key="FileChooserDialogImpl" timestamp="1578177200587">
+      <screen x="0" y="0" width="2048" height="1112" />
+    </state>
+    <state x="805" y="299" key="FileChooserDialogImpl/0.0.2048.1112@0.0.2048.1112" timestamp="1578177200587" />
     <state width="982" height="373" key="GridCell.Tab.-1.bottom" timestamp="1578155861011">
       <screen x="0" y="0" width="2048" height="1112" />
     </state>
@@ -757,22 +356,22 @@
       <screen x="0" y="0" width="2048" height="1112" />
     </state>
     <state width="982" height="373" key="GridCell.Tab.-1.right/0.0.2048.1112@0.0.2048.1112" timestamp="1578155861011" />
-    <state width="2005" height="322" key="GridCell.Tab.0.bottom" timestamp="1578170887086">
+    <state width="1002" height="322" key="GridCell.Tab.0.bottom" timestamp="1578176905878">
       <screen x="0" y="0" width="2048" height="1112" />
     </state>
-    <state width="2005" height="322" key="GridCell.Tab.0.bottom/0.0.2048.1112@0.0.2048.1112" timestamp="1578170887086" />
-    <state width="2005" height="322" key="GridCell.Tab.0.center" timestamp="1578170887086">
+    <state width="1002" height="322" key="GridCell.Tab.0.bottom/0.0.2048.1112@0.0.2048.1112" timestamp="1578176905878" />
+    <state width="1002" height="322" key="GridCell.Tab.0.center" timestamp="1578176905878">
       <screen x="0" y="0" width="2048" height="1112" />
     </state>
-    <state width="2005" height="322" key="GridCell.Tab.0.center/0.0.2048.1112@0.0.2048.1112" timestamp="1578170887086" />
-    <state width="2005" height="322" key="GridCell.Tab.0.left" timestamp="1578170887086">
+    <state width="1002" height="322" key="GridCell.Tab.0.center/0.0.2048.1112@0.0.2048.1112" timestamp="1578176905878" />
+    <state width="1002" height="322" key="GridCell.Tab.0.left" timestamp="1578176905878">
       <screen x="0" y="0" width="2048" height="1112" />
     </state>
-    <state width="2005" height="322" key="GridCell.Tab.0.left/0.0.2048.1112@0.0.2048.1112" timestamp="1578170887086" />
-    <state width="2005" height="322" key="GridCell.Tab.0.right" timestamp="1578170887086">
+    <state width="1002" height="322" key="GridCell.Tab.0.left/0.0.2048.1112@0.0.2048.1112" timestamp="1578176905878" />
+    <state width="1002" height="322" key="GridCell.Tab.0.right" timestamp="1578176905878">
       <screen x="0" y="0" width="2048" height="1112" />
     </state>
-    <state width="2005" height="322" key="GridCell.Tab.0.right/0.0.2048.1112@0.0.2048.1112" timestamp="1578170887086" />
+    <state width="1002" height="322" key="GridCell.Tab.0.right/0.0.2048.1112@0.0.2048.1112" timestamp="1578176905878" />
     <state width="982" height="373" key="GridCell.Tab.1.bottom" timestamp="1578155850300">
       <screen x="0" y="0" width="2048" height="1112" />
     </state>
@@ -797,10 +396,10 @@
       <screen x="0" y="0" width="2048" height="1112" />
     </state>
     <state width="1031" height="563" key="XDebugger.FullValuePopup/0.0.2048.1112@0.0.2048.1112" timestamp="1576360670785" />
-    <state x="1233" y="380" key="com.intellij.ide.util.TipDialog" timestamp="1578158564939">
+    <state x="1233" y="380" key="com.intellij.ide.util.TipDialog" timestamp="1578175816418">
       <screen x="0" y="0" width="2048" height="1112" />
     </state>
-    <state x="1233" y="380" key="com.intellij.ide.util.TipDialog/0.0.2048.1112@0.0.2048.1112" timestamp="1578158564939" />
+    <state x="1233" y="380" key="com.intellij.ide.util.TipDialog/0.0.2048.1112@0.0.2048.1112" timestamp="1578175816418" />
     <state x="658" y="171" key="com.intellij.openapi.editor.actions.MultiplePasteAction$ClipboardContentChooser" timestamp="1576371500886">
       <screen x="0" y="0" width="2048" height="1112" />
     </state>
@@ -828,9 +427,9 @@
     <SUITE FILE_PATH="coverage/tmtc$OBSW_UdpClient_Service_17.coverage" NAME="OBSW_UdpClient Service 17 Test Coverage Results" MODIFIED="1577735566580" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" />
     <SUITE FILE_PATH="coverage/tmtc$OBSW_UdpClient_Service_2_Test.coverage" NAME="OBSW_UdpClient Service 2 Test Coverage Results" MODIFIED="1577919480522" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" />
     <SUITE FILE_PATH="coverage/tmtc$OBSW_UdpClient_Listener_Mode_Serial.coverage" NAME="OBSW_UdpClient Listener Mode Serial Coverage Results" MODIFIED="1578102764154" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" />
-    <SUITE FILE_PATH="coverage/tmtc$OBSW_UdpClient_Service_200_UDP.coverage" NAME="OBSW_UdpClient Service 200 UDP Coverage Results" MODIFIED="1578104915786" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" />
+    <SUITE FILE_PATH="coverage/tmtc$OBSW_UdpClient_Service_200_UDP.coverage" NAME="OBSW_UdpClient Service 200 UDP Coverage Results" MODIFIED="1578176905873" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" />
     <SUITE FILE_PATH="coverage/tmtc$MIB_Returnvalues.coverage" NAME="MIB_Returnvalues Coverage Results" MODIFIED="1578152122867" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/../generators/returnvalues" />
-    <SUITE FILE_PATH="coverage/tmtc$OBSW_UdpClient_Unit_Test.coverage" NAME="OBSW_UdpClient Unit Test Coverage Results" MODIFIED="1578104161260" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" />
+    <SUITE FILE_PATH="coverage/tmtc$OBSW_UdpClient_Unit_Test.coverage" NAME="OBSW_UdpClient Unit Test Coverage Results" MODIFIED="1578176003856" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" />
     <SUITE FILE_PATH="coverage/tmtc$OBSW_UdpClient_Service_3_Serial_.coverage" NAME="OBSW_UdpClient Service 3 Serial  Coverage Results" MODIFIED="1578170887081" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" />
     <SUITE FILE_PATH="coverage/tmtc$OBSW_UdpClient_Software_Testmode.coverage" NAME="OBSW_UdpClient Software Testmode Coverage Results" MODIFIED="1578104232427" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" />
     <SUITE FILE_PATH="coverage/tmtc$OBSW_UdpClient_Service_8.coverage" NAME="OBSW_UdpClient Service 8 Coverage Results" MODIFIED="1578158566744" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" />
@@ -839,11 +438,12 @@
     <SUITE FILE_PATH="coverage/tmtc$OBSW_UdpClient_Service_5_Serial.coverage" NAME="OBSW_UdpClient Service 5 Serial Coverage Results" MODIFIED="1578012316105" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" />
     <SUITE FILE_PATH="coverage/tmtc$OBSW_UdpClient_Unit_Test_Serial.coverage" NAME="OBSW_UdpClient Unit Test Serial Coverage Results" MODIFIED="1578169947051" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" />
     <SUITE FILE_PATH="coverage/tmtc$OBSW_UdpClient_Service_8_Serial.coverage" NAME="OBSW_UdpClient Service 8 Serial Coverage Results" MODIFIED="1578170848389" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" />
-    <SUITE FILE_PATH="coverage/tmtc$OBSW_UdpClient_Service_3.coverage" NAME="OBSW_UdpClient Service 3 Coverage Results" MODIFIED="1577735616646" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" />
+    <SUITE FILE_PATH="coverage/tmtc$OBSW_UdpClient_Service_3.coverage" NAME="OBSW_UdpClient Service 3 Coverage Results" MODIFIED="1578176739598" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" />
+    <SUITE FILE_PATH="coverage/tmtc$OBSW_UdpClient_Unit_Test_STM32.coverage" NAME="OBSW_UdpClient Unit Test STM32 Coverage Results" MODIFIED="1578176681896" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" />
     <SUITE FILE_PATH="coverage/tmtc$OBSW_UdpClient_Help.coverage" NAME="OBSW_UdpClient Help Coverage Results" MODIFIED="1577996094909" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" />
     <SUITE FILE_PATH="coverage/tmtc$OBSW_UdpClient_rGPS.coverage" NAME="OBSW_UdpClient GPS1 Coverage Results" MODIFIED="1576874652996" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" />
     <SUITE FILE_PATH="coverage/tmtc$OBSW_UdpClient_Listener_Mode_UART.coverage" NAME="OBSW_UdpClient Listener Mode UART Coverage Results" MODIFIED="1577918075998" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" />
-    <SUITE FILE_PATH="coverage/tmtc$OBSW_UdpClient_Service_17_Test.coverage" NAME="OBSW_UdpClient Service 17 Test Coverage Results" MODIFIED="1578104689098" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" />
+    <SUITE FILE_PATH="coverage/tmtc$OBSW_UdpClient_Service_17_Test.coverage" NAME="OBSW_UdpClient Service 17 Test Coverage Results" MODIFIED="1578175846961" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" />
     <SUITE FILE_PATH="coverage/tmtc$OBSW_UdpClient_Single_Command_Serial.coverage" NAME="OBSW_UdpClient Single Command Serial Coverage Results" MODIFIED="1578161512290" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" />
   </component>
 </project>
\ No newline at end of file
diff --git a/OBSW_UdpClient.py b/OBSW_UdpClient.py
index 4fc364425f130801d657b256cef9f0d45d787421..a96aeedab5ac9498a03a0f25264359faa0690243 100644
--- a/OBSW_UdpClient.py
+++ b/OBSW_UdpClient.py
@@ -60,7 +60,7 @@ import unittest
 import argparse
 
 from test import OBSW_UnitTest
-import OBSW_Config as g
+from config import OBSW_Config as g
 from tc.OBSW_TcPacker import PUSTelecommand, createTotalTcQueue, serviceTestSelect
 from sendreceive.OBSW_CommandSenderReceiver import CommandSenderReceiver, connectToBoard
 from sendreceive.OBSW_SingleCommandSenderReceiver import SingleCommandSenderReceiver
diff --git a/OBSW_Config.py b/config/OBSW_Config.py
similarity index 100%
rename from OBSW_Config.py
rename to config/OBSW_Config.py
diff --git a/config/PyCharmConfig_README.md b/config/PyCharmConfig_README.md
deleted file mode 100644
index 5132743f04b44da46cb9ad3b1fc313bdc629ee13..0000000000000000000000000000000000000000
--- a/config/PyCharmConfig_README.md
+++ /dev/null
@@ -1,2 +0,0 @@
-Rename ConfigurationFolder inside PyCharm to .idea and move it to the root directory of the TMTC script(tmtc/).
-It contains the settings for PyCharm (Pre-defined command line parameters)
\ No newline at end of file
diff --git a/sendreceive/OBSW_CommandSenderReceiver.py b/sendreceive/OBSW_CommandSenderReceiver.py
index 1e3352df52cba0afd9326a7cc32e269c72910372..dd2709df67e1e8b4c022bc75b42e8d3877ccd0b3 100644
--- a/sendreceive/OBSW_CommandSenderReceiver.py
+++ b/sendreceive/OBSW_CommandSenderReceiver.py
@@ -12,7 +12,7 @@ This is still experimental.
 
 @author: R. Mueller
 """
-import OBSW_Config as g
+from config import OBSW_Config as g
 import time
 
 
diff --git a/sendreceive/OBSW_MultipleCommandsSenderReceiver.py b/sendreceive/OBSW_MultipleCommandsSenderReceiver.py
index be898686c52988ae600f45b021a6b4359f312d45..9d38bd123cdb5f9838c9cd0e39a282dd831b39de 100644
--- a/sendreceive/OBSW_MultipleCommandsSenderReceiver.py
+++ b/sendreceive/OBSW_MultipleCommandsSenderReceiver.py
@@ -6,12 +6,11 @@
 @brief
     Used to send multiple TCs as bursts and listen for replies simultaneously. Used by UnitTester
 """
-import OBSW_Config as g
+from config import OBSW_Config as g
 from sendreceive.OBSW_SequentialSenderReceiver import SequentialCommandSenderReceiver
 import queue
 import time
 import threading
-import select
 
 
 # Difference to seqential sender: This class can send TCs in bursts. Wait intervals can be specified with
diff --git a/test/OBSW_UnitTest.py b/test/OBSW_UnitTest.py
index b71698ee1874b8e8ff3808eda103df00958b4c1b..15633564beadb25b2f2c7017d9d54024a09a894b 100644
--- a/test/OBSW_UnitTest.py
+++ b/test/OBSW_UnitTest.py
@@ -22,18 +22,16 @@ to be specified in the analyseTcInfo method of the child test.
 
 @author: R. Mueller
 """
-import time
 import unittest
 import queue
 
 
 from tc.OBSW_TcPacker import packService17TestInto, packService5TestInto, packDummyDeviceTestInto
 from sendreceive.OBSW_MultipleCommandsSenderReceiver import MultipleCommandSenderReceiver
-from OBSW_UdpClient import connectToBoard
 from utility.OBSW_TmTcPrinter import TmtcPrinter
 from comIF.OBSW_Ethernet_ComIF import EthernetComIF
 from comIF.OBSW_Serial_ComIF import SerialComIF
-import OBSW_Config as g
+from config import OBSW_Config as g
 
 
 class TestService(unittest.TestCase):
diff --git a/utility/OBSW_TmTcPrinter.py b/utility/OBSW_TmTcPrinter.py
index f79183238d1e4425bd7e15df89c8919c0003082e..88e0f8d0f7857f6f4c542820215e15c4b762de23 100644
--- a/utility/OBSW_TmTcPrinter.py
+++ b/utility/OBSW_TmTcPrinter.py
@@ -8,7 +8,7 @@
 @brief
     Class that performs all printing functionalities
 """
-import OBSW_Config as g
+from config import OBSW_Config as g
 
 
 # TODO: Print everything in a file