diff --git a/examples/base/main.cpp b/examples/base/main.cpp
index cd48d90..518e384 100644
--- a/examples/base/main.cpp
+++ b/examples/base/main.cpp
@@ -8,10 +8,10 @@
 #include "TaskManager.h"
 
 // Services
-#include "NodeService.h"
-#include "NetworkService.h"
-#include "ClusterService.h"
-#include "TaskService.h"
+#include "services/NodeService.h"
+#include "services/NetworkService.h"
+#include "services/ClusterService.h"
+#include "services/TaskService.h"
 
 using namespace std;
 
diff --git a/examples/neopattern/NeoPatternService.h b/examples/neopattern/NeoPatternService.h
index 2407574..26d0226 100644
--- a/examples/neopattern/NeoPatternService.h
+++ b/examples/neopattern/NeoPatternService.h
@@ -1,5 +1,5 @@
 #pragma once
-#include "Service.h"
+#include "services/Service.h"
 #include "TaskManager.h"
 #include "NeoPattern.cpp"
 #include <map>
diff --git a/examples/neopattern/main.cpp b/examples/neopattern/main.cpp
index 9523c5c..3171d83 100644
--- a/examples/neopattern/main.cpp
+++ b/examples/neopattern/main.cpp
@@ -8,10 +8,10 @@
 #include "TaskManager.h"
 
 // Services
-#include "NodeService.h"
-#include "NetworkService.h"
-#include "ClusterService.h"
-#include "TaskService.h"
+#include "services/NodeService.h"
+#include "services/NetworkService.h"
+#include "services/ClusterService.h"
+#include "services/TaskService.h"
 #include "NeoPatternService.h"
 
 #ifndef LED_STRIP_PIN
diff --git a/examples/neopixel/NeoPixelService.h b/examples/neopixel/NeoPixelService.h
index a52c355..b0aee58 100644
--- a/examples/neopixel/NeoPixelService.h
+++ b/examples/neopixel/NeoPixelService.h
@@ -1,5 +1,5 @@
 #pragma once
-#include "Service.h"
+#include "services/Service.h"
 #include "TaskManager.h"
 #include <Adafruit_NeoPixel.h>
 #include <map>
diff --git a/examples/neopixel/main.cpp b/examples/neopixel/main.cpp
index 6e0d3b0..78dc4ec 100644
--- a/examples/neopixel/main.cpp
+++ b/examples/neopixel/main.cpp
@@ -8,10 +8,10 @@
 #include "TaskManager.h"
 
 // Services
-#include "NodeService.h"
-#include "NetworkService.h"
-#include "ClusterService.h"
-#include "TaskService.h"
+#include "services/NodeService.h"
+#include "services/NetworkService.h"
+#include "services/ClusterService.h"
+#include "services/TaskService.h"
 #include "NeoPixelService.h"
 
 #ifndef NEOPIXEL_PIN
diff --git a/examples/relay/RelayService.h b/examples/relay/RelayService.h
index b41fbc2..03913b3 100644
--- a/examples/relay/RelayService.h
+++ b/examples/relay/RelayService.h
@@ -1,5 +1,5 @@
 #pragma once
-#include "Service.h"
+#include "services/Service.h"
 #include "TaskManager.h"
 #include <ArduinoJson.h>
 
diff --git a/examples/relay/main.cpp b/examples/relay/main.cpp
index 0cb0474..b342ec1 100644
--- a/examples/relay/main.cpp
+++ b/examples/relay/main.cpp
@@ -8,10 +8,10 @@
 #include "TaskManager.h"
 
 // Services
-#include "NodeService.h"
-#include "NetworkService.h"
-#include "ClusterService.h"
-#include "TaskService.h"
+#include "services/NodeService.h"
+#include "services/NetworkService.h"
+#include "services/ClusterService.h"
+#include "services/TaskService.h"
 #include "RelayService.h"
 
 using namespace std;
diff --git a/examples/wifiscan/main.cpp b/examples/wifiscan/main.cpp
index fa7a60a..c5f8651 100644
--- a/examples/wifiscan/main.cpp
+++ b/examples/wifiscan/main.cpp
@@ -6,10 +6,10 @@
 #include "ClusterManager.h"
 
 // Services
-#include "NodeService.h"
-#include "ClusterService.h"
-#include "TaskService.h"
-#include "NetworkService.h"
+#include "services/NodeService.h"
+#include "services/ClusterService.h"
+#include "services/TaskService.h"
+#include "services/NetworkService.h"
 
 NodeContext ctx({
 	{"app", "network"},
diff --git a/include/ClusterService.h b/include/services/ClusterService.h
similarity index 92%
rename from include/ClusterService.h
rename to include/services/ClusterService.h
index 70b3415..41c0145 100644
--- a/include/ClusterService.h
+++ b/include/services/ClusterService.h
@@ -1,5 +1,5 @@
 #pragma once
-#include "Service.h"
+#include "services/Service.h"
 #include "NodeContext.h"
 #include <ArduinoJson.h>
 
diff --git a/include/NetworkService.h b/include/services/NetworkService.h
similarity index 95%
rename from include/NetworkService.h
rename to include/services/NetworkService.h
index c703bd7..fa4aef8 100644
--- a/include/NetworkService.h
+++ b/include/services/NetworkService.h
@@ -1,5 +1,5 @@
 #pragma once
-#include "Service.h"
+#include "services/Service.h"
 #include "NetworkManager.h"
 #include "NodeContext.h"
 
diff --git a/include/NodeService.h b/include/services/NodeService.h
similarity index 95%
rename from include/NodeService.h
rename to include/services/NodeService.h
index f5a89ff..c113fc2 100644
--- a/include/NodeService.h
+++ b/include/services/NodeService.h
@@ -1,5 +1,5 @@
 #pragma once
-#include "Service.h"
+#include "services/Service.h"
 #include "NodeContext.h"
 #include <ArduinoJson.h>
 #include <Updater.h>
diff --git a/include/Service.h b/include/services/Service.h
similarity index 100%
rename from include/Service.h
rename to include/services/Service.h
diff --git a/include/TaskService.h b/include/services/TaskService.h
similarity index 93%
rename from include/TaskService.h
rename to include/services/TaskService.h
index 823c1c1..9e3791c 100644
--- a/include/TaskService.h
+++ b/include/services/TaskService.h
@@ -1,5 +1,5 @@
 #pragma once
-#include "Service.h"
+#include "services/Service.h"
 #include "TaskManager.h"
 #include <ArduinoJson.h>
 
diff --git a/platformio.ini b/platformio.ini
index dee922c..5b060cc 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -9,7 +9,7 @@
 ; https://docs.platformio.org/page/projectconf.html
 
 [platformio]
-;default_envs = esp01_1m
+default_envs = esp01_1m
 src_dir = .
 
 [common]
@@ -32,6 +32,7 @@ build_src_filter =
     +<examples/base/*.cpp>
     +<src/*.c>
     +<src/*.cpp>
+    +<src/services/*.cpp>
 
 [env:d1_mini]
 platform = platformio/espressif8266@^4.2.1
@@ -46,6 +47,7 @@ build_src_filter =
     +<examples/base/*.cpp>
     +<src/*.c>
     +<src/*.cpp>
+    +<src/services/*.cpp>
 
 [env:esp01_1m_relay]
 platform = platformio/espressif8266@^4.2.1
@@ -61,6 +63,7 @@ build_src_filter =
     +<examples/relay/*.cpp>
     +<src/*.c>
     +<src/*.cpp>
+    +<src/services/*.cpp>
 
 [env:esp01_1m_neopixel]
 platform = platformio/espressif8266@^4.2.1
@@ -77,6 +80,7 @@ build_src_filter =
     +<examples/neopixel/*.cpp>
     +<src/*.c>
     +<src/*.cpp>
+    +<src/services/*.cpp>
 
 [env:d1_mini_neopixel]
 platform = platformio/espressif8266@^4.2.1
@@ -92,6 +96,7 @@ build_src_filter =
     +<examples/neopixel/*.cpp>
     +<src/*.c>
     +<src/*.cpp>
+    +<src/services/*.cpp>
 
 [env:esp01_1m_neopattern]
 platform = platformio/espressif8266@^4.2.1
@@ -109,6 +114,7 @@ build_src_filter =
     +<examples/neopattern/*.cpp>
     +<src/*.c>
     +<src/*.cpp>
+    +<src/services/*.cpp>
 
 [env:esp01_1m_wifiscan]
 platform = platformio/espressif8266@^4.2.1
@@ -124,6 +130,7 @@ build_src_filter =
     +<examples/wifiscan/*.cpp>
     +<src/*.c>
     +<src/*.cpp>
+    +<src/services/*.cpp>
 
 [env:d1_mini_wifiscan]
 platform = platformio/espressif8266@^4.2.1
@@ -138,6 +145,7 @@ build_src_filter =
     +<examples/wifiscan/*.cpp>
     +<src/*.c>
     +<src/*.cpp>
+    +<src/services/*.cpp>
 
 [env:d1_mini_neopattern]
 platform = platformio/espressif8266@^4.2.1
@@ -153,3 +161,4 @@ build_src_filter =
     +<examples/neopattern/*.cpp>
     +<src/*.c>
     +<src/*.cpp>
+    +<src/services/*.cpp>
diff --git a/src/ApiServer.cpp b/src/ApiServer.cpp
index 3a274ab..fb3c0ee 100644
--- a/src/ApiServer.cpp
+++ b/src/ApiServer.cpp
@@ -1,5 +1,5 @@
 #include "ApiServer.h"
-#include "Service.h"
+#include "services/Service.h"
 #include <algorithm>
 
 const char* ApiServer::methodToStr(int method) {
diff --git a/src/ClusterService.cpp b/src/services/ClusterService.cpp
similarity index 97%
rename from src/ClusterService.cpp
rename to src/services/ClusterService.cpp
index f6fdb0c..7b88d20 100644
--- a/src/ClusterService.cpp
+++ b/src/services/ClusterService.cpp
@@ -1,4 +1,4 @@
-#include "ClusterService.h"
+#include "services/ClusterService.h"
 #include "ApiServer.h"
 
 ClusterService::ClusterService(NodeContext& ctx) : ctx(ctx) {}
diff --git a/src/NetworkService.cpp b/src/services/NetworkService.cpp
similarity index 98%
rename from src/NetworkService.cpp
rename to src/services/NetworkService.cpp
index 8aa6d3b..237b0a4 100644
--- a/src/NetworkService.cpp
+++ b/src/services/NetworkService.cpp
@@ -1,4 +1,4 @@
-#include "NetworkService.h"
+#include "services/NetworkService.h"
 #include <ArduinoJson.h>
 
 NetworkService::NetworkService(NetworkManager& networkManager)
@@ -10,7 +10,7 @@ void NetworkService::registerEndpoints(ApiServer& api) {
         [this](AsyncWebServerRequest* request) { handleWifiScanRequest(request); },
         std::vector<ParamSpec>{});
 
-    api.addEndpoint("/api/network/wifi/networks", HTTP_GET, 
+    api.addEndpoint("/api/network/wifi/scan", HTTP_GET, 
         [this](AsyncWebServerRequest* request) { handleGetWifiNetworks(request); },
         std::vector<ParamSpec>{});
 
diff --git a/src/NodeService.cpp b/src/services/NodeService.cpp
similarity index 99%
rename from src/NodeService.cpp
rename to src/services/NodeService.cpp
index 6e506d7..ce420ec 100644
--- a/src/NodeService.cpp
+++ b/src/services/NodeService.cpp
@@ -1,4 +1,4 @@
-#include "NodeService.h"
+#include "services/NodeService.h"
 #include "ApiServer.h"
 
 NodeService::NodeService(NodeContext& ctx) : ctx(ctx) {}
diff --git a/src/TaskService.cpp b/src/services/TaskService.cpp
similarity index 99%
rename from src/TaskService.cpp
rename to src/services/TaskService.cpp
index f9f6eac..baa45f1 100644
--- a/src/TaskService.cpp
+++ b/src/services/TaskService.cpp
@@ -1,4 +1,4 @@
-#include "TaskService.h"
+#include "services/TaskService.h"
 #include "ApiServer.h"
 #include <algorithm>