diff --git a/.gitignore b/.gitignore
index 2edc8ee..ddec851 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,7 +2,6 @@
 .vscode/c_cpp_properties.json
 .vscode/launch.json
 .vscode/ipch
-
 __pycache__/
 *.py[cod]
 *$py.class
diff --git a/esp32/.gitignore b/esp32/.gitignore
index a75197b..8a90638 100644
--- a/esp32/.gitignore
+++ b/esp32/.gitignore
@@ -2,6 +2,6 @@
 data/
 www/
 build/
-lib/ESP32-sveltekit/WWWData.h
+include/WWWData.h
 **/.vscode/c_cpp_properties.json
 **/.vscode/launch.json
\ No newline at end of file
diff --git a/esp32/lib/ESP32-sveltekit/ap_service.h b/esp32/include/ap_service.h
similarity index 100%
rename from esp32/lib/ESP32-sveltekit/ap_service.h
rename to esp32/include/ap_service.h
diff --git a/esp32/lib/ESP32-sveltekit/event_socket.h b/esp32/include/event_socket.h
similarity index 100%
rename from esp32/lib/ESP32-sveltekit/event_socket.h
rename to esp32/include/event_socket.h
diff --git a/esp32/lib/ESP32-sveltekit/features.h b/esp32/include/features.h
similarity index 100%
rename from esp32/lib/ESP32-sveltekit/features.h
rename to esp32/include/features.h
diff --git a/esp32/lib/ESP32-sveltekit/filesystem.h b/esp32/include/filesystem.h
similarity index 100%
rename from esp32/lib/ESP32-sveltekit/filesystem.h
rename to esp32/include/filesystem.h
diff --git a/esp32/lib/ESP32-sveltekit/firmware_download_service.h b/esp32/include/firmware_download_service.h
similarity index 100%
rename from esp32/lib/ESP32-sveltekit/firmware_download_service.h
rename to esp32/include/firmware_download_service.h
diff --git a/esp32/lib/ESP32-sveltekit/firmware_upload_service.h b/esp32/include/firmware_upload_service.h
similarity index 100%
rename from esp32/lib/ESP32-sveltekit/firmware_upload_service.h
rename to esp32/include/firmware_upload_service.h
diff --git a/esp32/lib/ESP32-sveltekit/gait/bezier_state.h b/esp32/include/gait/bezier_state.h
similarity index 100%
rename from esp32/lib/ESP32-sveltekit/gait/bezier_state.h
rename to esp32/include/gait/bezier_state.h
diff --git a/esp32/lib/ESP32-sveltekit/gait/crawl_state.h b/esp32/include/gait/crawl_state.h
similarity index 100%
rename from esp32/lib/ESP32-sveltekit/gait/crawl_state.h
rename to esp32/include/gait/crawl_state.h
diff --git a/esp32/lib/ESP32-sveltekit/gait/four_phase_trot_state.h b/esp32/include/gait/four_phase_trot_state.h
similarity index 100%
rename from esp32/lib/ESP32-sveltekit/gait/four_phase_trot_state.h
rename to esp32/include/gait/four_phase_trot_state.h
diff --git a/esp32/lib/ESP32-sveltekit/gait/idle_state.h b/esp32/include/gait/idle_state.h
similarity index 100%
rename from esp32/lib/ESP32-sveltekit/gait/idle_state.h
rename to esp32/include/gait/idle_state.h
diff --git a/esp32/lib/ESP32-sveltekit/gait/phase_state_base.h b/esp32/include/gait/phase_state_base.h
similarity index 100%
rename from esp32/lib/ESP32-sveltekit/gait/phase_state_base.h
rename to esp32/include/gait/phase_state_base.h
diff --git a/esp32/lib/ESP32-sveltekit/gait/rest_state.h b/esp32/include/gait/rest_state.h
similarity index 100%
rename from esp32/lib/ESP32-sveltekit/gait/rest_state.h
rename to esp32/include/gait/rest_state.h
diff --git a/esp32/lib/ESP32-sveltekit/gait/stand_state.h b/esp32/include/gait/stand_state.h
similarity index 100%
rename from esp32/lib/ESP32-sveltekit/gait/stand_state.h
rename to esp32/include/gait/stand_state.h
diff --git a/esp32/lib/ESP32-sveltekit/gait/state.h b/esp32/include/gait/state.h
similarity index 100%
rename from esp32/lib/ESP32-sveltekit/gait/state.h
rename to esp32/include/gait/state.h
diff --git a/esp32/lib/ESP32-sveltekit/global.h b/esp32/include/global.h
similarity index 100%
rename from esp32/lib/ESP32-sveltekit/global.h
rename to esp32/include/global.h
diff --git a/esp32/lib/ESP32-sveltekit/kinematics.h b/esp32/include/kinematics.h
similarity index 100%
rename from esp32/lib/ESP32-sveltekit/kinematics.h
rename to esp32/include/kinematics.h
diff --git a/esp32/lib/ESP32-sveltekit/mdns_service.h b/esp32/include/mdns_service.h
similarity index 100%
rename from esp32/lib/ESP32-sveltekit/mdns_service.h
rename to esp32/include/mdns_service.h
diff --git a/esp32/lib/ESP32-sveltekit/motion.h b/esp32/include/motion.h
similarity index 100%
rename from esp32/lib/ESP32-sveltekit/motion.h
rename to esp32/include/motion.h
diff --git a/esp32/lib/ESP32-sveltekit/peripherals/barometer.h b/esp32/include/peripherals/barometer.h
similarity index 100%
rename from esp32/lib/ESP32-sveltekit/peripherals/barometer.h
rename to esp32/include/peripherals/barometer.h
diff --git a/esp32/lib/ESP32-sveltekit/peripherals/camera_pins.h b/esp32/include/peripherals/camera_pins.h
similarity index 100%
rename from esp32/lib/ESP32-sveltekit/peripherals/camera_pins.h
rename to esp32/include/peripherals/camera_pins.h
diff --git a/esp32/lib/ESP32-sveltekit/peripherals/camera_service.h b/esp32/include/peripherals/camera_service.h
similarity index 100%
rename from esp32/lib/ESP32-sveltekit/peripherals/camera_service.h
rename to esp32/include/peripherals/camera_service.h
diff --git a/esp32/lib/ESP32-sveltekit/peripherals/imu.h b/esp32/include/peripherals/imu.h
similarity index 100%
rename from esp32/lib/ESP32-sveltekit/peripherals/imu.h
rename to esp32/include/peripherals/imu.h
diff --git a/esp32/lib/ESP32-sveltekit/peripherals/led_service.h b/esp32/include/peripherals/led_service.h
similarity index 100%
rename from esp32/lib/ESP32-sveltekit/peripherals/led_service.h
rename to esp32/include/peripherals/led_service.h
diff --git a/esp32/lib/ESP32-sveltekit/peripherals/magnetometer.h b/esp32/include/peripherals/magnetometer.h
similarity index 100%
rename from esp32/lib/ESP32-sveltekit/peripherals/magnetometer.h
rename to esp32/include/peripherals/magnetometer.h
diff --git a/esp32/lib/ESP32-sveltekit/peripherals/peripherals.h b/esp32/include/peripherals/peripherals.h
similarity index 100%
rename from esp32/lib/ESP32-sveltekit/peripherals/peripherals.h
rename to esp32/include/peripherals/peripherals.h
diff --git a/esp32/lib/ESP32-sveltekit/peripherals/servo_controller.h b/esp32/include/peripherals/servo_controller.h
similarity index 100%
rename from esp32/lib/ESP32-sveltekit/peripherals/servo_controller.h
rename to esp32/include/peripherals/servo_controller.h
diff --git a/esp32/lib/ESP32-sveltekit/settings/ap_settings.h b/esp32/include/settings/ap_settings.h
similarity index 100%
rename from esp32/lib/ESP32-sveltekit/settings/ap_settings.h
rename to esp32/include/settings/ap_settings.h
diff --git a/esp32/lib/ESP32-sveltekit/settings/camera_settings.h b/esp32/include/settings/camera_settings.h
similarity index 100%
rename from esp32/lib/ESP32-sveltekit/settings/camera_settings.h
rename to esp32/include/settings/camera_settings.h
diff --git a/esp32/lib/ESP32-sveltekit/settings/mdns_settings.h b/esp32/include/settings/mdns_settings.h
similarity index 100%
rename from esp32/lib/ESP32-sveltekit/settings/mdns_settings.h
rename to esp32/include/settings/mdns_settings.h
diff --git a/esp32/lib/ESP32-sveltekit/settings/ntp_settings.h b/esp32/include/settings/ntp_settings.h
similarity index 100%
rename from esp32/lib/ESP32-sveltekit/settings/ntp_settings.h
rename to esp32/include/settings/ntp_settings.h
diff --git a/esp32/lib/ESP32-sveltekit/settings/peripherals_settings.h b/esp32/include/settings/peripherals_settings.h
similarity index 100%
rename from esp32/lib/ESP32-sveltekit/settings/peripherals_settings.h
rename to esp32/include/settings/peripherals_settings.h
diff --git a/esp32/lib/ESP32-sveltekit/settings/servo_settings.h b/esp32/include/settings/servo_settings.h
similarity index 100%
rename from esp32/lib/ESP32-sveltekit/settings/servo_settings.h
rename to esp32/include/settings/servo_settings.h
diff --git a/esp32/lib/ESP32-sveltekit/settings/wifi_settings.h b/esp32/include/settings/wifi_settings.h
similarity index 100%
rename from esp32/lib/ESP32-sveltekit/settings/wifi_settings.h
rename to esp32/include/settings/wifi_settings.h
diff --git a/esp32/lib/ESP32-sveltekit/system_service.h b/esp32/include/system_service.h
similarity index 100%
rename from esp32/lib/ESP32-sveltekit/system_service.h
rename to esp32/include/system_service.h
diff --git a/esp32/lib/ESP32-sveltekit/task_manager.h b/esp32/include/task_manager.h
similarity index 100%
rename from esp32/lib/ESP32-sveltekit/task_manager.h
rename to esp32/include/task_manager.h
diff --git a/esp32/lib/ESP32-sveltekit/template/state_result.h b/esp32/include/template/state_result.h
similarity index 100%
rename from esp32/lib/ESP32-sveltekit/template/state_result.h
rename to esp32/include/template/state_result.h
diff --git a/esp32/lib/ESP32-sveltekit/template/stateful_endpoint.h b/esp32/include/template/stateful_endpoint.h
similarity index 100%
rename from esp32/lib/ESP32-sveltekit/template/stateful_endpoint.h
rename to esp32/include/template/stateful_endpoint.h
diff --git a/esp32/lib/ESP32-sveltekit/template/stateful_persistence.h b/esp32/include/template/stateful_persistence.h
similarity index 100%
rename from esp32/lib/ESP32-sveltekit/template/stateful_persistence.h
rename to esp32/include/template/stateful_persistence.h
diff --git a/esp32/lib/ESP32-sveltekit/template/stateful_service.h b/esp32/include/template/stateful_service.h
similarity index 100%
rename from esp32/lib/ESP32-sveltekit/template/stateful_service.h
rename to esp32/include/template/stateful_service.h
diff --git a/esp32/lib/ESP32-sveltekit/template/stateful_socket.h b/esp32/include/template/stateful_socket.h
similarity index 100%
rename from esp32/lib/ESP32-sveltekit/template/stateful_socket.h
rename to esp32/include/template/stateful_socket.h
diff --git a/esp32/lib/ESP32-sveltekit/utils/ip_utils.h b/esp32/include/utils/ip_utils.h
similarity index 100%
rename from esp32/lib/ESP32-sveltekit/utils/ip_utils.h
rename to esp32/include/utils/ip_utils.h
diff --git a/esp32/lib/ESP32-sveltekit/utils/json_utils.h b/esp32/include/utils/json_utils.h
similarity index 100%
rename from esp32/lib/ESP32-sveltekit/utils/json_utils.h
rename to esp32/include/utils/json_utils.h
diff --git a/esp32/lib/ESP32-sveltekit/utils/math_utils.h b/esp32/include/utils/math_utils.h
similarity index 100%
rename from esp32/lib/ESP32-sveltekit/utils/math_utils.h
rename to esp32/include/utils/math_utils.h
diff --git a/esp32/lib/ESP32-sveltekit/utils/string_utils.h b/esp32/include/utils/string_utils.h
similarity index 100%
rename from esp32/lib/ESP32-sveltekit/utils/string_utils.h
rename to esp32/include/utils/string_utils.h
diff --git a/esp32/lib/ESP32-sveltekit/utils/timing.h b/esp32/include/utils/timing.h
similarity index 100%
rename from esp32/lib/ESP32-sveltekit/utils/timing.h
rename to esp32/include/utils/timing.h
diff --git a/esp32/lib/ESP32-sveltekit/wifi_service.h b/esp32/include/wifi_service.h
similarity index 100%
rename from esp32/lib/ESP32-sveltekit/wifi_service.h
rename to esp32/include/wifi_service.h
diff --git a/esp32/scripts/build_app.py b/esp32/scripts/build_app.py
index 1f5f620..ef180c9 100644
--- a/esp32/scripts/build_app.py
+++ b/esp32/scripts/build_app.py
@@ -27,7 +27,7 @@ project_dir = env["PROJECT_DIR"]
 buildFlags = env.ParseFlags(env["BUILD_FLAGS"])
 
 interface_dir = project_dir + "/app"
-output_file = project_dir + "/esp32/lib/ESP32-sveltekit/WWWData.h"
+output_file = project_dir + "/esp32/include/WWWData.h"
 source_www_dir = interface_dir + "/src"
 build_dir = interface_dir + "/build"
 filesystem_dir = project_dir + "/data/www"
diff --git a/esp32/lib/ESP32-sveltekit/ap_service.cpp b/esp32/src/ap_service.cpp
similarity index 100%
rename from esp32/lib/ESP32-sveltekit/ap_service.cpp
rename to esp32/src/ap_service.cpp
diff --git a/esp32/lib/ESP32-sveltekit/event_socket.cpp b/esp32/src/event_socket.cpp
similarity index 100%
rename from esp32/lib/ESP32-sveltekit/event_socket.cpp
rename to esp32/src/event_socket.cpp
diff --git a/esp32/lib/ESP32-sveltekit/features.cpp b/esp32/src/features.cpp
similarity index 100%
rename from esp32/lib/ESP32-sveltekit/features.cpp
rename to esp32/src/features.cpp
diff --git a/esp32/lib/ESP32-sveltekit/filesystem.cpp b/esp32/src/filesystem.cpp
similarity index 100%
rename from esp32/lib/ESP32-sveltekit/filesystem.cpp
rename to esp32/src/filesystem.cpp
diff --git a/esp32/lib/ESP32-sveltekit/firmware_download_service.cpp b/esp32/src/firmware_download_service.cpp
similarity index 100%
rename from esp32/lib/ESP32-sveltekit/firmware_download_service.cpp
rename to esp32/src/firmware_download_service.cpp
diff --git a/esp32/lib/ESP32-sveltekit/firmware_upload_service.cpp b/esp32/src/firmware_upload_service.cpp
similarity index 100%
rename from esp32/lib/ESP32-sveltekit/firmware_upload_service.cpp
rename to esp32/src/firmware_upload_service.cpp
diff --git a/esp32/lib/ESP32-sveltekit/mdns_service.cpp b/esp32/src/mdns_service.cpp
similarity index 100%
rename from esp32/lib/ESP32-sveltekit/mdns_service.cpp
rename to esp32/src/mdns_service.cpp
diff --git a/esp32/lib/ESP32-sveltekit/peripherals/camera_service.cpp b/esp32/src/peripherals/camera_service.cpp
similarity index 100%
rename from esp32/lib/ESP32-sveltekit/peripherals/camera_service.cpp
rename to esp32/src/peripherals/camera_service.cpp
diff --git a/esp32/lib/ESP32-sveltekit/system_service.cpp b/esp32/src/system_service.cpp
similarity index 100%
rename from esp32/lib/ESP32-sveltekit/system_service.cpp
rename to esp32/src/system_service.cpp
diff --git a/esp32/lib/ESP32-sveltekit/task_manager.cpp b/esp32/src/task_manager.cpp
similarity index 100%
rename from esp32/lib/ESP32-sveltekit/task_manager.cpp
rename to esp32/src/task_manager.cpp
diff --git a/esp32/lib/ESP32-sveltekit/wifi_service.cpp b/esp32/src/wifi_service.cpp
similarity index 100%
rename from esp32/lib/ESP32-sveltekit/wifi_service.cpp
rename to esp32/src/wifi_service.cpp