diff --git a/esp32/lib/ESP32-sveltekit/ap_service.h b/esp32/lib/ESP32-sveltekit/ap_service.h
index 7038c79..b3b1068 100644
--- a/esp32/lib/ESP32-sveltekit/ap_service.h
+++ b/esp32/lib/ESP32-sveltekit/ap_service.h
@@ -1,6 +1,6 @@
-#include <stateful_service.h>
-#include <stateful_service_endpoint.h>
-#include <stateful_persistence.h>
+#include <template/stateful_service.h>
+#include <template/stateful_endpoint.h>
+#include <template/stateful_persistence.h>
 #include <settings/ap_settings.h>
 #include <utils/timing.h>
 #include <WiFi.h>
diff --git a/esp32/lib/ESP32-sveltekit/event_socket.h b/esp32/lib/ESP32-sveltekit/event_socket.h
index bfc86d6..6eb62c8 100644
--- a/esp32/lib/ESP32-sveltekit/event_socket.h
+++ b/esp32/lib/ESP32-sveltekit/event_socket.h
@@ -2,7 +2,7 @@
 #define Socket_h
 
 #include <PsychicHttp.h>
-#include <stateful_service.h>
+#include <template/stateful_service.h>
 #include <list>
 #include <map>
 #include <vector>
diff --git a/esp32/lib/ESP32-sveltekit/ntp_service.h b/esp32/lib/ESP32-sveltekit/ntp_service.h
index 7b50104..d713aae 100644
--- a/esp32/lib/ESP32-sveltekit/ntp_service.h
+++ b/esp32/lib/ESP32-sveltekit/ntp_service.h
@@ -2,9 +2,9 @@
 #define NTPService_h
 
 #include <filesystem.h>
-#include <stateful_persistence.h>
+#include <template/stateful_persistence.h>
 #include <WiFi.h>
-#include <stateful_service_endpoint.h>
+#include <template/stateful_endpoint.h>
 #include <settings/ntp_settings.h>
 
 #include <lwip/apps/sntp.h>
diff --git a/esp32/lib/ESP32-sveltekit/peripherals/camera_service.h b/esp32/lib/ESP32-sveltekit/peripherals/camera_service.h
index cb0f2f8..b010aa2 100644
--- a/esp32/lib/ESP32-sveltekit/peripherals/camera_service.h
+++ b/esp32/lib/ESP32-sveltekit/peripherals/camera_service.h
@@ -8,9 +8,9 @@
 
 #include <features.h>
 #include <task_manager.h>
-#include <stateful_socket.h>
-#include <stateful_persistence.h>
-#include <stateful_service_endpoint.h>
+#include <template/stateful_socket.h>
+#include <template/stateful_persistence.h>
+#include <template/stateful_endpoint.h>
 
 #include <settings/camera_settings.h>
 
diff --git a/esp32/lib/ESP32-sveltekit/peripherals/peripherals.h b/esp32/lib/ESP32-sveltekit/peripherals/peripherals.h
index 592567f..bee9918 100644
--- a/esp32/lib/ESP32-sveltekit/peripherals/peripherals.h
+++ b/esp32/lib/ESP32-sveltekit/peripherals/peripherals.h
@@ -1,15 +1,15 @@
 #ifndef Peripherals_h
 #define Peripherals_h
 
-#include <stateful_socket.h>
-#include <stateful_persistence.h>
-#include <stateful_service.h>
+#include <template/stateful_socket.h>
+#include <template/stateful_persistence.h>
+#include <template/stateful_service.h>
 #include <utils/math_utils.h>
 #include <utils/timing.h>
 #include <filesystem.h>
 #include <features.h>
 #include <settings/peripherals_settings.h>
-#include <stateful_service_endpoint.h>
+#include <template/stateful_endpoint.h>
 
 #include <list>
 #include <SPI.h>
diff --git a/esp32/lib/ESP32-sveltekit/peripherals/servo_controller.h b/esp32/lib/ESP32-sveltekit/peripherals/servo_controller.h
index 47af7ae..5bf952f 100644
--- a/esp32/lib/ESP32-sveltekit/peripherals/servo_controller.h
+++ b/esp32/lib/ESP32-sveltekit/peripherals/servo_controller.h
@@ -3,9 +3,9 @@
 
 #include <Adafruit_PWMServoDriver.h>
 #include <event_socket.h>
-#include <stateful_persistence.h>
-#include <stateful_service.h>
-#include <stateful_service_endpoint.h>
+#include <template/stateful_persistence.h>
+#include <template/stateful_service.h>
+#include <template/stateful_endpoint.h>
 #include <utils/math_utils.h>
 #include <settings/servo_settings.h>
 
diff --git a/esp32/lib/ESP32-sveltekit/settings/ap_settings.h b/esp32/lib/ESP32-sveltekit/settings/ap_settings.h
index 9273671..80e4617 100644
--- a/esp32/lib/ESP32-sveltekit/settings/ap_settings.h
+++ b/esp32/lib/ESP32-sveltekit/settings/ap_settings.h
@@ -6,7 +6,7 @@
 #include <utils/json_utils.h>
 #include <utils/string_utils.h>
 #include <utils/ip_utils.h>
-#include <state_result.h>
+#include <template/state_result.h>
 
 #include <DNSServer.h>
 #include <IPAddress.h>
diff --git a/esp32/lib/ESP32-sveltekit/settings/camera_settings.h b/esp32/lib/ESP32-sveltekit/settings/camera_settings.h
index da01e15..7ce17f6 100644
--- a/esp32/lib/ESP32-sveltekit/settings/camera_settings.h
+++ b/esp32/lib/ESP32-sveltekit/settings/camera_settings.h
@@ -3,7 +3,7 @@
 namespace Camera {
 
 #include <ArduinoJson.h>
-#include <state_result.h>
+#include <template/state_result.h>
 #include <esp_camera.h>
 
 class CameraSettings {
diff --git a/esp32/lib/ESP32-sveltekit/settings/ntp_settings.h b/esp32/lib/ESP32-sveltekit/settings/ntp_settings.h
index b53fc60..6bad5af 100644
--- a/esp32/lib/ESP32-sveltekit/settings/ntp_settings.h
+++ b/esp32/lib/ESP32-sveltekit/settings/ntp_settings.h
@@ -1,5 +1,5 @@
 #include <Arduino.h>
-#include <state_result.h>
+#include <template/state_result.h>
 #include <ArduinoJson.h>
 
 #ifndef FACTORY_NTP_ENABLED
diff --git a/esp32/lib/ESP32-sveltekit/settings/peripherals_settings.h b/esp32/lib/ESP32-sveltekit/settings/peripherals_settings.h
index 6d12715..13b7c9a 100644
--- a/esp32/lib/ESP32-sveltekit/settings/peripherals_settings.h
+++ b/esp32/lib/ESP32-sveltekit/settings/peripherals_settings.h
@@ -2,7 +2,7 @@
 
 #include <vector>
 #include <ArduinoJson.h>
-#include <state_result.h>
+#include <template/state_result.h>
 
 /*
  * I2C software connection
diff --git a/esp32/lib/ESP32-sveltekit/settings/servo_settings.h b/esp32/lib/ESP32-sveltekit/settings/servo_settings.h
index fb9dd7c..f45ebf2 100644
--- a/esp32/lib/ESP32-sveltekit/settings/servo_settings.h
+++ b/esp32/lib/ESP32-sveltekit/settings/servo_settings.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <ArduinoJson.h>
-#include <state_result.h>
+#include <template/state_result.h>
 
 typedef struct {
     float centerPwm;
diff --git a/esp32/lib/ESP32-sveltekit/settings/wifi_settings.h b/esp32/lib/ESP32-sveltekit/settings/wifi_settings.h
index 338c241..fef3d71 100644
--- a/esp32/lib/ESP32-sveltekit/settings/wifi_settings.h
+++ b/esp32/lib/ESP32-sveltekit/settings/wifi_settings.h
@@ -6,7 +6,7 @@
 #include <utils/json_utils.h>
 #include <utils/ip_utils.h>
 #include <utils/string_utils.h>
-#include <state_result.h>
+#include <template/state_result.h>
 
 #ifndef FACTORY_WIFI_SSID
 #define FACTORY_WIFI_SSID ""
diff --git a/esp32/lib/ESP32-sveltekit/state_result.h b/esp32/lib/ESP32-sveltekit/template/state_result.h
similarity index 100%
rename from esp32/lib/ESP32-sveltekit/state_result.h
rename to esp32/lib/ESP32-sveltekit/template/state_result.h
diff --git a/esp32/lib/ESP32-sveltekit/stateful_service_endpoint.h b/esp32/lib/ESP32-sveltekit/template/stateful_endpoint.h
similarity index 97%
rename from esp32/lib/ESP32-sveltekit/stateful_service_endpoint.h
rename to esp32/lib/ESP32-sveltekit/template/stateful_endpoint.h
index e85d645..91d43e4 100644
--- a/esp32/lib/ESP32-sveltekit/stateful_service_endpoint.h
+++ b/esp32/lib/ESP32-sveltekit/template/stateful_endpoint.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <PsychicHttp.h>
-#include <stateful_service_endpoint.h>
+#include <template/stateful_endpoint.h>
 
 #include <functional>
 
diff --git a/esp32/lib/ESP32-sveltekit/stateful_persistence.h b/esp32/lib/ESP32-sveltekit/template/stateful_persistence.h
similarity index 99%
rename from esp32/lib/ESP32-sveltekit/stateful_persistence.h
rename to esp32/lib/ESP32-sveltekit/template/stateful_persistence.h
index 521bc00..38dbc23 100644
--- a/esp32/lib/ESP32-sveltekit/stateful_persistence.h
+++ b/esp32/lib/ESP32-sveltekit/template/stateful_persistence.h
@@ -17,7 +17,7 @@
  **/
 
 #include <FS.h>
-#include <stateful_service.h>
+#include <template/stateful_service.h>
 #include <filesystem.h>
 
 template <class T>
diff --git a/esp32/lib/ESP32-sveltekit/stateful_service.h b/esp32/lib/ESP32-sveltekit/template/stateful_service.h
similarity index 99%
rename from esp32/lib/ESP32-sveltekit/stateful_service.h
rename to esp32/lib/ESP32-sveltekit/template/stateful_service.h
index 20db4d2..29101ee 100644
--- a/esp32/lib/ESP32-sveltekit/stateful_service.h
+++ b/esp32/lib/ESP32-sveltekit/template/stateful_service.h
@@ -24,7 +24,7 @@
 #include <freertos/FreeRTOS.h>
 #include <freertos/semphr.h>
 
-#include <state_result.h>
+#include <template/state_result.h>
 
 template <typename T>
 using JsonStateUpdater = std::function<StateUpdateResult(JsonObject &root, T &settings)>;
diff --git a/esp32/lib/ESP32-sveltekit/stateful_socket.h b/esp32/lib/ESP32-sveltekit/template/stateful_socket.h
similarity index 97%
rename from esp32/lib/ESP32-sveltekit/stateful_socket.h
rename to esp32/lib/ESP32-sveltekit/template/stateful_socket.h
index 35be9a7..d5a3847 100644
--- a/esp32/lib/ESP32-sveltekit/stateful_socket.h
+++ b/esp32/lib/ESP32-sveltekit/template/stateful_socket.h
@@ -3,7 +3,7 @@
 #include <PsychicHttp.h>
 
 #include <event_socket.h>
-#include <stateful_service.h>
+#include <template/stateful_service.h>
 
 template <class T>
 class EventEndpoint {
diff --git a/esp32/lib/ESP32-sveltekit/wifi_service.h b/esp32/lib/ESP32-sveltekit/wifi_service.h
index 431e70c..34d7afd 100644
--- a/esp32/lib/ESP32-sveltekit/wifi_service.h
+++ b/esp32/lib/ESP32-sveltekit/wifi_service.h
@@ -7,9 +7,9 @@
 
 #include <filesystem.h>
 #include <utils/timing.h>
-#include <stateful_service.h>
-#include <stateful_persistence.h>
-#include <stateful_service_endpoint.h>
+#include <template/stateful_service.h>
+#include <template/stateful_persistence.h>
+#include <template/stateful_endpoint.h>
 #include <settings/wifi_settings.h>
 
 class WiFiService : public StatefulService<WiFiSettings> {