diff --git a/.gitignore b/.gitignore
index 1c9a165..f7eadc5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,7 +3,6 @@
 .vs
 *.sln
 *.vcxproj*
-x64
 NerdMinerLog.txt
 bin/0x10000_firmware.bin
 logs
diff --git a/platformio.ini b/platformio.ini
index 0d72395..8ca1833 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -10,7 +10,7 @@
 
 [platformio]
 globallib_dir = lib
-default_envs =   esp32cam ;ESP32-2432S028R, NerminerV2, ESP32-devKitv1, NerminerV2-S3-DONGLE, NerminerV2-S3-AMOLED, NerminerV2-T-QT, NerdminerV2-T-Display_V1, ESP32-2432S028R
+default_envs =   esp32cam, ESP32-2432S028R, NerminerV2, ESP32-devKitv1, NerminerV2-S3-DONGLE, NerminerV2-S3-AMOLED, NerminerV2-T-QT, NerdminerV2-T-Display_V1, ESP32-2432S028R
 
 [env:NerminerV2]
 platform = espressif32
diff --git a/src/drivers/devices/device.h b/src/drivers/devices/device.h
index a1c74a8..7d8ba51 100644
--- a/src/drivers/devices/device.h
+++ b/src/drivers/devices/device.h
@@ -2,21 +2,21 @@
 #define __DEVICE_H__
 
 #if defined(NERDMINERV2)
-#include "devices/nerdMinerV2.h"
+#include "nerdMinerV2.h"
 #elif defined(DEVKITV1)
-#include "devices/esp32DevKit.h"
+#include "esp32DevKit.h"
 #elif defined(TDISPLAY)
-#include "devices/lilygoS3TDisplay.h"
+#include "lilygoS3TDisplay.h"
 #elif defined(NERMINER_S3_AMOLED)
-#include "devices/lilygoS3Amoled.h"
+#include "lilygoS3Amoled.h"
 #elif defined(NERMINER_S3_DONGLE)
-#include "devices/lilygoS3Dongle.h"
+#include "lilygoS3Dongle.h"
 #elif defined(ESP32_2432S028R)
-#include "devices/esp322432s028r.h"
+#include "esp322432s028r.h"
 #elif defined(NERMINER_T_QT)
-#include "devices/lilygoT_QT.h"
+#include "lilygoT_QT.h"
 #elif defined(NERDMINER_T_DISPLAY_V1)
-#include "devices/lilygoV1TDisplay.h"
+#include "lilygoV1TDisplay.h"
 #elif defined(ESP32_CAM)
 #include "esp32CAM.h"
 
diff --git a/src/drivers/displays/esp23_2432s028r.cpp b/src/drivers/displays/esp23_2432s028r.cpp
index 1221b72..71cc72f 100644
--- a/src/drivers/displays/esp23_2432s028r.cpp
+++ b/src/drivers/displays/esp23_2432s028r.cpp
@@ -1,4 +1,4 @@
-#include "../drivers.h"
+#include "DisplayDriver.h"
 
 #ifdef ESP32_2432S028R
 
diff --git a/src/drivers/displays/tDisplayV1Driver.cpp b/src/drivers/displays/tDisplayV1Driver.cpp
index ac05290..93b8f76 100644
--- a/src/drivers/displays/tDisplayV1Driver.cpp
+++ b/src/drivers/displays/tDisplayV1Driver.cpp
@@ -1,4 +1,4 @@
-#include "../drivers.h"
+#include "DisplayDriver.h"
 
 #ifdef V1_DISPLAY
 
diff --git a/src/drivers/displays/t_qtDisplayDriver.cpp b/src/drivers/displays/t_qtDisplayDriver.cpp
index c5ddadc..f632cae 100644
--- a/src/drivers/displays/t_qtDisplayDriver.cpp
+++ b/src/drivers/displays/t_qtDisplayDriver.cpp
@@ -1,4 +1,4 @@
-#include "../drivers.h"
+#include "DisplayDriver.h"
 
 #ifdef T_QT_DISPLAY