diff --git a/esp32/include/spot.h b/esp32/include/spot.h
index 4773acd..6a15470 100644
--- a/esp32/include/spot.h
+++ b/esp32/include/spot.h
@@ -6,10 +6,10 @@
 #include <filesystem.h>
 #include <firmware_download_service.h>
 #include <firmware_upload_service.h>
-#include <Peripherals.h>
-#include <ServoController.h>
+#include <peripherals/peripherals.h>
+#include <peripherals/servo_controller.h>
+#include <peripherals/led_service.h>
 #include <ESPmDNS.h>
-#include <LEDService.h>
 #include <event_socket.h>
 #include <features.h>
 #include <MotionService.h>
diff --git a/esp32/lib/ESP32-sveltekit/MotionService.h b/esp32/lib/ESP32-sveltekit/MotionService.h
index 9a3e5a2..19f4539 100644
--- a/esp32/lib/ESP32-sveltekit/MotionService.h
+++ b/esp32/lib/ESP32-sveltekit/MotionService.h
@@ -3,7 +3,7 @@
 
 #include <event_socket.h>
 #include <Kinematics.h>
-#include <ServoController.h>
+#include <peripherals/servo_controller.h>
 #include <utils/timing.h>
 #include <MathUtils.h>
 
diff --git a/esp32/lib/ESP32-sveltekit/LEDService.h b/esp32/lib/ESP32-sveltekit/peripherals/led_service.h
similarity index 100%
rename from esp32/lib/ESP32-sveltekit/LEDService.h
rename to esp32/lib/ESP32-sveltekit/peripherals/led_service.h
diff --git a/esp32/lib/ESP32-sveltekit/Peripherals.h b/esp32/lib/ESP32-sveltekit/peripherals/peripherals.h
similarity index 100%
rename from esp32/lib/ESP32-sveltekit/Peripherals.h
rename to esp32/lib/ESP32-sveltekit/peripherals/peripherals.h
diff --git a/esp32/lib/ESP32-sveltekit/ServoController.h b/esp32/lib/ESP32-sveltekit/peripherals/servo_controller.h
similarity index 100%
rename from esp32/lib/ESP32-sveltekit/ServoController.h
rename to esp32/lib/ESP32-sveltekit/peripherals/servo_controller.h