diff --git a/src/Motor/Actuators/Actuators.cpp b/src/Engine/Actuators/Actuators.cpp similarity index 100% rename from src/Motor/Actuators/Actuators.cpp rename to src/Engine/Actuators/Actuators.cpp diff --git a/src/Motor/Actuators/Actuators.h b/src/Engine/Actuators/Actuators.h similarity index 100% rename from src/Motor/Actuators/Actuators.h rename to src/Engine/Actuators/Actuators.h diff --git a/src/Motor/Actuators/ActuatorsData.h b/src/Engine/Actuators/ActuatorsData.h similarity index 100% rename from src/Motor/Actuators/ActuatorsData.h rename to src/Engine/Actuators/ActuatorsData.h diff --git a/src/Motor/BoardScheduler.h b/src/Engine/BoardScheduler.h similarity index 100% rename from src/Motor/BoardScheduler.h rename to src/Engine/BoardScheduler.h diff --git a/src/Motor/Buses.h b/src/Engine/Buses.h similarity index 100% rename from src/Motor/Buses.h rename to src/Engine/Buses.h diff --git a/src/Motor/CanHandler/CanHandler.cpp b/src/Engine/CanHandler/CanHandler.cpp similarity index 100% rename from src/Motor/CanHandler/CanHandler.cpp rename to src/Engine/CanHandler/CanHandler.cpp diff --git a/src/Motor/CanHandler/CanHandler.h b/src/Engine/CanHandler/CanHandler.h similarity index 100% rename from src/Motor/CanHandler/CanHandler.h rename to src/Engine/CanHandler/CanHandler.h diff --git a/src/Motor/Configs/ActuatorsConfig.h b/src/Engine/Configs/ActuatorsConfig.h similarity index 100% rename from src/Motor/Configs/ActuatorsConfig.h rename to src/Engine/Configs/ActuatorsConfig.h diff --git a/src/Motor/Configs/CanHandlerConfig.h b/src/Engine/Configs/CanHandlerConfig.h similarity index 100% rename from src/Motor/Configs/CanHandlerConfig.h rename to src/Engine/Configs/CanHandlerConfig.h diff --git a/src/Motor/Configs/HILSimulationConfig.h b/src/Engine/Configs/HILSimulationConfig.h similarity index 100% rename from src/Motor/Configs/HILSimulationConfig.h rename to src/Engine/Configs/HILSimulationConfig.h diff --git a/src/Motor/Configs/SchedulerConfig.h b/src/Engine/Configs/SchedulerConfig.h similarity index 100% rename from src/Motor/Configs/SchedulerConfig.h rename to src/Engine/Configs/SchedulerConfig.h diff --git a/src/Motor/Configs/SensorsConfig.h b/src/Engine/Configs/SensorsConfig.h similarity index 100% rename from src/Motor/Configs/SensorsConfig.h rename to src/Engine/Configs/SensorsConfig.h diff --git a/src/Motor/HIL/HIL.cpp b/src/Engine/HIL/HIL.cpp similarity index 100% rename from src/Motor/HIL/HIL.cpp rename to src/Engine/HIL/HIL.cpp diff --git a/src/Motor/HIL/HIL.h b/src/Engine/HIL/HIL.h similarity index 100% rename from src/Motor/HIL/HIL.h rename to src/Engine/HIL/HIL.h diff --git a/src/Motor/HIL/HILData.h b/src/Engine/HIL/HILData.h similarity index 100% rename from src/Motor/HIL/HILData.h rename to src/Engine/HIL/HILData.h diff --git a/src/Motor/PersistentVars/PersistentVars.cpp b/src/Engine/PersistentVars/PersistentVars.cpp similarity index 100% rename from src/Motor/PersistentVars/PersistentVars.cpp rename to src/Engine/PersistentVars/PersistentVars.cpp diff --git a/src/Motor/PersistentVars/PersistentVars.h b/src/Engine/PersistentVars/PersistentVars.h similarity index 100% rename from src/Motor/PersistentVars/PersistentVars.h rename to src/Engine/PersistentVars/PersistentVars.h diff --git a/src/Motor/Sensors/HILSensors.h b/src/Engine/Sensors/HILSensors.h similarity index 100% rename from src/Motor/Sensors/HILSensors.h rename to src/Engine/Sensors/HILSensors.h diff --git a/src/Motor/Sensors/KuliteThermocouple.h b/src/Engine/Sensors/KuliteThermocouple.h similarity index 100% rename from src/Motor/Sensors/KuliteThermocouple.h rename to src/Engine/Sensors/KuliteThermocouple.h diff --git a/src/Motor/Sensors/Sensors.cpp b/src/Engine/Sensors/Sensors.cpp similarity index 100% rename from src/Motor/Sensors/Sensors.cpp rename to src/Engine/Sensors/Sensors.cpp diff --git a/src/Motor/Sensors/Sensors.h b/src/Engine/Sensors/Sensors.h similarity index 100% rename from src/Motor/Sensors/Sensors.h rename to src/Engine/Sensors/Sensors.h diff --git a/src/Motor/Sensors/SensorsData.h b/src/Engine/Sensors/SensorsData.h similarity index 100% rename from src/Motor/Sensors/SensorsData.h rename to src/Engine/Sensors/SensorsData.h diff --git a/src/Motor/motor-entry.cpp b/src/Engine/engine-entry.cpp similarity index 100% rename from src/Motor/motor-entry.cpp rename to src/Engine/engine-entry.cpp