diff --git a/Devices/lilygo-tdeck/CMakeLists.txt b/Devices/lilygo-tdeck/CMakeLists.txt
index eda65fcd2..8481a43dc 100644
--- a/Devices/lilygo-tdeck/CMakeLists.txt
+++ b/Devices/lilygo-tdeck/CMakeLists.txt
@@ -1,7 +1,7 @@
-file(GLOB_RECURSE SOURCE_FILES Source/*.c*)
+file(GLOB_RECURSE SOURCE_FILES source/*.c*)
 
 idf_component_register(
     SRCS ${SOURCE_FILES}
-    INCLUDE_DIRS "Source"
+    INCLUDE_DIRS "include"
     REQUIRES Tactility driver
 )
diff --git a/Devices/lilygo-tdeck/source/bindings/tdeck_keyboard.h b/Devices/lilygo-tdeck/include/bindings/tdeck_keyboard.h
similarity index 100%
rename from Devices/lilygo-tdeck/source/bindings/tdeck_keyboard.h
rename to Devices/lilygo-tdeck/include/bindings/tdeck_keyboard.h
diff --git a/Devices/lilygo-tdeck/source/bindings/tdeck_keyboard_backlight.h b/Devices/lilygo-tdeck/include/bindings/tdeck_keyboard_backlight.h
similarity index 100%
rename from Devices/lilygo-tdeck/source/bindings/tdeck_keyboard_backlight.h
rename to Devices/lilygo-tdeck/include/bindings/tdeck_keyboard_backlight.h
diff --git a/Devices/lilygo-tdeck/source/bindings/tdeck_trackball.h b/Devices/lilygo-tdeck/include/bindings/tdeck_trackball.h
similarity index 100%
rename from Devices/lilygo-tdeck/source/bindings/tdeck_trackball.h
rename to Devices/lilygo-tdeck/include/bindings/tdeck_trackball.h
diff --git a/Devices/lilygo-tdeck/source/drivers/tdeck_keyboard.h b/Devices/lilygo-tdeck/include/drivers/tdeck_keyboard.h
similarity index 100%
rename from Devices/lilygo-tdeck/source/drivers/tdeck_keyboard.h
rename to Devices/lilygo-tdeck/include/drivers/tdeck_keyboard.h
diff --git a/Devices/lilygo-tdeck/source/drivers/tdeck_keyboard_backlight.h b/Devices/lilygo-tdeck/include/drivers/tdeck_keyboard_backlight.h
similarity index 100%
rename from Devices/lilygo-tdeck/source/drivers/tdeck_keyboard_backlight.h
rename to Devices/lilygo-tdeck/include/drivers/tdeck_keyboard_backlight.h
diff --git a/Devices/lilygo-tdeck/source/drivers/tdeck_trackball.h b/Devices/lilygo-tdeck/include/drivers/tdeck_trackball.h
similarity index 100%
rename from Devices/lilygo-tdeck/source/drivers/tdeck_trackball.h
rename to Devices/lilygo-tdeck/include/drivers/tdeck_trackball.h
diff --git a/Devices/lilygo-tdeck/source/Trackball/Trackball.h b/Devices/lilygo-tdeck/include/drivers/trackball.h
similarity index 100%
rename from Devices/lilygo-tdeck/source/Trackball/Trackball.h
rename to Devices/lilygo-tdeck/include/drivers/trackball.h
diff --git a/Devices/lilygo-tdeck/source/tdeck_keyboard.cpp b/Devices/lilygo-tdeck/source/drivers/tdeck_keyboard.cpp
similarity index 100%
rename from Devices/lilygo-tdeck/source/tdeck_keyboard.cpp
rename to Devices/lilygo-tdeck/source/drivers/tdeck_keyboard.cpp
diff --git a/Devices/lilygo-tdeck/source/tdeck_keyboard_backlight.cpp b/Devices/lilygo-tdeck/source/drivers/tdeck_keyboard_backlight.cpp
similarity index 100%
rename from Devices/lilygo-tdeck/source/tdeck_keyboard_backlight.cpp
rename to Devices/lilygo-tdeck/source/drivers/tdeck_keyboard_backlight.cpp
diff --git a/Devices/lilygo-tdeck/source/tdeck_trackball.cpp b/Devices/lilygo-tdeck/source/drivers/tdeck_trackball.cpp
similarity index 100%
rename from Devices/lilygo-tdeck/source/tdeck_trackball.cpp
rename to Devices/lilygo-tdeck/source/drivers/tdeck_trackball.cpp
diff --git a/Devices/lilygo-tdeck/source/Trackball/Trackball.cpp b/Devices/lilygo-tdeck/source/drivers/trackball.cpp
similarity index 99%
rename from Devices/lilygo-tdeck/source/Trackball/Trackball.cpp
rename to Devices/lilygo-tdeck/source/drivers/trackball.cpp
index bd07a096c..63107a789 100644
--- a/Devices/lilygo-tdeck/source/Trackball/Trackball.cpp
+++ b/Devices/lilygo-tdeck/source/drivers/trackball.cpp
@@ -1,10 +1,11 @@
-#include "Trackball.h"
+#include <drivers/trackball.h>
+#include <drivers/tdeck_trackball.h>
 
 #include <Tactility/Assets.h>
+
 #include <tactility/device.h>
 #include <tactility/log.h>
 
-#include <drivers/tdeck_trackball.h>
 
 constexpr auto* TAG = "Trackball";
 
diff --git a/Devices/lilygo-tdeck/source/module.cpp b/Devices/lilygo-tdeck/source/module.cpp
index 8f2741cf2..ff895356b 100644
--- a/Devices/lilygo-tdeck/source/module.cpp
+++ b/Devices/lilygo-tdeck/source/module.cpp
@@ -13,7 +13,7 @@
 #include <Tactility/service/gps/GpsService.h>
 #include <Tactility/settings/TrackballSettings.h>
 
-#include <Trackball/Trackball.h>
+#include <drivers/trackball.h>
 
 #include <driver/gpio.h>