diff --git a/esp32/include/spot.h b/esp32/include/spot.h
index 6a15470..6d6ff97 100644
--- a/esp32/include/spot.h
+++ b/esp32/include/spot.h
@@ -9,12 +9,12 @@
 #include <peripherals/peripherals.h>
 #include <peripherals/servo_controller.h>
 #include <peripherals/led_service.h>
+#include <peripherals/camera_service.h>
 #include <ESPmDNS.h>
 #include <event_socket.h>
 #include <features.h>
 #include <MotionService.h>
 #include <ntp_service.h>
-#include <camera_service.h>
 #include <PsychicHttp.h>
 #include <task_manager.h>
 #include <WiFi.h>
diff --git a/esp32/lib/ESP32-sveltekit/camera_pins.h b/esp32/lib/ESP32-sveltekit/peripherals/camera_pins.h
similarity index 100%
rename from esp32/lib/ESP32-sveltekit/camera_pins.h
rename to esp32/lib/ESP32-sveltekit/peripherals/camera_pins.h
diff --git a/esp32/lib/ESP32-sveltekit/camera_service.cpp b/esp32/lib/ESP32-sveltekit/peripherals/camera_service.cpp
similarity index 99%
rename from esp32/lib/ESP32-sveltekit/camera_service.cpp
rename to esp32/lib/ESP32-sveltekit/peripherals/camera_service.cpp
index 3148284..253856f 100644
--- a/esp32/lib/ESP32-sveltekit/camera_service.cpp
+++ b/esp32/lib/ESP32-sveltekit/peripherals/camera_service.cpp
@@ -1,4 +1,4 @@
-#include <camera_service.h>
+#include <peripherals/camera_service.h>
 
 namespace Camera {
 
diff --git a/esp32/lib/ESP32-sveltekit/camera_service.h b/esp32/lib/ESP32-sveltekit/peripherals/camera_service.h
similarity index 96%
rename from esp32/lib/ESP32-sveltekit/camera_service.h
rename to esp32/lib/ESP32-sveltekit/peripherals/camera_service.h
index 18eed7c..cb0f2f8 100644
--- a/esp32/lib/ESP32-sveltekit/camera_service.h
+++ b/esp32/lib/ESP32-sveltekit/peripherals/camera_service.h
@@ -19,7 +19,7 @@ namespace Camera {
 #include <esp_camera.h>
 
 #if USE_CAMERA
-#include <camera_pins.h>
+#include <peripherals/camera_pins.h>
 #endif
 
 #define PART_BOUNDARY "frame"