diff --git a/Devices/generic-esp32/CMakeLists.txt b/Devices/generic-esp32/CMakeLists.txt
index b2352d223..a832a83a2 100644
--- a/Devices/generic-esp32/CMakeLists.txt
+++ b/Devices/generic-esp32/CMakeLists.txt
@@ -1,7 +1,6 @@
-file(GLOB_RECURSE SOURCE_FILES Source/*.c*)
+file(GLOB_RECURSE SOURCE_FILES source/*.c*)
 
 idf_component_register(
     SRCS ${SOURCE_FILES}
-    INCLUDE_DIRS "Source"
-    REQUIRES Tactility
+    REQUIRES TactilityKernel driver
 )
diff --git a/Devices/generic-esp32/Source/Configuration.cpp b/Devices/generic-esp32/Source/Configuration.cpp
deleted file mode 100644
index 180cffb23..000000000
--- a/Devices/generic-esp32/Source/Configuration.cpp
+++ /dev/null
@@ -1,3 +0,0 @@
-#include <Tactility/hal/Configuration.h>
-
-extern const tt::hal::Configuration hardwareConfiguration = {};
diff --git a/Devices/generic-esp32/device.properties b/Devices/generic-esp32/device.properties
index 8b803a84d..03f143e8b 100644
--- a/Devices/generic-esp32/device.properties
+++ b/Devices/generic-esp32/device.properties
@@ -7,4 +7,6 @@ hardware.target=ESP32
 hardware.flashSize=8MB
 hardware.spiRam=false
 
+dependencies.useDeprecatedHal=false
+
 storage.userDataLocation=Internal
diff --git a/Devices/generic-esp32/Source/module.cpp b/Devices/generic-esp32/source/module.cpp
similarity index 87%
rename from Devices/generic-esp32/Source/module.cpp
rename to Devices/generic-esp32/source/module.cpp
index 6b0d3d849..70fa7604b 100644
--- a/Devices/generic-esp32/Source/module.cpp
+++ b/Devices/generic-esp32/source/module.cpp
@@ -3,12 +3,10 @@
 extern "C" {
 
 static error_t start() {
-    // Empty for now
     return ERROR_NONE;
 }
 
 static error_t stop() {
-    // Empty for now
     return ERROR_NONE;
 }
 
diff --git a/Devices/generic-esp32c6/CMakeLists.txt b/Devices/generic-esp32c6/CMakeLists.txt
index b2352d223..a832a83a2 100644
--- a/Devices/generic-esp32c6/CMakeLists.txt
+++ b/Devices/generic-esp32c6/CMakeLists.txt
@@ -1,7 +1,6 @@
-file(GLOB_RECURSE SOURCE_FILES Source/*.c*)
+file(GLOB_RECURSE SOURCE_FILES source/*.c*)
 
 idf_component_register(
     SRCS ${SOURCE_FILES}
-    INCLUDE_DIRS "Source"
-    REQUIRES Tactility
+    REQUIRES TactilityKernel driver
 )
diff --git a/Devices/generic-esp32c6/Source/Configuration.cpp b/Devices/generic-esp32c6/Source/Configuration.cpp
deleted file mode 100644
index 180cffb23..000000000
--- a/Devices/generic-esp32c6/Source/Configuration.cpp
+++ /dev/null
@@ -1,3 +0,0 @@
-#include <Tactility/hal/Configuration.h>
-
-extern const tt::hal::Configuration hardwareConfiguration = {};
diff --git a/Devices/generic-esp32c6/device.properties b/Devices/generic-esp32c6/device.properties
index bd332c250..310bae863 100644
--- a/Devices/generic-esp32c6/device.properties
+++ b/Devices/generic-esp32c6/device.properties
@@ -7,4 +7,6 @@ hardware.target=ESP32C6
 hardware.flashSize=8MB
 hardware.spiRam=false
 
+dependencies.useDeprecatedHal=false
+
 storage.userDataLocation=Internal
diff --git a/Devices/generic-esp32c6/Source/module.cpp b/Devices/generic-esp32c6/source/module.cpp
similarity index 88%
rename from Devices/generic-esp32c6/Source/module.cpp
rename to Devices/generic-esp32c6/source/module.cpp
index fb7def5f9..2113d5cc9 100644
--- a/Devices/generic-esp32c6/Source/module.cpp
+++ b/Devices/generic-esp32c6/source/module.cpp
@@ -3,12 +3,10 @@
 extern "C" {
 
 static error_t start() {
-    // Empty for now
     return ERROR_NONE;
 }
 
 static error_t stop() {
-    // Empty for now
     return ERROR_NONE;
 }
 
diff --git a/Devices/generic-esp32p4/CMakeLists.txt b/Devices/generic-esp32p4/CMakeLists.txt
index b2352d223..a832a83a2 100644
--- a/Devices/generic-esp32p4/CMakeLists.txt
+++ b/Devices/generic-esp32p4/CMakeLists.txt
@@ -1,7 +1,6 @@
-file(GLOB_RECURSE SOURCE_FILES Source/*.c*)
+file(GLOB_RECURSE SOURCE_FILES source/*.c*)
 
 idf_component_register(
     SRCS ${SOURCE_FILES}
-    INCLUDE_DIRS "Source"
-    REQUIRES Tactility
+    REQUIRES TactilityKernel driver
 )
diff --git a/Devices/generic-esp32p4/Source/Configuration.cpp b/Devices/generic-esp32p4/Source/Configuration.cpp
deleted file mode 100644
index 180cffb23..000000000
--- a/Devices/generic-esp32p4/Source/Configuration.cpp
+++ /dev/null
@@ -1,3 +0,0 @@
-#include <Tactility/hal/Configuration.h>
-
-extern const tt::hal::Configuration hardwareConfiguration = {};
diff --git a/Devices/generic-esp32p4/device.properties b/Devices/generic-esp32p4/device.properties
index 4a050b399..d2641c1fb 100644
--- a/Devices/generic-esp32p4/device.properties
+++ b/Devices/generic-esp32p4/device.properties
@@ -7,4 +7,6 @@ hardware.target=ESP32P4
 hardware.flashSize=8MB
 hardware.spiRam=false
 
+dependencies.useDeprecatedHal=false
+
 storage.userDataLocation=Internal
diff --git a/Devices/generic-esp32p4/Source/module.cpp b/Devices/generic-esp32p4/source/module.cpp
similarity index 88%
rename from Devices/generic-esp32p4/Source/module.cpp
rename to Devices/generic-esp32p4/source/module.cpp
index 00f8cf7db..3a54bde16 100644
--- a/Devices/generic-esp32p4/Source/module.cpp
+++ b/Devices/generic-esp32p4/source/module.cpp
@@ -3,12 +3,10 @@
 extern "C" {
 
 static error_t start() {
-    // Empty for now
     return ERROR_NONE;
 }
 
 static error_t stop() {
-    // Empty for now
     return ERROR_NONE;
 }
 
diff --git a/Devices/generic-esp32s3/CMakeLists.txt b/Devices/generic-esp32s3/CMakeLists.txt
index b2352d223..a832a83a2 100644
--- a/Devices/generic-esp32s3/CMakeLists.txt
+++ b/Devices/generic-esp32s3/CMakeLists.txt
@@ -1,7 +1,6 @@
-file(GLOB_RECURSE SOURCE_FILES Source/*.c*)
+file(GLOB_RECURSE SOURCE_FILES source/*.c*)
 
 idf_component_register(
     SRCS ${SOURCE_FILES}
-    INCLUDE_DIRS "Source"
-    REQUIRES Tactility
+    REQUIRES TactilityKernel driver
 )
diff --git a/Devices/generic-esp32s3/Source/Configuration.cpp b/Devices/generic-esp32s3/Source/Configuration.cpp
deleted file mode 100644
index 180cffb23..000000000
--- a/Devices/generic-esp32s3/Source/Configuration.cpp
+++ /dev/null
@@ -1,3 +0,0 @@
-#include <Tactility/hal/Configuration.h>
-
-extern const tt::hal::Configuration hardwareConfiguration = {};
diff --git a/Devices/generic-esp32s3/device.properties b/Devices/generic-esp32s3/device.properties
index 8512a4506..132ea86ce 100644
--- a/Devices/generic-esp32s3/device.properties
+++ b/Devices/generic-esp32s3/device.properties
@@ -7,4 +7,6 @@ hardware.target=ESP32S3
 hardware.flashSize=8MB
 hardware.spiRam=false
 
+dependencies.useDeprecatedHal=false
+
 storage.userDataLocation=Internal
diff --git a/Devices/generic-esp32s3/Source/module.cpp b/Devices/generic-esp32s3/source/module.cpp
similarity index 88%
rename from Devices/generic-esp32s3/Source/module.cpp
rename to Devices/generic-esp32s3/source/module.cpp
index 566d17c3b..05fe7d0dc 100644
--- a/Devices/generic-esp32s3/Source/module.cpp
+++ b/Devices/generic-esp32s3/source/module.cpp
@@ -3,12 +3,10 @@
 extern "C" {
 
 static error_t start() {
-    // Empty for now
     return ERROR_NONE;
 }
 
 static error_t stop() {
-    // Empty for now
     return ERROR_NONE;
 }