diff --git a/src/boards/DeathStack Lynx/AirBrakes/AirBrakes.scxml b/src Lynx/boards/DeathStack/AirBrakes/AirBrakes.scxml
similarity index 100%
rename from src/boards/DeathStack Lynx/AirBrakes/AirBrakes.scxml
rename to src Lynx/boards/DeathStack/AirBrakes/AirBrakes.scxml
diff --git a/src/boards/DeathStack Lynx/AirBrakes/AirBrakesAlgorithm.h b/src Lynx/boards/DeathStack/AirBrakes/AirBrakesAlgorithm.h
similarity index 100%
rename from src/boards/DeathStack Lynx/AirBrakes/AirBrakesAlgorithm.h
rename to src Lynx/boards/DeathStack/AirBrakes/AirBrakesAlgorithm.h
diff --git a/src/boards/DeathStack Lynx/AirBrakes/AirBrakesController.h b/src Lynx/boards/DeathStack/AirBrakes/AirBrakesController.h
similarity index 100%
rename from src/boards/DeathStack Lynx/AirBrakes/AirBrakesController.h
rename to src Lynx/boards/DeathStack/AirBrakes/AirBrakesController.h
diff --git a/src/boards/DeathStack Lynx/AirBrakes/AirBrakesData.h b/src Lynx/boards/DeathStack/AirBrakes/AirBrakesData.h
similarity index 100%
rename from src/boards/DeathStack Lynx/AirBrakes/AirBrakesData.h
rename to src Lynx/boards/DeathStack/AirBrakes/AirBrakesData.h
diff --git a/src/boards/DeathStack Lynx/AirBrakes/AirBrakesServo.cpp b/src Lynx/boards/DeathStack/AirBrakes/AirBrakesServo.cpp
similarity index 100%
rename from src/boards/DeathStack Lynx/AirBrakes/AirBrakesServo.cpp
rename to src Lynx/boards/DeathStack/AirBrakes/AirBrakesServo.cpp
diff --git a/src/boards/DeathStack Lynx/AirBrakes/AirBrakesServo.h b/src Lynx/boards/DeathStack/AirBrakes/AirBrakesServo.h
similarity index 100%
rename from src/boards/DeathStack Lynx/AirBrakes/AirBrakesServo.h
rename to src Lynx/boards/DeathStack/AirBrakes/AirBrakesServo.h
diff --git a/src/boards/DeathStack Lynx/AirBrakes/PID.h b/src Lynx/boards/DeathStack/AirBrakes/PID.h
similarity index 100%
rename from src/boards/DeathStack Lynx/AirBrakes/PID.h
rename to src Lynx/boards/DeathStack/AirBrakes/PID.h
diff --git a/src/boards/DeathStack Lynx/AirBrakes/readme.md b/src Lynx/boards/DeathStack/AirBrakes/readme.md
similarity index 100%
rename from src/boards/DeathStack Lynx/AirBrakes/readme.md
rename to src Lynx/boards/DeathStack/AirBrakes/readme.md
diff --git a/src/boards/DeathStack Lynx/AirBrakes/trajectories/TrajectoriesEuroc.h b/src Lynx/boards/DeathStack/AirBrakes/trajectories/TrajectoriesEuroc.h
similarity index 100%
rename from src/boards/DeathStack Lynx/AirBrakes/trajectories/TrajectoriesEuroc.h
rename to src Lynx/boards/DeathStack/AirBrakes/trajectories/TrajectoriesEuroc.h
diff --git a/src/boards/DeathStack Lynx/AirBrakes/trajectories/TrajectoriesRoccaraso.h b/src Lynx/boards/DeathStack/AirBrakes/trajectories/TrajectoriesRoccaraso.h
similarity index 100%
rename from src/boards/DeathStack Lynx/AirBrakes/trajectories/TrajectoriesRoccaraso.h
rename to src Lynx/boards/DeathStack/AirBrakes/trajectories/TrajectoriesRoccaraso.h
diff --git a/src/boards/DeathStack Lynx/AirBrakes/trajectories/Trajectory.h b/src Lynx/boards/DeathStack/AirBrakes/trajectories/Trajectory.h
similarity index 100%
rename from src/boards/DeathStack Lynx/AirBrakes/trajectories/Trajectory.h
rename to src Lynx/boards/DeathStack/AirBrakes/trajectories/Trajectory.h
diff --git a/src/boards/DeathStack Lynx/AirBrakes/trajectories/TrajectoryPoint.h b/src Lynx/boards/DeathStack/AirBrakes/trajectories/TrajectoryPoint.h
similarity index 100%
rename from src/boards/DeathStack Lynx/AirBrakes/trajectories/TrajectoryPoint.h
rename to src Lynx/boards/DeathStack/AirBrakes/trajectories/TrajectoryPoint.h
diff --git a/src/boards/DeathStack Lynx/ApogeeDetectionAlgorithm/ADA.scxml b/src Lynx/boards/DeathStack/ApogeeDetectionAlgorithm/ADA.scxml
similarity index 100%
rename from src/boards/DeathStack Lynx/ApogeeDetectionAlgorithm/ADA.scxml
rename to src Lynx/boards/DeathStack/ApogeeDetectionAlgorithm/ADA.scxml
diff --git a/src/boards/DeathStack Lynx/ApogeeDetectionAlgorithm/ADAAlgorithm.cpp b/src Lynx/boards/DeathStack/ApogeeDetectionAlgorithm/ADAAlgorithm.cpp
similarity index 100%
rename from src/boards/DeathStack Lynx/ApogeeDetectionAlgorithm/ADAAlgorithm.cpp
rename to src Lynx/boards/DeathStack/ApogeeDetectionAlgorithm/ADAAlgorithm.cpp
diff --git a/src/boards/DeathStack Lynx/ApogeeDetectionAlgorithm/ADAAlgorithm.h b/src Lynx/boards/DeathStack/ApogeeDetectionAlgorithm/ADAAlgorithm.h
similarity index 100%
rename from src/boards/DeathStack Lynx/ApogeeDetectionAlgorithm/ADAAlgorithm.h
rename to src Lynx/boards/DeathStack/ApogeeDetectionAlgorithm/ADAAlgorithm.h
diff --git a/src/boards/DeathStack Lynx/ApogeeDetectionAlgorithm/ADACalibrator.cpp b/src Lynx/boards/DeathStack/ApogeeDetectionAlgorithm/ADACalibrator.cpp
similarity index 100%
rename from src/boards/DeathStack Lynx/ApogeeDetectionAlgorithm/ADACalibrator.cpp
rename to src Lynx/boards/DeathStack/ApogeeDetectionAlgorithm/ADACalibrator.cpp
diff --git a/src/boards/DeathStack Lynx/ApogeeDetectionAlgorithm/ADACalibrator.h b/src Lynx/boards/DeathStack/ApogeeDetectionAlgorithm/ADACalibrator.h
similarity index 100%
rename from src/boards/DeathStack Lynx/ApogeeDetectionAlgorithm/ADACalibrator.h
rename to src Lynx/boards/DeathStack/ApogeeDetectionAlgorithm/ADACalibrator.h
diff --git a/src/boards/DeathStack Lynx/ApogeeDetectionAlgorithm/ADAController.h b/src Lynx/boards/DeathStack/ApogeeDetectionAlgorithm/ADAController.h
similarity index 100%
rename from src/boards/DeathStack Lynx/ApogeeDetectionAlgorithm/ADAController.h
rename to src Lynx/boards/DeathStack/ApogeeDetectionAlgorithm/ADAController.h
diff --git a/src/boards/DeathStack Lynx/ApogeeDetectionAlgorithm/ADAData.h b/src Lynx/boards/DeathStack/ApogeeDetectionAlgorithm/ADAData.h
similarity index 100%
rename from src/boards/DeathStack Lynx/ApogeeDetectionAlgorithm/ADAData.h
rename to src Lynx/boards/DeathStack/ApogeeDetectionAlgorithm/ADAData.h
diff --git a/src/boards/DeathStack Lynx/DeathStack.h b/src Lynx/boards/DeathStack/DeathStack.h
similarity index 100%
rename from src/boards/DeathStack Lynx/DeathStack.h
rename to src Lynx/boards/DeathStack/DeathStack.h
diff --git a/src/boards/DeathStack Lynx/DeathStackStatus.h b/src Lynx/boards/DeathStack/DeathStackStatus.h
similarity index 100%
rename from src/boards/DeathStack Lynx/DeathStackStatus.h
rename to src Lynx/boards/DeathStack/DeathStackStatus.h
diff --git a/src/boards/DeathStack Lynx/Deployment/Deployment.scxml b/src Lynx/boards/DeathStack/Deployment/Deployment.scxml
similarity index 100%
rename from src/boards/DeathStack Lynx/Deployment/Deployment.scxml
rename to src Lynx/boards/DeathStack/Deployment/Deployment.scxml
diff --git a/src/boards/DeathStack Lynx/Deployment/DeploymentController.cpp b/src Lynx/boards/DeathStack/Deployment/DeploymentController.cpp
similarity index 100%
rename from src/boards/DeathStack Lynx/Deployment/DeploymentController.cpp
rename to src Lynx/boards/DeathStack/Deployment/DeploymentController.cpp
diff --git a/src/boards/DeathStack Lynx/Deployment/DeploymentController.h b/src Lynx/boards/DeathStack/Deployment/DeploymentController.h
similarity index 100%
rename from src/boards/DeathStack Lynx/Deployment/DeploymentController.h
rename to src Lynx/boards/DeathStack/Deployment/DeploymentController.h
diff --git a/src/boards/DeathStack Lynx/Deployment/DeploymentData.h b/src Lynx/boards/DeathStack/Deployment/DeploymentData.h
similarity index 100%
rename from src/boards/DeathStack Lynx/Deployment/DeploymentData.h
rename to src Lynx/boards/DeathStack/Deployment/DeploymentData.h
diff --git a/src/boards/DeathStack Lynx/Deployment/DeploymentServo.h b/src Lynx/boards/DeathStack/Deployment/DeploymentServo.h
similarity index 100%
rename from src/boards/DeathStack Lynx/Deployment/DeploymentServo.h
rename to src Lynx/boards/DeathStack/Deployment/DeploymentServo.h
diff --git a/src/boards/DeathStack Lynx/Deployment/readme.md b/src Lynx/boards/DeathStack/Deployment/readme.md
similarity index 100%
rename from src/boards/DeathStack Lynx/Deployment/readme.md
rename to src Lynx/boards/DeathStack/Deployment/readme.md
diff --git a/src/boards/DeathStack Lynx/FlightModeManager/FMM.scxml b/src Lynx/boards/DeathStack/FlightModeManager/FMM.scxml
similarity index 100%
rename from src/boards/DeathStack Lynx/FlightModeManager/FMM.scxml
rename to src Lynx/boards/DeathStack/FlightModeManager/FMM.scxml
diff --git a/src/boards/DeathStack Lynx/FlightModeManager/FMMController.cpp b/src Lynx/boards/DeathStack/FlightModeManager/FMMController.cpp
similarity index 100%
rename from src/boards/DeathStack Lynx/FlightModeManager/FMMController.cpp
rename to src Lynx/boards/DeathStack/FlightModeManager/FMMController.cpp
diff --git a/src/boards/DeathStack Lynx/FlightModeManager/FMMController.h b/src Lynx/boards/DeathStack/FlightModeManager/FMMController.h
similarity index 100%
rename from src/boards/DeathStack Lynx/FlightModeManager/FMMController.h
rename to src Lynx/boards/DeathStack/FlightModeManager/FMMController.h
diff --git a/src/boards/DeathStack Lynx/FlightModeManager/FMMStatus.h b/src Lynx/boards/DeathStack/FlightModeManager/FMMStatus.h
similarity index 100%
rename from src/boards/DeathStack Lynx/FlightModeManager/FMMStatus.h
rename to src Lynx/boards/DeathStack/FlightModeManager/FMMStatus.h
diff --git a/src/boards/DeathStack Lynx/FlightStatsRecorder/FSR.scxml b/src Lynx/boards/DeathStack/FlightStatsRecorder/FSR.scxml
similarity index 100%
rename from src/boards/DeathStack Lynx/FlightStatsRecorder/FSR.scxml
rename to src Lynx/boards/DeathStack/FlightStatsRecorder/FSR.scxml
diff --git a/src/boards/DeathStack Lynx/FlightStatsRecorder/FSRController.cpp b/src Lynx/boards/DeathStack/FlightStatsRecorder/FSRController.cpp
similarity index 100%
rename from src/boards/DeathStack Lynx/FlightStatsRecorder/FSRController.cpp
rename to src Lynx/boards/DeathStack/FlightStatsRecorder/FSRController.cpp
diff --git a/src/boards/DeathStack Lynx/FlightStatsRecorder/FSRController.h b/src Lynx/boards/DeathStack/FlightStatsRecorder/FSRController.h
similarity index 100%
rename from src/boards/DeathStack Lynx/FlightStatsRecorder/FSRController.h
rename to src Lynx/boards/DeathStack/FlightStatsRecorder/FSRController.h
diff --git a/src/boards/DeathStack Lynx/FlightStatsRecorder/FSRData.h b/src Lynx/boards/DeathStack/FlightStatsRecorder/FSRData.h
similarity index 100%
rename from src/boards/DeathStack Lynx/FlightStatsRecorder/FSRData.h
rename to src Lynx/boards/DeathStack/FlightStatsRecorder/FSRData.h
diff --git a/src/boards/DeathStack Lynx/LoggerService/LoggerService.h b/src Lynx/boards/DeathStack/LoggerService/LoggerService.h
similarity index 100%
rename from src/boards/DeathStack Lynx/LoggerService/LoggerService.h
rename to src Lynx/boards/DeathStack/LoggerService/LoggerService.h
diff --git a/src/boards/DeathStack Lynx/Main/Actuators.h b/src Lynx/boards/DeathStack/Main/Actuators.h
similarity index 100%
rename from src/boards/DeathStack Lynx/Main/Actuators.h
rename to src Lynx/boards/DeathStack/Main/Actuators.h
diff --git a/src/boards/DeathStack Lynx/Main/Bus.h b/src Lynx/boards/DeathStack/Main/Bus.h
similarity index 100%
rename from src/boards/DeathStack Lynx/Main/Bus.h
rename to src Lynx/boards/DeathStack/Main/Bus.h
diff --git a/src/boards/DeathStack Lynx/Main/Radio.cpp b/src Lynx/boards/DeathStack/Main/Radio.cpp
similarity index 100%
rename from src/boards/DeathStack Lynx/Main/Radio.cpp
rename to src Lynx/boards/DeathStack/Main/Radio.cpp
diff --git a/src/boards/DeathStack Lynx/Main/Radio.h b/src Lynx/boards/DeathStack/Main/Radio.h
similarity index 100%
rename from src/boards/DeathStack Lynx/Main/Radio.h
rename to src Lynx/boards/DeathStack/Main/Radio.h
diff --git a/src/boards/DeathStack Lynx/Main/Sensors.cpp b/src Lynx/boards/DeathStack/Main/Sensors.cpp
similarity index 100%
rename from src/boards/DeathStack Lynx/Main/Sensors.cpp
rename to src Lynx/boards/DeathStack/Main/Sensors.cpp
diff --git a/src/boards/DeathStack Lynx/Main/Sensors.h b/src Lynx/boards/DeathStack/Main/Sensors.h
similarity index 100%
rename from src/boards/DeathStack Lynx/Main/Sensors.h
rename to src Lynx/boards/DeathStack/Main/Sensors.h
diff --git a/src/boards/DeathStack Lynx/Main/SensorsData.h b/src Lynx/boards/DeathStack/Main/SensorsData.h
similarity index 100%
rename from src/boards/DeathStack Lynx/Main/SensorsData.h
rename to src Lynx/boards/DeathStack/Main/SensorsData.h
diff --git a/src/boards/DeathStack Lynx/Main/StateMachines.cpp b/src Lynx/boards/DeathStack/Main/StateMachines.cpp
similarity index 100%
rename from src/boards/DeathStack Lynx/Main/StateMachines.cpp
rename to src Lynx/boards/DeathStack/Main/StateMachines.cpp
diff --git a/src/boards/DeathStack Lynx/Main/StateMachines.h b/src Lynx/boards/DeathStack/Main/StateMachines.h
similarity index 100%
rename from src/boards/DeathStack Lynx/Main/StateMachines.h
rename to src Lynx/boards/DeathStack/Main/StateMachines.h
diff --git a/src/boards/DeathStack Lynx/NavigationAttitudeSystem/ExtendedKalmanConfig.h b/src Lynx/boards/DeathStack/NavigationAttitudeSystem/ExtendedKalmanConfig.h
similarity index 100%
rename from src/boards/DeathStack Lynx/NavigationAttitudeSystem/ExtendedKalmanConfig.h
rename to src Lynx/boards/DeathStack/NavigationAttitudeSystem/ExtendedKalmanConfig.h
diff --git a/src/boards/DeathStack Lynx/NavigationAttitudeSystem/ExtendedKalmanEigen.cpp b/src Lynx/boards/DeathStack/NavigationAttitudeSystem/ExtendedKalmanEigen.cpp
similarity index 100%
rename from src/boards/DeathStack Lynx/NavigationAttitudeSystem/ExtendedKalmanEigen.cpp
rename to src Lynx/boards/DeathStack/NavigationAttitudeSystem/ExtendedKalmanEigen.cpp
diff --git a/src/boards/DeathStack Lynx/NavigationAttitudeSystem/ExtendedKalmanEigen.h b/src Lynx/boards/DeathStack/NavigationAttitudeSystem/ExtendedKalmanEigen.h
similarity index 100%
rename from src/boards/DeathStack Lynx/NavigationAttitudeSystem/ExtendedKalmanEigen.h
rename to src Lynx/boards/DeathStack/NavigationAttitudeSystem/ExtendedKalmanEigen.h
diff --git a/src/boards/DeathStack Lynx/NavigationAttitudeSystem/InitStates.h b/src Lynx/boards/DeathStack/NavigationAttitudeSystem/InitStates.h
similarity index 100%
rename from src/boards/DeathStack Lynx/NavigationAttitudeSystem/InitStates.h
rename to src Lynx/boards/DeathStack/NavigationAttitudeSystem/InitStates.h
diff --git a/src/boards/DeathStack Lynx/NavigationAttitudeSystem/NAS.h b/src Lynx/boards/DeathStack/NavigationAttitudeSystem/NAS.h
similarity index 100%
rename from src/boards/DeathStack Lynx/NavigationAttitudeSystem/NAS.h
rename to src Lynx/boards/DeathStack/NavigationAttitudeSystem/NAS.h
diff --git a/src/boards/DeathStack Lynx/NavigationAttitudeSystem/NAS.scxml b/src Lynx/boards/DeathStack/NavigationAttitudeSystem/NAS.scxml
similarity index 100%
rename from src/boards/DeathStack Lynx/NavigationAttitudeSystem/NAS.scxml
rename to src Lynx/boards/DeathStack/NavigationAttitudeSystem/NAS.scxml
diff --git a/src/boards/DeathStack Lynx/NavigationAttitudeSystem/NASCalibrator.cpp b/src Lynx/boards/DeathStack/NavigationAttitudeSystem/NASCalibrator.cpp
similarity index 100%
rename from src/boards/DeathStack Lynx/NavigationAttitudeSystem/NASCalibrator.cpp
rename to src Lynx/boards/DeathStack/NavigationAttitudeSystem/NASCalibrator.cpp
diff --git a/src/boards/DeathStack Lynx/NavigationAttitudeSystem/NASCalibrator.h b/src Lynx/boards/DeathStack/NavigationAttitudeSystem/NASCalibrator.h
similarity index 100%
rename from src/boards/DeathStack Lynx/NavigationAttitudeSystem/NASCalibrator.h
rename to src Lynx/boards/DeathStack/NavigationAttitudeSystem/NASCalibrator.h
diff --git a/src/boards/DeathStack Lynx/NavigationAttitudeSystem/NASController.h b/src Lynx/boards/DeathStack/NavigationAttitudeSystem/NASController.h
similarity index 100%
rename from src/boards/DeathStack Lynx/NavigationAttitudeSystem/NASController.h
rename to src Lynx/boards/DeathStack/NavigationAttitudeSystem/NASController.h
diff --git a/src/boards/DeathStack Lynx/NavigationAttitudeSystem/NASData.h b/src Lynx/boards/DeathStack/NavigationAttitudeSystem/NASData.h
similarity index 100%
rename from src/boards/DeathStack Lynx/NavigationAttitudeSystem/NASData.h
rename to src Lynx/boards/DeathStack/NavigationAttitudeSystem/NASData.h
diff --git a/src/boards/DeathStack Lynx/NavigationAttitudeSystem/readme.md b/src Lynx/boards/DeathStack/NavigationAttitudeSystem/readme.md
similarity index 100%
rename from src/boards/DeathStack Lynx/NavigationAttitudeSystem/readme.md
rename to src Lynx/boards/DeathStack/NavigationAttitudeSystem/readme.md
diff --git a/src/boards/DeathStack Lynx/PinHandler/PinHandler.cpp b/src Lynx/boards/DeathStack/PinHandler/PinHandler.cpp
similarity index 100%
rename from src/boards/DeathStack Lynx/PinHandler/PinHandler.cpp
rename to src Lynx/boards/DeathStack/PinHandler/PinHandler.cpp
diff --git a/src/boards/DeathStack Lynx/PinHandler/PinHandler.h b/src Lynx/boards/DeathStack/PinHandler/PinHandler.h
similarity index 100%
rename from src/boards/DeathStack Lynx/PinHandler/PinHandler.h
rename to src Lynx/boards/DeathStack/PinHandler/PinHandler.h
diff --git a/src/boards/DeathStack Lynx/PinHandler/PinHandlerData.h b/src Lynx/boards/DeathStack/PinHandler/PinHandlerData.h
similarity index 100%
rename from src/boards/DeathStack Lynx/PinHandler/PinHandlerData.h
rename to src Lynx/boards/DeathStack/PinHandler/PinHandlerData.h
diff --git a/src/boards/DeathStack Lynx/System/StackLogger.h b/src Lynx/boards/DeathStack/System/StackLogger.h
similarity index 100%
rename from src/boards/DeathStack Lynx/System/StackLogger.h
rename to src Lynx/boards/DeathStack/System/StackLogger.h
diff --git a/src/boards/DeathStack Lynx/System/TaskID.h b/src Lynx/boards/DeathStack/System/TaskID.h
similarity index 100%
rename from src/boards/DeathStack Lynx/System/TaskID.h
rename to src Lynx/boards/DeathStack/System/TaskID.h
diff --git a/src/boards/DeathStack Lynx/TelemetriesTelecommands/Mavlink.h b/src Lynx/boards/DeathStack/TelemetriesTelecommands/Mavlink.h
similarity index 100%
rename from src/boards/DeathStack Lynx/TelemetriesTelecommands/Mavlink.h
rename to src Lynx/boards/DeathStack/TelemetriesTelecommands/Mavlink.h
diff --git a/src/boards/DeathStack Lynx/TelemetriesTelecommands/TCHandler.cpp b/src Lynx/boards/DeathStack/TelemetriesTelecommands/TCHandler.cpp
similarity index 100%
rename from src/boards/DeathStack Lynx/TelemetriesTelecommands/TCHandler.cpp
rename to src Lynx/boards/DeathStack/TelemetriesTelecommands/TCHandler.cpp
diff --git a/src/boards/DeathStack Lynx/TelemetriesTelecommands/TCHandler.h b/src Lynx/boards/DeathStack/TelemetriesTelecommands/TCHandler.h
similarity index 100%
rename from src/boards/DeathStack Lynx/TelemetriesTelecommands/TCHandler.h
rename to src Lynx/boards/DeathStack/TelemetriesTelecommands/TCHandler.h
diff --git a/src/boards/DeathStack Lynx/TelemetriesTelecommands/TMTC.scxml b/src Lynx/boards/DeathStack/TelemetriesTelecommands/TMTC.scxml
similarity index 100%
rename from src/boards/DeathStack Lynx/TelemetriesTelecommands/TMTC.scxml
rename to src Lynx/boards/DeathStack/TelemetriesTelecommands/TMTC.scxml
diff --git a/src/boards/DeathStack Lynx/TelemetriesTelecommands/TMTCController.cpp b/src Lynx/boards/DeathStack/TelemetriesTelecommands/TMTCController.cpp
similarity index 100%
rename from src/boards/DeathStack Lynx/TelemetriesTelecommands/TMTCController.cpp
rename to src Lynx/boards/DeathStack/TelemetriesTelecommands/TMTCController.cpp
diff --git a/src/boards/DeathStack Lynx/TelemetriesTelecommands/TMTCController.h b/src Lynx/boards/DeathStack/TelemetriesTelecommands/TMTCController.h
similarity index 100%
rename from src/boards/DeathStack Lynx/TelemetriesTelecommands/TMTCController.h
rename to src Lynx/boards/DeathStack/TelemetriesTelecommands/TMTCController.h
diff --git a/src/boards/DeathStack Lynx/TelemetriesTelecommands/TmRepository.cpp b/src Lynx/boards/DeathStack/TelemetriesTelecommands/TmRepository.cpp
similarity index 100%
rename from src/boards/DeathStack Lynx/TelemetriesTelecommands/TmRepository.cpp
rename to src Lynx/boards/DeathStack/TelemetriesTelecommands/TmRepository.cpp
diff --git a/src/boards/DeathStack Lynx/TelemetriesTelecommands/TmRepository.h b/src Lynx/boards/DeathStack/TelemetriesTelecommands/TmRepository.h
similarity index 100%
rename from src/boards/DeathStack Lynx/TelemetriesTelecommands/TmRepository.h
rename to src Lynx/boards/DeathStack/TelemetriesTelecommands/TmRepository.h
diff --git a/src/boards/DeathStack Lynx/common/Algorithm.h b/src Lynx/boards/DeathStack/common/Algorithm.h
similarity index 100%
rename from src/boards/DeathStack Lynx/common/Algorithm.h
rename to src Lynx/boards/DeathStack/common/Algorithm.h
diff --git a/src/boards/DeathStack Lynx/common/CanInterfaces.h b/src Lynx/boards/DeathStack/common/CanInterfaces.h
similarity index 100%
rename from src/boards/DeathStack Lynx/common/CanInterfaces.h
rename to src Lynx/boards/DeathStack/common/CanInterfaces.h
diff --git a/src/boards/DeathStack Lynx/common/ServoInterface.h b/src Lynx/boards/DeathStack/common/ServoInterface.h
similarity index 100%
rename from src/boards/DeathStack Lynx/common/ServoInterface.h
rename to src Lynx/boards/DeathStack/common/ServoInterface.h
diff --git a/src/boards/DeathStack Lynx/common/SystemData.h b/src Lynx/boards/DeathStack/common/SystemData.h
similarity index 100%
rename from src/boards/DeathStack Lynx/common/SystemData.h
rename to src Lynx/boards/DeathStack/common/SystemData.h
diff --git a/src/boards/DeathStack Lynx/common/events/EventStrings.cpp b/src Lynx/boards/DeathStack/common/events/EventStrings.cpp
similarity index 100%
rename from src/boards/DeathStack Lynx/common/events/EventStrings.cpp
rename to src Lynx/boards/DeathStack/common/events/EventStrings.cpp
diff --git a/src/boards/DeathStack Lynx/common/events/Events.h b/src Lynx/boards/DeathStack/common/events/Events.h
similarity index 100%
rename from src/boards/DeathStack Lynx/common/events/Events.h
rename to src Lynx/boards/DeathStack/common/events/Events.h
diff --git a/src/boards/DeathStack Lynx/common/events/Topics.h b/src Lynx/boards/DeathStack/common/events/Topics.h
similarity index 100%
rename from src/boards/DeathStack Lynx/common/events/Topics.h
rename to src Lynx/boards/DeathStack/common/events/Topics.h
diff --git a/src/boards/DeathStack Lynx/configs/ADAConfig.h b/src Lynx/boards/DeathStack/configs/ADAConfig.h
similarity index 100%
rename from src/boards/DeathStack Lynx/configs/ADAConfig.h
rename to src Lynx/boards/DeathStack/configs/ADAConfig.h
diff --git a/src/boards/DeathStack Lynx/configs/AirBrakesConfig.h b/src Lynx/boards/DeathStack/configs/AirBrakesConfig.h
similarity index 100%
rename from src/boards/DeathStack Lynx/configs/AirBrakesConfig.h
rename to src Lynx/boards/DeathStack/configs/AirBrakesConfig.h
diff --git a/src/boards/DeathStack Lynx/configs/CutterConfig.h b/src Lynx/boards/DeathStack/configs/CutterConfig.h
similarity index 100%
rename from src/boards/DeathStack Lynx/configs/CutterConfig.h
rename to src Lynx/boards/DeathStack/configs/CutterConfig.h
diff --git a/src/boards/DeathStack Lynx/configs/DeploymentConfig.h b/src Lynx/boards/DeathStack/configs/DeploymentConfig.h
similarity index 100%
rename from src/boards/DeathStack Lynx/configs/DeploymentConfig.h
rename to src Lynx/boards/DeathStack/configs/DeploymentConfig.h
diff --git a/src/boards/DeathStack Lynx/configs/FMMConfig.h b/src Lynx/boards/DeathStack/configs/FMMConfig.h
similarity index 100%
rename from src/boards/DeathStack Lynx/configs/FMMConfig.h
rename to src Lynx/boards/DeathStack/configs/FMMConfig.h
diff --git a/src/boards/DeathStack Lynx/configs/FlightStatsConfig.h b/src Lynx/boards/DeathStack/configs/FlightStatsConfig.h
similarity index 100%
rename from src/boards/DeathStack Lynx/configs/FlightStatsConfig.h
rename to src Lynx/boards/DeathStack/configs/FlightStatsConfig.h
diff --git a/src/boards/DeathStack Lynx/configs/HILConfig.h b/src Lynx/boards/DeathStack/configs/HILConfig.h
similarity index 100%
rename from src/boards/DeathStack Lynx/configs/HILConfig.h
rename to src Lynx/boards/DeathStack/configs/HILConfig.h
diff --git a/src/boards/DeathStack Lynx/configs/IgnitionConfig.h b/src Lynx/boards/DeathStack/configs/IgnitionConfig.h
similarity index 100%
rename from src/boards/DeathStack Lynx/configs/IgnitionConfig.h
rename to src Lynx/boards/DeathStack/configs/IgnitionConfig.h
diff --git a/src/boards/DeathStack Lynx/configs/MavlinkConfig.h b/src Lynx/boards/DeathStack/configs/MavlinkConfig.h
similarity index 100%
rename from src/boards/DeathStack Lynx/configs/MavlinkConfig.h
rename to src Lynx/boards/DeathStack/configs/MavlinkConfig.h
diff --git a/src/boards/DeathStack Lynx/configs/MotorConfig.h b/src Lynx/boards/DeathStack/configs/MotorConfig.h
similarity index 100%
rename from src/boards/DeathStack Lynx/configs/MotorConfig.h
rename to src Lynx/boards/DeathStack/configs/MotorConfig.h
diff --git a/src/boards/DeathStack Lynx/configs/NASConfig.h b/src Lynx/boards/DeathStack/configs/NASConfig.h
similarity index 100%
rename from src/boards/DeathStack Lynx/configs/NASConfig.h
rename to src Lynx/boards/DeathStack/configs/NASConfig.h
diff --git a/src/boards/DeathStack Lynx/configs/PinObserverConfig.h b/src Lynx/boards/DeathStack/configs/PinObserverConfig.h
similarity index 100%
rename from src/boards/DeathStack Lynx/configs/PinObserverConfig.h
rename to src Lynx/boards/DeathStack/configs/PinObserverConfig.h
diff --git a/src/boards/DeathStack Lynx/configs/SensorsConfig.h b/src Lynx/boards/DeathStack/configs/SensorsConfig.h
similarity index 100%
rename from src/boards/DeathStack Lynx/configs/SensorsConfig.h
rename to src Lynx/boards/DeathStack/configs/SensorsConfig.h
diff --git a/src/boards/DeathStack Lynx/configs/TMTCConfig.h b/src Lynx/boards/DeathStack/configs/TMTCConfig.h
similarity index 100%
rename from src/boards/DeathStack Lynx/configs/TMTCConfig.h
rename to src Lynx/boards/DeathStack/configs/TMTCConfig.h
diff --git a/src/boards/DeathStack Lynx/configs/config.h b/src Lynx/boards/DeathStack/configs/config.h
similarity index 100%
rename from src/boards/DeathStack Lynx/configs/config.h
rename to src Lynx/boards/DeathStack/configs/config.h
diff --git a/src/entrypoints/death-stack-x-decoder/.gitignore b/src Lynx/entrypoints/death-stack-x-decoder/.gitignore
similarity index 100%
rename from src/entrypoints/death-stack-x-decoder/.gitignore
rename to src Lynx/entrypoints/death-stack-x-decoder/.gitignore
diff --git a/src/entrypoints/death-stack-x-decoder/LogTypes.h b/src Lynx/entrypoints/death-stack-x-decoder/LogTypes.h
similarity index 100%
rename from src/entrypoints/death-stack-x-decoder/LogTypes.h
rename to src Lynx/entrypoints/death-stack-x-decoder/LogTypes.h
diff --git a/src/entrypoints/death-stack-x-decoder/Makefile b/src Lynx/entrypoints/death-stack-x-decoder/Makefile
similarity index 100%
rename from src/entrypoints/death-stack-x-decoder/Makefile
rename to src Lynx/entrypoints/death-stack-x-decoder/Makefile
diff --git a/src/entrypoints/death-stack-x-decoder/death-stack-x-decoder.cpp b/src Lynx/entrypoints/death-stack-x-decoder/death-stack-x-decoder.cpp
similarity index 100%
rename from src/entrypoints/death-stack-x-decoder/death-stack-x-decoder.cpp
rename to src Lynx/entrypoints/death-stack-x-decoder/death-stack-x-decoder.cpp
diff --git a/src/entrypoints/death-stack-x-entry.cpp b/src Lynx/entrypoints/death-stack-x-entry.cpp
similarity index 100%
rename from src/entrypoints/death-stack-x-entry.cpp
rename to src Lynx/entrypoints/death-stack-x-entry.cpp
diff --git a/src/entrypoints/death-stack-x-testsuite.cpp b/src Lynx/entrypoints/death-stack-x-testsuite.cpp
similarity index 100%
rename from src/entrypoints/death-stack-x-testsuite.cpp
rename to src Lynx/entrypoints/death-stack-x-testsuite.cpp
diff --git a/src/entrypoints/deserializer/.gitignore b/src Lynx/entrypoints/deserializer/.gitignore
similarity index 100%
rename from src/entrypoints/deserializer/.gitignore
rename to src Lynx/entrypoints/deserializer/.gitignore
diff --git a/src/entrypoints/deserializer/logdecoder.cpp b/src Lynx/entrypoints/deserializer/logdecoder.cpp
similarity index 100%
rename from src/entrypoints/deserializer/logdecoder.cpp
rename to src Lynx/entrypoints/deserializer/logdecoder.cpp
diff --git a/src/entrypoints/hardware_in_the_loop/HILSimulationConfig.h b/src Lynx/entrypoints/hardware_in_the_loop/HILSimulationConfig.h
similarity index 100%
rename from src/entrypoints/hardware_in_the_loop/HILSimulationConfig.h
rename to src Lynx/entrypoints/hardware_in_the_loop/HILSimulationConfig.h
diff --git a/src/entrypoints/hardware_in_the_loop/hil-entry.cpp b/src Lynx/entrypoints/hardware_in_the_loop/hil-entry.cpp
similarity index 100%
rename from src/entrypoints/hardware_in_the_loop/hil-entry.cpp
rename to src Lynx/entrypoints/hardware_in_the_loop/hil-entry.cpp
diff --git a/src/entrypoints/lynx-mock-telemetry.cpp b/src Lynx/entrypoints/lynx-mock-telemetry.cpp
similarity index 100%
rename from src/entrypoints/lynx-mock-telemetry.cpp
rename to src Lynx/entrypoints/lynx-mock-telemetry.cpp
diff --git a/src/entrypoints/payload-entry.cpp b/src Lynx/entrypoints/payload-entry.cpp
similarity index 100%
rename from src/entrypoints/payload-entry.cpp
rename to src Lynx/entrypoints/payload-entry.cpp
diff --git a/src/entrypoints/windtunnel-entry.cpp b/src Lynx/entrypoints/windtunnel-entry.cpp
similarity index 100%
rename from src/entrypoints/windtunnel-entry.cpp
rename to src Lynx/entrypoints/windtunnel-entry.cpp
diff --git a/src/entrypoints/windtunnel-test-decoder/.gitignore b/src Lynx/entrypoints/windtunnel-test-decoder/.gitignore
similarity index 100%
rename from src/entrypoints/windtunnel-test-decoder/.gitignore
rename to src Lynx/entrypoints/windtunnel-test-decoder/.gitignore
diff --git a/src/entrypoints/windtunnel-test-decoder/LogTypes.h b/src Lynx/entrypoints/windtunnel-test-decoder/LogTypes.h
similarity index 100%
rename from src/entrypoints/windtunnel-test-decoder/LogTypes.h
rename to src Lynx/entrypoints/windtunnel-test-decoder/LogTypes.h
diff --git a/src/entrypoints/windtunnel-test-decoder/Makefile b/src Lynx/entrypoints/windtunnel-test-decoder/Makefile
similarity index 100%
rename from src/entrypoints/windtunnel-test-decoder/Makefile
rename to src Lynx/entrypoints/windtunnel-test-decoder/Makefile
diff --git a/src/entrypoints/windtunnel-test-decoder/windtunnel-decoder.cpp b/src Lynx/entrypoints/windtunnel-test-decoder/windtunnel-decoder.cpp
similarity index 100%
rename from src/entrypoints/windtunnel-test-decoder/windtunnel-decoder.cpp
rename to src Lynx/entrypoints/windtunnel-test-decoder/windtunnel-decoder.cpp
diff --git a/src/hardware_in_the_loop/HIL.h b/src Lynx/hardware_in_the_loop/HIL.h
similarity index 100%
rename from src/hardware_in_the_loop/HIL.h
rename to src Lynx/hardware_in_the_loop/HIL.h
diff --git a/src/hardware_in_the_loop/HILConfig.h b/src Lynx/hardware_in_the_loop/HILConfig.h
similarity index 100%
rename from src/hardware_in_the_loop/HILConfig.h
rename to src Lynx/hardware_in_the_loop/HILConfig.h
diff --git a/src/hardware_in_the_loop/HILFlightPhasesManager.h b/src Lynx/hardware_in_the_loop/HILFlightPhasesManager.h
similarity index 100%
rename from src/hardware_in_the_loop/HILFlightPhasesManager.h
rename to src Lynx/hardware_in_the_loop/HILFlightPhasesManager.h
diff --git a/src/hardware_in_the_loop/HIL_actuators/HILServo.h b/src Lynx/hardware_in_the_loop/HIL_actuators/HILServo.h
similarity index 100%
rename from src/hardware_in_the_loop/HIL_actuators/HILServo.h
rename to src Lynx/hardware_in_the_loop/HIL_actuators/HILServo.h
diff --git a/src/hardware_in_the_loop/HIL_algorithms/HILMockAerobrakeAlgorithm.h b/src Lynx/hardware_in_the_loop/HIL_algorithms/HILMockAerobrakeAlgorithm.h
similarity index 100%
rename from src/hardware_in_the_loop/HIL_algorithms/HILMockAerobrakeAlgorithm.h
rename to src Lynx/hardware_in_the_loop/HIL_algorithms/HILMockAerobrakeAlgorithm.h
diff --git a/src/hardware_in_the_loop/HIL_algorithms/HILMockKalman.h b/src Lynx/hardware_in_the_loop/HIL_algorithms/HILMockKalman.h
similarity index 100%
rename from src/hardware_in_the_loop/HIL_algorithms/HILMockKalman.h
rename to src Lynx/hardware_in_the_loop/HIL_algorithms/HILMockKalman.h
diff --git a/src/hardware_in_the_loop/HIL_algorithms/HILMockNAS.h b/src Lynx/hardware_in_the_loop/HIL_algorithms/HILMockNAS.h
similarity index 100%
rename from src/hardware_in_the_loop/HIL_algorithms/HILMockNAS.h
rename to src Lynx/hardware_in_the_loop/HIL_algorithms/HILMockNAS.h
diff --git a/src/hardware_in_the_loop/HIL_sensors/HILAccelerometer.h b/src Lynx/hardware_in_the_loop/HIL_sensors/HILAccelerometer.h
similarity index 100%
rename from src/hardware_in_the_loop/HIL_sensors/HILAccelerometer.h
rename to src Lynx/hardware_in_the_loop/HIL_sensors/HILAccelerometer.h
diff --git a/src/hardware_in_the_loop/HIL_sensors/HILBarometer.h b/src Lynx/hardware_in_the_loop/HIL_sensors/HILBarometer.h
similarity index 100%
rename from src/hardware_in_the_loop/HIL_sensors/HILBarometer.h
rename to src Lynx/hardware_in_the_loop/HIL_sensors/HILBarometer.h
diff --git a/src/hardware_in_the_loop/HIL_sensors/HILGps.h b/src Lynx/hardware_in_the_loop/HIL_sensors/HILGps.h
similarity index 100%
rename from src/hardware_in_the_loop/HIL_sensors/HILGps.h
rename to src Lynx/hardware_in_the_loop/HIL_sensors/HILGps.h
diff --git a/src/hardware_in_the_loop/HIL_sensors/HILGyroscope.h b/src Lynx/hardware_in_the_loop/HIL_sensors/HILGyroscope.h
similarity index 100%
rename from src/hardware_in_the_loop/HIL_sensors/HILGyroscope.h
rename to src Lynx/hardware_in_the_loop/HIL_sensors/HILGyroscope.h
diff --git a/src/hardware_in_the_loop/HIL_sensors/HILImu.h b/src Lynx/hardware_in_the_loop/HIL_sensors/HILImu.h
similarity index 100%
rename from src/hardware_in_the_loop/HIL_sensors/HILImu.h
rename to src Lynx/hardware_in_the_loop/HIL_sensors/HILImu.h
diff --git a/src/hardware_in_the_loop/HIL_sensors/HILMagnetometer.h b/src Lynx/hardware_in_the_loop/HIL_sensors/HILMagnetometer.h
similarity index 100%
rename from src/hardware_in_the_loop/HIL_sensors/HILMagnetometer.h
rename to src Lynx/hardware_in_the_loop/HIL_sensors/HILMagnetometer.h
diff --git a/src/hardware_in_the_loop/HIL_sensors/HILSensor.h b/src Lynx/hardware_in_the_loop/HIL_sensors/HILSensor.h
similarity index 100%
rename from src/hardware_in_the_loop/HIL_sensors/HILSensor.h
rename to src Lynx/hardware_in_the_loop/HIL_sensors/HILSensor.h
diff --git a/src/hardware_in_the_loop/HIL_sensors/HILSensors.h b/src Lynx/hardware_in_the_loop/HIL_sensors/HILSensors.h
similarity index 100%
rename from src/hardware_in_the_loop/HIL_sensors/HILSensors.h
rename to src Lynx/hardware_in_the_loop/HIL_sensors/HILSensors.h
diff --git a/src/hardware_in_the_loop/HIL_sensors/HILSensorsData.h b/src Lynx/hardware_in_the_loop/HIL_sensors/HILSensorsData.h
similarity index 100%
rename from src/hardware_in_the_loop/HIL_sensors/HILSensorsData.h
rename to src Lynx/hardware_in_the_loop/HIL_sensors/HILSensorsData.h
diff --git a/src/hardware_in_the_loop/HIL_sensors/HILTimestampManagement.h b/src Lynx/hardware_in_the_loop/HIL_sensors/HILTimestampManagement.h
similarity index 100%
rename from src/hardware_in_the_loop/HIL_sensors/HILTimestampManagement.h
rename to src Lynx/hardware_in_the_loop/HIL_sensors/HILTimestampManagement.h
diff --git a/src/hardware_in_the_loop/README.md b/src Lynx/hardware_in_the_loop/README.md
similarity index 100%
rename from src/hardware_in_the_loop/README.md
rename to src Lynx/hardware_in_the_loop/README.md
diff --git a/src/hardware_in_the_loop/simulator_communication/HILTransceiver.h b/src Lynx/hardware_in_the_loop/simulator_communication/HILTransceiver.h
similarity index 100%
rename from src/hardware_in_the_loop/simulator_communication/HILTransceiver.h
rename to src Lynx/hardware_in_the_loop/simulator_communication/HILTransceiver.h
diff --git a/src/hardware_in_the_loop/simulator_communication/SerialInterface.h b/src Lynx/hardware_in_the_loop/simulator_communication/SerialInterface.h
similarity index 100%
rename from src/hardware_in_the_loop/simulator_communication/SerialInterface.h
rename to src Lynx/hardware_in_the_loop/simulator_communication/SerialInterface.h
diff --git a/src/mocksensors/MockGPS.h b/src Lynx/mocksensors/MockGPS.h
similarity index 100%
rename from src/mocksensors/MockGPS.h
rename to src Lynx/mocksensors/MockGPS.h
diff --git a/src/mocksensors/MockIMU.h b/src Lynx/mocksensors/MockIMU.h
similarity index 100%
rename from src/mocksensors/MockIMU.h
rename to src Lynx/mocksensors/MockIMU.h
diff --git a/src/mocksensors/MockPressureSensor.h b/src Lynx/mocksensors/MockPressureSensor.h
similarity index 100%
rename from src/mocksensors/MockPressureSensor.h
rename to src Lynx/mocksensors/MockPressureSensor.h
diff --git a/src/mocksensors/MockSensors.h b/src Lynx/mocksensors/MockSensors.h
similarity index 100%
rename from src/mocksensors/MockSensors.h
rename to src Lynx/mocksensors/MockSensors.h
diff --git a/src/mocksensors/MockSensorsData.h b/src Lynx/mocksensors/MockSensorsData.h
similarity index 100%
rename from src/mocksensors/MockSensorsData.h
rename to src Lynx/mocksensors/MockSensorsData.h
diff --git a/src/mocksensors/MockSpeedSensor.h b/src Lynx/mocksensors/MockSpeedSensor.h
similarity index 100%
rename from src/mocksensors/MockSpeedSensor.h
rename to src Lynx/mocksensors/MockSpeedSensor.h
diff --git a/src/mocksensors/lynx_flight_data/lynx_airspeed_data.cpp b/src Lynx/mocksensors/lynx_flight_data/lynx_airspeed_data.cpp
similarity index 100%
rename from src/mocksensors/lynx_flight_data/lynx_airspeed_data.cpp
rename to src Lynx/mocksensors/lynx_flight_data/lynx_airspeed_data.cpp
diff --git a/src/mocksensors/lynx_flight_data/lynx_airspeed_data.h b/src Lynx/mocksensors/lynx_flight_data/lynx_airspeed_data.h
similarity index 100%
rename from src/mocksensors/lynx_flight_data/lynx_airspeed_data.h
rename to src Lynx/mocksensors/lynx_flight_data/lynx_airspeed_data.h
diff --git a/src/mocksensors/lynx_flight_data/lynx_gps_data.cpp b/src Lynx/mocksensors/lynx_flight_data/lynx_gps_data.cpp
similarity index 100%
rename from src/mocksensors/lynx_flight_data/lynx_gps_data.cpp
rename to src Lynx/mocksensors/lynx_flight_data/lynx_gps_data.cpp
diff --git a/src/mocksensors/lynx_flight_data/lynx_gps_data.h b/src Lynx/mocksensors/lynx_flight_data/lynx_gps_data.h
similarity index 100%
rename from src/mocksensors/lynx_flight_data/lynx_gps_data.h
rename to src Lynx/mocksensors/lynx_flight_data/lynx_gps_data.h
diff --git a/src/mocksensors/lynx_flight_data/lynx_imu_data.cpp b/src Lynx/mocksensors/lynx_flight_data/lynx_imu_data.cpp
similarity index 100%
rename from src/mocksensors/lynx_flight_data/lynx_imu_data.cpp
rename to src Lynx/mocksensors/lynx_flight_data/lynx_imu_data.cpp
diff --git a/src/mocksensors/lynx_flight_data/lynx_imu_data.h b/src Lynx/mocksensors/lynx_flight_data/lynx_imu_data.h
similarity index 100%
rename from src/mocksensors/lynx_flight_data/lynx_imu_data.h
rename to src Lynx/mocksensors/lynx_flight_data/lynx_imu_data.h
diff --git a/src/mocksensors/lynx_flight_data/lynx_press_data.cpp b/src Lynx/mocksensors/lynx_flight_data/lynx_press_data.cpp
similarity index 100%
rename from src/mocksensors/lynx_flight_data/lynx_press_data.cpp
rename to src Lynx/mocksensors/lynx_flight_data/lynx_press_data.cpp
diff --git a/src/mocksensors/lynx_flight_data/lynx_press_data.h b/src Lynx/mocksensors/lynx_flight_data/lynx_press_data.h
similarity index 100%
rename from src/mocksensors/lynx_flight_data/lynx_press_data.h
rename to src Lynx/mocksensors/lynx_flight_data/lynx_press_data.h
diff --git a/src/mocksensors/lynx_flight_data/lynx_pressure_static_data.cpp b/src Lynx/mocksensors/lynx_flight_data/lynx_pressure_static_data.cpp
similarity index 100%
rename from src/mocksensors/lynx_flight_data/lynx_pressure_static_data.cpp
rename to src Lynx/mocksensors/lynx_flight_data/lynx_pressure_static_data.cpp
diff --git a/src/mocksensors/lynx_flight_data/lynx_pressure_static_data.h b/src Lynx/mocksensors/lynx_flight_data/lynx_pressure_static_data.h
similarity index 100%
rename from src/mocksensors/lynx_flight_data/lynx_pressure_static_data.h
rename to src Lynx/mocksensors/lynx_flight_data/lynx_pressure_static_data.h
diff --git a/src/mocksensors/mock_data/test-mock-data.cpp b/src Lynx/mocksensors/mock_data/test-mock-data.cpp
similarity index 100%
rename from src/mocksensors/mock_data/test-mock-data.cpp
rename to src Lynx/mocksensors/mock_data/test-mock-data.cpp
diff --git a/src/mocksensors/mock_data/test-mock-data.h b/src Lynx/mocksensors/mock_data/test-mock-data.h
similarity index 100%
rename from src/mocksensors/mock_data/test-mock-data.h
rename to src Lynx/mocksensors/mock_data/test-mock-data.h
diff --git a/src/mocksensors/mock_data/test-mock-sensors.cpp b/src Lynx/mocksensors/mock_data/test-mock-sensors.cpp
similarity index 100%
rename from src/mocksensors/mock_data/test-mock-sensors.cpp
rename to src Lynx/mocksensors/mock_data/test-mock-sensors.cpp
diff --git a/src/tests Lynx/airbrakes/test-airbrakes-algorithm.cpp b/src Lynx/tests/airbrakes/test-airbrakes-algorithm.cpp
similarity index 100%
rename from src/tests Lynx/airbrakes/test-airbrakes-algorithm.cpp
rename to src Lynx/tests/airbrakes/test-airbrakes-algorithm.cpp
diff --git a/src/tests Lynx/airbrakes/test-airbrakes-interactive.cpp b/src Lynx/tests/airbrakes/test-airbrakes-interactive.cpp
similarity index 100%
rename from src/tests Lynx/airbrakes/test-airbrakes-interactive.cpp
rename to src Lynx/tests/airbrakes/test-airbrakes-interactive.cpp
diff --git a/src/tests Lynx/airbrakes/test_data.h b/src Lynx/tests/airbrakes/test_data.h
similarity index 100%
rename from src/tests Lynx/airbrakes/test_data.h
rename to src Lynx/tests/airbrakes/test_data.h
diff --git a/src/tests Lynx/catch/ada/ada_kalman_p/test-ada-data.cpp b/src Lynx/tests/catch/ada/ada_kalman_p/test-ada-data.cpp
similarity index 100%
rename from src/tests Lynx/catch/ada/ada_kalman_p/test-ada-data.cpp
rename to src Lynx/tests/catch/ada/ada_kalman_p/test-ada-data.cpp
diff --git a/src/tests Lynx/catch/ada/ada_kalman_p/test-ada-data.h b/src Lynx/tests/catch/ada/ada_kalman_p/test-ada-data.h
similarity index 100%
rename from src/tests Lynx/catch/ada/ada_kalman_p/test-ada-data.h
rename to src Lynx/tests/catch/ada/ada_kalman_p/test-ada-data.h
diff --git a/src/tests Lynx/catch/ada/ada_kalman_p/test-ada-simulation.cpp b/src Lynx/tests/catch/ada/ada_kalman_p/test-ada-simulation.cpp
similarity index 100%
rename from src/tests Lynx/catch/ada/ada_kalman_p/test-ada-simulation.cpp
rename to src Lynx/tests/catch/ada/ada_kalman_p/test-ada-simulation.cpp
diff --git a/src/tests Lynx/catch/ada/kalman_acc/test-kalman-acc-data.cpp b/src Lynx/tests/catch/ada/kalman_acc/test-kalman-acc-data.cpp
similarity index 100%
rename from src/tests Lynx/catch/ada/kalman_acc/test-kalman-acc-data.cpp
rename to src Lynx/tests/catch/ada/kalman_acc/test-kalman-acc-data.cpp
diff --git a/src/tests Lynx/catch/ada/kalman_acc/test-kalman-acc-data.h b/src Lynx/tests/catch/ada/kalman_acc/test-kalman-acc-data.h
similarity index 100%
rename from src/tests Lynx/catch/ada/kalman_acc/test-kalman-acc-data.h
rename to src Lynx/tests/catch/ada/kalman_acc/test-kalman-acc-data.h
diff --git a/src/tests Lynx/catch/ada/kalman_acc/test-kalman-acc.cpp b/src Lynx/tests/catch/ada/kalman_acc/test-kalman-acc.cpp
similarity index 100%
rename from src/tests Lynx/catch/ada/kalman_acc/test-kalman-acc.cpp
rename to src Lynx/tests/catch/ada/kalman_acc/test-kalman-acc.cpp
diff --git a/src/tests Lynx/catch/ada/test-rogallo-dts.cpp b/src Lynx/tests/catch/ada/test-rogallo-dts.cpp
similarity index 100%
rename from src/tests Lynx/catch/ada/test-rogallo-dts.cpp
rename to src Lynx/tests/catch/ada/test-rogallo-dts.cpp
diff --git a/src/tests Lynx/catch/catch-tests-entry.cpp b/src Lynx/tests/catch/catch-tests-entry.cpp
similarity index 100%
rename from src/tests Lynx/catch/catch-tests-entry.cpp
rename to src Lynx/tests/catch/catch-tests-entry.cpp
diff --git a/src/tests Lynx/catch/fsm/test-ada.cpp b/src Lynx/tests/catch/fsm/test-ada.cpp
similarity index 100%
rename from src/tests Lynx/catch/fsm/test-ada.cpp
rename to src Lynx/tests/catch/fsm/test-ada.cpp
diff --git a/src/tests Lynx/catch/fsm/test-airbrakes.cpp b/src Lynx/tests/catch/fsm/test-airbrakes.cpp
similarity index 100%
rename from src/tests Lynx/catch/fsm/test-airbrakes.cpp
rename to src Lynx/tests/catch/fsm/test-airbrakes.cpp
diff --git a/src/tests Lynx/catch/fsm/test-deployment.cpp b/src Lynx/tests/catch/fsm/test-deployment.cpp
similarity index 100%
rename from src/tests Lynx/catch/fsm/test-deployment.cpp
rename to src Lynx/tests/catch/fsm/test-deployment.cpp
diff --git a/src/tests Lynx/catch/fsm/test-flightstatsrecorder.cpp b/src Lynx/tests/catch/fsm/test-flightstatsrecorder.cpp
similarity index 100%
rename from src/tests Lynx/catch/fsm/test-flightstatsrecorder.cpp
rename to src Lynx/tests/catch/fsm/test-flightstatsrecorder.cpp
diff --git a/src/tests Lynx/catch/fsm/test-fmm.cpp b/src Lynx/tests/catch/fsm/test-fmm.cpp
similarity index 100%
rename from src/tests Lynx/catch/fsm/test-fmm.cpp
rename to src Lynx/tests/catch/fsm/test-fmm.cpp
diff --git a/src/tests Lynx/catch/fsm/test-ignition.cpp b/src Lynx/tests/catch/fsm/test-ignition.cpp
similarity index 100%
rename from src/tests Lynx/catch/fsm/test-ignition.cpp
rename to src Lynx/tests/catch/fsm/test-ignition.cpp
diff --git a/src/tests Lynx/catch/fsm/test-nas.cpp b/src Lynx/tests/catch/fsm/test-nas.cpp
similarity index 100%
rename from src/tests Lynx/catch/fsm/test-nas.cpp
rename to src Lynx/tests/catch/fsm/test-nas.cpp
diff --git a/src/tests Lynx/catch/fsm/test-tmtc.cpp b/src Lynx/tests/catch/fsm/test-tmtc.cpp
similarity index 100%
rename from src/tests Lynx/catch/fsm/test-tmtc.cpp
rename to src Lynx/tests/catch/fsm/test-tmtc.cpp
diff --git a/src/tests Lynx/catch/nas/test-nas-simulation.cpp b/src Lynx/tests/catch/nas/test-nas-simulation.cpp
similarity index 100%
rename from src/tests Lynx/catch/nas/test-nas-simulation.cpp
rename to src Lynx/tests/catch/nas/test-nas-simulation.cpp
diff --git a/src/tests Lynx/deathstack-boards/test-analog-board.cpp b/src Lynx/tests/deathstack-boards/test-analog-board.cpp
similarity index 100%
rename from src/tests Lynx/deathstack-boards/test-analog-board.cpp
rename to src Lynx/tests/deathstack-boards/test-analog-board.cpp
diff --git a/src/tests Lynx/deathstack-boards/test-power-board.cpp b/src Lynx/tests/deathstack-boards/test-power-board.cpp
similarity index 100%
rename from src/tests Lynx/deathstack-boards/test-power-board.cpp
rename to src Lynx/tests/deathstack-boards/test-power-board.cpp
diff --git a/src/tests Lynx/deathstack-boards/test-rf-board.cpp b/src Lynx/tests/deathstack-boards/test-rf-board.cpp
similarity index 100%
rename from src/tests Lynx/deathstack-boards/test-rf-board.cpp
rename to src Lynx/tests/deathstack-boards/test-rf-board.cpp
diff --git a/src/tests Lynx/deathstack-boards/test-stm-board.cpp b/src Lynx/tests/deathstack-boards/test-stm-board.cpp
similarity index 100%
rename from src/tests Lynx/deathstack-boards/test-stm-board.cpp
rename to src Lynx/tests/deathstack-boards/test-stm-board.cpp
diff --git a/src/tests Lynx/deployment/test-deployment-interactive.cpp b/src Lynx/tests/deployment/test-deployment-interactive.cpp
similarity index 100%
rename from src/tests Lynx/deployment/test-deployment-interactive.cpp
rename to src Lynx/tests/deployment/test-deployment-interactive.cpp
diff --git a/src/tests Lynx/drivers/test-all-sensors.cpp b/src Lynx/tests/drivers/test-all-sensors.cpp
similarity index 100%
rename from src/tests Lynx/drivers/test-all-sensors.cpp
rename to src Lynx/tests/drivers/test-all-sensors.cpp
diff --git a/src/tests Lynx/drivers/test-cutter.cpp b/src Lynx/tests/drivers/test-cutter.cpp
similarity index 100%
rename from src/tests Lynx/drivers/test-cutter.cpp
rename to src Lynx/tests/drivers/test-cutter.cpp
diff --git a/src/tests Lynx/drivers/test-imus.cpp b/src Lynx/tests/drivers/test-imus.cpp
similarity index 100%
rename from src/tests Lynx/drivers/test-imus.cpp
rename to src Lynx/tests/drivers/test-imus.cpp
diff --git a/src/tests Lynx/drivers/test-mavlink.cpp b/src Lynx/tests/drivers/test-mavlink.cpp
similarity index 100%
rename from src/tests Lynx/drivers/test-mavlink.cpp
rename to src Lynx/tests/drivers/test-mavlink.cpp
diff --git a/src/tests Lynx/drivers/test-motor.cpp b/src Lynx/tests/drivers/test-motor.cpp
similarity index 100%
rename from src/tests Lynx/drivers/test-motor.cpp
rename to src Lynx/tests/drivers/test-motor.cpp
diff --git a/src/tests Lynx/drivers/test-pressure-calib.cpp b/src Lynx/tests/drivers/test-pressure-calib.cpp
similarity index 100%
rename from src/tests Lynx/drivers/test-pressure-calib.cpp
rename to src Lynx/tests/drivers/test-pressure-calib.cpp
diff --git a/src/tests Lynx/drivers/test-servo.cpp b/src Lynx/tests/drivers/test-servo.cpp
similarity index 100%
rename from src/tests Lynx/drivers/test-servo.cpp
rename to src Lynx/tests/drivers/test-servo.cpp
diff --git a/src/tests Lynx/eigen-test.cpp b/src Lynx/tests/eigen-test.cpp
similarity index 100%
rename from src/tests Lynx/eigen-test.cpp
rename to src Lynx/tests/eigen-test.cpp
diff --git a/src/tests Lynx/hardware_in_the_loop/test-HIL+ADA+Aerobrake/HILSimulationConfig.h b/src Lynx/tests/hardware_in_the_loop/test-HIL+ADA+Aerobrake/HILSimulationConfig.h
similarity index 100%
rename from src/tests Lynx/hardware_in_the_loop/test-HIL+ADA+Aerobrake/HILSimulationConfig.h
rename to src Lynx/tests/hardware_in_the_loop/test-HIL+ADA+Aerobrake/HILSimulationConfig.h
diff --git a/src/tests Lynx/hardware_in_the_loop/test-HIL+ADA+Aerobrake/test-HIL+ADA+Aerobrake.cpp b/src Lynx/tests/hardware_in_the_loop/test-HIL+ADA+Aerobrake/test-HIL+ADA+Aerobrake.cpp
similarity index 100%
rename from src/tests Lynx/hardware_in_the_loop/test-HIL+ADA+Aerobrake/test-HIL+ADA+Aerobrake.cpp
rename to src Lynx/tests/hardware_in_the_loop/test-HIL+ADA+Aerobrake/test-HIL+ADA+Aerobrake.cpp
diff --git a/src/tests Lynx/hardware_in_the_loop/test-HIL+ADA+AerobrakeController+nas/HILSimulationConfig.h b/src Lynx/tests/hardware_in_the_loop/test-HIL+ADA+AerobrakeController+nas/HILSimulationConfig.h
similarity index 100%
rename from src/tests Lynx/hardware_in_the_loop/test-HIL+ADA+AerobrakeController+nas/HILSimulationConfig.h
rename to src Lynx/tests/hardware_in_the_loop/test-HIL+ADA+AerobrakeController+nas/HILSimulationConfig.h
diff --git a/src/tests Lynx/hardware_in_the_loop/test-HIL+ADA+AerobrakeController+nas/test-HIL+ADA+AerobrakeController+nas.cpp b/src Lynx/tests/hardware_in_the_loop/test-HIL+ADA+AerobrakeController+nas/test-HIL+ADA+AerobrakeController+nas.cpp
similarity index 100%
rename from src/tests Lynx/hardware_in_the_loop/test-HIL+ADA+AerobrakeController+nas/test-HIL+ADA+AerobrakeController+nas.cpp
rename to src Lynx/tests/hardware_in_the_loop/test-HIL+ADA+AerobrakeController+nas/test-HIL+ADA+AerobrakeController+nas.cpp
diff --git a/src/tests Lynx/hardware_in_the_loop/test-HIL+ADA/HILSimulationConfig.h b/src Lynx/tests/hardware_in_the_loop/test-HIL+ADA/HILSimulationConfig.h
similarity index 100%
rename from src/tests Lynx/hardware_in_the_loop/test-HIL+ADA/HILSimulationConfig.h
rename to src Lynx/tests/hardware_in_the_loop/test-HIL+ADA/HILSimulationConfig.h
diff --git a/src/tests Lynx/hardware_in_the_loop/test-HIL+ADA/test-HIL+ADA.cpp b/src Lynx/tests/hardware_in_the_loop/test-HIL+ADA/test-HIL+ADA.cpp
similarity index 100%
rename from src/tests Lynx/hardware_in_the_loop/test-HIL+ADA/test-HIL+ADA.cpp
rename to src Lynx/tests/hardware_in_the_loop/test-HIL+ADA/test-HIL+ADA.cpp
diff --git a/src/tests Lynx/hardware_in_the_loop/test-HIL+Aerobrake/HILAerobrakeConfig.h b/src Lynx/tests/hardware_in_the_loop/test-HIL+Aerobrake/HILAerobrakeConfig.h
similarity index 100%
rename from src/tests Lynx/hardware_in_the_loop/test-HIL+Aerobrake/HILAerobrakeConfig.h
rename to src Lynx/tests/hardware_in_the_loop/test-HIL+Aerobrake/HILAerobrakeConfig.h
diff --git a/src/tests Lynx/hardware_in_the_loop/test-HIL+Aerobrake/HILSimulationConfig.h b/src Lynx/tests/hardware_in_the_loop/test-HIL+Aerobrake/HILSimulationConfig.h
similarity index 100%
rename from src/tests Lynx/hardware_in_the_loop/test-HIL+Aerobrake/HILSimulationConfig.h
rename to src Lynx/tests/hardware_in_the_loop/test-HIL+Aerobrake/HILSimulationConfig.h
diff --git a/src/tests Lynx/hardware_in_the_loop/test-HIL+Aerobrake/test-HIL+Aerobrake.cpp b/src Lynx/tests/hardware_in_the_loop/test-HIL+Aerobrake/test-HIL+Aerobrake.cpp
similarity index 100%
rename from src/tests Lynx/hardware_in_the_loop/test-HIL+Aerobrake/test-HIL+Aerobrake.cpp
rename to src Lynx/tests/hardware_in_the_loop/test-HIL+Aerobrake/test-HIL+Aerobrake.cpp
diff --git a/src/tests Lynx/hardware_in_the_loop/test-HIL/HILSimulationConfig.h b/src Lynx/tests/hardware_in_the_loop/test-HIL/HILSimulationConfig.h
similarity index 100%
rename from src/tests Lynx/hardware_in_the_loop/test-HIL/HILSimulationConfig.h
rename to src Lynx/tests/hardware_in_the_loop/test-HIL/HILSimulationConfig.h
diff --git a/src/tests Lynx/hardware_in_the_loop/test-HIL/test-HIL.cpp b/src Lynx/tests/hardware_in_the_loop/test-HIL/test-HIL.cpp
similarity index 100%
rename from src/tests Lynx/hardware_in_the_loop/test-HIL/test-HIL.cpp
rename to src Lynx/tests/hardware_in_the_loop/test-HIL/test-HIL.cpp
diff --git a/src/tests Lynx/hardware_in_the_loop/test-SerialInterface/HILSimulationConfig.h b/src Lynx/tests/hardware_in_the_loop/test-SerialInterface/HILSimulationConfig.h
similarity index 100%
rename from src/tests Lynx/hardware_in_the_loop/test-SerialInterface/HILSimulationConfig.h
rename to src Lynx/tests/hardware_in_the_loop/test-SerialInterface/HILSimulationConfig.h
diff --git a/src/tests Lynx/hardware_in_the_loop/test-SerialInterface/test-SerialInterface.cpp b/src Lynx/tests/hardware_in_the_loop/test-SerialInterface/test-SerialInterface.cpp
similarity index 100%
rename from src/tests Lynx/hardware_in_the_loop/test-SerialInterface/test-SerialInterface.cpp
rename to src Lynx/tests/hardware_in_the_loop/test-SerialInterface/test-SerialInterface.cpp
diff --git a/src/tests Lynx/ledwave.cpp b/src Lynx/tests/ledwave.cpp
similarity index 100%
rename from src/tests Lynx/ledwave.cpp
rename to src Lynx/tests/ledwave.cpp
diff --git a/src/tests Lynx/mock_sensors/test-mock-data.cpp b/src Lynx/tests/mock_sensors/test-mock-data.cpp
similarity index 100%
rename from src/tests Lynx/mock_sensors/test-mock-data.cpp
rename to src Lynx/tests/mock_sensors/test-mock-data.cpp
diff --git a/src/tests Lynx/mock_sensors/test-mock-data.h b/src Lynx/tests/mock_sensors/test-mock-data.h
similarity index 100%
rename from src/tests Lynx/mock_sensors/test-mock-data.h
rename to src Lynx/tests/mock_sensors/test-mock-data.h
diff --git a/src/tests Lynx/mock_sensors/test-mock-sensors.cpp b/src Lynx/tests/mock_sensors/test-mock-sensors.cpp
similarity index 100%
rename from src/tests Lynx/mock_sensors/test-mock-sensors.cpp
rename to src Lynx/tests/mock_sensors/test-mock-sensors.cpp
diff --git a/src/tests Lynx/ram_test/README.md b/src Lynx/tests/ram_test/README.md
similarity index 100%
rename from src/tests Lynx/ram_test/README.md
rename to src Lynx/tests/ram_test/README.md
diff --git a/src/tests Lynx/ram_test/ramtest.cpp b/src Lynx/tests/ram_test/ramtest.cpp
similarity index 100%
rename from src/tests Lynx/ram_test/ramtest.cpp
rename to src Lynx/tests/ram_test/ramtest.cpp
diff --git a/src/tests Lynx/ram_test/sha1.cpp b/src Lynx/tests/ram_test/sha1.cpp
similarity index 100%
rename from src/tests Lynx/ram_test/sha1.cpp
rename to src Lynx/tests/ram_test/sha1.cpp
diff --git a/src/tests Lynx/ram_test/sha1.h b/src Lynx/tests/ram_test/sha1.h
similarity index 100%
rename from src/tests Lynx/ram_test/sha1.h
rename to src Lynx/tests/ram_test/sha1.h
diff --git a/src/tests Lynx/test-ada-dpl-simulation.cpp b/src Lynx/tests/test-ada-dpl-simulation.cpp
similarity index 100%
rename from src/tests Lynx/test-ada-dpl-simulation.cpp
rename to src Lynx/tests/test-ada-dpl-simulation.cpp
diff --git a/src/tests Lynx/test-airbrakes-algorithm/test-airbrakes-algorithm.cpp b/src Lynx/tests/test-airbrakes-algorithm/test-airbrakes-algorithm.cpp
similarity index 100%
rename from src/tests Lynx/test-airbrakes-algorithm/test-airbrakes-algorithm.cpp
rename to src Lynx/tests/test-airbrakes-algorithm/test-airbrakes-algorithm.cpp
diff --git a/src/tests Lynx/test-airbrakes-algorithm/testdata.h b/src Lynx/tests/test-airbrakes-algorithm/testdata.h
similarity index 100%
rename from src/tests Lynx/test-airbrakes-algorithm/testdata.h
rename to src Lynx/tests/test-airbrakes-algorithm/testdata.h
diff --git a/src/tests Lynx/test-airbrakescontroller/test-airbrakescontroller.cpp b/src Lynx/tests/test-airbrakescontroller/test-airbrakescontroller.cpp
similarity index 100%
rename from src/tests Lynx/test-airbrakescontroller/test-airbrakescontroller.cpp
rename to src Lynx/tests/test-airbrakescontroller/test-airbrakescontroller.cpp
diff --git a/src/tests Lynx/test-airbrakescontroller/testdata.cpp b/src Lynx/tests/test-airbrakescontroller/testdata.cpp
similarity index 100%
rename from src/tests Lynx/test-airbrakescontroller/testdata.cpp
rename to src Lynx/tests/test-airbrakescontroller/testdata.cpp
diff --git a/src/tests Lynx/test-airbrakescontroller/testdata.h b/src Lynx/tests/test-airbrakescontroller/testdata.h
similarity index 100%
rename from src/tests Lynx/test-airbrakescontroller/testdata.h
rename to src Lynx/tests/test-airbrakescontroller/testdata.h
diff --git a/src/tests Lynx/test-fmm-interactive.cpp b/src Lynx/tests/test-fmm-interactive.cpp
similarity index 100%
rename from src/tests Lynx/test-fmm-interactive.cpp
rename to src Lynx/tests/test-fmm-interactive.cpp
diff --git a/src/tests Lynx/test-hse.cpp b/src Lynx/tests/test-hse.cpp
similarity index 100%
rename from src/tests Lynx/test-hse.cpp
rename to src Lynx/tests/test-hse.cpp
diff --git a/src/tests Lynx/test-kalman-hitl.cpp b/src Lynx/tests/test-kalman-hitl.cpp
similarity index 100%
rename from src/tests Lynx/test-kalman-hitl.cpp
rename to src Lynx/tests/test-kalman-hitl.cpp
diff --git a/src/tests Lynx/test-logproxy.cpp b/src Lynx/tests/test-logproxy.cpp
similarity index 100%
rename from src/tests Lynx/test-logproxy.cpp
rename to src Lynx/tests/test-logproxy.cpp
diff --git a/src/tests Lynx/test-pinhandler.cpp b/src Lynx/tests/test-pinhandler.cpp
similarity index 100%
rename from src/tests Lynx/test-pinhandler.cpp
rename to src Lynx/tests/test-pinhandler.cpp
diff --git a/src/tests Lynx/test-sensormanager.cpp b/src Lynx/tests/test-sensormanager.cpp
similarity index 100%
rename from src/tests Lynx/test-sensormanager.cpp
rename to src Lynx/tests/test-sensormanager.cpp
diff --git a/src/tests Lynx/test-sm+tmtc.cpp b/src Lynx/tests/test-sm+tmtc.cpp
similarity index 100%
rename from src/tests Lynx/test-sm+tmtc.cpp
rename to src Lynx/tests/test-sm+tmtc.cpp
diff --git a/src/tests Lynx/test-tmtc.cpp b/src Lynx/tests/test-tmtc.cpp
similarity index 100%
rename from src/tests Lynx/test-tmtc.cpp
rename to src Lynx/tests/test-tmtc.cpp