diff --git a/src/dev/device.h b/src/dev/device.h
index 98250540..f1f053f5 100644
--- a/src/dev/device.h
+++ b/src/dev/device.h
@@ -22,13 +22,12 @@ class BaseDevice {
 
 using dev::BaseDevice;
 
-#include "lanbonl8.h"
-#include "m5stackcore2.h"
-
 #if defined(LANBONL8)
     #warning Lanbon L8
+    #include "lanbonl8.h"
 #elif defined(M5STACK)
     #warning M5 Stack
+    #include "m5stackcore2.h"
 #else
 extern dev::BaseDevice haspDevice;
 #endif
diff --git a/src/dev/lanbonl8.cpp b/src/dev/lanbon-l8/lanbonl8.cpp
similarity index 97%
rename from src/dev/lanbonl8.cpp
rename to src/dev/lanbon-l8/lanbonl8.cpp
index 71f92851..9fdccb7e 100644
--- a/src/dev/lanbonl8.cpp
+++ b/src/dev/lanbon-l8/lanbonl8.cpp
@@ -1,7 +1,8 @@
-#include "Arduino.h"
 #include "lanbonl8.h"
 
 #if defined(LANBONL8)
+    #include "Arduino.h"
+    #include "../device.h"
 
     #include "driver/adc.h"
     #include "esp_adc_cal.h"
diff --git a/src/dev/lanbonl8.h b/src/dev/lanbon-l8/lanbonl8.h
similarity index 95%
rename from src/dev/lanbonl8.h
rename to src/dev/lanbon-l8/lanbonl8.h
index 445a2204..9155109e 100644
--- a/src/dev/lanbonl8.h
+++ b/src/dev/lanbon-l8/lanbonl8.h
@@ -4,7 +4,7 @@
 #ifndef HASP_DEVICE_LANBONL8_H
 #define HASP_DEVICE_LANBONL8_H
 
-#include "device.h"
+#include "../device.h"
 
 #if defined(LANBONL8)
 
diff --git a/src/dev/m5stackcore2.cpp b/src/dev/m5stackcore2/m5stackcore2.cpp
similarity index 97%
rename from src/dev/m5stackcore2.cpp
rename to src/dev/m5stackcore2/m5stackcore2.cpp
index d208931d..c3354aa2 100644
--- a/src/dev/m5stackcore2.cpp
+++ b/src/dev/m5stackcore2/m5stackcore2.cpp
@@ -1,8 +1,8 @@
-#include "device.h"
 #include "m5stackcore2.h"
 
 #if defined(M5STACK)
     #include "AXP192.h" // Power Mgmt
+    #include "../device.h"
 
 // AXP192 Axp;
 namespace dev {
diff --git a/src/dev/m5stackcore2.h b/src/dev/m5stackcore2/m5stackcore2.h
similarity index 95%
rename from src/dev/m5stackcore2.h
rename to src/dev/m5stackcore2/m5stackcore2.h
index 39539fff..fa51231d 100644
--- a/src/dev/m5stackcore2.h
+++ b/src/dev/m5stackcore2/m5stackcore2.h
@@ -6,7 +6,7 @@
 
 #if defined(M5STACK)
 
-    #include "device.h"
+    #include "../device.h"
 
 namespace dev {