diff --git a/esp32/include/event_socket.h b/esp32/include/communication/websocket_adapter.h
similarity index 100%
rename from esp32/include/event_socket.h
rename to esp32/include/communication/websocket_adapter.h
diff --git a/esp32/include/peripherals/servo_controller.h b/esp32/include/peripherals/servo_controller.h
index 1adb683..dc3ac74 100644
--- a/esp32/include/peripherals/servo_controller.h
+++ b/esp32/include/peripherals/servo_controller.h
@@ -2,7 +2,7 @@
 #define ServoController_h
 
 #include <Adafruit_PWMServoDriver.h>
-#include <event_socket.h>
+#include <communication/websocket_adapter.h>
 #include <template/stateful_persistence.h>
 #include <template/stateful_service.h>
 #include <template/stateful_endpoint.h>
diff --git a/esp32/include/system_service.h b/esp32/include/system_service.h
index 222aed3..1cd17b4 100644
--- a/esp32/include/system_service.h
+++ b/esp32/include/system_service.h
@@ -4,7 +4,7 @@
 #include <ESPmDNS.h>
 #include <PsychicHttp.h>
 #include <WiFi.h>
-// #include <event_socket.h>
+// #include <communication/websocket_adapter.h>
 #include <filesystem.h>
 #include <global.h>
 
diff --git a/esp32/include/template/stateful_socket.h b/esp32/include/template/stateful_socket.h
index 38e6a0d..5317f61 100644
--- a/esp32/include/template/stateful_socket.h
+++ b/esp32/include/template/stateful_socket.h
@@ -3,7 +3,7 @@
 #include <PsychicHttp.h>
 #include <string>
 
-// #include <event_socket.h>
+// #include <communication/websocket_adapter.h>
 #include <template/stateful_service.h>
 
 template <class T>
diff --git a/esp32/src/event_socket.cpp b/esp32/src/communication/websocket_adapter.cpp
similarity index 99%
rename from esp32/src/event_socket.cpp
rename to esp32/src/communication/websocket_adapter.cpp
index 2dd8d82..3f7bb18 100644
--- a/esp32/src/event_socket.cpp
+++ b/esp32/src/communication/websocket_adapter.cpp
@@ -1,4 +1,4 @@
-#include <event_socket.h>
+#include <communication/websocket_adapter.h>
 #include <string>
 
 SemaphoreHandle_t clientSubscriptionsMutex = xSemaphoreCreateMutex();
diff --git a/esp32/src/main.cpp b/esp32/src/main.cpp
index 90fbcc2..0995974 100644
--- a/esp32/src/main.cpp
+++ b/esp32/src/main.cpp
@@ -9,7 +9,7 @@
 #include <peripherals/servo_controller.h>
 #include <peripherals/led_service.h>
 #include <peripherals/camera_service.h>
-#include <event_socket.h>
+#include <communication/websocket_adapter.h>
 #include <features.h>
 #include <motion.h>
 #include <wifi_service.h>