diff --git a/src/autopilot.cpp b/src/driveModi/autopilot.cpp
similarity index 100%
rename from src/autopilot.cpp
rename to src/driveModi/autopilot.cpp
diff --git a/src/autopilot.h b/src/driveModi/autopilot.h
similarity index 90%
rename from src/autopilot.h
rename to src/driveModi/autopilot.h
index a05c0c5..ae6becc 100644
--- a/src/autopilot.h
+++ b/src/driveModi/autopilot.h
@@ -13,7 +13,7 @@ class Autopilot {
     private:
         Route *route;
         MoveControl *moveControl;
-        TinyGPSPlus * gps;
+        TinyGPSPlus *gps;
 
 };
 
diff --git a/src/driveModi/manualControl.cpp b/src/driveModi/manualControl.cpp
new file mode 100644
index 0000000..e69de29
diff --git a/src/driveModi/manualControl.h b/src/driveModi/manualControl.h
new file mode 100644
index 0000000..e69de29
diff --git a/src/motorControl.cpp b/src/hardware/motorControl.cpp
similarity index 100%
rename from src/motorControl.cpp
rename to src/hardware/motorControl.cpp
diff --git a/src/motorControl.h b/src/hardware/motorControl.h
similarity index 100%
rename from src/motorControl.h
rename to src/hardware/motorControl.h
diff --git a/src/speedometer.cpp b/src/hardware/speedometer.cpp
similarity index 100%
rename from src/speedometer.cpp
rename to src/hardware/speedometer.cpp
diff --git a/src/speedometer.h b/src/hardware/speedometer.h
similarity index 100%
rename from src/speedometer.h
rename to src/hardware/speedometer.h
diff --git a/src/hardware/underfloorLighting.cpp b/src/hardware/underfloorLighting.cpp
new file mode 100644
index 0000000..e69de29
diff --git a/src/hardware/underfloorLighting.h b/src/hardware/underfloorLighting.h
new file mode 100644
index 0000000..e69de29
diff --git a/src/main.cpp b/src/main.cpp
index 626a0b7..10ba911 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -5,9 +5,9 @@
 #include <time.h>
 
 #include "config.h"
-#include "motorControl.h"
+#include "hardware/motorControl.h"
 #include "moveControl.h"
-#include "speedometer.h"
+#include "hardware/speedometer.h"
 #include "debugMqtt.h"
 
 void callbackControllerAction();
diff --git a/src/moveControl.h b/src/moveControl.h
index 3bcab16..47bd57e 100644
--- a/src/moveControl.h
+++ b/src/moveControl.h
@@ -3,8 +3,8 @@
 
 #include <cstdint>
 
-#include "motorControl.h"
-#include "speedometer.h"
+#include "hardware/motorControl.h"
+#include "hardware/speedometer.h"
 #include "config.h"
 #include "debugMqtt.h"
 
diff --git a/src/route.h b/src/route.h
index c1a5314..f392308 100644
--- a/src/route.h
+++ b/src/route.h
@@ -4,8 +4,8 @@
 #include <cstdint>
 #include <list>
 
-#include "motorControl.h"
-#include "speedometer.h"
+#include "hardware/motorControl.h"
+#include "hardware/speedometer.h"
 #include "config.h"
 
 struct Point{