diff --git a/Grbl_Esp32/src/Grbl.h b/Grbl_Esp32/src/Grbl.h
index 241c3e3a..f21c43b7 100644
--- a/Grbl_Esp32/src/Grbl.h
+++ b/Grbl_Esp32/src/Grbl.h
@@ -43,6 +43,7 @@
 #include "Defaults.h"
 #include "SettingsStorage.h"
 #include "WebUI/Authentication.h"
+#include "WebUI/Commands.h"
 #include "System.h"
 
 #include "Planner.h"
@@ -61,7 +62,6 @@
 #include "Stepper.h"
 #include "Jog.h"
 #include "WebUI/InputBuffer.h"
-#include "Commands.h"
 #include "Settings.h"
 #include "SettingsDefinitions.h"
 #include "WebUI/WebSettings.h"
@@ -70,7 +70,7 @@
 #include "SDCard.h"
 
 #ifdef ENABLE_BLUETOOTH
-#    include "BTConfig.h"
+#    include "WebUI/BTConfig.h"
 #endif
 
 #ifdef ENABLE_WIFI
diff --git a/Grbl_Esp32/src/System.h b/Grbl_Esp32/src/System.h
index f092e356..97a1150a 100644
--- a/Grbl_Esp32/src/System.h
+++ b/Grbl_Esp32/src/System.h
@@ -1,7 +1,7 @@
 #pragma once
 
 /*
-  system.h - Header for system level commands and real-time processes
+  System.h - Header for system level commands and real-time processes
   Part of Grbl
   Copyright (c) 2014-2016 Sungeun K. Jeon for Gnea Research LLC
 
@@ -22,7 +22,6 @@
 
 #include "Grbl.h"
 #include "TDef.h"
-#include "Commands.h"
 
 // Define global system variables
 typedef struct {
diff --git a/Grbl_Esp32/src/BTConfig.cpp b/Grbl_Esp32/src/WebUI/BTConfig.cpp
similarity index 99%
rename from Grbl_Esp32/src/BTConfig.cpp
rename to Grbl_Esp32/src/WebUI/BTConfig.cpp
index bee8883e..757855ca 100644
--- a/Grbl_Esp32/src/BTConfig.cpp
+++ b/Grbl_Esp32/src/WebUI/BTConfig.cpp
@@ -18,7 +18,7 @@
   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 */
 
-#include "Grbl.h"
+#include "../Grbl.h"
 
 #ifdef ENABLE_BLUETOOTH
 #    include <BluetoothSerial.h>
diff --git a/Grbl_Esp32/src/BTConfig.h b/Grbl_Esp32/src/WebUI/BTConfig.h
similarity index 100%
rename from Grbl_Esp32/src/BTConfig.h
rename to Grbl_Esp32/src/WebUI/BTConfig.h
diff --git a/Grbl_Esp32/src/Commands.cpp b/Grbl_Esp32/src/WebUI/Commands.cpp
similarity index 98%
rename from Grbl_Esp32/src/Commands.cpp
rename to Grbl_Esp32/src/WebUI/Commands.cpp
index 863d7d36..727542ea 100644
--- a/Grbl_Esp32/src/Commands.cpp
+++ b/Grbl_Esp32/src/WebUI/Commands.cpp
@@ -17,7 +17,7 @@
   License along with this library; if not, write to the Free Software
   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 */
-#include "Grbl.h"
+#include "../Grbl.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/Grbl_Esp32/src/Commands.h b/Grbl_Esp32/src/WebUI/Commands.h
similarity index 100%
rename from Grbl_Esp32/src/Commands.h
rename to Grbl_Esp32/src/WebUI/Commands.h
diff --git a/Grbl_Esp32/src/NoFile.h b/Grbl_Esp32/src/WebUI/NoFile.h
similarity index 100%
rename from Grbl_Esp32/src/NoFile.h
rename to Grbl_Esp32/src/WebUI/NoFile.h
diff --git a/Grbl_Esp32/src/WebUI/WebServer.cpp b/Grbl_Esp32/src/WebUI/WebServer.cpp
index 36d59d2f..cb436cc5 100644
--- a/Grbl_Esp32/src/WebUI/WebServer.cpp
+++ b/Grbl_Esp32/src/WebUI/WebServer.cpp
@@ -54,7 +54,7 @@ DNSServer  dnsServer;
 #    include <esp_ota_ops.h>
 
 //embedded response file if no files on SPIFFS
-#    include "../NoFile.h"
+#    include "NoFile.h"
 
 //Upload status
 typedef enum {
diff --git a/Grbl_Esp32/src/WebUI/WebServer.h b/Grbl_Esp32/src/WebUI/WebServer.h
index 6a8c3cf8..0421f10e 100644
--- a/Grbl_Esp32/src/WebUI/WebServer.h
+++ b/Grbl_Esp32/src/WebUI/WebServer.h
@@ -21,7 +21,7 @@
 */
 
 #include "../Config.h"
-#include "../Commands.h"
+#include "Commands.h"
 class WebSocketsServer;
 class WebServer;
 
diff --git a/Grbl_Esp32/src/WebUI/WifiServices.cpp b/Grbl_Esp32/src/WebUI/WifiServices.cpp
index 6f1f3927..39a3fd74 100644
--- a/Grbl_Esp32/src/WebUI/WifiServices.cpp
+++ b/Grbl_Esp32/src/WebUI/WifiServices.cpp
@@ -41,7 +41,7 @@
 #    ifdef ENABLE_NOTIFICATIONS
 #        include "NotificationsService.h"
 #    endif
-#    include "../Commands.h"
+#    include "Commands.h"
 
 WiFiServices wifi_services;