diff --git a/CMakeLists.txt b/CMakeLists.txt
index ba99e25e22ee8dc2c0bc99e3bd5542f36f44d7a4..0e91c7441f83e25e0934fb95f11326ecaf0d4fc5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -34,70 +34,70 @@ project(OnBoardSoftware)
 #                              Flight entrypoints                             #
 #-----------------------------------------------------------------------------#
 
-add_executable(main-entry src/entrypoints/Main/main-entry.cpp ${MAIN_COMPUTER})
+add_executable(main-entry src/Main/main-entry.cpp ${MAIN_COMPUTER})
 target_include_directories(main-entry PRIVATE ${OBSW_INCLUDE_DIRS})
 target_compile_definitions(main-entry PRIVATE DEFAULT_STDOUT_LOG_LEVEL=20)
 sbs_target(main-entry stm32f767zi_lyra_biscotto)
 
-add_executable(main-entry-roccaraso src/entrypoints/Main/main-entry.cpp ${MAIN_COMPUTER})
+add_executable(main-entry-roccaraso src/Main/main-entry.cpp ${MAIN_COMPUTER})
 target_include_directories(main-entry-roccaraso PRIVATE ${OBSW_INCLUDE_DIRS})
 target_compile_definitions(main-entry-roccaraso PRIVATE DEFAULT_STDOUT_LOG_LEVEL=20 ROCCARASO)
 sbs_target(main-entry-roccaraso stm32f767zi_lyra_biscotto)
 
-add_executable(main-entry-euroc src/entrypoints/Main/main-entry.cpp ${MAIN_COMPUTER})
+add_executable(main-entry-euroc src/Main/main-entry.cpp ${MAIN_COMPUTER})
 target_include_directories(main-entry-euroc PRIVATE ${OBSW_INCLUDE_DIRS})
 target_compile_definitions(main-entry-euroc PRIVATE DEFAULT_STDOUT_LOG_LEVEL=20 EUROC)
 sbs_target(main-entry-euroc stm32f767zi_lyra_biscotto)
 
-add_executable(payload-entry src/entrypoints/Payload/payload-entry.cpp ${PAYLOAD_COMPUTER})
+add_executable(payload-entry src/Payload/payload-entry.cpp ${PAYLOAD_COMPUTER})
 target_include_directories(payload-entry PRIVATE ${OBSW_INCLUDE_DIRS})
 sbs_target(payload-entry stm32f767zi_lyra_biscotto)
 
-add_executable(payload-entry-roccaraso src/entrypoints/Payload/payload-entry.cpp ${PAYLOAD_COMPUTER})
+add_executable(payload-entry-roccaraso src/Payload/payload-entry.cpp ${PAYLOAD_COMPUTER})
 target_include_directories(payload-entry-roccaraso PRIVATE ${OBSW_INCLUDE_DIRS})
 target_compile_definitions(payload-entry-roccaraso PRIVATE ROCCARASO)
 sbs_target(payload-entry-roccaraso stm32f767zi_lyra_biscotto)
 
-add_executable(payload-entry-euroc src/entrypoints/Payload/payload-entry.cpp ${PAYLOAD_COMPUTER})
+add_executable(payload-entry-euroc src/Payload/payload-entry.cpp ${PAYLOAD_COMPUTER})
 target_include_directories(payload-entry-euroc PRIVATE ${OBSW_INCLUDE_DIRS})
 target_compile_definitions(payload-entry-euroc PRIVATE EUROC)
 sbs_target(payload-entry-euroc stm32f767zi_lyra_biscotto)
 
-add_executable(motor-entry src/entrypoints/Motor/motor-entry.cpp ${MOTOR_SOURCES})
+add_executable(motor-entry src/Motor/motor-entry.cpp ${MOTOR_SOURCES})
 target_include_directories(motor-entry PRIVATE ${OBSW_INCLUDE_DIRS})
 sbs_target(motor-entry stm32f767zi_lyra_motor)
 
-add_executable(rig-v2-entry src/entrypoints/RIGv2/rig-v2-entry.cpp ${RIG_V2_COMPUTER})
+add_executable(rig-v2-entry src/RIGv2/rig-v2-entry.cpp ${RIG_V2_COMPUTER})
 target_include_directories(rig-v2-entry PRIVATE ${OBSW_INCLUDE_DIRS})
 sbs_target(rig-v2-entry stm32f767zi_rig_v2)
 
-add_executable(con_rig-entry src/entrypoints/ConRIG/con_rig-entry.cpp ${CON_RIG_COMPUTER})
+add_executable(con_rig-entry src/ConRIG/con_rig-entry.cpp ${CON_RIG_COMPUTER})
 target_include_directories(con_rig-entry PRIVATE ${OBSW_INCLUDE_DIRS})
 sbs_target(con_rig-entry stm32f429zi_con_rig)
 
 add_executable(rovie-groundstation-entry 
-    src/entrypoints/Groundstation/rovie-groundstation-entry.cpp 
+    src/Groundstation/Rovie/rovie-groundstation-entry.cpp 
     ${GROUNDSTATION_COMMON} ${GROUNDSTATION_ROVIE}
 )
 target_include_directories(rovie-groundstation-entry PRIVATE ${OBSW_INCLUDE_DIRS})
 sbs_target(rovie-groundstation-entry stm32f767zi_gemini_gs)
 
 add_executable(nokia-groundstation-entry 
-    src/entrypoints/Groundstation/nokia-groundstation-entry.cpp 
+    src/Groundstation/Nokia/nokia-groundstation-entry.cpp 
     ${GROUNDSTATION_COMMON} ${GROUNDSTATION_NOKIA}
 )
 target_include_directories(nokia-groundstation-entry PRIVATE ${OBSW_INCLUDE_DIRS})
 sbs_target(nokia-groundstation-entry stm32f429zi_nokia)
 
 add_executable(test-actuators
-    src/entrypoints/Groundstation/Automated/test-actuators.cpp
+    src/Groundstation/Automated/test-actuators.cpp
     ${LYRA_GS} ${GROUNDSTATION_COMMON}
 )
 target_include_directories(test-actuators PRIVATE ${OBSW_INCLUDE_DIRS})
 sbs_target(test-actuators stm32f767zi_lyra_gs)
 
 add_executable(lyra-gs-entry
-    src/entrypoints/Groundstation/lyra-gs-entry.cpp
+    src/Groundstation/LyraGS/lyra-gs-entry.cpp
     ${LYRA_GS} ${GROUNDSTATION_COMMON}
 )
 target_include_directories(lyra-gs-entry PRIVATE ${OBSW_INCLUDE_DIRS})
diff --git a/cmake/dependencies.cmake b/cmake/dependencies.cmake
index 68d981a4bc7e8c00763683dc0c3614ec7ffec15d..e011996fd1cce8a00671076b9eae967a0458cf6b 100644
--- a/cmake/dependencies.cmake
+++ b/cmake/dependencies.cmake
@@ -25,96 +25,96 @@ set(OBSW_INCLUDE_DIRS
 )
 
 set(MAIN_COMPUTER
-    src/boards/Main/Data/ABKTrajectorySet.cpp
-    src/boards/Main/PersistentVars/PersistentVars.cpp
-    src/boards/Main/HIL/HIL.cpp
-    src/boards/Main/Sensors/Sensors.cpp
-    src/boards/Main/AlgoReference/AlgoReference.cpp
-    src/boards/Main/Radio/Radio.cpp
-    src/boards/Main/CanHandler/CanHandler.cpp
-    src/boards/Main/StateMachines/FlightModeManager/FlightModeManager.cpp
-    src/boards/Main/Actuators/Actuators.cpp
-    src/boards/Main/StateMachines/NASController/NASController.cpp
-    src/boards/Main/StateMachines/ADAController/ADAController.cpp
-    src/boards/Main/PinHandler/PinHandler.cpp
-    src/boards/Main/StateMachines/ABKController/ABKController.cpp
-    src/boards/Main/StateMachines/MEAController/MEAController.cpp
-    src/boards/Main/StatsRecorder/StatsRecorder.cpp
+    src/Main/Data/ABKTrajectorySet.cpp
+    src/Main/PersistentVars/PersistentVars.cpp
+    src/Main/HIL/HIL.cpp
+    src/Main/Sensors/Sensors.cpp
+    src/Main/AlgoReference/AlgoReference.cpp
+    src/Main/Radio/Radio.cpp
+    src/Main/CanHandler/CanHandler.cpp
+    src/Main/StateMachines/FlightModeManager/FlightModeManager.cpp
+    src/Main/Actuators/Actuators.cpp
+    src/Main/StateMachines/NASController/NASController.cpp
+    src/Main/StateMachines/ADAController/ADAController.cpp
+    src/Main/PinHandler/PinHandler.cpp
+    src/Main/StateMachines/ABKController/ABKController.cpp
+    src/Main/StateMachines/MEAController/MEAController.cpp
+    src/Main/StatsRecorder/StatsRecorder.cpp
 )
 
 set(GROUNDSTATION_COMMON
-    src/boards/Groundstation/Common/Radio/RadioBase.cpp
-    src/boards/Groundstation/Common/Ports/EthernetBase.cpp
-    src/boards/Groundstation/Common/Ports/Serial.cpp
-    src/boards/Groundstation/Common/HubBase.cpp
+    src/Groundstation/Common/Radio/RadioBase.cpp
+    src/Groundstation/Common/Ports/EthernetBase.cpp
+    src/Groundstation/Common/Ports/Serial.cpp
+    src/Groundstation/Common/HubBase.cpp
 )
 
 set(MOTOR_SOURCES
-    src/boards/Motor/PersistentVars/PersistentVars.cpp
-    src/boards/Motor/HIL/HIL.cpp
-    src/boards/Motor/Actuators/Actuators.cpp
-    src/boards/Motor/Sensors/Sensors.cpp
-    src/boards/Motor/CanHandler/CanHandler.cpp
+    src/Motor/PersistentVars/PersistentVars.cpp
+    src/Motor/HIL/HIL.cpp
+    src/Motor/Actuators/Actuators.cpp
+    src/Motor/Sensors/Sensors.cpp
+    src/Motor/CanHandler/CanHandler.cpp
 )
 
 set(RIG_V2_COMPUTER
-    src/boards/RIGv2/Radio/Radio.cpp
-    src/boards/RIGv2/Sensors/Sensors.cpp
-    src/boards/RIGv2/Actuators/Actuators.cpp
-    src/boards/RIGv2/Registry/Registry.cpp
-    src/boards/RIGv2/CanHandler/CanHandler.cpp
-    src/boards/RIGv2/StateMachines/GroundModeManager/GroundModeManager.cpp
-    src/boards/RIGv2/StateMachines/TARS1/TARS1.cpp
+    src/RIGv2/Radio/Radio.cpp
+    src/RIGv2/Sensors/Sensors.cpp
+    src/RIGv2/Actuators/Actuators.cpp
+    src/RIGv2/Registry/Registry.cpp
+    src/RIGv2/CanHandler/CanHandler.cpp
+    src/RIGv2/StateMachines/GroundModeManager/GroundModeManager.cpp
+    src/RIGv2/StateMachines/TARS1/TARS1.cpp
 )
 
 set(CON_RIG_COMPUTER
-    src/boards/ConRIG/Buttons/Buttons.cpp
-    src/boards/ConRIG/Radio/Radio.cpp
-    src/boards/ConRIG/Serial/Serial.cpp
+    src/ConRIG/Buttons/Buttons.cpp
+    src/ConRIG/Radio/Radio.cpp
+    src/ConRIG/Serial/Serial.cpp
 )
 
 set(PAYLOAD_COMPUTER
-    src/boards/Payload/Actuators/Actuators.cpp
-    src/boards/Payload/CanHandler/CanHandler.cpp
-    src/boards/Payload/FlightStatsRecorder/FlightStatsRecorder.cpp
-    src/boards/Payload/HIL/HIL.cpp
-    src/boards/Payload/Sensors/Sensors.cpp
-    src/boards/Payload/PersistentVars/PersistentVars.cpp
-    src/boards/Payload/PinHandler/PinHandler.cpp
-    src/boards/Payload/Radio/Radio.cpp
-    src/boards/Payload/Radio/MessageHandler.cpp
-    src/boards/Payload/StateMachines/NASController/NASController.cpp
-    src/boards/Payload/StateMachines/FlightModeManager/FlightModeManager.cpp
-    src/boards/Payload/StateMachines/WingController/WingController.cpp
-    src/boards/Payload/AltitudeTrigger/AltitudeTrigger.cpp
-    src/boards/Payload/Wing/AutomaticWingAlgorithm.cpp
-    src/boards/Payload/Wing/Guidance/EarlyManeuverGuidanceAlgorithm.cpp
-    src/boards/Payload/Wing/Guidance/ClosedLoopGuidanceAlgorithm.cpp
-    src/boards/Payload/Wing/FileWingAlgorithm.cpp
-    src/boards/Payload/Wing/WingAlgorithm.cpp
+    src/Payload/Actuators/Actuators.cpp
+    src/Payload/CanHandler/CanHandler.cpp
+    src/Payload/FlightStatsRecorder/FlightStatsRecorder.cpp
+    src/Payload/HIL/HIL.cpp
+    src/Payload/Sensors/Sensors.cpp
+    src/Payload/PersistentVars/PersistentVars.cpp
+    src/Payload/PinHandler/PinHandler.cpp
+    src/Payload/Radio/Radio.cpp
+    src/Payload/Radio/MessageHandler.cpp
+    src/Payload/StateMachines/NASController/NASController.cpp
+    src/Payload/StateMachines/FlightModeManager/FlightModeManager.cpp
+    src/Payload/StateMachines/WingController/WingController.cpp
+    src/Payload/AltitudeTrigger/AltitudeTrigger.cpp
+    src/Payload/Wing/AutomaticWingAlgorithm.cpp
+    src/Payload/Wing/Guidance/EarlyManeuverGuidanceAlgorithm.cpp
+    src/Payload/Wing/Guidance/ClosedLoopGuidanceAlgorithm.cpp
+    src/Payload/Wing/FileWingAlgorithm.cpp
+    src/Payload/Wing/WingAlgorithm.cpp
 )
 
 set(GROUNDSTATION_ROVIE
-    src/boards/Groundstation/Rovie/Radio/Radio.cpp
-    src/boards/Groundstation/Rovie/Ports/Ethernet.cpp
-    src/boards/Groundstation/Rovie/Hub.cpp
+    src/Groundstation/Rovie/Radio/Radio.cpp
+    src/Groundstation/Rovie/Ports/Ethernet.cpp
+    src/Groundstation/Rovie/Hub.cpp
 )
 
 set(GROUNDSTATION_NOKIA
-    src/boards/Groundstation/Nokia/Radio/Radio.cpp
-    src/boards/Groundstation/Nokia/Hub.cpp
+    src/Groundstation/Nokia/Radio/Radio.cpp
+    src/Groundstation/Nokia/Hub.cpp
 )
 
 set (LYRA_GS
-    src/boards/Groundstation/LyraGS/Radio/Radio.cpp
-    src/boards/Groundstation/LyraGS/Ports/Ethernet.cpp
-    src/boards/Groundstation/LyraGS/BoardStatus.cpp
-    src/boards/Groundstation/LyraGS/Base/Hub.cpp
-    src/boards/Groundstation/Automated/Hub.cpp
-    src/boards/Groundstation/Automated/Leds/Leds.cpp
-    src/boards/Groundstation/Automated/SMA/SMA.cpp
-    src/boards/Groundstation/Automated/Actuators/Actuators.cpp
-    src/boards/Groundstation/Automated/Sensors/Sensors.cpp
-    src/boards/Groundstation/Automated/PinHandler/PinHandler.cpp
-    src/boards/Groundstation/LyraGS/Ports/SerialLyraGS.cpp
-)
\ No newline at end of file
+    src/Groundstation/LyraGS/Radio/Radio.cpp
+    src/Groundstation/LyraGS/Ports/Ethernet.cpp
+    src/Groundstation/LyraGS/BoardStatus.cpp
+    src/Groundstation/LyraGS/Base/Hub.cpp
+    src/Groundstation/Automated/Hub.cpp
+    src/Groundstation/Automated/Leds/Leds.cpp
+    src/Groundstation/Automated/SMA/SMA.cpp
+    src/Groundstation/Automated/Actuators/Actuators.cpp
+    src/Groundstation/Automated/Sensors/Sensors.cpp
+    src/Groundstation/Automated/PinHandler/PinHandler.cpp
+    src/Groundstation/LyraGS/Ports/SerialLyraGS.cpp
+)
diff --git a/src/scripts/AbkCodegen/References.py b/scripts/AbkCodegen/References.py
similarity index 100%
rename from src/scripts/AbkCodegen/References.py
rename to scripts/AbkCodegen/References.py
diff --git a/src/scripts/EventDumper/EventDumper.cpp b/scripts/EventDumper/EventDumper.cpp
similarity index 100%
rename from src/scripts/EventDumper/EventDumper.cpp
rename to scripts/EventDumper/EventDumper.cpp
diff --git a/src/scripts/EventDumper/Makefile b/scripts/EventDumper/Makefile
similarity index 100%
rename from src/scripts/EventDumper/Makefile
rename to scripts/EventDumper/Makefile
diff --git a/src/scripts/eventgen.sh b/scripts/eventgen.sh
similarity index 100%
rename from src/scripts/eventgen.sh
rename to scripts/eventgen.sh
diff --git a/src/scripts/fsmgen.sh b/scripts/fsmgen.sh
similarity index 100%
rename from src/scripts/fsmgen.sh
rename to scripts/fsmgen.sh
diff --git a/src/scripts/logdecoder/AutomatedAntennas/Makefile b/scripts/logdecoder/AutomatedAntennas/Makefile
similarity index 100%
rename from src/scripts/logdecoder/AutomatedAntennas/Makefile
rename to scripts/logdecoder/AutomatedAntennas/Makefile
diff --git a/src/scripts/logdecoder/AutomatedAntennas/logdecoder.cpp b/scripts/logdecoder/AutomatedAntennas/logdecoder.cpp
similarity index 100%
rename from src/scripts/logdecoder/AutomatedAntennas/logdecoder.cpp
rename to scripts/logdecoder/AutomatedAntennas/logdecoder.cpp
diff --git a/src/scripts/logdecoder/General/Makefile b/scripts/logdecoder/General/Makefile
similarity index 100%
rename from src/scripts/logdecoder/General/Makefile
rename to scripts/logdecoder/General/Makefile
diff --git a/scripts/logdecoder/General/logdecoder b/scripts/logdecoder/General/logdecoder
new file mode 100755
index 0000000000000000000000000000000000000000..385742662a6bfd3771392c88dcbcb13b29daf608
Binary files /dev/null and b/scripts/logdecoder/General/logdecoder differ
diff --git a/src/scripts/logdecoder/General/logdecoder.cpp b/scripts/logdecoder/General/logdecoder.cpp
similarity index 100%
rename from src/scripts/logdecoder/General/logdecoder.cpp
rename to scripts/logdecoder/General/logdecoder.cpp
diff --git a/src/scripts/logdecoder/Main/Makefile b/scripts/logdecoder/Main/Makefile
similarity index 100%
rename from src/scripts/logdecoder/Main/Makefile
rename to scripts/logdecoder/Main/Makefile
diff --git a/src/scripts/logdecoder/Main/logdecoder.cpp b/scripts/logdecoder/Main/logdecoder.cpp
similarity index 100%
rename from src/scripts/logdecoder/Main/logdecoder.cpp
rename to scripts/logdecoder/Main/logdecoder.cpp
diff --git a/src/scripts/logdecoder/Motor/Makefile b/scripts/logdecoder/Motor/Makefile
similarity index 100%
rename from src/scripts/logdecoder/Motor/Makefile
rename to scripts/logdecoder/Motor/Makefile
diff --git a/src/scripts/logdecoder/Motor/logdecoder.cpp b/scripts/logdecoder/Motor/logdecoder.cpp
similarity index 100%
rename from src/scripts/logdecoder/Motor/logdecoder.cpp
rename to scripts/logdecoder/Motor/logdecoder.cpp
diff --git a/src/scripts/logdecoder/Payload/Makefile b/scripts/logdecoder/Payload/Makefile
similarity index 100%
rename from src/scripts/logdecoder/Payload/Makefile
rename to scripts/logdecoder/Payload/Makefile
diff --git a/scripts/logdecoder/Payload/logdecoder b/scripts/logdecoder/Payload/logdecoder
new file mode 100755
index 0000000000000000000000000000000000000000..cff67070794a9349219bb229e7987cc74d183c2f
Binary files /dev/null and b/scripts/logdecoder/Payload/logdecoder differ
diff --git a/src/scripts/logdecoder/Payload/logdecoder.cpp b/scripts/logdecoder/Payload/logdecoder.cpp
similarity index 100%
rename from src/scripts/logdecoder/Payload/logdecoder.cpp
rename to scripts/logdecoder/Payload/logdecoder.cpp
diff --git a/src/scripts/logdecoder/RIGv2/Makefile b/scripts/logdecoder/RIGv2/Makefile
similarity index 100%
rename from src/scripts/logdecoder/RIGv2/Makefile
rename to scripts/logdecoder/RIGv2/Makefile
diff --git a/src/scripts/logdecoder/RIGv2/logdecoder.cpp b/scripts/logdecoder/RIGv2/logdecoder.cpp
similarity index 100%
rename from src/scripts/logdecoder/RIGv2/logdecoder.cpp
rename to scripts/logdecoder/RIGv2/logdecoder.cpp
diff --git a/src/boards/ConRIG/BoardScheduler.h b/src/ConRIG/BoardScheduler.h
similarity index 100%
rename from src/boards/ConRIG/BoardScheduler.h
rename to src/ConRIG/BoardScheduler.h
diff --git a/src/boards/ConRIG/Buses.h b/src/ConRIG/Buses.h
similarity index 100%
rename from src/boards/ConRIG/Buses.h
rename to src/ConRIG/Buses.h
diff --git a/src/boards/ConRIG/Buttons/Buttons.cpp b/src/ConRIG/Buttons/Buttons.cpp
similarity index 100%
rename from src/boards/ConRIG/Buttons/Buttons.cpp
rename to src/ConRIG/Buttons/Buttons.cpp
diff --git a/src/boards/ConRIG/Buttons/Buttons.h b/src/ConRIG/Buttons/Buttons.h
similarity index 100%
rename from src/boards/ConRIG/Buttons/Buttons.h
rename to src/ConRIG/Buttons/Buttons.h
diff --git a/src/boards/ConRIG/Configs/ButtonsConfig.h b/src/ConRIG/Configs/ButtonsConfig.h
similarity index 100%
rename from src/boards/ConRIG/Configs/ButtonsConfig.h
rename to src/ConRIG/Configs/ButtonsConfig.h
diff --git a/src/boards/ConRIG/Configs/RadioConfig.h b/src/ConRIG/Configs/RadioConfig.h
similarity index 100%
rename from src/boards/ConRIG/Configs/RadioConfig.h
rename to src/ConRIG/Configs/RadioConfig.h
diff --git a/src/boards/ConRIG/Radio/Radio.cpp b/src/ConRIG/Radio/Radio.cpp
similarity index 100%
rename from src/boards/ConRIG/Radio/Radio.cpp
rename to src/ConRIG/Radio/Radio.cpp
diff --git a/src/boards/ConRIG/Radio/Radio.h b/src/ConRIG/Radio/Radio.h
similarity index 100%
rename from src/boards/ConRIG/Radio/Radio.h
rename to src/ConRIG/Radio/Radio.h
diff --git a/src/boards/ConRIG/Serial/Serial.cpp b/src/ConRIG/Serial/Serial.cpp
similarity index 100%
rename from src/boards/ConRIG/Serial/Serial.cpp
rename to src/ConRIG/Serial/Serial.cpp
diff --git a/src/boards/ConRIG/Serial/Serial.h b/src/ConRIG/Serial/Serial.h
similarity index 100%
rename from src/boards/ConRIG/Serial/Serial.h
rename to src/ConRIG/Serial/Serial.h
diff --git a/src/entrypoints/ConRIG/con_rig-entry.cpp b/src/ConRIG/con_rig-entry.cpp
similarity index 100%
rename from src/entrypoints/ConRIG/con_rig-entry.cpp
rename to src/ConRIG/con_rig-entry.cpp
diff --git a/src/boards/Groundstation/Automated/Actuators/Actuators.cpp b/src/Groundstation/Automated/Actuators/Actuators.cpp
similarity index 100%
rename from src/boards/Groundstation/Automated/Actuators/Actuators.cpp
rename to src/Groundstation/Automated/Actuators/Actuators.cpp
diff --git a/src/boards/Groundstation/Automated/Actuators/Actuators.h b/src/Groundstation/Automated/Actuators/Actuators.h
similarity index 100%
rename from src/boards/Groundstation/Automated/Actuators/Actuators.h
rename to src/Groundstation/Automated/Actuators/Actuators.h
diff --git a/src/boards/Groundstation/Automated/Actuators/ActuatorsConfig.h b/src/Groundstation/Automated/Actuators/ActuatorsConfig.h
similarity index 100%
rename from src/boards/Groundstation/Automated/Actuators/ActuatorsConfig.h
rename to src/Groundstation/Automated/Actuators/ActuatorsConfig.h
diff --git a/src/boards/Groundstation/Automated/Actuators/ActuatorsData.h b/src/Groundstation/Automated/Actuators/ActuatorsData.h
similarity index 100%
rename from src/boards/Groundstation/Automated/Actuators/ActuatorsData.h
rename to src/Groundstation/Automated/Actuators/ActuatorsData.h
diff --git a/src/boards/Groundstation/Automated/Config/PinHandlerConfig.h b/src/Groundstation/Automated/Config/PinHandlerConfig.h
similarity index 100%
rename from src/boards/Groundstation/Automated/Config/PinHandlerConfig.h
rename to src/Groundstation/Automated/Config/PinHandlerConfig.h
diff --git a/src/boards/Groundstation/Automated/Config/SMAConfig.h b/src/Groundstation/Automated/Config/SMAConfig.h
similarity index 100%
rename from src/boards/Groundstation/Automated/Config/SMAConfig.h
rename to src/Groundstation/Automated/Config/SMAConfig.h
diff --git a/src/entrypoints/Groundstation/Automated/Converter.h b/src/Groundstation/Automated/Converter.h
similarity index 100%
rename from src/entrypoints/Groundstation/Automated/Converter.h
rename to src/Groundstation/Automated/Converter.h
diff --git a/src/boards/Groundstation/Automated/Hub.cpp b/src/Groundstation/Automated/Hub.cpp
similarity index 100%
rename from src/boards/Groundstation/Automated/Hub.cpp
rename to src/Groundstation/Automated/Hub.cpp
diff --git a/src/boards/Groundstation/Automated/Hub.h b/src/Groundstation/Automated/Hub.h
similarity index 100%
rename from src/boards/Groundstation/Automated/Hub.h
rename to src/Groundstation/Automated/Hub.h
diff --git a/src/boards/Groundstation/Automated/Leds/Leds.cpp b/src/Groundstation/Automated/Leds/Leds.cpp
similarity index 100%
rename from src/boards/Groundstation/Automated/Leds/Leds.cpp
rename to src/Groundstation/Automated/Leds/Leds.cpp
diff --git a/src/boards/Groundstation/Automated/Leds/Leds.h b/src/Groundstation/Automated/Leds/Leds.h
similarity index 100%
rename from src/boards/Groundstation/Automated/Leds/Leds.h
rename to src/Groundstation/Automated/Leds/Leds.h
diff --git a/src/boards/Groundstation/Automated/PinHandler/PinData.h b/src/Groundstation/Automated/PinHandler/PinData.h
similarity index 100%
rename from src/boards/Groundstation/Automated/PinHandler/PinData.h
rename to src/Groundstation/Automated/PinHandler/PinData.h
diff --git a/src/boards/Groundstation/Automated/PinHandler/PinHandler.cpp b/src/Groundstation/Automated/PinHandler/PinHandler.cpp
similarity index 100%
rename from src/boards/Groundstation/Automated/PinHandler/PinHandler.cpp
rename to src/Groundstation/Automated/PinHandler/PinHandler.cpp
diff --git a/src/boards/Groundstation/Automated/PinHandler/PinHandler.h b/src/Groundstation/Automated/PinHandler/PinHandler.h
similarity index 100%
rename from src/boards/Groundstation/Automated/PinHandler/PinHandler.h
rename to src/Groundstation/Automated/PinHandler/PinHandler.h
diff --git a/src/boards/Groundstation/Automated/SMA/SMA.cpp b/src/Groundstation/Automated/SMA/SMA.cpp
similarity index 100%
rename from src/boards/Groundstation/Automated/SMA/SMA.cpp
rename to src/Groundstation/Automated/SMA/SMA.cpp
diff --git a/src/boards/Groundstation/Automated/SMA/SMA.h b/src/Groundstation/Automated/SMA/SMA.h
similarity index 100%
rename from src/boards/Groundstation/Automated/SMA/SMA.h
rename to src/Groundstation/Automated/SMA/SMA.h
diff --git a/src/boards/Groundstation/Automated/SMA/SMAData.h b/src/Groundstation/Automated/SMA/SMAData.h
similarity index 100%
rename from src/boards/Groundstation/Automated/SMA/SMAData.h
rename to src/Groundstation/Automated/SMA/SMAData.h
diff --git a/src/boards/Groundstation/Automated/Sensors/Sensors.cpp b/src/Groundstation/Automated/Sensors/Sensors.cpp
similarity index 100%
rename from src/boards/Groundstation/Automated/Sensors/Sensors.cpp
rename to src/Groundstation/Automated/Sensors/Sensors.cpp
diff --git a/src/boards/Groundstation/Automated/Sensors/Sensors.h b/src/Groundstation/Automated/Sensors/Sensors.h
similarity index 100%
rename from src/boards/Groundstation/Automated/Sensors/Sensors.h
rename to src/Groundstation/Automated/Sensors/Sensors.h
diff --git a/src/entrypoints/Groundstation/Automated/automated-antennas-entry.cpp b/src/Groundstation/Automated/automated-antennas-entry.cpp
similarity index 100%
rename from src/entrypoints/Groundstation/Automated/automated-antennas-entry.cpp
rename to src/Groundstation/Automated/automated-antennas-entry.cpp
diff --git a/src/entrypoints/Groundstation/Automated/test-actuators.cpp b/src/Groundstation/Automated/test-actuators.cpp
similarity index 100%
rename from src/entrypoints/Groundstation/Automated/test-actuators.cpp
rename to src/Groundstation/Automated/test-actuators.cpp
diff --git a/src/entrypoints/Groundstation/Automated/test-automated-radio.cpp b/src/Groundstation/Automated/test-automated-radio.cpp
similarity index 100%
rename from src/entrypoints/Groundstation/Automated/test-automated-radio.cpp
rename to src/Groundstation/Automated/test-automated-radio.cpp
diff --git a/src/entrypoints/Groundstation/Automated/test-smcontroller.cpp b/src/Groundstation/Automated/test-smcontroller.cpp
similarity index 100%
rename from src/entrypoints/Groundstation/Automated/test-smcontroller.cpp
rename to src/Groundstation/Automated/test-smcontroller.cpp
diff --git a/src/entrypoints/Groundstation/Automated/test-steps.cpp b/src/Groundstation/Automated/test-steps.cpp
similarity index 100%
rename from src/entrypoints/Groundstation/Automated/test-steps.cpp
rename to src/Groundstation/Automated/test-steps.cpp
diff --git a/src/boards/Groundstation/Common/Config/EthernetConfig.h b/src/Groundstation/Common/Config/EthernetConfig.h
similarity index 100%
rename from src/boards/Groundstation/Common/Config/EthernetConfig.h
rename to src/Groundstation/Common/Config/EthernetConfig.h
diff --git a/src/boards/Groundstation/Common/Config/GeneralConfig.h b/src/Groundstation/Common/Config/GeneralConfig.h
similarity index 100%
rename from src/boards/Groundstation/Common/Config/GeneralConfig.h
rename to src/Groundstation/Common/Config/GeneralConfig.h
diff --git a/src/boards/Groundstation/Common/Config/RadioConfig.h b/src/Groundstation/Common/Config/RadioConfig.h
similarity index 100%
rename from src/boards/Groundstation/Common/Config/RadioConfig.h
rename to src/Groundstation/Common/Config/RadioConfig.h
diff --git a/src/boards/Groundstation/Common/HubBase.cpp b/src/Groundstation/Common/HubBase.cpp
similarity index 100%
rename from src/boards/Groundstation/Common/HubBase.cpp
rename to src/Groundstation/Common/HubBase.cpp
diff --git a/src/boards/Groundstation/Common/HubBase.h b/src/Groundstation/Common/HubBase.h
similarity index 100%
rename from src/boards/Groundstation/Common/HubBase.h
rename to src/Groundstation/Common/HubBase.h
diff --git a/src/boards/Groundstation/Common/Ports/EthernetBase.cpp b/src/Groundstation/Common/Ports/EthernetBase.cpp
similarity index 100%
rename from src/boards/Groundstation/Common/Ports/EthernetBase.cpp
rename to src/Groundstation/Common/Ports/EthernetBase.cpp
diff --git a/src/boards/Groundstation/Common/Ports/EthernetBase.h b/src/Groundstation/Common/Ports/EthernetBase.h
similarity index 100%
rename from src/boards/Groundstation/Common/Ports/EthernetBase.h
rename to src/Groundstation/Common/Ports/EthernetBase.h
diff --git a/src/boards/Groundstation/Common/Ports/Serial.cpp b/src/Groundstation/Common/Ports/Serial.cpp
similarity index 100%
rename from src/boards/Groundstation/Common/Ports/Serial.cpp
rename to src/Groundstation/Common/Ports/Serial.cpp
diff --git a/src/boards/Groundstation/Common/Ports/Serial.h b/src/Groundstation/Common/Ports/Serial.h
similarity index 100%
rename from src/boards/Groundstation/Common/Ports/Serial.h
rename to src/Groundstation/Common/Ports/Serial.h
diff --git a/src/boards/Groundstation/Common/Radio/RadioBase.cpp b/src/Groundstation/Common/Radio/RadioBase.cpp
similarity index 100%
rename from src/boards/Groundstation/Common/Radio/RadioBase.cpp
rename to src/Groundstation/Common/Radio/RadioBase.cpp
diff --git a/src/boards/Groundstation/Common/Radio/RadioBase.h b/src/Groundstation/Common/Radio/RadioBase.h
similarity index 100%
rename from src/boards/Groundstation/Common/Radio/RadioBase.h
rename to src/Groundstation/Common/Radio/RadioBase.h
diff --git a/src/boards/Groundstation/LyraGS/Base/Hub.cpp b/src/Groundstation/LyraGS/Base/Hub.cpp
similarity index 100%
rename from src/boards/Groundstation/LyraGS/Base/Hub.cpp
rename to src/Groundstation/LyraGS/Base/Hub.cpp
diff --git a/src/boards/Groundstation/LyraGS/Base/Hub.h b/src/Groundstation/LyraGS/Base/Hub.h
similarity index 100%
rename from src/boards/Groundstation/LyraGS/Base/Hub.h
rename to src/Groundstation/LyraGS/Base/Hub.h
diff --git a/src/boards/Groundstation/LyraGS/BoardStatus.cpp b/src/Groundstation/LyraGS/BoardStatus.cpp
similarity index 100%
rename from src/boards/Groundstation/LyraGS/BoardStatus.cpp
rename to src/Groundstation/LyraGS/BoardStatus.cpp
diff --git a/src/boards/Groundstation/LyraGS/BoardStatus.h b/src/Groundstation/LyraGS/BoardStatus.h
similarity index 100%
rename from src/boards/Groundstation/LyraGS/BoardStatus.h
rename to src/Groundstation/LyraGS/BoardStatus.h
diff --git a/src/boards/Groundstation/LyraGS/Buses.h b/src/Groundstation/LyraGS/Buses.h
similarity index 100%
rename from src/boards/Groundstation/LyraGS/Buses.h
rename to src/Groundstation/LyraGS/Buses.h
diff --git a/src/boards/Groundstation/LyraGS/Ports/Ethernet.cpp b/src/Groundstation/LyraGS/Ports/Ethernet.cpp
similarity index 100%
rename from src/boards/Groundstation/LyraGS/Ports/Ethernet.cpp
rename to src/Groundstation/LyraGS/Ports/Ethernet.cpp
diff --git a/src/boards/Groundstation/LyraGS/Ports/Ethernet.h b/src/Groundstation/LyraGS/Ports/Ethernet.h
similarity index 100%
rename from src/boards/Groundstation/LyraGS/Ports/Ethernet.h
rename to src/Groundstation/LyraGS/Ports/Ethernet.h
diff --git a/src/boards/Groundstation/LyraGS/Ports/SerialLyraGS.cpp b/src/Groundstation/LyraGS/Ports/SerialLyraGS.cpp
similarity index 100%
rename from src/boards/Groundstation/LyraGS/Ports/SerialLyraGS.cpp
rename to src/Groundstation/LyraGS/Ports/SerialLyraGS.cpp
diff --git a/src/boards/Groundstation/LyraGS/Ports/SerialLyraGS.h b/src/Groundstation/LyraGS/Ports/SerialLyraGS.h
similarity index 100%
rename from src/boards/Groundstation/LyraGS/Ports/SerialLyraGS.h
rename to src/Groundstation/LyraGS/Ports/SerialLyraGS.h
diff --git a/src/boards/Groundstation/LyraGS/Radio/Radio.cpp b/src/Groundstation/LyraGS/Radio/Radio.cpp
similarity index 100%
rename from src/boards/Groundstation/LyraGS/Radio/Radio.cpp
rename to src/Groundstation/LyraGS/Radio/Radio.cpp
diff --git a/src/boards/Groundstation/LyraGS/Radio/Radio.h b/src/Groundstation/LyraGS/Radio/Radio.h
similarity index 100%
rename from src/boards/Groundstation/LyraGS/Radio/Radio.h
rename to src/Groundstation/LyraGS/Radio/Radio.h
diff --git a/src/entrypoints/Groundstation/lyra-gs-entry.cpp b/src/Groundstation/LyraGS/lyra-gs-entry.cpp
similarity index 100%
rename from src/entrypoints/Groundstation/lyra-gs-entry.cpp
rename to src/Groundstation/LyraGS/lyra-gs-entry.cpp
diff --git a/src/boards/Groundstation/Nokia/Buses.h b/src/Groundstation/Nokia/Buses.h
similarity index 100%
rename from src/boards/Groundstation/Nokia/Buses.h
rename to src/Groundstation/Nokia/Buses.h
diff --git a/src/boards/Groundstation/Nokia/Hub.cpp b/src/Groundstation/Nokia/Hub.cpp
similarity index 100%
rename from src/boards/Groundstation/Nokia/Hub.cpp
rename to src/Groundstation/Nokia/Hub.cpp
diff --git a/src/boards/Groundstation/Nokia/Hub.h b/src/Groundstation/Nokia/Hub.h
similarity index 100%
rename from src/boards/Groundstation/Nokia/Hub.h
rename to src/Groundstation/Nokia/Hub.h
diff --git a/src/boards/Groundstation/Nokia/Radio/Radio.cpp b/src/Groundstation/Nokia/Radio/Radio.cpp
similarity index 100%
rename from src/boards/Groundstation/Nokia/Radio/Radio.cpp
rename to src/Groundstation/Nokia/Radio/Radio.cpp
diff --git a/src/boards/Groundstation/Nokia/Radio/Radio.h b/src/Groundstation/Nokia/Radio/Radio.h
similarity index 100%
rename from src/boards/Groundstation/Nokia/Radio/Radio.h
rename to src/Groundstation/Nokia/Radio/Radio.h
diff --git a/src/entrypoints/Groundstation/nokia-groundstation-entry.cpp b/src/Groundstation/Nokia/nokia-groundstation-entry.cpp
similarity index 100%
rename from src/entrypoints/Groundstation/nokia-groundstation-entry.cpp
rename to src/Groundstation/Nokia/nokia-groundstation-entry.cpp
diff --git a/src/boards/Groundstation/Rovie/Buses.h b/src/Groundstation/Rovie/Buses.h
similarity index 100%
rename from src/boards/Groundstation/Rovie/Buses.h
rename to src/Groundstation/Rovie/Buses.h
diff --git a/src/boards/Groundstation/Rovie/Hub.cpp b/src/Groundstation/Rovie/Hub.cpp
similarity index 100%
rename from src/boards/Groundstation/Rovie/Hub.cpp
rename to src/Groundstation/Rovie/Hub.cpp
diff --git a/src/boards/Groundstation/Rovie/Hub.h b/src/Groundstation/Rovie/Hub.h
similarity index 100%
rename from src/boards/Groundstation/Rovie/Hub.h
rename to src/Groundstation/Rovie/Hub.h
diff --git a/src/boards/Groundstation/Rovie/Ports/Ethernet.cpp b/src/Groundstation/Rovie/Ports/Ethernet.cpp
similarity index 100%
rename from src/boards/Groundstation/Rovie/Ports/Ethernet.cpp
rename to src/Groundstation/Rovie/Ports/Ethernet.cpp
diff --git a/src/boards/Groundstation/Rovie/Ports/Ethernet.h b/src/Groundstation/Rovie/Ports/Ethernet.h
similarity index 100%
rename from src/boards/Groundstation/Rovie/Ports/Ethernet.h
rename to src/Groundstation/Rovie/Ports/Ethernet.h
diff --git a/src/boards/Groundstation/Rovie/Radio/Radio.cpp b/src/Groundstation/Rovie/Radio/Radio.cpp
similarity index 100%
rename from src/boards/Groundstation/Rovie/Radio/Radio.cpp
rename to src/Groundstation/Rovie/Radio/Radio.cpp
diff --git a/src/boards/Groundstation/Rovie/Radio/Radio.h b/src/Groundstation/Rovie/Radio/Radio.h
similarity index 100%
rename from src/boards/Groundstation/Rovie/Radio/Radio.h
rename to src/Groundstation/Rovie/Radio/Radio.h
diff --git a/src/entrypoints/Groundstation/rovie-groundstation-entry.cpp b/src/Groundstation/Rovie/rovie-groundstation-entry.cpp
similarity index 100%
rename from src/entrypoints/Groundstation/rovie-groundstation-entry.cpp
rename to src/Groundstation/Rovie/rovie-groundstation-entry.cpp
diff --git a/src/boards/Main/Actuators/Actuators.cpp b/src/Main/Actuators/Actuators.cpp
similarity index 100%
rename from src/boards/Main/Actuators/Actuators.cpp
rename to src/Main/Actuators/Actuators.cpp
diff --git a/src/boards/Main/Actuators/Actuators.h b/src/Main/Actuators/Actuators.h
similarity index 100%
rename from src/boards/Main/Actuators/Actuators.h
rename to src/Main/Actuators/Actuators.h
diff --git a/src/boards/Main/AlgoReference/AlgoReference.cpp b/src/Main/AlgoReference/AlgoReference.cpp
similarity index 100%
rename from src/boards/Main/AlgoReference/AlgoReference.cpp
rename to src/Main/AlgoReference/AlgoReference.cpp
diff --git a/src/boards/Main/AlgoReference/AlgoReference.h b/src/Main/AlgoReference/AlgoReference.h
similarity index 100%
rename from src/boards/Main/AlgoReference/AlgoReference.h
rename to src/Main/AlgoReference/AlgoReference.h
diff --git a/src/boards/Main/BoardScheduler.h b/src/Main/BoardScheduler.h
similarity index 100%
rename from src/boards/Main/BoardScheduler.h
rename to src/Main/BoardScheduler.h
diff --git a/src/boards/Main/Buses.h b/src/Main/Buses.h
similarity index 100%
rename from src/boards/Main/Buses.h
rename to src/Main/Buses.h
diff --git a/src/boards/Main/CanHandler/CanHandler.cpp b/src/Main/CanHandler/CanHandler.cpp
similarity index 100%
rename from src/boards/Main/CanHandler/CanHandler.cpp
rename to src/Main/CanHandler/CanHandler.cpp
diff --git a/src/boards/Main/CanHandler/CanHandler.h b/src/Main/CanHandler/CanHandler.h
similarity index 100%
rename from src/boards/Main/CanHandler/CanHandler.h
rename to src/Main/CanHandler/CanHandler.h
diff --git a/src/boards/Main/Configs/ABKConfig.h b/src/Main/Configs/ABKConfig.h
similarity index 100%
rename from src/boards/Main/Configs/ABKConfig.h
rename to src/Main/Configs/ABKConfig.h
diff --git a/src/boards/Main/Configs/ADAConfig.h b/src/Main/Configs/ADAConfig.h
similarity index 100%
rename from src/boards/Main/Configs/ADAConfig.h
rename to src/Main/Configs/ADAConfig.h
diff --git a/src/boards/Main/Configs/ActuatorsConfig.h b/src/Main/Configs/ActuatorsConfig.h
similarity index 100%
rename from src/boards/Main/Configs/ActuatorsConfig.h
rename to src/Main/Configs/ActuatorsConfig.h
diff --git a/src/boards/Main/Configs/CanHandlerConfig.h b/src/Main/Configs/CanHandlerConfig.h
similarity index 100%
rename from src/boards/Main/Configs/CanHandlerConfig.h
rename to src/Main/Configs/CanHandlerConfig.h
diff --git a/src/boards/Main/Configs/FMMConfig.h b/src/Main/Configs/FMMConfig.h
similarity index 100%
rename from src/boards/Main/Configs/FMMConfig.h
rename to src/Main/Configs/FMMConfig.h
diff --git a/src/boards/Main/Configs/HILSimulationConfig.h b/src/Main/Configs/HILSimulationConfig.h
similarity index 100%
rename from src/boards/Main/Configs/HILSimulationConfig.h
rename to src/Main/Configs/HILSimulationConfig.h
diff --git a/src/boards/Main/Configs/MEAConfig.h b/src/Main/Configs/MEAConfig.h
similarity index 100%
rename from src/boards/Main/Configs/MEAConfig.h
rename to src/Main/Configs/MEAConfig.h
diff --git a/src/boards/Main/Configs/NASConfig.h b/src/Main/Configs/NASConfig.h
similarity index 100%
rename from src/boards/Main/Configs/NASConfig.h
rename to src/Main/Configs/NASConfig.h
diff --git a/src/boards/Main/Configs/PinHandlerConfig.h b/src/Main/Configs/PinHandlerConfig.h
similarity index 100%
rename from src/boards/Main/Configs/PinHandlerConfig.h
rename to src/Main/Configs/PinHandlerConfig.h
diff --git a/src/boards/Main/Configs/RadioConfig.h b/src/Main/Configs/RadioConfig.h
similarity index 100%
rename from src/boards/Main/Configs/RadioConfig.h
rename to src/Main/Configs/RadioConfig.h
diff --git a/src/boards/Main/Configs/ReferenceConfig.h b/src/Main/Configs/ReferenceConfig.h
similarity index 100%
rename from src/boards/Main/Configs/ReferenceConfig.h
rename to src/Main/Configs/ReferenceConfig.h
diff --git a/src/boards/Main/Configs/SchedulerConfig.h b/src/Main/Configs/SchedulerConfig.h
similarity index 100%
rename from src/boards/Main/Configs/SchedulerConfig.h
rename to src/Main/Configs/SchedulerConfig.h
diff --git a/src/boards/Main/Configs/SensorsConfig.h b/src/Main/Configs/SensorsConfig.h
similarity index 100%
rename from src/boards/Main/Configs/SensorsConfig.h
rename to src/Main/Configs/SensorsConfig.h
diff --git a/src/boards/Main/Data/ABKTrajectorySet.cpp b/src/Main/Data/ABKTrajectorySet.cpp
similarity index 100%
rename from src/boards/Main/Data/ABKTrajectorySet.cpp
rename to src/Main/Data/ABKTrajectorySet.cpp
diff --git a/src/boards/Main/Data/ABKTrajectorySet.h b/src/Main/Data/ABKTrajectorySet.h
similarity index 100%
rename from src/boards/Main/Data/ABKTrajectorySet.h
rename to src/Main/Data/ABKTrajectorySet.h
diff --git a/src/boards/Main/HIL/HIL.cpp b/src/Main/HIL/HIL.cpp
similarity index 100%
rename from src/boards/Main/HIL/HIL.cpp
rename to src/Main/HIL/HIL.cpp
diff --git a/src/boards/Main/HIL/HIL.h b/src/Main/HIL/HIL.h
similarity index 100%
rename from src/boards/Main/HIL/HIL.h
rename to src/Main/HIL/HIL.h
diff --git a/src/boards/Main/HIL/HILData.h b/src/Main/HIL/HILData.h
similarity index 100%
rename from src/boards/Main/HIL/HILData.h
rename to src/Main/HIL/HILData.h
diff --git a/src/boards/Main/PersistentVars/PersistentVars.cpp b/src/Main/PersistentVars/PersistentVars.cpp
similarity index 100%
rename from src/boards/Main/PersistentVars/PersistentVars.cpp
rename to src/Main/PersistentVars/PersistentVars.cpp
diff --git a/src/boards/Main/PersistentVars/PersistentVars.h b/src/Main/PersistentVars/PersistentVars.h
similarity index 100%
rename from src/boards/Main/PersistentVars/PersistentVars.h
rename to src/Main/PersistentVars/PersistentVars.h
diff --git a/src/boards/Main/PinHandler/PinData.h b/src/Main/PinHandler/PinData.h
similarity index 100%
rename from src/boards/Main/PinHandler/PinData.h
rename to src/Main/PinHandler/PinData.h
diff --git a/src/boards/Main/PinHandler/PinHandler.cpp b/src/Main/PinHandler/PinHandler.cpp
similarity index 100%
rename from src/boards/Main/PinHandler/PinHandler.cpp
rename to src/Main/PinHandler/PinHandler.cpp
diff --git a/src/boards/Main/PinHandler/PinHandler.h b/src/Main/PinHandler/PinHandler.h
similarity index 100%
rename from src/boards/Main/PinHandler/PinHandler.h
rename to src/Main/PinHandler/PinHandler.h
diff --git a/src/boards/Main/Radio/Radio.cpp b/src/Main/Radio/Radio.cpp
similarity index 100%
rename from src/boards/Main/Radio/Radio.cpp
rename to src/Main/Radio/Radio.cpp
diff --git a/src/boards/Main/Radio/Radio.h b/src/Main/Radio/Radio.h
similarity index 100%
rename from src/boards/Main/Radio/Radio.h
rename to src/Main/Radio/Radio.h
diff --git a/src/boards/Main/Sensors/HILSensors.h b/src/Main/Sensors/HILSensors.h
similarity index 100%
rename from src/boards/Main/Sensors/HILSensors.h
rename to src/Main/Sensors/HILSensors.h
diff --git a/src/boards/Main/Sensors/Sensors.cpp b/src/Main/Sensors/Sensors.cpp
similarity index 100%
rename from src/boards/Main/Sensors/Sensors.cpp
rename to src/Main/Sensors/Sensors.cpp
diff --git a/src/boards/Main/Sensors/Sensors.h b/src/Main/Sensors/Sensors.h
similarity index 100%
rename from src/boards/Main/Sensors/Sensors.h
rename to src/Main/Sensors/Sensors.h
diff --git a/src/boards/Main/Sensors/SensorsData.h b/src/Main/Sensors/SensorsData.h
similarity index 100%
rename from src/boards/Main/Sensors/SensorsData.h
rename to src/Main/Sensors/SensorsData.h
diff --git a/src/boards/Main/StateMachines/ABKController/ABKController.cpp b/src/Main/StateMachines/ABKController/ABKController.cpp
similarity index 100%
rename from src/boards/Main/StateMachines/ABKController/ABKController.cpp
rename to src/Main/StateMachines/ABKController/ABKController.cpp
diff --git a/src/boards/Main/StateMachines/ABKController/ABKController.h b/src/Main/StateMachines/ABKController/ABKController.h
similarity index 100%
rename from src/boards/Main/StateMachines/ABKController/ABKController.h
rename to src/Main/StateMachines/ABKController/ABKController.h
diff --git a/src/boards/Main/StateMachines/ABKController/ABKControllerData.h b/src/Main/StateMachines/ABKController/ABKControllerData.h
similarity index 100%
rename from src/boards/Main/StateMachines/ABKController/ABKControllerData.h
rename to src/Main/StateMachines/ABKController/ABKControllerData.h
diff --git a/src/boards/Main/StateMachines/ADAController/ADAController.cpp b/src/Main/StateMachines/ADAController/ADAController.cpp
similarity index 100%
rename from src/boards/Main/StateMachines/ADAController/ADAController.cpp
rename to src/Main/StateMachines/ADAController/ADAController.cpp
diff --git a/src/boards/Main/StateMachines/ADAController/ADAController.h b/src/Main/StateMachines/ADAController/ADAController.h
similarity index 100%
rename from src/boards/Main/StateMachines/ADAController/ADAController.h
rename to src/Main/StateMachines/ADAController/ADAController.h
diff --git a/src/boards/Main/StateMachines/ADAController/ADAControllerData.h b/src/Main/StateMachines/ADAController/ADAControllerData.h
similarity index 100%
rename from src/boards/Main/StateMachines/ADAController/ADAControllerData.h
rename to src/Main/StateMachines/ADAController/ADAControllerData.h
diff --git a/src/boards/Main/StateMachines/FlightModeManager/FlightModeManager.cpp b/src/Main/StateMachines/FlightModeManager/FlightModeManager.cpp
similarity index 100%
rename from src/boards/Main/StateMachines/FlightModeManager/FlightModeManager.cpp
rename to src/Main/StateMachines/FlightModeManager/FlightModeManager.cpp
diff --git a/src/boards/Main/StateMachines/FlightModeManager/FlightModeManager.h b/src/Main/StateMachines/FlightModeManager/FlightModeManager.h
similarity index 100%
rename from src/boards/Main/StateMachines/FlightModeManager/FlightModeManager.h
rename to src/Main/StateMachines/FlightModeManager/FlightModeManager.h
diff --git a/src/boards/Main/StateMachines/FlightModeManager/FlightModeManagerData.h b/src/Main/StateMachines/FlightModeManager/FlightModeManagerData.h
similarity index 100%
rename from src/boards/Main/StateMachines/FlightModeManager/FlightModeManagerData.h
rename to src/Main/StateMachines/FlightModeManager/FlightModeManagerData.h
diff --git a/src/boards/Main/StateMachines/MEAController/MEAController.cpp b/src/Main/StateMachines/MEAController/MEAController.cpp
similarity index 100%
rename from src/boards/Main/StateMachines/MEAController/MEAController.cpp
rename to src/Main/StateMachines/MEAController/MEAController.cpp
diff --git a/src/boards/Main/StateMachines/MEAController/MEAController.h b/src/Main/StateMachines/MEAController/MEAController.h
similarity index 100%
rename from src/boards/Main/StateMachines/MEAController/MEAController.h
rename to src/Main/StateMachines/MEAController/MEAController.h
diff --git a/src/boards/Main/StateMachines/MEAController/MEAControllerData.h b/src/Main/StateMachines/MEAController/MEAControllerData.h
similarity index 100%
rename from src/boards/Main/StateMachines/MEAController/MEAControllerData.h
rename to src/Main/StateMachines/MEAController/MEAControllerData.h
diff --git a/src/boards/Main/StateMachines/NASController/NASController.cpp b/src/Main/StateMachines/NASController/NASController.cpp
similarity index 100%
rename from src/boards/Main/StateMachines/NASController/NASController.cpp
rename to src/Main/StateMachines/NASController/NASController.cpp
diff --git a/src/boards/Main/StateMachines/NASController/NASController.h b/src/Main/StateMachines/NASController/NASController.h
similarity index 100%
rename from src/boards/Main/StateMachines/NASController/NASController.h
rename to src/Main/StateMachines/NASController/NASController.h
diff --git a/src/boards/Main/StateMachines/NASController/NASControllerData.h b/src/Main/StateMachines/NASController/NASControllerData.h
similarity index 100%
rename from src/boards/Main/StateMachines/NASController/NASControllerData.h
rename to src/Main/StateMachines/NASController/NASControllerData.h
diff --git a/src/boards/Main/StatsRecorder/StatsRecorder.cpp b/src/Main/StatsRecorder/StatsRecorder.cpp
similarity index 100%
rename from src/boards/Main/StatsRecorder/StatsRecorder.cpp
rename to src/Main/StatsRecorder/StatsRecorder.cpp
diff --git a/src/boards/Main/StatsRecorder/StatsRecorder.h b/src/Main/StatsRecorder/StatsRecorder.h
similarity index 100%
rename from src/boards/Main/StatsRecorder/StatsRecorder.h
rename to src/Main/StatsRecorder/StatsRecorder.h
diff --git a/src/entrypoints/Main/main-entry.cpp b/src/Main/main-entry.cpp
similarity index 100%
rename from src/entrypoints/Main/main-entry.cpp
rename to src/Main/main-entry.cpp
diff --git a/src/boards/Motor/Actuators/Actuators.cpp b/src/Motor/Actuators/Actuators.cpp
similarity index 100%
rename from src/boards/Motor/Actuators/Actuators.cpp
rename to src/Motor/Actuators/Actuators.cpp
diff --git a/src/boards/Motor/Actuators/Actuators.h b/src/Motor/Actuators/Actuators.h
similarity index 100%
rename from src/boards/Motor/Actuators/Actuators.h
rename to src/Motor/Actuators/Actuators.h
diff --git a/src/boards/Motor/Actuators/ActuatorsData.h b/src/Motor/Actuators/ActuatorsData.h
similarity index 100%
rename from src/boards/Motor/Actuators/ActuatorsData.h
rename to src/Motor/Actuators/ActuatorsData.h
diff --git a/src/boards/Motor/BoardScheduler.h b/src/Motor/BoardScheduler.h
similarity index 100%
rename from src/boards/Motor/BoardScheduler.h
rename to src/Motor/BoardScheduler.h
diff --git a/src/boards/Motor/Buses.h b/src/Motor/Buses.h
similarity index 100%
rename from src/boards/Motor/Buses.h
rename to src/Motor/Buses.h
diff --git a/src/boards/Motor/CanHandler/CanHandler.cpp b/src/Motor/CanHandler/CanHandler.cpp
similarity index 100%
rename from src/boards/Motor/CanHandler/CanHandler.cpp
rename to src/Motor/CanHandler/CanHandler.cpp
diff --git a/src/boards/Motor/CanHandler/CanHandler.h b/src/Motor/CanHandler/CanHandler.h
similarity index 100%
rename from src/boards/Motor/CanHandler/CanHandler.h
rename to src/Motor/CanHandler/CanHandler.h
diff --git a/src/boards/Motor/Configs/ActuatorsConfig.h b/src/Motor/Configs/ActuatorsConfig.h
similarity index 100%
rename from src/boards/Motor/Configs/ActuatorsConfig.h
rename to src/Motor/Configs/ActuatorsConfig.h
diff --git a/src/boards/Motor/Configs/CanHandlerConfig.h b/src/Motor/Configs/CanHandlerConfig.h
similarity index 100%
rename from src/boards/Motor/Configs/CanHandlerConfig.h
rename to src/Motor/Configs/CanHandlerConfig.h
diff --git a/src/boards/Motor/Configs/HILSimulationConfig.h b/src/Motor/Configs/HILSimulationConfig.h
similarity index 100%
rename from src/boards/Motor/Configs/HILSimulationConfig.h
rename to src/Motor/Configs/HILSimulationConfig.h
diff --git a/src/boards/Motor/Configs/SchedulerConfig.h b/src/Motor/Configs/SchedulerConfig.h
similarity index 100%
rename from src/boards/Motor/Configs/SchedulerConfig.h
rename to src/Motor/Configs/SchedulerConfig.h
diff --git a/src/boards/Motor/Configs/SensorsConfig.h b/src/Motor/Configs/SensorsConfig.h
similarity index 100%
rename from src/boards/Motor/Configs/SensorsConfig.h
rename to src/Motor/Configs/SensorsConfig.h
diff --git a/src/boards/Motor/HIL/HIL.cpp b/src/Motor/HIL/HIL.cpp
similarity index 100%
rename from src/boards/Motor/HIL/HIL.cpp
rename to src/Motor/HIL/HIL.cpp
diff --git a/src/boards/Motor/HIL/HIL.h b/src/Motor/HIL/HIL.h
similarity index 100%
rename from src/boards/Motor/HIL/HIL.h
rename to src/Motor/HIL/HIL.h
diff --git a/src/boards/Motor/HIL/HILData.h b/src/Motor/HIL/HILData.h
similarity index 100%
rename from src/boards/Motor/HIL/HILData.h
rename to src/Motor/HIL/HILData.h
diff --git a/src/boards/Motor/PersistentVars/PersistentVars.cpp b/src/Motor/PersistentVars/PersistentVars.cpp
similarity index 100%
rename from src/boards/Motor/PersistentVars/PersistentVars.cpp
rename to src/Motor/PersistentVars/PersistentVars.cpp
diff --git a/src/boards/Motor/PersistentVars/PersistentVars.h b/src/Motor/PersistentVars/PersistentVars.h
similarity index 100%
rename from src/boards/Motor/PersistentVars/PersistentVars.h
rename to src/Motor/PersistentVars/PersistentVars.h
diff --git a/src/boards/Motor/Sensors/HILSensors.h b/src/Motor/Sensors/HILSensors.h
similarity index 100%
rename from src/boards/Motor/Sensors/HILSensors.h
rename to src/Motor/Sensors/HILSensors.h
diff --git a/src/boards/Motor/Sensors/KuliteThermocouple.h b/src/Motor/Sensors/KuliteThermocouple.h
similarity index 100%
rename from src/boards/Motor/Sensors/KuliteThermocouple.h
rename to src/Motor/Sensors/KuliteThermocouple.h
diff --git a/src/boards/Motor/Sensors/Sensors.cpp b/src/Motor/Sensors/Sensors.cpp
similarity index 100%
rename from src/boards/Motor/Sensors/Sensors.cpp
rename to src/Motor/Sensors/Sensors.cpp
diff --git a/src/boards/Motor/Sensors/Sensors.h b/src/Motor/Sensors/Sensors.h
similarity index 100%
rename from src/boards/Motor/Sensors/Sensors.h
rename to src/Motor/Sensors/Sensors.h
diff --git a/src/boards/Motor/Sensors/SensorsData.h b/src/Motor/Sensors/SensorsData.h
similarity index 100%
rename from src/boards/Motor/Sensors/SensorsData.h
rename to src/Motor/Sensors/SensorsData.h
diff --git a/src/entrypoints/Motor/motor-entry.cpp b/src/Motor/motor-entry.cpp
similarity index 100%
rename from src/entrypoints/Motor/motor-entry.cpp
rename to src/Motor/motor-entry.cpp
diff --git a/src/boards/Payload/Actuators/Actuators.cpp b/src/Payload/Actuators/Actuators.cpp
similarity index 100%
rename from src/boards/Payload/Actuators/Actuators.cpp
rename to src/Payload/Actuators/Actuators.cpp
diff --git a/src/boards/Payload/Actuators/Actuators.h b/src/Payload/Actuators/Actuators.h
similarity index 100%
rename from src/boards/Payload/Actuators/Actuators.h
rename to src/Payload/Actuators/Actuators.h
diff --git a/src/boards/Payload/AltitudeTrigger/AltitudeTrigger.cpp b/src/Payload/AltitudeTrigger/AltitudeTrigger.cpp
similarity index 100%
rename from src/boards/Payload/AltitudeTrigger/AltitudeTrigger.cpp
rename to src/Payload/AltitudeTrigger/AltitudeTrigger.cpp
diff --git a/src/boards/Payload/AltitudeTrigger/AltitudeTrigger.h b/src/Payload/AltitudeTrigger/AltitudeTrigger.h
similarity index 100%
rename from src/boards/Payload/AltitudeTrigger/AltitudeTrigger.h
rename to src/Payload/AltitudeTrigger/AltitudeTrigger.h
diff --git a/src/boards/Payload/BoardScheduler.h b/src/Payload/BoardScheduler.h
similarity index 100%
rename from src/boards/Payload/BoardScheduler.h
rename to src/Payload/BoardScheduler.h
diff --git a/src/boards/Payload/Buses.h b/src/Payload/Buses.h
similarity index 100%
rename from src/boards/Payload/Buses.h
rename to src/Payload/Buses.h
diff --git a/src/boards/Payload/CanHandler/CanHandler.cpp b/src/Payload/CanHandler/CanHandler.cpp
similarity index 100%
rename from src/boards/Payload/CanHandler/CanHandler.cpp
rename to src/Payload/CanHandler/CanHandler.cpp
diff --git a/src/boards/Payload/CanHandler/CanHandler.h b/src/Payload/CanHandler/CanHandler.h
similarity index 100%
rename from src/boards/Payload/CanHandler/CanHandler.h
rename to src/Payload/CanHandler/CanHandler.h
diff --git a/src/boards/Payload/Configs/ActuatorsConfig.h b/src/Payload/Configs/ActuatorsConfig.h
similarity index 100%
rename from src/boards/Payload/Configs/ActuatorsConfig.h
rename to src/Payload/Configs/ActuatorsConfig.h
diff --git a/src/boards/Payload/Configs/CanHandlerConfig.h b/src/Payload/Configs/CanHandlerConfig.h
similarity index 100%
rename from src/boards/Payload/Configs/CanHandlerConfig.h
rename to src/Payload/Configs/CanHandlerConfig.h
diff --git a/src/boards/Payload/Configs/FlightModeManagerConfig.h b/src/Payload/Configs/FlightModeManagerConfig.h
similarity index 100%
rename from src/boards/Payload/Configs/FlightModeManagerConfig.h
rename to src/Payload/Configs/FlightModeManagerConfig.h
diff --git a/src/boards/Payload/Configs/HILSimulationConfig.h b/src/Payload/Configs/HILSimulationConfig.h
similarity index 100%
rename from src/boards/Payload/Configs/HILSimulationConfig.h
rename to src/Payload/Configs/HILSimulationConfig.h
diff --git a/src/boards/Payload/Configs/NASConfig.h b/src/Payload/Configs/NASConfig.h
similarity index 100%
rename from src/boards/Payload/Configs/NASConfig.h
rename to src/Payload/Configs/NASConfig.h
diff --git a/src/boards/Payload/Configs/PinHandlerConfig.h b/src/Payload/Configs/PinHandlerConfig.h
similarity index 100%
rename from src/boards/Payload/Configs/PinHandlerConfig.h
rename to src/Payload/Configs/PinHandlerConfig.h
diff --git a/src/boards/Payload/Configs/RadioConfig.h b/src/Payload/Configs/RadioConfig.h
similarity index 100%
rename from src/boards/Payload/Configs/RadioConfig.h
rename to src/Payload/Configs/RadioConfig.h
diff --git a/src/boards/Payload/Configs/SensorsConfig.h b/src/Payload/Configs/SensorsConfig.h
similarity index 100%
rename from src/boards/Payload/Configs/SensorsConfig.h
rename to src/Payload/Configs/SensorsConfig.h
diff --git a/src/boards/Payload/Configs/WingConfig.h b/src/Payload/Configs/WingConfig.h
similarity index 100%
rename from src/boards/Payload/Configs/WingConfig.h
rename to src/Payload/Configs/WingConfig.h
diff --git a/src/boards/Payload/FlightStatsRecorder/FlightStatsRecorder.cpp b/src/Payload/FlightStatsRecorder/FlightStatsRecorder.cpp
similarity index 100%
rename from src/boards/Payload/FlightStatsRecorder/FlightStatsRecorder.cpp
rename to src/Payload/FlightStatsRecorder/FlightStatsRecorder.cpp
diff --git a/src/boards/Payload/FlightStatsRecorder/FlightStatsRecorder.h b/src/Payload/FlightStatsRecorder/FlightStatsRecorder.h
similarity index 100%
rename from src/boards/Payload/FlightStatsRecorder/FlightStatsRecorder.h
rename to src/Payload/FlightStatsRecorder/FlightStatsRecorder.h
diff --git a/src/boards/Payload/HIL/HIL.cpp b/src/Payload/HIL/HIL.cpp
similarity index 100%
rename from src/boards/Payload/HIL/HIL.cpp
rename to src/Payload/HIL/HIL.cpp
diff --git a/src/boards/Payload/HIL/HIL.h b/src/Payload/HIL/HIL.h
similarity index 100%
rename from src/boards/Payload/HIL/HIL.h
rename to src/Payload/HIL/HIL.h
diff --git a/src/boards/Payload/HIL/HILData.h b/src/Payload/HIL/HILData.h
similarity index 100%
rename from src/boards/Payload/HIL/HILData.h
rename to src/Payload/HIL/HILData.h
diff --git a/src/boards/Payload/PersistentVars/PersistentVars.cpp b/src/Payload/PersistentVars/PersistentVars.cpp
similarity index 100%
rename from src/boards/Payload/PersistentVars/PersistentVars.cpp
rename to src/Payload/PersistentVars/PersistentVars.cpp
diff --git a/src/boards/Payload/PersistentVars/PersistentVars.h b/src/Payload/PersistentVars/PersistentVars.h
similarity index 100%
rename from src/boards/Payload/PersistentVars/PersistentVars.h
rename to src/Payload/PersistentVars/PersistentVars.h
diff --git a/src/boards/Payload/PinHandler/PinData.h b/src/Payload/PinHandler/PinData.h
similarity index 100%
rename from src/boards/Payload/PinHandler/PinData.h
rename to src/Payload/PinHandler/PinData.h
diff --git a/src/boards/Payload/PinHandler/PinHandler.cpp b/src/Payload/PinHandler/PinHandler.cpp
similarity index 100%
rename from src/boards/Payload/PinHandler/PinHandler.cpp
rename to src/Payload/PinHandler/PinHandler.cpp
diff --git a/src/boards/Payload/PinHandler/PinHandler.h b/src/Payload/PinHandler/PinHandler.h
similarity index 100%
rename from src/boards/Payload/PinHandler/PinHandler.h
rename to src/Payload/PinHandler/PinHandler.h
diff --git a/src/boards/Payload/Radio/MessageHandler.cpp b/src/Payload/Radio/MessageHandler.cpp
similarity index 100%
rename from src/boards/Payload/Radio/MessageHandler.cpp
rename to src/Payload/Radio/MessageHandler.cpp
diff --git a/src/boards/Payload/Radio/Radio.cpp b/src/Payload/Radio/Radio.cpp
similarity index 100%
rename from src/boards/Payload/Radio/Radio.cpp
rename to src/Payload/Radio/Radio.cpp
diff --git a/src/boards/Payload/Radio/Radio.h b/src/Payload/Radio/Radio.h
similarity index 100%
rename from src/boards/Payload/Radio/Radio.h
rename to src/Payload/Radio/Radio.h
diff --git a/src/boards/Payload/Sensors/HILSensors.h b/src/Payload/Sensors/HILSensors.h
similarity index 100%
rename from src/boards/Payload/Sensors/HILSensors.h
rename to src/Payload/Sensors/HILSensors.h
diff --git a/src/boards/Payload/Sensors/SensorData.h b/src/Payload/Sensors/SensorData.h
similarity index 100%
rename from src/boards/Payload/Sensors/SensorData.h
rename to src/Payload/Sensors/SensorData.h
diff --git a/src/boards/Payload/Sensors/Sensors.cpp b/src/Payload/Sensors/Sensors.cpp
similarity index 100%
rename from src/boards/Payload/Sensors/Sensors.cpp
rename to src/Payload/Sensors/Sensors.cpp
diff --git a/src/boards/Payload/Sensors/Sensors.h b/src/Payload/Sensors/Sensors.h
similarity index 100%
rename from src/boards/Payload/Sensors/Sensors.h
rename to src/Payload/Sensors/Sensors.h
diff --git a/src/boards/Payload/StateMachines/FlightModeManager/FlightModeManager.cpp b/src/Payload/StateMachines/FlightModeManager/FlightModeManager.cpp
similarity index 100%
rename from src/boards/Payload/StateMachines/FlightModeManager/FlightModeManager.cpp
rename to src/Payload/StateMachines/FlightModeManager/FlightModeManager.cpp
diff --git a/src/boards/Payload/StateMachines/FlightModeManager/FlightModeManager.h b/src/Payload/StateMachines/FlightModeManager/FlightModeManager.h
similarity index 100%
rename from src/boards/Payload/StateMachines/FlightModeManager/FlightModeManager.h
rename to src/Payload/StateMachines/FlightModeManager/FlightModeManager.h
diff --git a/src/boards/Payload/StateMachines/FlightModeManager/FlightModeManagerData.h b/src/Payload/StateMachines/FlightModeManager/FlightModeManagerData.h
similarity index 100%
rename from src/boards/Payload/StateMachines/FlightModeManager/FlightModeManagerData.h
rename to src/Payload/StateMachines/FlightModeManager/FlightModeManagerData.h
diff --git a/src/boards/Payload/StateMachines/NASController/NASController.cpp b/src/Payload/StateMachines/NASController/NASController.cpp
similarity index 100%
rename from src/boards/Payload/StateMachines/NASController/NASController.cpp
rename to src/Payload/StateMachines/NASController/NASController.cpp
diff --git a/src/boards/Payload/StateMachines/NASController/NASController.h b/src/Payload/StateMachines/NASController/NASController.h
similarity index 100%
rename from src/boards/Payload/StateMachines/NASController/NASController.h
rename to src/Payload/StateMachines/NASController/NASController.h
diff --git a/src/boards/Payload/StateMachines/NASController/NASControllerData.h b/src/Payload/StateMachines/NASController/NASControllerData.h
similarity index 100%
rename from src/boards/Payload/StateMachines/NASController/NASControllerData.h
rename to src/Payload/StateMachines/NASController/NASControllerData.h
diff --git a/src/boards/Payload/StateMachines/WingController/WingController.cpp b/src/Payload/StateMachines/WingController/WingController.cpp
similarity index 100%
rename from src/boards/Payload/StateMachines/WingController/WingController.cpp
rename to src/Payload/StateMachines/WingController/WingController.cpp
diff --git a/src/boards/Payload/StateMachines/WingController/WingController.h b/src/Payload/StateMachines/WingController/WingController.h
similarity index 100%
rename from src/boards/Payload/StateMachines/WingController/WingController.h
rename to src/Payload/StateMachines/WingController/WingController.h
diff --git a/src/boards/Payload/StateMachines/WingController/WingControllerData.h b/src/Payload/StateMachines/WingController/WingControllerData.h
similarity index 100%
rename from src/boards/Payload/StateMachines/WingController/WingControllerData.h
rename to src/Payload/StateMachines/WingController/WingControllerData.h
diff --git a/src/boards/Payload/Wing/AutomaticWingAlgorithm.cpp b/src/Payload/Wing/AutomaticWingAlgorithm.cpp
similarity index 100%
rename from src/boards/Payload/Wing/AutomaticWingAlgorithm.cpp
rename to src/Payload/Wing/AutomaticWingAlgorithm.cpp
diff --git a/src/boards/Payload/Wing/AutomaticWingAlgorithm.h b/src/Payload/Wing/AutomaticWingAlgorithm.h
similarity index 100%
rename from src/boards/Payload/Wing/AutomaticWingAlgorithm.h
rename to src/Payload/Wing/AutomaticWingAlgorithm.h
diff --git a/src/boards/Payload/Wing/FileWingAlgorithm.cpp b/src/Payload/Wing/FileWingAlgorithm.cpp
similarity index 100%
rename from src/boards/Payload/Wing/FileWingAlgorithm.cpp
rename to src/Payload/Wing/FileWingAlgorithm.cpp
diff --git a/src/boards/Payload/Wing/FileWingAlgorithm.h b/src/Payload/Wing/FileWingAlgorithm.h
similarity index 100%
rename from src/boards/Payload/Wing/FileWingAlgorithm.h
rename to src/Payload/Wing/FileWingAlgorithm.h
diff --git a/src/boards/Payload/Wing/Guidance/ClosedLoopGuidanceAlgorithm.cpp b/src/Payload/Wing/Guidance/ClosedLoopGuidanceAlgorithm.cpp
similarity index 100%
rename from src/boards/Payload/Wing/Guidance/ClosedLoopGuidanceAlgorithm.cpp
rename to src/Payload/Wing/Guidance/ClosedLoopGuidanceAlgorithm.cpp
diff --git a/src/boards/Payload/Wing/Guidance/ClosedLoopGuidanceAlgorithm.h b/src/Payload/Wing/Guidance/ClosedLoopGuidanceAlgorithm.h
similarity index 100%
rename from src/boards/Payload/Wing/Guidance/ClosedLoopGuidanceAlgorithm.h
rename to src/Payload/Wing/Guidance/ClosedLoopGuidanceAlgorithm.h
diff --git a/src/boards/Payload/Wing/Guidance/EarlyManeuverGuidanceAlgorithm.cpp b/src/Payload/Wing/Guidance/EarlyManeuverGuidanceAlgorithm.cpp
similarity index 100%
rename from src/boards/Payload/Wing/Guidance/EarlyManeuverGuidanceAlgorithm.cpp
rename to src/Payload/Wing/Guidance/EarlyManeuverGuidanceAlgorithm.cpp
diff --git a/src/boards/Payload/Wing/Guidance/EarlyManeuversGuidanceAlgorithm.h b/src/Payload/Wing/Guidance/EarlyManeuversGuidanceAlgorithm.h
similarity index 100%
rename from src/boards/Payload/Wing/Guidance/EarlyManeuversGuidanceAlgorithm.h
rename to src/Payload/Wing/Guidance/EarlyManeuversGuidanceAlgorithm.h
diff --git a/src/boards/Payload/Wing/Guidance/GuidanceAlgorithm.h b/src/Payload/Wing/Guidance/GuidanceAlgorithm.h
similarity index 100%
rename from src/boards/Payload/Wing/Guidance/GuidanceAlgorithm.h
rename to src/Payload/Wing/Guidance/GuidanceAlgorithm.h
diff --git a/src/boards/Payload/Wing/WingAlgorithm.cpp b/src/Payload/Wing/WingAlgorithm.cpp
similarity index 100%
rename from src/boards/Payload/Wing/WingAlgorithm.cpp
rename to src/Payload/Wing/WingAlgorithm.cpp
diff --git a/src/boards/Payload/Wing/WingAlgorithm.h b/src/Payload/Wing/WingAlgorithm.h
similarity index 100%
rename from src/boards/Payload/Wing/WingAlgorithm.h
rename to src/Payload/Wing/WingAlgorithm.h
diff --git a/src/boards/Payload/Wing/WingAlgorithmData.h b/src/Payload/Wing/WingAlgorithmData.h
similarity index 100%
rename from src/boards/Payload/Wing/WingAlgorithmData.h
rename to src/Payload/Wing/WingAlgorithmData.h
diff --git a/src/boards/Payload/Wing/WingTargetPositionData.h b/src/Payload/Wing/WingTargetPositionData.h
similarity index 100%
rename from src/boards/Payload/Wing/WingTargetPositionData.h
rename to src/Payload/Wing/WingTargetPositionData.h
diff --git a/src/entrypoints/Payload/payload-entry.cpp b/src/Payload/payload-entry.cpp
similarity index 100%
rename from src/entrypoints/Payload/payload-entry.cpp
rename to src/Payload/payload-entry.cpp
diff --git a/src/boards/RIGv2/Actuators/Actuators.cpp b/src/RIGv2/Actuators/Actuators.cpp
similarity index 100%
rename from src/boards/RIGv2/Actuators/Actuators.cpp
rename to src/RIGv2/Actuators/Actuators.cpp
diff --git a/src/boards/RIGv2/Actuators/Actuators.h b/src/RIGv2/Actuators/Actuators.h
similarity index 100%
rename from src/boards/RIGv2/Actuators/Actuators.h
rename to src/RIGv2/Actuators/Actuators.h
diff --git a/src/boards/RIGv2/Actuators/ActuatorsData.h b/src/RIGv2/Actuators/ActuatorsData.h
similarity index 100%
rename from src/boards/RIGv2/Actuators/ActuatorsData.h
rename to src/RIGv2/Actuators/ActuatorsData.h
diff --git a/src/boards/RIGv2/BoardScheduler.h b/src/RIGv2/BoardScheduler.h
similarity index 100%
rename from src/boards/RIGv2/BoardScheduler.h
rename to src/RIGv2/BoardScheduler.h
diff --git a/src/boards/RIGv2/Buses.h b/src/RIGv2/Buses.h
similarity index 100%
rename from src/boards/RIGv2/Buses.h
rename to src/RIGv2/Buses.h
diff --git a/src/boards/RIGv2/CanHandler/CanHandler.cpp b/src/RIGv2/CanHandler/CanHandler.cpp
similarity index 100%
rename from src/boards/RIGv2/CanHandler/CanHandler.cpp
rename to src/RIGv2/CanHandler/CanHandler.cpp
diff --git a/src/boards/RIGv2/CanHandler/CanHandler.h b/src/RIGv2/CanHandler/CanHandler.h
similarity index 100%
rename from src/boards/RIGv2/CanHandler/CanHandler.h
rename to src/RIGv2/CanHandler/CanHandler.h
diff --git a/src/boards/RIGv2/Configs/ActuatorsConfig.h b/src/RIGv2/Configs/ActuatorsConfig.h
similarity index 100%
rename from src/boards/RIGv2/Configs/ActuatorsConfig.h
rename to src/RIGv2/Configs/ActuatorsConfig.h
diff --git a/src/boards/RIGv2/Configs/CanHandlerConfig.h b/src/RIGv2/Configs/CanHandlerConfig.h
similarity index 100%
rename from src/boards/RIGv2/Configs/CanHandlerConfig.h
rename to src/RIGv2/Configs/CanHandlerConfig.h
diff --git a/src/boards/RIGv2/Configs/GMMConfig.h b/src/RIGv2/Configs/GMMConfig.h
similarity index 100%
rename from src/boards/RIGv2/Configs/GMMConfig.h
rename to src/RIGv2/Configs/GMMConfig.h
diff --git a/src/boards/RIGv2/Configs/RadioConfig.h b/src/RIGv2/Configs/RadioConfig.h
similarity index 100%
rename from src/boards/RIGv2/Configs/RadioConfig.h
rename to src/RIGv2/Configs/RadioConfig.h
diff --git a/src/boards/RIGv2/Configs/SchedulerConfig.h b/src/RIGv2/Configs/SchedulerConfig.h
similarity index 100%
rename from src/boards/RIGv2/Configs/SchedulerConfig.h
rename to src/RIGv2/Configs/SchedulerConfig.h
diff --git a/src/boards/RIGv2/Configs/SensorsConfig.h b/src/RIGv2/Configs/SensorsConfig.h
similarity index 100%
rename from src/boards/RIGv2/Configs/SensorsConfig.h
rename to src/RIGv2/Configs/SensorsConfig.h
diff --git a/src/boards/RIGv2/Configs/TARS1Config.h b/src/RIGv2/Configs/TARS1Config.h
similarity index 100%
rename from src/boards/RIGv2/Configs/TARS1Config.h
rename to src/RIGv2/Configs/TARS1Config.h
diff --git a/src/boards/RIGv2/Radio/Radio.cpp b/src/RIGv2/Radio/Radio.cpp
similarity index 100%
rename from src/boards/RIGv2/Radio/Radio.cpp
rename to src/RIGv2/Radio/Radio.cpp
diff --git a/src/boards/RIGv2/Radio/Radio.h b/src/RIGv2/Radio/Radio.h
similarity index 100%
rename from src/boards/RIGv2/Radio/Radio.h
rename to src/RIGv2/Radio/Radio.h
diff --git a/src/boards/RIGv2/Registry/Registry.cpp b/src/RIGv2/Registry/Registry.cpp
similarity index 100%
rename from src/boards/RIGv2/Registry/Registry.cpp
rename to src/RIGv2/Registry/Registry.cpp
diff --git a/src/boards/RIGv2/Registry/Registry.h b/src/RIGv2/Registry/Registry.h
similarity index 100%
rename from src/boards/RIGv2/Registry/Registry.h
rename to src/RIGv2/Registry/Registry.h
diff --git a/src/boards/RIGv2/Sensors/Sensors.cpp b/src/RIGv2/Sensors/Sensors.cpp
similarity index 100%
rename from src/boards/RIGv2/Sensors/Sensors.cpp
rename to src/RIGv2/Sensors/Sensors.cpp
diff --git a/src/boards/RIGv2/Sensors/Sensors.h b/src/RIGv2/Sensors/Sensors.h
similarity index 100%
rename from src/boards/RIGv2/Sensors/Sensors.h
rename to src/RIGv2/Sensors/Sensors.h
diff --git a/src/boards/RIGv2/Sensors/SensorsData.h b/src/RIGv2/Sensors/SensorsData.h
similarity index 100%
rename from src/boards/RIGv2/Sensors/SensorsData.h
rename to src/RIGv2/Sensors/SensorsData.h
diff --git a/src/boards/RIGv2/StateMachines/GroundModeManager/GroundModeManager.cpp b/src/RIGv2/StateMachines/GroundModeManager/GroundModeManager.cpp
similarity index 100%
rename from src/boards/RIGv2/StateMachines/GroundModeManager/GroundModeManager.cpp
rename to src/RIGv2/StateMachines/GroundModeManager/GroundModeManager.cpp
diff --git a/src/boards/RIGv2/StateMachines/GroundModeManager/GroundModeManager.h b/src/RIGv2/StateMachines/GroundModeManager/GroundModeManager.h
similarity index 100%
rename from src/boards/RIGv2/StateMachines/GroundModeManager/GroundModeManager.h
rename to src/RIGv2/StateMachines/GroundModeManager/GroundModeManager.h
diff --git a/src/boards/RIGv2/StateMachines/GroundModeManager/GroundModeManagerData.h b/src/RIGv2/StateMachines/GroundModeManager/GroundModeManagerData.h
similarity index 100%
rename from src/boards/RIGv2/StateMachines/GroundModeManager/GroundModeManagerData.h
rename to src/RIGv2/StateMachines/GroundModeManager/GroundModeManagerData.h
diff --git a/src/boards/RIGv2/StateMachines/TARS1/MedianFilter.h b/src/RIGv2/StateMachines/TARS1/MedianFilter.h
similarity index 100%
rename from src/boards/RIGv2/StateMachines/TARS1/MedianFilter.h
rename to src/RIGv2/StateMachines/TARS1/MedianFilter.h
diff --git a/src/boards/RIGv2/StateMachines/TARS1/TARS1.cpp b/src/RIGv2/StateMachines/TARS1/TARS1.cpp
similarity index 100%
rename from src/boards/RIGv2/StateMachines/TARS1/TARS1.cpp
rename to src/RIGv2/StateMachines/TARS1/TARS1.cpp
diff --git a/src/boards/RIGv2/StateMachines/TARS1/TARS1.h b/src/RIGv2/StateMachines/TARS1/TARS1.h
similarity index 100%
rename from src/boards/RIGv2/StateMachines/TARS1/TARS1.h
rename to src/RIGv2/StateMachines/TARS1/TARS1.h
diff --git a/src/boards/RIGv2/StateMachines/TARS1/TARS1Data.h b/src/RIGv2/StateMachines/TARS1/TARS1Data.h
similarity index 100%
rename from src/boards/RIGv2/StateMachines/TARS1/TARS1Data.h
rename to src/RIGv2/StateMachines/TARS1/TARS1Data.h
diff --git a/src/entrypoints/RIGv2/rig-v2-entry.cpp b/src/RIGv2/rig-v2-entry.cpp
similarity index 100%
rename from src/entrypoints/RIGv2/rig-v2-entry.cpp
rename to src/RIGv2/rig-v2-entry.cpp
diff --git a/src/boards/common/CanConfig.h b/src/common/CanConfig.h
similarity index 100%
rename from src/boards/common/CanConfig.h
rename to src/common/CanConfig.h
diff --git a/src/boards/common/Events.h b/src/common/Events.h
similarity index 100%
rename from src/boards/common/Events.h
rename to src/common/Events.h
diff --git a/src/boards/common/Mavlink.h b/src/common/Mavlink.h
similarity index 100%
rename from src/boards/common/Mavlink.h
rename to src/common/Mavlink.h
diff --git a/src/boards/common/MavlinkGemini.h b/src/common/MavlinkGemini.h
similarity index 100%
rename from src/boards/common/MavlinkGemini.h
rename to src/common/MavlinkGemini.h
diff --git a/src/boards/common/Radio.h b/src/common/Radio.h
similarity index 100%
rename from src/boards/common/Radio.h
rename to src/common/Radio.h
diff --git a/src/boards/common/ReferenceConfig.h b/src/common/ReferenceConfig.h
similarity index 100%
rename from src/boards/common/ReferenceConfig.h
rename to src/common/ReferenceConfig.h
diff --git a/src/boards/common/Topics.h b/src/common/Topics.h
similarity index 100%
rename from src/boards/common/Topics.h
rename to src/common/Topics.h
diff --git a/src/entrypoints/Groundstation/base-groundstation-entry.cpp b/src/entrypoints/Groundstation/base-groundstation-entry.cpp
deleted file mode 100644
index 0546bdc8550d1095574548b51ad9fa48c378d5cd..0000000000000000000000000000000000000000
--- a/src/entrypoints/Groundstation/base-groundstation-entry.cpp
+++ /dev/null
@@ -1,142 +0,0 @@
-/* Copyright (c) 2023 Skyward Experimental Rocketry
- * Author: Davide Mor
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-
-#include <Groundstation/Base/Buses.h>
-#include <Groundstation/Base/Hub.h>
-#include <Groundstation/Base/Ports/Ethernet.h>
-#include <Groundstation/Base/Radio/Radio.h>
-#include <Groundstation/Common/Ports/Serial.h>
-#include <Groundstation/LyraGS/BoardStatus.h>
-#include <miosix.h>
-
-using namespace Groundstation;
-using namespace Boardcore;
-using namespace miosix;
-
-void idleLoop()
-{
-    while (1)
-    {
-        Thread::wait();
-    }
-}
-
-void errorLoop()
-{
-    while (1)
-    {
-        led1On();
-        Thread::sleep(100);
-        led1Off();
-        Thread::sleep(100);
-    }
-}
-
-int main()
-{
-    ledOff();
-
-    Hub *hub                    = new Hub();
-    Buses *buses                = new Buses();
-    Serial *serial              = new Serial();
-    Ethernet *ethernet          = new Ethernet();
-    RadioMain *radio_main       = new RadioMain();
-    RadioPayload *radio_payload = new RadioPayload();
-    BoardStatus *board_status   = new BoardStatus();
-
-    ModuleManager &modules = ModuleManager::getInstance();
-
-    bool ok = true;
-
-    ok &= modules.insert<HubBase>(hub);
-    ok &= modules.insert(buses);
-    ok &= modules.insert(serial);
-    ok &= modules.insert(ethernet);
-    ok &= modules.insert(radio_main);
-    ok &= modules.insert(radio_payload);
-    ok &= modules.insert(board_status);
-
-    // If insertion failed, stop right here
-    if (!ok)
-    {
-        printf("[error] Failed to insert all modules!\n");
-        errorLoop();
-    }
-
-    // Ok now start them
-
-    ok &= serial->start();
-    if (!ok)
-    {
-        printf("[error] Failed to start serial!\n");
-    }
-
-    ok &= ethernet->start();
-    if (!ok)
-    {
-        printf("[error] Failed to start ethernet!\n");
-    }
-
-    ok &= radio_main->start();
-    if (!ok)
-    {
-        printf("[error] Failed to start main radio!\n");
-    }
-
-    ok &= radio_payload->start();
-    if (!ok)
-    {
-        printf("[error] Failed to start payload radio!\n");
-    }
-
-    ok &= board_status->start();
-    if (!ok)
-    {
-        printf("[error] Failed to start board status!\n");
-    }
-
-    if (board_status->isMainRadioPresent())
-    {
-        printf("Main radio detected!\n");
-        led2On();
-    }
-
-    if (board_status->isPayloadRadioPresent())
-    {
-        printf("Payload radio detected!\n");
-        led3On();
-    }
-
-    if (board_status->isEthernetPresent())
-    {
-        printf("Ethernet detected!\n");
-    }
-
-    if (!ok)
-    {
-        errorLoop();
-    }
-
-    led1On();
-    idleLoop();
-    return 0;
-}
\ No newline at end of file