diff --git a/.claude/rules/architecture-device-model.md b/.claude/rules/architecture-device-model.md
index 024b391ec..ccaaf81aa 100644
--- a/.claude/rules/architecture-device-model.md
+++ b/.claude/rules/architecture-device-model.md
@@ -7,4 +7,4 @@ The kernel uses a Linux-inspired device model:
 - **Device** (`struct Device`): represents hardware. Lifecycle: `device_construct` → `device_add` → `device_start`. Has a parent-child tree, driver binding, and locking.
 - **DeviceType** (`struct DeviceType`): enables discovering devices by category (e.g. `DISPLAY_TYPE`, `TOUCH_TYPE`, `UART_CONTROLLER_TYPE`).
 
-Devices are defined via **devicetree** `.dts` files in each `Devices/<id>/` folder. A custom devicetree compiler (`Buildscripts/DevicetreeCompiler/compile.py`) generates C code from these files. Each device folder also has a `devicetree.yaml` specifying dependencies and the `.dts` file.
+Devices are defined via **devicetree** `.dts` files in each `Devices/<id>/` folder. A custom devicetree compiler (`Buildscripts/DevicetreeCompiler/compile.py`) generates C code from these files. Each device folder also has a `module.yaml` specifying dependencies and the `.dts` file.
diff --git a/.claude/rules/hardware-abstraction-layer.md b/.claude/rules/hardware-abstraction-layer.md
index bff3d4a27..0459b20dc 100644
--- a/.claude/rules/hardware-abstraction-layer.md
+++ b/.claude/rules/hardware-abstraction-layer.md
@@ -30,7 +30,7 @@ Kernel module names are lower case and postfixed with `-module`.
 Projects that are kernel modules:
 
 1. Declare a `struct Module`
-2. Contain a `devicetree.yaml` file that declares a list of dependencies (for parsing the devicetree) and specifies the bindings folder that contains the drivers' YAML definitions. For example:
+2. Contain a `module.yaml` file that declares a list of dependencies (for parsing the devicetree) and specifies the bindings folder that contains the drivers' YAML definitions. For example:
 ```yaml
 dependencies:
   - TactilityKernel
diff --git a/Buildscripts/DevicetreeCompiler/compile.py b/Buildscripts/DevicetreeCompiler/compile.py
index 9f21731e7..d0a063271 100644
--- a/Buildscripts/DevicetreeCompiler/compile.py
+++ b/Buildscripts/DevicetreeCompiler/compile.py
@@ -5,7 +5,7 @@ from source.main import main
 
 def print_help():
     print("Usage: python compile.py [in_file] [out_path] [arguments]\n")
-    print(f"\t[in_path]                 the path where the root devicetree.yaml file is")
+    print(f"\t[in_path]                 the path where the root module.yaml file is")
     print(f"\t[out_path]                output folder for C file output")
     print("")
     print("Optional arguments:\n")
diff --git a/Buildscripts/DevicetreeCompiler/dependencies.py b/Buildscripts/DevicetreeCompiler/dependencies.py
index 5e5580690..c29853885 100644
--- a/Buildscripts/DevicetreeCompiler/dependencies.py
+++ b/Buildscripts/DevicetreeCompiler/dependencies.py
@@ -6,7 +6,7 @@ from source.config import parse_config
 
 def print_help():
     print("Usage: python dependencies.py [path]\n")
-    print("\t[in_file]                 the path where the root devicetree.yaml file is")
+    print("\t[in_file]                 the path where the root module.yaml file is")
 
 if __name__ == "__main__":
     if "--help" in sys.argv:
@@ -28,8 +28,10 @@ if __name__ == "__main__":
 
     # Device module is added first because it's started first:
     # It creates the root device, so it must exist before its children.
-    device_dependency = os.path.basename(os.path.normpath(yaml_directory))
-    print(device_dependency)
+    # Skipped for dts-only devices: they have no CMakeLists.txt, so there's no component to require.
+    if not config.dts_only:
+        device_dependency = os.path.basename(os.path.normpath(yaml_directory))
+        print(device_dependency)
     for dependency in config.dependencies:
         dependency_name = os.path.basename(os.path.normpath(dependency))
         print(dependency_name)
diff --git a/Buildscripts/DevicetreeCompiler/source/config.py b/Buildscripts/DevicetreeCompiler/source/config.py
index 432a3f842..2a9b43633 100644
--- a/Buildscripts/DevicetreeCompiler/source/config.py
+++ b/Buildscripts/DevicetreeCompiler/source/config.py
@@ -2,15 +2,18 @@ from dataclasses import dataclass, field
 import yaml
 import os
 
+from .exception import DevicetreeException
+
 @dataclass
 class DeviceTreeConfig:
     dependencies: list[str] = field(default_factory=list)
     bindings: list[str] = field(default_factory=list)
     dts: str = ""
+    dts_only: bool = False
 
 def parse_config(file_path: str, project_root: str) -> DeviceTreeConfig:
     """
-    Parses devicetree.yaml and recursively finds dependencies.
+    Parses module.yaml and recursively finds dependencies.
     Returns a list of DeviceTreeConfig objects in post-order (dependencies first).
     """
     config = DeviceTreeConfig([], [], "")
@@ -22,9 +25,9 @@ def parse_config(file_path: str, project_root: str) -> DeviceTreeConfig:
             return
         visited.add(abs_path)
 
-        # Try to see if it's a directory and contains devicetree.yaml
+        # Try to see if it's a directory and contains module.yaml
         if os.path.isdir(abs_path):
-            abs_path = os.path.join(abs_path, "devicetree.yaml")
+            abs_path = os.path.join(abs_path, "module.yaml")
 
         with open(abs_path, 'r') as f:
             data = yaml.safe_load(f) or {}
@@ -40,6 +43,10 @@ def parse_config(file_path: str, project_root: str) -> DeviceTreeConfig:
             config.dependencies += deps
             dts_path = data.get("dts", "")
             config.dts = os.path.join(current_path, dts_path)
+            dts_only = data.get("dts-only", False)
+            if not isinstance(dts_only, bool):
+                raise DevicetreeException(f"'dts-only' must be a boolean, got {dts_only!r}")
+            config.dts_only = dts_only
 
         bindings = data.get("bindings", "")
         if bindings:
diff --git a/Buildscripts/DevicetreeCompiler/source/generator.py b/Buildscripts/DevicetreeCompiler/source/generator.py
index b19e75da2..9a0ccf6cf 100644
--- a/Buildscripts/DevicetreeCompiler/source/generator.py
+++ b/Buildscripts/DevicetreeCompiler/source/generator.py
@@ -359,7 +359,7 @@ def generate_devicetree_c(filename: str, items: list[object], bindings: list[Bin
         # Gather module symbols
         module_symbol_names = []
         # Device's own module goes first (started before its dependency modules)
-        if config.dts:
+        if config.dts and not config.dts_only:
             device_dir = os.path.dirname(os.path.normpath(config.dts))
             device_name = os.path.basename(device_dir)
             if device_name:
diff --git a/Buildscripts/DevicetreeCompiler/tests/data/devicetree.yaml b/Buildscripts/DevicetreeCompiler/tests/data/module.yaml
similarity index 100%
rename from Buildscripts/DevicetreeCompiler/tests/data/devicetree.yaml
rename to Buildscripts/DevicetreeCompiler/tests/data/module.yaml
diff --git a/Buildscripts/DevicetreeCompiler/tests/test_integration.py b/Buildscripts/DevicetreeCompiler/tests/test_integration.py
index a5186e700..6e21883dc 100644
--- a/Buildscripts/DevicetreeCompiler/tests/test_integration.py
+++ b/Buildscripts/DevicetreeCompiler/tests/test_integration.py
@@ -59,7 +59,7 @@ def test_compile_invalid_dts():
         output_dir = os.path.join(tmp_dir, "output")
         os.makedirs(output_dir)
         
-        with open(os.path.join(bad_data_dir, "devicetree.yaml"), "w") as f:
+        with open(os.path.join(bad_data_dir, "module.yaml"), "w") as f:
             f.write("dts: bad.dts\nbindings: bindings")
         
         with open(os.path.join(bad_data_dir, "bad.dts"), "w") as f:
@@ -81,7 +81,7 @@ def write_minmax_config(tmp_dir, device_property_line, binding_min=0, binding_ma
     bindings_dir = os.path.join(config_dir, "bindings")
     os.makedirs(bindings_dir)
 
-    with open(os.path.join(config_dir, "devicetree.yaml"), "w") as f:
+    with open(os.path.join(config_dir, "module.yaml"), "w") as f:
         f.write("dts: test.dts\nbindings: bindings")
 
     with open(os.path.join(config_dir, "test.dts"), "w") as f:
@@ -214,7 +214,7 @@ def write_array_config(tmp_dir, device_property_line):
     bindings_dir = os.path.join(config_dir, "bindings")
     os.makedirs(bindings_dir)
 
-    with open(os.path.join(config_dir, "devicetree.yaml"), "w") as f:
+    with open(os.path.join(config_dir, "module.yaml"), "w") as f:
         f.write("dts: test.dts\nbindings: bindings")
 
     with open(os.path.join(config_dir, "test.dts"), "w") as f:
diff --git a/Devices/btt-panda-touch/CMakeLists.txt b/Devices/btt-panda-touch/CMakeLists.txt
deleted file mode 100644
index 09a2fdee3..000000000
--- a/Devices/btt-panda-touch/CMakeLists.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-file(GLOB_RECURSE SOURCE_FILES source/*.c*)
-
-idf_component_register(
-    SRCS ${SOURCE_FILES}
-    INCLUDE_DIRS "source"
-    REQUIRES TactilityKernel
-)
diff --git a/Devices/btt-panda-touch/devicetree.yaml b/Devices/btt-panda-touch/module.yaml
similarity index 89%
rename from Devices/btt-panda-touch/devicetree.yaml
rename to Devices/btt-panda-touch/module.yaml
index b02d1ed00..9a414c9d7 100644
--- a/Devices/btt-panda-touch/devicetree.yaml
+++ b/Devices/btt-panda-touch/module.yaml
@@ -3,3 +3,4 @@ dependencies:
   - Drivers/rgb-display-module
   - Drivers/gt911-module
 dts: bigtreetech,panda-touch.dts
+dts-only: true
diff --git a/Devices/btt-panda-touch/source/module.cpp b/Devices/btt-panda-touch/source/module.cpp
deleted file mode 100644
index 63ad7f4b2..000000000
--- a/Devices/btt-panda-touch/source/module.cpp
+++ /dev/null
@@ -1,14 +0,0 @@
-#include <tactility/module.h>
-
-extern "C" {
-
-Module btt_panda_touch_module = {
-    .name = "btt-panda-touch",
-    .start = nullptr,
-    .stop = nullptr,
-    .drivers = nullptr,
-    .symbols = nullptr,
-    .internal = nullptr
-};
-
-}
diff --git a/Devices/cl32/devicetree.yaml b/Devices/cl32/module.yaml
similarity index 100%
rename from Devices/cl32/devicetree.yaml
rename to Devices/cl32/module.yaml
diff --git a/Devices/cyd-2432s022c/CMakeLists.txt b/Devices/cyd-2432s022c/CMakeLists.txt
deleted file mode 100644
index a7d3e6712..000000000
--- a/Devices/cyd-2432s022c/CMakeLists.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-file(GLOB_RECURSE SOURCE_FILES source/*.c*)
-
-idf_component_register(
-    SRCS ${SOURCE_FILES}
-    REQUIRES TactilityKernel
-)
diff --git a/Devices/cyd-2432s022c/devicetree.yaml b/Devices/cyd-2432s022c/module.yaml
similarity index 92%
rename from Devices/cyd-2432s022c/devicetree.yaml
rename to Devices/cyd-2432s022c/module.yaml
index 528fcae3d..b3c5f684d 100644
--- a/Devices/cyd-2432s022c/devicetree.yaml
+++ b/Devices/cyd-2432s022c/module.yaml
@@ -5,3 +5,4 @@ dependencies:
   - Drivers/esp32-dac-speaker-module
   - Drivers/audio-stream-module
 dts: cyd,2432s022c.dts
+dts-only: true
diff --git a/Devices/cyd-2432s022c/source/module.cpp b/Devices/cyd-2432s022c/source/module.cpp
deleted file mode 100644
index 38164084e..000000000
--- a/Devices/cyd-2432s022c/source/module.cpp
+++ /dev/null
@@ -1,14 +0,0 @@
-#include <tactility/module.h>
-
-extern "C" {
-
-Module cyd_2432s022c_module = {
-    .name = "cyd-2432s022c",
-    .start = nullptr,
-    .stop = nullptr,
-    .drivers = nullptr,
-    .symbols = nullptr,
-    .internal = nullptr
-};
-
-}
diff --git a/Devices/cyd-2432s024c/CMakeLists.txt b/Devices/cyd-2432s024c/CMakeLists.txt
deleted file mode 100644
index a7d3e6712..000000000
--- a/Devices/cyd-2432s024c/CMakeLists.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-file(GLOB_RECURSE SOURCE_FILES source/*.c*)
-
-idf_component_register(
-    SRCS ${SOURCE_FILES}
-    REQUIRES TactilityKernel
-)
diff --git a/Devices/cyd-2432s024c/devicetree.yaml b/Devices/cyd-2432s024c/module.yaml
similarity index 88%
rename from Devices/cyd-2432s024c/devicetree.yaml
rename to Devices/cyd-2432s024c/module.yaml
index 8a9a77296..4b50c8586 100644
--- a/Devices/cyd-2432s024c/devicetree.yaml
+++ b/Devices/cyd-2432s024c/module.yaml
@@ -3,3 +3,4 @@ dependencies:
   - Drivers/ili9341-module
   - Drivers/cst816s-module
 dts: cyd,2432s024c.dts
+dts-only: true
diff --git a/Devices/cyd-2432s024c/source/module.cpp b/Devices/cyd-2432s024c/source/module.cpp
deleted file mode 100644
index 137119788..000000000
--- a/Devices/cyd-2432s024c/source/module.cpp
+++ /dev/null
@@ -1,14 +0,0 @@
-#include <tactility/module.h>
-
-extern "C" {
-
-Module cyd_2432s024c_module = {
-    .name = "cyd-2432s024c",
-    .start = nullptr,
-    .stop = nullptr,
-    .drivers = nullptr,
-    .symbols = nullptr,
-    .internal = nullptr
-};
-
-}
diff --git a/Devices/cyd-2432s024r/CMakeLists.txt b/Devices/cyd-2432s024r/CMakeLists.txt
deleted file mode 100644
index a7d3e6712..000000000
--- a/Devices/cyd-2432s024r/CMakeLists.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-file(GLOB_RECURSE SOURCE_FILES source/*.c*)
-
-idf_component_register(
-    SRCS ${SOURCE_FILES}
-    REQUIRES TactilityKernel
-)
diff --git a/Devices/cyd-2432s024r/devicetree.yaml b/Devices/cyd-2432s024r/module.yaml
similarity index 88%
rename from Devices/cyd-2432s024r/devicetree.yaml
rename to Devices/cyd-2432s024r/module.yaml
index 0f60266f2..107990997 100644
--- a/Devices/cyd-2432s024r/devicetree.yaml
+++ b/Devices/cyd-2432s024r/module.yaml
@@ -3,3 +3,4 @@ dependencies:
   - Drivers/ili9341-module
   - Drivers/xpt2046-module
 dts: cyd,2432s024r.dts
+dts-only: true
diff --git a/Devices/cyd-2432s024r/source/module.cpp b/Devices/cyd-2432s024r/source/module.cpp
deleted file mode 100644
index 29c76420c..000000000
--- a/Devices/cyd-2432s024r/source/module.cpp
+++ /dev/null
@@ -1,14 +0,0 @@
-#include <tactility/module.h>
-
-extern "C" {
-
-Module cyd_2432s024r_module = {
-    .name = "cyd-2432s024r",
-    .start = nullptr,
-    .stop = nullptr,
-    .drivers = nullptr,
-    .symbols = nullptr,
-    .internal = nullptr
-};
-
-}
diff --git a/Devices/cyd-2432s028r/CMakeLists.txt b/Devices/cyd-2432s028r/CMakeLists.txt
deleted file mode 100644
index a7d3e6712..000000000
--- a/Devices/cyd-2432s028r/CMakeLists.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-file(GLOB_RECURSE SOURCE_FILES source/*.c*)
-
-idf_component_register(
-    SRCS ${SOURCE_FILES}
-    REQUIRES TactilityKernel
-)
diff --git a/Devices/cyd-2432s028r/devicetree.yaml b/Devices/cyd-2432s028r/module.yaml
similarity index 89%
rename from Devices/cyd-2432s028r/devicetree.yaml
rename to Devices/cyd-2432s028r/module.yaml
index 8d45bc194..f74044372 100644
--- a/Devices/cyd-2432s028r/devicetree.yaml
+++ b/Devices/cyd-2432s028r/module.yaml
@@ -3,3 +3,4 @@ dependencies:
   - Drivers/ili9341-module
   - Drivers/xpt2046-softspi-module
 dts: cyd,2432s028r.dts
+dts-only: true
diff --git a/Devices/cyd-2432s028r/source/module.cpp b/Devices/cyd-2432s028r/source/module.cpp
deleted file mode 100644
index bab284510..000000000
--- a/Devices/cyd-2432s028r/source/module.cpp
+++ /dev/null
@@ -1,14 +0,0 @@
-#include <tactility/module.h>
-
-extern "C" {
-
-Module cyd_2432s028r_module = {
-    .name = "cyd-2432s028r",
-    .start = nullptr,
-    .stop = nullptr,
-    .drivers = nullptr,
-    .symbols = nullptr,
-    .internal = nullptr
-};
-
-}
diff --git a/Devices/cyd-2432s028rv3/CMakeLists.txt b/Devices/cyd-2432s028rv3/CMakeLists.txt
deleted file mode 100644
index a7d3e6712..000000000
--- a/Devices/cyd-2432s028rv3/CMakeLists.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-file(GLOB_RECURSE SOURCE_FILES source/*.c*)
-
-idf_component_register(
-    SRCS ${SOURCE_FILES}
-    REQUIRES TactilityKernel
-)
diff --git a/Devices/cyd-2432s028rv3/devicetree.yaml b/Devices/cyd-2432s028rv3/module.yaml
similarity index 89%
rename from Devices/cyd-2432s028rv3/devicetree.yaml
rename to Devices/cyd-2432s028rv3/module.yaml
index 2a9ecdd3a..0d4137e5e 100644
--- a/Devices/cyd-2432s028rv3/devicetree.yaml
+++ b/Devices/cyd-2432s028rv3/module.yaml
@@ -3,3 +3,4 @@ dependencies:
   - Drivers/st7789-module
   - Drivers/xpt2046-softspi-module
 dts: cyd,2432s028rv3.dts
+dts-only: true
diff --git a/Devices/cyd-2432s028rv3/source/module.cpp b/Devices/cyd-2432s028rv3/source/module.cpp
deleted file mode 100644
index 7edcb9967..000000000
--- a/Devices/cyd-2432s028rv3/source/module.cpp
+++ /dev/null
@@ -1,14 +0,0 @@
-#include <tactility/module.h>
-
-extern "C" {
-
-Module cyd_2432s028rv3_module = {
-    .name = "cyd-2432s028rv3",
-    .start = nullptr,
-    .stop = nullptr,
-    .drivers = nullptr,
-    .symbols = nullptr,
-    .internal = nullptr
-};
-
-}
diff --git a/Devices/cyd-2432s032c/CMakeLists.txt b/Devices/cyd-2432s032c/CMakeLists.txt
deleted file mode 100644
index a7d3e6712..000000000
--- a/Devices/cyd-2432s032c/CMakeLists.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-file(GLOB_RECURSE SOURCE_FILES source/*.c*)
-
-idf_component_register(
-    SRCS ${SOURCE_FILES}
-    REQUIRES TactilityKernel
-)
diff --git a/Devices/cyd-2432s032c/devicetree.yaml b/Devices/cyd-2432s032c/module.yaml
similarity index 88%
rename from Devices/cyd-2432s032c/devicetree.yaml
rename to Devices/cyd-2432s032c/module.yaml
index b7f4d0173..38c88a96f 100644
--- a/Devices/cyd-2432s032c/devicetree.yaml
+++ b/Devices/cyd-2432s032c/module.yaml
@@ -3,3 +3,4 @@ dependencies:
   - Drivers/ili9341-module
   - Drivers/gt911-module
 dts: cyd,2432s032c.dts
+dts-only: true
diff --git a/Devices/cyd-2432s032c/source/module.cpp b/Devices/cyd-2432s032c/source/module.cpp
deleted file mode 100644
index c991e41be..000000000
--- a/Devices/cyd-2432s032c/source/module.cpp
+++ /dev/null
@@ -1,14 +0,0 @@
-#include <tactility/module.h>
-
-extern "C" {
-
-Module cyd_2432s032c_module = {
-    .name = "cyd-2432s032c",
-    .start = nullptr,
-    .stop = nullptr,
-    .drivers = nullptr,
-    .symbols = nullptr,
-    .internal = nullptr
-};
-
-}
diff --git a/Devices/cyd-3248s035c/CMakeLists.txt b/Devices/cyd-3248s035c/CMakeLists.txt
deleted file mode 100644
index 731e5e601..000000000
--- a/Devices/cyd-3248s035c/CMakeLists.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-file(GLOB_RECURSE SOURCE_FILES source/*.c*)
-
-idf_component_register(
-    SRCS ${SOURCE_FILES}
-    REQUIRES TactilityKernel
-)
diff --git a/Devices/cyd-3248s035c/devicetree.yaml b/Devices/cyd-3248s035c/module.yaml
similarity index 85%
rename from Devices/cyd-3248s035c/devicetree.yaml
rename to Devices/cyd-3248s035c/module.yaml
index 22496f063..4b0582688 100644
--- a/Devices/cyd-3248s035c/devicetree.yaml
+++ b/Devices/cyd-3248s035c/module.yaml
@@ -3,3 +3,4 @@ dependencies:
   - Drivers/st7796-module
   - Drivers/gt911-module
 dts: cyd,3248s035c.dts
+dts-only: true
diff --git a/Devices/cyd-3248s035c/source/module.cpp b/Devices/cyd-3248s035c/source/module.cpp
deleted file mode 100644
index 36163ac9f..000000000
--- a/Devices/cyd-3248s035c/source/module.cpp
+++ /dev/null
@@ -1,14 +0,0 @@
-#include <tactility/module.h>
-
-extern "C" {
-
-Module cyd_3248s035c_module = {
-    .name = "cyd-3248s035c",
-    .start = nullptr,
-    .stop = nullptr,
-    .drivers = nullptr,
-    .symbols = nullptr,
-    .internal = nullptr
-};
-
-}
diff --git a/Devices/cyd-4848s040c/CMakeLists.txt b/Devices/cyd-4848s040c/CMakeLists.txt
deleted file mode 100644
index a7d3e6712..000000000
--- a/Devices/cyd-4848s040c/CMakeLists.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-file(GLOB_RECURSE SOURCE_FILES source/*.c*)
-
-idf_component_register(
-    SRCS ${SOURCE_FILES}
-    REQUIRES TactilityKernel
-)
diff --git a/Devices/cyd-4848s040c/devicetree.yaml b/Devices/cyd-4848s040c/module.yaml
similarity index 88%
rename from Devices/cyd-4848s040c/devicetree.yaml
rename to Devices/cyd-4848s040c/module.yaml
index 2e9427c84..b09c0d7dd 100644
--- a/Devices/cyd-4848s040c/devicetree.yaml
+++ b/Devices/cyd-4848s040c/module.yaml
@@ -3,3 +3,4 @@ dependencies:
   - Drivers/st7701-module
   - Drivers/gt911-module
 dts: cyd,4848s040c.dts
+dts-only: true
diff --git a/Devices/cyd-4848s040c/source/module.cpp b/Devices/cyd-4848s040c/source/module.cpp
deleted file mode 100644
index cc07a28e9..000000000
--- a/Devices/cyd-4848s040c/source/module.cpp
+++ /dev/null
@@ -1,14 +0,0 @@
-#include <tactility/module.h>
-
-extern "C" {
-
-Module cyd_4848s040c_module = {
-    .name = "cyd-4848s040c",
-    .start = nullptr,
-    .stop = nullptr,
-    .drivers = nullptr,
-    .symbols = nullptr,
-    .internal = nullptr
-};
-
-}
diff --git a/Devices/cyd-8048s043c/CMakeLists.txt b/Devices/cyd-8048s043c/CMakeLists.txt
deleted file mode 100644
index a7d3e6712..000000000
--- a/Devices/cyd-8048s043c/CMakeLists.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-file(GLOB_RECURSE SOURCE_FILES source/*.c*)
-
-idf_component_register(
-    SRCS ${SOURCE_FILES}
-    REQUIRES TactilityKernel
-)
diff --git a/Devices/cyd-8048s043c/devicetree.yaml b/Devices/cyd-8048s043c/module.yaml
similarity index 89%
rename from Devices/cyd-8048s043c/devicetree.yaml
rename to Devices/cyd-8048s043c/module.yaml
index bc3c70e6c..b4bd9db52 100644
--- a/Devices/cyd-8048s043c/devicetree.yaml
+++ b/Devices/cyd-8048s043c/module.yaml
@@ -3,3 +3,4 @@ dependencies:
   - Drivers/rgb-display-module
   - Drivers/gt911-module
 dts: cyd,8048s043c.dts
+dts-only: true
diff --git a/Devices/cyd-8048s043c/source/module.cpp b/Devices/cyd-8048s043c/source/module.cpp
deleted file mode 100644
index fc0d08b8b..000000000
--- a/Devices/cyd-8048s043c/source/module.cpp
+++ /dev/null
@@ -1,14 +0,0 @@
-#include <tactility/module.h>
-
-extern "C" {
-
-Module cyd_8048s043c_module = {
-    .name = "cyd-8048s043c",
-    .start = nullptr,
-    .stop = nullptr,
-    .drivers = nullptr,
-    .symbols = nullptr,
-    .internal = nullptr
-};
-
-}
diff --git a/Devices/cyd-e32r28t/CMakeLists.txt b/Devices/cyd-e32r28t/CMakeLists.txt
deleted file mode 100644
index a7d3e6712..000000000
--- a/Devices/cyd-e32r28t/CMakeLists.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-file(GLOB_RECURSE SOURCE_FILES source/*.c*)
-
-idf_component_register(
-    SRCS ${SOURCE_FILES}
-    REQUIRES TactilityKernel
-)
diff --git a/Devices/cyd-e32r28t/devicetree.yaml b/Devices/cyd-e32r28t/module.yaml
similarity index 89%
rename from Devices/cyd-e32r28t/devicetree.yaml
rename to Devices/cyd-e32r28t/module.yaml
index a77f50c5f..10b99ca59 100644
--- a/Devices/cyd-e32r28t/devicetree.yaml
+++ b/Devices/cyd-e32r28t/module.yaml
@@ -3,3 +3,4 @@ dependencies:
   - Drivers/ili9341-module
   - Drivers/xpt2046-softspi-module
 dts: cyd,e32r28t.dts
+dts-only: true
diff --git a/Devices/cyd-e32r28t/source/module.cpp b/Devices/cyd-e32r28t/source/module.cpp
deleted file mode 100644
index ed776992f..000000000
--- a/Devices/cyd-e32r28t/source/module.cpp
+++ /dev/null
@@ -1,14 +0,0 @@
-#include <tactility/module.h>
-
-extern "C" {
-
-Module cyd_e32r28t_module = {
-    .name = "cyd-e32r28t",
-    .start = nullptr,
-    .stop = nullptr,
-    .drivers = nullptr,
-    .symbols = nullptr,
-    .internal = nullptr
-};
-
-}
diff --git a/Devices/cyd-e32r32p/CMakeLists.txt b/Devices/cyd-e32r32p/CMakeLists.txt
deleted file mode 100644
index a7d3e6712..000000000
--- a/Devices/cyd-e32r32p/CMakeLists.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-file(GLOB_RECURSE SOURCE_FILES source/*.c*)
-
-idf_component_register(
-    SRCS ${SOURCE_FILES}
-    REQUIRES TactilityKernel
-)
diff --git a/Devices/cyd-e32r32p/devicetree.yaml b/Devices/cyd-e32r32p/module.yaml
similarity index 88%
rename from Devices/cyd-e32r32p/devicetree.yaml
rename to Devices/cyd-e32r32p/module.yaml
index 5817b2267..f7ada370e 100644
--- a/Devices/cyd-e32r32p/devicetree.yaml
+++ b/Devices/cyd-e32r32p/module.yaml
@@ -3,3 +3,4 @@ dependencies:
   - Drivers/st7789-module
   - Drivers/xpt2046-module
 dts: cyd,e32r32p.dts
+dts-only: true
diff --git a/Devices/cyd-e32r32p/source/module.cpp b/Devices/cyd-e32r32p/source/module.cpp
deleted file mode 100644
index 8fa63396a..000000000
--- a/Devices/cyd-e32r32p/source/module.cpp
+++ /dev/null
@@ -1,14 +0,0 @@
-#include <tactility/module.h>
-
-extern "C" {
-
-Module cyd_e32r32p_module = {
-    .name = "cyd-e32r32p",
-    .start = nullptr,
-    .stop = nullptr,
-    .drivers = nullptr,
-    .symbols = nullptr,
-    .internal = nullptr
-};
-
-}
diff --git a/Devices/elecrow-crowpanel-advance-28/CMakeLists.txt b/Devices/elecrow-crowpanel-advance-28/CMakeLists.txt
deleted file mode 100644
index a7d3e6712..000000000
--- a/Devices/elecrow-crowpanel-advance-28/CMakeLists.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-file(GLOB_RECURSE SOURCE_FILES source/*.c*)
-
-idf_component_register(
-    SRCS ${SOURCE_FILES}
-    REQUIRES TactilityKernel
-)
diff --git a/Devices/elecrow-crowpanel-advance-28/devicetree.yaml b/Devices/elecrow-crowpanel-advance-28/module.yaml
similarity index 89%
rename from Devices/elecrow-crowpanel-advance-28/devicetree.yaml
rename to Devices/elecrow-crowpanel-advance-28/module.yaml
index 45e44f88c..b6ef4b592 100644
--- a/Devices/elecrow-crowpanel-advance-28/devicetree.yaml
+++ b/Devices/elecrow-crowpanel-advance-28/module.yaml
@@ -3,3 +3,4 @@ dependencies:
   - Drivers/st7789-module
   - Drivers/ft5x06-module
 dts: elecrow,crowpanel-advance-28.dts
+dts-only: true
diff --git a/Devices/elecrow-crowpanel-advance-28/source/module.cpp b/Devices/elecrow-crowpanel-advance-28/source/module.cpp
deleted file mode 100644
index 7234819c0..000000000
--- a/Devices/elecrow-crowpanel-advance-28/source/module.cpp
+++ /dev/null
@@ -1,14 +0,0 @@
-#include <tactility/module.h>
-
-extern "C" {
-
-Module elecrow_crowpanel_advance_28_module = {
-    .name = "elecrow-crowpanel-advance-28",
-    .start = nullptr,
-    .stop = nullptr,
-    .drivers = nullptr,
-    .symbols = nullptr,
-    .internal = nullptr
-};
-
-}
diff --git a/Devices/elecrow-crowpanel-advance-35/CMakeLists.txt b/Devices/elecrow-crowpanel-advance-35/CMakeLists.txt
deleted file mode 100644
index a7d3e6712..000000000
--- a/Devices/elecrow-crowpanel-advance-35/CMakeLists.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-file(GLOB_RECURSE SOURCE_FILES source/*.c*)
-
-idf_component_register(
-    SRCS ${SOURCE_FILES}
-    REQUIRES TactilityKernel
-)
diff --git a/Devices/elecrow-crowpanel-advance-35/devicetree.yaml b/Devices/elecrow-crowpanel-advance-35/module.yaml
similarity index 89%
rename from Devices/elecrow-crowpanel-advance-35/devicetree.yaml
rename to Devices/elecrow-crowpanel-advance-35/module.yaml
index 60461df6a..0173f90b3 100644
--- a/Devices/elecrow-crowpanel-advance-35/devicetree.yaml
+++ b/Devices/elecrow-crowpanel-advance-35/module.yaml
@@ -3,3 +3,4 @@ dependencies:
   - Drivers/ili9488-module
   - Drivers/gt911-module
 dts: elecrow,crowpanel-advance-35.dts
+dts-only: true
diff --git a/Devices/elecrow-crowpanel-advance-35/source/module.cpp b/Devices/elecrow-crowpanel-advance-35/source/module.cpp
deleted file mode 100644
index 2aa0a7e41..000000000
--- a/Devices/elecrow-crowpanel-advance-35/source/module.cpp
+++ /dev/null
@@ -1,14 +0,0 @@
-#include <tactility/module.h>
-
-extern "C" {
-
-Module elecrow_crowpanel_advance_35_module = {
-    .name = "elecrow-crowpanel-advance-35",
-    .start = nullptr,
-    .stop = nullptr,
-    .drivers = nullptr,
-    .symbols = nullptr,
-    .internal = nullptr
-};
-
-}
diff --git a/Devices/elecrow-crowpanel-advance-50/CMakeLists.txt b/Devices/elecrow-crowpanel-advance-50/CMakeLists.txt
deleted file mode 100644
index 09a2fdee3..000000000
--- a/Devices/elecrow-crowpanel-advance-50/CMakeLists.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-file(GLOB_RECURSE SOURCE_FILES source/*.c*)
-
-idf_component_register(
-    SRCS ${SOURCE_FILES}
-    INCLUDE_DIRS "source"
-    REQUIRES TactilityKernel
-)
diff --git a/Devices/elecrow-crowpanel-advance-50/devicetree.yaml b/Devices/elecrow-crowpanel-advance-50/module.yaml
similarity index 91%
rename from Devices/elecrow-crowpanel-advance-50/devicetree.yaml
rename to Devices/elecrow-crowpanel-advance-50/module.yaml
index 0273223b0..f6b76ef65 100644
--- a/Devices/elecrow-crowpanel-advance-50/devicetree.yaml
+++ b/Devices/elecrow-crowpanel-advance-50/module.yaml
@@ -4,3 +4,4 @@ dependencies:
   - Drivers/gt911-module
   - Drivers/tca9534-module
 dts: elecrow,crowpanel-advance-50.dts
+dts-only: true
diff --git a/Devices/elecrow-crowpanel-advance-50/source/module.cpp b/Devices/elecrow-crowpanel-advance-50/source/module.cpp
deleted file mode 100644
index fe6fdcfec..000000000
--- a/Devices/elecrow-crowpanel-advance-50/source/module.cpp
+++ /dev/null
@@ -1,14 +0,0 @@
-#include <tactility/module.h>
-
-extern "C" {
-
-Module elecrow_crowpanel_advance_50_module = {
-    .name = "elecrow-crowpanel-advance-50",
-    .start = nullptr,
-    .stop = nullptr,
-    .drivers = nullptr,
-    .symbols = nullptr,
-    .internal = nullptr
-};
-
-}
diff --git a/Devices/elecrow-crowpanel-basic-28/CMakeLists.txt b/Devices/elecrow-crowpanel-basic-28/CMakeLists.txt
deleted file mode 100644
index a7d3e6712..000000000
--- a/Devices/elecrow-crowpanel-basic-28/CMakeLists.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-file(GLOB_RECURSE SOURCE_FILES source/*.c*)
-
-idf_component_register(
-    SRCS ${SOURCE_FILES}
-    REQUIRES TactilityKernel
-)
diff --git a/Devices/elecrow-crowpanel-basic-28/devicetree.yaml b/Devices/elecrow-crowpanel-basic-28/module.yaml
similarity index 89%
rename from Devices/elecrow-crowpanel-basic-28/devicetree.yaml
rename to Devices/elecrow-crowpanel-basic-28/module.yaml
index ec0480924..27c59332e 100644
--- a/Devices/elecrow-crowpanel-basic-28/devicetree.yaml
+++ b/Devices/elecrow-crowpanel-basic-28/module.yaml
@@ -3,3 +3,4 @@ dependencies:
   - Drivers/ili9341-module
   - Drivers/xpt2046-module
 dts: elecrow,crowpanel-basic-28.dts
+dts-only: true
diff --git a/Devices/elecrow-crowpanel-basic-28/source/module.cpp b/Devices/elecrow-crowpanel-basic-28/source/module.cpp
deleted file mode 100644
index 1b01a2ba7..000000000
--- a/Devices/elecrow-crowpanel-basic-28/source/module.cpp
+++ /dev/null
@@ -1,14 +0,0 @@
-#include <tactility/module.h>
-
-extern "C" {
-
-Module elecrow_crowpanel_basic_28_module = {
-    .name = "elecrow-crowpanel-basic-28",
-    .start = nullptr,
-    .stop = nullptr,
-    .drivers = nullptr,
-    .symbols = nullptr,
-    .internal = nullptr
-};
-
-}
diff --git a/Devices/elecrow-crowpanel-basic-35/CMakeLists.txt b/Devices/elecrow-crowpanel-basic-35/CMakeLists.txt
deleted file mode 100644
index a7d3e6712..000000000
--- a/Devices/elecrow-crowpanel-basic-35/CMakeLists.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-file(GLOB_RECURSE SOURCE_FILES source/*.c*)
-
-idf_component_register(
-    SRCS ${SOURCE_FILES}
-    REQUIRES TactilityKernel
-)
diff --git a/Devices/elecrow-crowpanel-basic-35/devicetree.yaml b/Devices/elecrow-crowpanel-basic-35/module.yaml
similarity index 89%
rename from Devices/elecrow-crowpanel-basic-35/devicetree.yaml
rename to Devices/elecrow-crowpanel-basic-35/module.yaml
index 9d7187d9e..d3212c998 100644
--- a/Devices/elecrow-crowpanel-basic-35/devicetree.yaml
+++ b/Devices/elecrow-crowpanel-basic-35/module.yaml
@@ -3,3 +3,4 @@ dependencies:
   - Drivers/ili9488-module
   - Drivers/xpt2046-module
 dts: elecrow,crowpanel-basic-35.dts
+dts-only: true
diff --git a/Devices/elecrow-crowpanel-basic-35/source/module.cpp b/Devices/elecrow-crowpanel-basic-35/source/module.cpp
deleted file mode 100644
index 54ac87a83..000000000
--- a/Devices/elecrow-crowpanel-basic-35/source/module.cpp
+++ /dev/null
@@ -1,14 +0,0 @@
-#include <tactility/module.h>
-
-extern "C" {
-
-Module elecrow_crowpanel_basic_35_module = {
-    .name = "elecrow-crowpanel-basic-35",
-    .start = nullptr,
-    .stop = nullptr,
-    .drivers = nullptr,
-    .symbols = nullptr,
-    .internal = nullptr
-};
-
-}
diff --git a/Devices/elecrow-crowpanel-basic-50/CMakeLists.txt b/Devices/elecrow-crowpanel-basic-50/CMakeLists.txt
deleted file mode 100644
index 09a2fdee3..000000000
--- a/Devices/elecrow-crowpanel-basic-50/CMakeLists.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-file(GLOB_RECURSE SOURCE_FILES source/*.c*)
-
-idf_component_register(
-    SRCS ${SOURCE_FILES}
-    INCLUDE_DIRS "source"
-    REQUIRES TactilityKernel
-)
diff --git a/Devices/elecrow-crowpanel-basic-50/devicetree.yaml b/Devices/elecrow-crowpanel-basic-50/module.yaml
similarity index 90%
rename from Devices/elecrow-crowpanel-basic-50/devicetree.yaml
rename to Devices/elecrow-crowpanel-basic-50/module.yaml
index 8d7898b97..f2f1fff4e 100644
--- a/Devices/elecrow-crowpanel-basic-50/devicetree.yaml
+++ b/Devices/elecrow-crowpanel-basic-50/module.yaml
@@ -3,3 +3,4 @@ dependencies:
   - Drivers/rgb-display-module
   - Drivers/gt911-module
 dts: elecrow,crowpanel-basic-50.dts
+dts-only: true
diff --git a/Devices/elecrow-crowpanel-basic-50/source/module.cpp b/Devices/elecrow-crowpanel-basic-50/source/module.cpp
deleted file mode 100644
index 913454176..000000000
--- a/Devices/elecrow-crowpanel-basic-50/source/module.cpp
+++ /dev/null
@@ -1,14 +0,0 @@
-#include <tactility/module.h>
-
-extern "C" {
-
-Module elecrow_crowpanel_basic_50_module = {
-    .name = "elecrow-crowpanel-basic-50",
-    .start = nullptr,
-    .stop = nullptr,
-    .drivers = nullptr,
-    .symbols = nullptr,
-    .internal = nullptr
-};
-
-}
diff --git a/Devices/es3c28p/CMakeLists.txt b/Devices/es3c28p/CMakeLists.txt
deleted file mode 100644
index 7ad1ad012..000000000
--- a/Devices/es3c28p/CMakeLists.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-idf_component_register(
-    SRCS "source/module.cpp"
-    REQUIRES TactilityKernel
-)
diff --git a/Devices/es3c28p/devicetree.yaml b/Devices/es3c28p/module.yaml
similarity index 91%
rename from Devices/es3c28p/devicetree.yaml
rename to Devices/es3c28p/module.yaml
index 58a8b4c99..646a53645 100644
--- a/Devices/es3c28p/devicetree.yaml
+++ b/Devices/es3c28p/module.yaml
@@ -5,3 +5,4 @@ dependencies:
   - Drivers/es8311-module
   - Drivers/audio-stream-module
 dts: es3c28p.dts
+dts-only: true
diff --git a/Devices/es3c28p/source/module.cpp b/Devices/es3c28p/source/module.cpp
deleted file mode 100644
index 38d70d651..000000000
--- a/Devices/es3c28p/source/module.cpp
+++ /dev/null
@@ -1,14 +0,0 @@
-#include <tactility/module.h>
-
-extern "C" {
-
-Module es3c28p_module = {
-    .name = "es3c28p",
-    .start = nullptr,
-    .stop = nullptr,
-    .drivers = nullptr,
-    .symbols = nullptr,
-    .internal = nullptr
-};
-
-}
diff --git a/Devices/generic-esp32/CMakeLists.txt b/Devices/generic-esp32/CMakeLists.txt
deleted file mode 100644
index a7d3e6712..000000000
--- a/Devices/generic-esp32/CMakeLists.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-file(GLOB_RECURSE SOURCE_FILES source/*.c*)
-
-idf_component_register(
-    SRCS ${SOURCE_FILES}
-    REQUIRES TactilityKernel
-)
diff --git a/Devices/generic-esp32/devicetree.yaml b/Devices/generic-esp32/module.yaml
similarity index 81%
rename from Devices/generic-esp32/devicetree.yaml
rename to Devices/generic-esp32/module.yaml
index 6a9f8cbbe..eb0ded129 100644
--- a/Devices/generic-esp32/devicetree.yaml
+++ b/Devices/generic-esp32/module.yaml
@@ -1,3 +1,4 @@
 dependencies:
   - Platforms/platform-esp32
 dts: generic,esp32.dts
+dts-only: true
diff --git a/Devices/generic-esp32/source/module.cpp b/Devices/generic-esp32/source/module.cpp
deleted file mode 100644
index 04800db7b..000000000
--- a/Devices/generic-esp32/source/module.cpp
+++ /dev/null
@@ -1,14 +0,0 @@
-#include <tactility/module.h>
-
-extern "C" {
-
-Module generic_esp32_module = {
-    .name = "generic-esp32",
-    .start = nullptr,
-    .stop = nullptr,
-    .drivers = nullptr,
-    .symbols = nullptr,
-    .internal = nullptr
-};
-
-}
diff --git a/Devices/generic-esp32c6/CMakeLists.txt b/Devices/generic-esp32c6/CMakeLists.txt
deleted file mode 100644
index a7d3e6712..000000000
--- a/Devices/generic-esp32c6/CMakeLists.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-file(GLOB_RECURSE SOURCE_FILES source/*.c*)
-
-idf_component_register(
-    SRCS ${SOURCE_FILES}
-    REQUIRES TactilityKernel
-)
diff --git a/Devices/generic-esp32c6/devicetree.yaml b/Devices/generic-esp32c6/module.yaml
similarity index 81%
rename from Devices/generic-esp32c6/devicetree.yaml
rename to Devices/generic-esp32c6/module.yaml
index 3b5ab4d4c..527bec337 100644
--- a/Devices/generic-esp32c6/devicetree.yaml
+++ b/Devices/generic-esp32c6/module.yaml
@@ -1,3 +1,4 @@
 dependencies:
   - Platforms/platform-esp32
 dts: generic,esp32c6.dts
+dts-only: true
diff --git a/Devices/generic-esp32c6/source/module.cpp b/Devices/generic-esp32c6/source/module.cpp
deleted file mode 100644
index d5381c72d..000000000
--- a/Devices/generic-esp32c6/source/module.cpp
+++ /dev/null
@@ -1,14 +0,0 @@
-#include <tactility/module.h>
-
-extern "C" {
-
-Module generic_esp32c6_module = {
-    .name = "generic-esp32c6",
-    .start = nullptr,
-    .stop = nullptr,
-    .drivers = nullptr,
-    .symbols = nullptr,
-    .internal = nullptr
-};
-
-}
diff --git a/Devices/generic-esp32p4/CMakeLists.txt b/Devices/generic-esp32p4/CMakeLists.txt
deleted file mode 100644
index a7d3e6712..000000000
--- a/Devices/generic-esp32p4/CMakeLists.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-file(GLOB_RECURSE SOURCE_FILES source/*.c*)
-
-idf_component_register(
-    SRCS ${SOURCE_FILES}
-    REQUIRES TactilityKernel
-)
diff --git a/Devices/generic-esp32p4/devicetree.yaml b/Devices/generic-esp32p4/module.yaml
similarity index 81%
rename from Devices/generic-esp32p4/devicetree.yaml
rename to Devices/generic-esp32p4/module.yaml
index 4c31671aa..1826ad54d 100644
--- a/Devices/generic-esp32p4/devicetree.yaml
+++ b/Devices/generic-esp32p4/module.yaml
@@ -1,3 +1,4 @@
 dependencies:
   - Platforms/platform-esp32
 dts: generic,esp32p4.dts
+dts-only: true
diff --git a/Devices/generic-esp32p4/source/module.cpp b/Devices/generic-esp32p4/source/module.cpp
deleted file mode 100644
index 9465ba9b3..000000000
--- a/Devices/generic-esp32p4/source/module.cpp
+++ /dev/null
@@ -1,14 +0,0 @@
-#include <tactility/module.h>
-
-extern "C" {
-
-Module generic_esp32p4_module = {
-    .name = "generic-esp32p4",
-    .start = nullptr,
-    .stop = nullptr,
-    .drivers = nullptr,
-    .symbols = nullptr,
-    .internal = nullptr
-};
-
-}
diff --git a/Devices/generic-esp32s3/CMakeLists.txt b/Devices/generic-esp32s3/CMakeLists.txt
deleted file mode 100644
index a7d3e6712..000000000
--- a/Devices/generic-esp32s3/CMakeLists.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-file(GLOB_RECURSE SOURCE_FILES source/*.c*)
-
-idf_component_register(
-    SRCS ${SOURCE_FILES}
-    REQUIRES TactilityKernel
-)
diff --git a/Devices/generic-esp32s3/devicetree.yaml b/Devices/generic-esp32s3/module.yaml
similarity index 81%
rename from Devices/generic-esp32s3/devicetree.yaml
rename to Devices/generic-esp32s3/module.yaml
index 1a525a8ad..33946b9b0 100644
--- a/Devices/generic-esp32s3/devicetree.yaml
+++ b/Devices/generic-esp32s3/module.yaml
@@ -1,3 +1,4 @@
 dependencies:
   - Platforms/platform-esp32
 dts: generic,esp32s3.dts
+dts-only: true
diff --git a/Devices/generic-esp32s3/source/module.cpp b/Devices/generic-esp32s3/source/module.cpp
deleted file mode 100644
index a38b1298c..000000000
--- a/Devices/generic-esp32s3/source/module.cpp
+++ /dev/null
@@ -1,14 +0,0 @@
-#include <tactility/module.h>
-
-extern "C" {
-
-Module generic_esp32s3_module = {
-    .name = "generic-esp32s3",
-    .start = nullptr,
-    .stop = nullptr,
-    .drivers = nullptr,
-    .symbols = nullptr,
-    .internal = nullptr
-};
-
-}
diff --git a/Devices/guition-jc1060p470ciwy/CMakeLists.txt b/Devices/guition-jc1060p470ciwy/CMakeLists.txt
deleted file mode 100644
index a7d3e6712..000000000
--- a/Devices/guition-jc1060p470ciwy/CMakeLists.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-file(GLOB_RECURSE SOURCE_FILES source/*.c*)
-
-idf_component_register(
-    SRCS ${SOURCE_FILES}
-    REQUIRES TactilityKernel
-)
diff --git a/Devices/guition-jc1060p470ciwy/devicetree.yaml b/Devices/guition-jc1060p470ciwy/module.yaml
similarity index 89%
rename from Devices/guition-jc1060p470ciwy/devicetree.yaml
rename to Devices/guition-jc1060p470ciwy/module.yaml
index 0f53f3dc8..80182ee91 100644
--- a/Devices/guition-jc1060p470ciwy/devicetree.yaml
+++ b/Devices/guition-jc1060p470ciwy/module.yaml
@@ -3,3 +3,4 @@ dependencies:
   - Drivers/jd9165-module
   - Drivers/gt911-module
 dts: guition,jc1060p470ciwy.dts
+dts-only: true
diff --git a/Devices/guition-jc1060p470ciwy/source/module.cpp b/Devices/guition-jc1060p470ciwy/source/module.cpp
deleted file mode 100644
index 7b2bba590..000000000
--- a/Devices/guition-jc1060p470ciwy/source/module.cpp
+++ /dev/null
@@ -1,14 +0,0 @@
-#include <tactility/module.h>
-
-extern "C" {
-
-Module guition_jc1060p470ciwy_module = {
-    .name = "guition-jc1060p470ciwy",
-    .start = nullptr,
-    .stop = nullptr,
-    .drivers = nullptr,
-    .symbols = nullptr,
-    .internal = nullptr
-};
-
-}
diff --git a/Devices/guition-jc2432w328c/CMakeLists.txt b/Devices/guition-jc2432w328c/CMakeLists.txt
deleted file mode 100644
index a7d3e6712..000000000
--- a/Devices/guition-jc2432w328c/CMakeLists.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-file(GLOB_RECURSE SOURCE_FILES source/*.c*)
-
-idf_component_register(
-    SRCS ${SOURCE_FILES}
-    REQUIRES TactilityKernel
-)
diff --git a/Devices/guition-jc2432w328c/devicetree.yaml b/Devices/guition-jc2432w328c/module.yaml
similarity index 89%
rename from Devices/guition-jc2432w328c/devicetree.yaml
rename to Devices/guition-jc2432w328c/module.yaml
index 90e0fb90b..ac445178d 100644
--- a/Devices/guition-jc2432w328c/devicetree.yaml
+++ b/Devices/guition-jc2432w328c/module.yaml
@@ -3,3 +3,4 @@ dependencies:
   - Drivers/st7789-module
   - Drivers/cst816s-module
 dts: guition,jc2432w328c.dts
+dts-only: true
diff --git a/Devices/guition-jc2432w328c/source/module.cpp b/Devices/guition-jc2432w328c/source/module.cpp
deleted file mode 100644
index cf38381a6..000000000
--- a/Devices/guition-jc2432w328c/source/module.cpp
+++ /dev/null
@@ -1,14 +0,0 @@
-#include <tactility/module.h>
-
-extern "C" {
-
-Module guition_jc2432w328c_module = {
-    .name = "guition-jc2432w328c",
-    .start = nullptr,
-    .stop = nullptr,
-    .drivers = nullptr,
-    .symbols = nullptr,
-    .internal = nullptr
-};
-
-}
diff --git a/Devices/guition-jc8048w550c/CMakeLists.txt b/Devices/guition-jc8048w550c/CMakeLists.txt
deleted file mode 100644
index a7d3e6712..000000000
--- a/Devices/guition-jc8048w550c/CMakeLists.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-file(GLOB_RECURSE SOURCE_FILES source/*.c*)
-
-idf_component_register(
-    SRCS ${SOURCE_FILES}
-    REQUIRES TactilityKernel
-)
diff --git a/Devices/guition-jc8048w550c/devicetree.yaml b/Devices/guition-jc8048w550c/module.yaml
similarity index 92%
rename from Devices/guition-jc8048w550c/devicetree.yaml
rename to Devices/guition-jc8048w550c/module.yaml
index 02cb31d9b..dd19210f6 100644
--- a/Devices/guition-jc8048w550c/devicetree.yaml
+++ b/Devices/guition-jc8048w550c/module.yaml
@@ -5,3 +5,4 @@ dependencies:
   - Drivers/rgb-display-module
   - Drivers/gt911-module
 dts: guition,jc8048w550c.dts
+dts-only: true
diff --git a/Devices/guition-jc8048w550c/source/module.cpp b/Devices/guition-jc8048w550c/source/module.cpp
deleted file mode 100644
index cf2380f47..000000000
--- a/Devices/guition-jc8048w550c/source/module.cpp
+++ /dev/null
@@ -1,14 +0,0 @@
-#include <tactility/module.h>
-
-extern "C" {
-
-Module guition_jc8048w550c_module = {
-    .name = "guition-jc8048w550c",
-    .start = nullptr,
-    .stop = nullptr,
-    .drivers = nullptr,
-    .symbols = nullptr,
-    .internal = nullptr
-};
-
-}
diff --git a/Devices/heltec-wifi-lora-32-v3/CMakeLists.txt b/Devices/heltec-wifi-lora-32-v3/CMakeLists.txt
deleted file mode 100644
index a7d3e6712..000000000
--- a/Devices/heltec-wifi-lora-32-v3/CMakeLists.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-file(GLOB_RECURSE SOURCE_FILES source/*.c*)
-
-idf_component_register(
-    SRCS ${SOURCE_FILES}
-    REQUIRES TactilityKernel
-)
diff --git a/Devices/heltec-wifi-lora-32-v3/devicetree.yaml b/Devices/heltec-wifi-lora-32-v3/module.yaml
similarity index 90%
rename from Devices/heltec-wifi-lora-32-v3/devicetree.yaml
rename to Devices/heltec-wifi-lora-32-v3/module.yaml
index 9b552609c..7cca6dcf6 100644
--- a/Devices/heltec-wifi-lora-32-v3/devicetree.yaml
+++ b/Devices/heltec-wifi-lora-32-v3/module.yaml
@@ -3,3 +3,4 @@ dependencies:
   - Drivers/ssd1306-module
   - Drivers/button-control-module
 dts: heltec,wifi-lora-32-v3.dts
+dts-only: true
diff --git a/Devices/heltec-wifi-lora-32-v3/source/module.cpp b/Devices/heltec-wifi-lora-32-v3/source/module.cpp
deleted file mode 100644
index 595b475f9..000000000
--- a/Devices/heltec-wifi-lora-32-v3/source/module.cpp
+++ /dev/null
@@ -1,14 +0,0 @@
-#include <tactility/module.h>
-
-extern "C" {
-
-Module heltec_wifi_lora_32_v3_module = {
-    .name = "heltec-wifi-lora-32-v3",
-    .start = nullptr,
-    .stop = nullptr,
-    .drivers = nullptr,
-    .symbols = nullptr,
-    .internal = nullptr
-};
-
-}
diff --git a/Devices/lilygo-tdeck-max/CMakeLists.txt b/Devices/lilygo-tdeck-max/CMakeLists.txt
deleted file mode 100644
index 09a2fdee3..000000000
--- a/Devices/lilygo-tdeck-max/CMakeLists.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-file(GLOB_RECURSE SOURCE_FILES source/*.c*)
-
-idf_component_register(
-    SRCS ${SOURCE_FILES}
-    INCLUDE_DIRS "source"
-    REQUIRES TactilityKernel
-)
diff --git a/Devices/lilygo-tdeck-max/devicetree.yaml b/Devices/lilygo-tdeck-max/module.yaml
similarity index 95%
rename from Devices/lilygo-tdeck-max/devicetree.yaml
rename to Devices/lilygo-tdeck-max/module.yaml
index fab0e33d1..86aacdd78 100644
--- a/Devices/lilygo-tdeck-max/devicetree.yaml
+++ b/Devices/lilygo-tdeck-max/module.yaml
@@ -10,3 +10,4 @@ dependencies:
   - Drivers/drv2605-module
   - Drivers/gps-generic-module
 dts: lilygo,tdeck-max.dts
+dts-only: true
diff --git a/Devices/lilygo-tdeck-max/source/module.cpp b/Devices/lilygo-tdeck-max/source/module.cpp
deleted file mode 100644
index ec75ebbd9..000000000
--- a/Devices/lilygo-tdeck-max/source/module.cpp
+++ /dev/null
@@ -1,14 +0,0 @@
-#include <tactility/module.h>
-
-extern "C" {
-
-Module lilygo_tdeck_max_module = {
-    .name = "lilygo-tdeck-max",
-    .start = nullptr,
-    .stop = nullptr,
-    .drivers = nullptr,
-    .symbols = nullptr,
-    .internal = nullptr
-};
-
-}
diff --git a/Devices/lilygo-tdeck-plus/devicetree.yaml b/Devices/lilygo-tdeck-plus/module.yaml
similarity index 100%
rename from Devices/lilygo-tdeck-plus/devicetree.yaml
rename to Devices/lilygo-tdeck-plus/module.yaml
diff --git a/Devices/lilygo-tdeck-pro/devicetree.yaml b/Devices/lilygo-tdeck-pro/module.yaml
similarity index 100%
rename from Devices/lilygo-tdeck-pro/devicetree.yaml
rename to Devices/lilygo-tdeck-pro/module.yaml
diff --git a/Devices/lilygo-tdeck/devicetree.yaml b/Devices/lilygo-tdeck/module.yaml
similarity index 100%
rename from Devices/lilygo-tdeck/devicetree.yaml
rename to Devices/lilygo-tdeck/module.yaml
diff --git a/Devices/lilygo-tdisplay-s3/devicetree.yaml b/Devices/lilygo-tdisplay-s3/module.yaml
similarity index 100%
rename from Devices/lilygo-tdisplay-s3/devicetree.yaml
rename to Devices/lilygo-tdisplay-s3/module.yaml
diff --git a/Devices/lilygo-tdisplay/CMakeLists.txt b/Devices/lilygo-tdisplay/CMakeLists.txt
deleted file mode 100644
index a7d3e6712..000000000
--- a/Devices/lilygo-tdisplay/CMakeLists.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-file(GLOB_RECURSE SOURCE_FILES source/*.c*)
-
-idf_component_register(
-    SRCS ${SOURCE_FILES}
-    REQUIRES TactilityKernel
-)
diff --git a/Devices/lilygo-tdisplay/devicetree.yaml b/Devices/lilygo-tdisplay/module.yaml
similarity index 89%
rename from Devices/lilygo-tdisplay/devicetree.yaml
rename to Devices/lilygo-tdisplay/module.yaml
index e77bc9f2a..e57bfc7c0 100644
--- a/Devices/lilygo-tdisplay/devicetree.yaml
+++ b/Devices/lilygo-tdisplay/module.yaml
@@ -3,3 +3,4 @@ dependencies:
   - Drivers/st7789-module
   - Drivers/button-control-module
 dts: lilygo,tdisplay.dts
+dts-only: true
diff --git a/Devices/lilygo-tdisplay/source/module.cpp b/Devices/lilygo-tdisplay/source/module.cpp
deleted file mode 100644
index 246988ba5..000000000
--- a/Devices/lilygo-tdisplay/source/module.cpp
+++ /dev/null
@@ -1,14 +0,0 @@
-#include <tactility/module.h>
-
-extern "C" {
-
-Module lilygo_tdisplay_module = {
-    .name = "lilygo-tdisplay",
-    .start = nullptr,
-    .stop = nullptr,
-    .drivers = nullptr,
-    .symbols = nullptr,
-    .internal = nullptr
-};
-
-}
diff --git a/Devices/lilygo-tdongle-s3/CMakeLists.txt b/Devices/lilygo-tdongle-s3/CMakeLists.txt
deleted file mode 100644
index a7d3e6712..000000000
--- a/Devices/lilygo-tdongle-s3/CMakeLists.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-file(GLOB_RECURSE SOURCE_FILES source/*.c*)
-
-idf_component_register(
-    SRCS ${SOURCE_FILES}
-    REQUIRES TactilityKernel
-)
diff --git a/Devices/lilygo-tdongle-s3/devicetree.yaml b/Devices/lilygo-tdongle-s3/module.yaml
similarity index 86%
rename from Devices/lilygo-tdongle-s3/devicetree.yaml
rename to Devices/lilygo-tdongle-s3/module.yaml
index 8ebecd7c7..c372fbead 100644
--- a/Devices/lilygo-tdongle-s3/devicetree.yaml
+++ b/Devices/lilygo-tdongle-s3/module.yaml
@@ -2,3 +2,4 @@ dependencies:
   - Platforms/platform-esp32
   - Drivers/st7735-module
 dts: lilygo,tdongle-s3.dts
+dts-only: true
diff --git a/Devices/lilygo-tdongle-s3/source/module.cpp b/Devices/lilygo-tdongle-s3/source/module.cpp
deleted file mode 100644
index 06b46bcbd..000000000
--- a/Devices/lilygo-tdongle-s3/source/module.cpp
+++ /dev/null
@@ -1,14 +0,0 @@
-#include <tactility/module.h>
-
-extern "C" {
-
-Module lilygo_tdongle_s3_module = {
-    .name = "lilygo-tdongle-s3",
-    .start = nullptr,
-    .stop = nullptr,
-    .drivers = nullptr,
-    .symbols = nullptr,
-    .internal = nullptr
-};
-
-}
diff --git a/Devices/lilygo-thmi/CMakeLists.txt b/Devices/lilygo-thmi/CMakeLists.txt
deleted file mode 100644
index a7d3e6712..000000000
--- a/Devices/lilygo-thmi/CMakeLists.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-file(GLOB_RECURSE SOURCE_FILES source/*.c*)
-
-idf_component_register(
-    SRCS ${SOURCE_FILES}
-    REQUIRES TactilityKernel
-)
diff --git a/Devices/lilygo-thmi/devicetree.yaml b/Devices/lilygo-thmi/module.yaml
similarity index 91%
rename from Devices/lilygo-thmi/devicetree.yaml
rename to Devices/lilygo-thmi/module.yaml
index 20bd971f1..070aff930 100644
--- a/Devices/lilygo-thmi/devicetree.yaml
+++ b/Devices/lilygo-thmi/module.yaml
@@ -4,3 +4,4 @@ dependencies:
   - Drivers/st7789-i8080-module
   - Drivers/button-control-module
 dts: lilygo,thmi.dts
+dts-only: true
diff --git a/Devices/lilygo-thmi/source/module.cpp b/Devices/lilygo-thmi/source/module.cpp
deleted file mode 100644
index cd9757cbd..000000000
--- a/Devices/lilygo-thmi/source/module.cpp
+++ /dev/null
@@ -1,14 +0,0 @@
-#include <tactility/module.h>
-
-extern "C" {
-
-Module lilygo_thmi_module = {
-    .name = "lilygo-thmi",
-    .start = nullptr,
-    .stop = nullptr,
-    .drivers = nullptr,
-    .symbols = nullptr,
-    .internal = nullptr
-};
-
-}
diff --git a/Devices/lilygo-tlora-pager/devicetree.yaml b/Devices/lilygo-tlora-pager/module.yaml
similarity index 100%
rename from Devices/lilygo-tlora-pager/devicetree.yaml
rename to Devices/lilygo-tlora-pager/module.yaml
diff --git a/Devices/m5stack-cardputer-adv/CMakeLists.txt b/Devices/m5stack-cardputer-adv/CMakeLists.txt
deleted file mode 100644
index 09a2fdee3..000000000
--- a/Devices/m5stack-cardputer-adv/CMakeLists.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-file(GLOB_RECURSE SOURCE_FILES source/*.c*)
-
-idf_component_register(
-    SRCS ${SOURCE_FILES}
-    INCLUDE_DIRS "source"
-    REQUIRES TactilityKernel
-)
diff --git a/Devices/m5stack-cardputer-adv/devicetree.yaml b/Devices/m5stack-cardputer-adv/module.yaml
similarity index 90%
rename from Devices/m5stack-cardputer-adv/devicetree.yaml
rename to Devices/m5stack-cardputer-adv/module.yaml
index 67fa747f0..0dbff58d2 100644
--- a/Devices/m5stack-cardputer-adv/devicetree.yaml
+++ b/Devices/m5stack-cardputer-adv/module.yaml
@@ -4,3 +4,4 @@ dependencies:
 - Drivers/st7789-module
 - Drivers/m5stack-module
 dts: m5stack,cardputer-adv.dts
+dts-only: true
diff --git a/Devices/m5stack-cardputer-adv/source/module.cpp b/Devices/m5stack-cardputer-adv/source/module.cpp
deleted file mode 100644
index 5e4f2605b..000000000
--- a/Devices/m5stack-cardputer-adv/source/module.cpp
+++ /dev/null
@@ -1,14 +0,0 @@
-#include <tactility/module.h>
-
-extern "C" {
-
-Module m5stack_cardputer_adv_module = {
-    .name = "m5stack-cardputer-adv",
-    .start = nullptr,
-    .stop = nullptr,
-    .drivers = nullptr,
-    .symbols = nullptr,
-    .internal = nullptr
-};
-
-}
diff --git a/Devices/m5stack-cardputer/CMakeLists.txt b/Devices/m5stack-cardputer/CMakeLists.txt
deleted file mode 100644
index 09a2fdee3..000000000
--- a/Devices/m5stack-cardputer/CMakeLists.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-file(GLOB_RECURSE SOURCE_FILES source/*.c*)
-
-idf_component_register(
-    SRCS ${SOURCE_FILES}
-    INCLUDE_DIRS "source"
-    REQUIRES TactilityKernel
-)
diff --git a/Devices/m5stack-cardputer/devicetree.yaml b/Devices/m5stack-cardputer/module.yaml
similarity index 93%
rename from Devices/m5stack-cardputer/devicetree.yaml
rename to Devices/m5stack-cardputer/module.yaml
index 5860a2387..15f912d00 100644
--- a/Devices/m5stack-cardputer/devicetree.yaml
+++ b/Devices/m5stack-cardputer/module.yaml
@@ -6,3 +6,4 @@ dependencies:
   - Drivers/pdm-mic-module
   - Drivers/audio-stream-module
 dts: m5stack,cardputer.dts
+dts-only: true
diff --git a/Devices/m5stack-cardputer/source/module.cpp b/Devices/m5stack-cardputer/source/module.cpp
deleted file mode 100644
index c96dfda9c..000000000
--- a/Devices/m5stack-cardputer/source/module.cpp
+++ /dev/null
@@ -1,14 +0,0 @@
-#include <tactility/module.h>
-
-extern "C" {
-
-Module m5stack_cardputer_module = {
-    .name = "m5stack-cardputer",
-    .start = nullptr,
-    .stop = nullptr,
-    .drivers = nullptr,
-    .symbols = nullptr,
-    .internal = nullptr
-};
-
-}
diff --git a/Devices/m5stack-core2/CMakeLists.txt b/Devices/m5stack-core2/CMakeLists.txt
deleted file mode 100644
index a7d3e6712..000000000
--- a/Devices/m5stack-core2/CMakeLists.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-file(GLOB_RECURSE SOURCE_FILES source/*.c*)
-
-idf_component_register(
-    SRCS ${SOURCE_FILES}
-    REQUIRES TactilityKernel
-)
diff --git a/Devices/m5stack-core2/devicetree.yaml b/Devices/m5stack-core2/module.yaml
similarity index 94%
rename from Devices/m5stack-core2/devicetree.yaml
rename to Devices/m5stack-core2/module.yaml
index 894ee337e..fa1f0194a 100644
--- a/Devices/m5stack-core2/devicetree.yaml
+++ b/Devices/m5stack-core2/module.yaml
@@ -9,3 +9,4 @@ dependencies:
 - Drivers/ft5x06-module
 - Drivers/ili9341-module
 dts: m5stack,core2.dts
+dts-only: true
diff --git a/Devices/m5stack-core2/source/module.cpp b/Devices/m5stack-core2/source/module.cpp
deleted file mode 100644
index 2272f6556..000000000
--- a/Devices/m5stack-core2/source/module.cpp
+++ /dev/null
@@ -1,17 +0,0 @@
-#include <tactility/module.h>
-
-extern "C" {
-
-// AXP192 rail/GPIO1 bring-up is now devicetree-configured (see m5stack,core2.dts's axp192 node
-// and axp192-module's start()), replacing what used to be done by hand here via a
-// DEVICE_EVENT_STARTED device_listener.
-Module m5stack_core2_module = {
-    .name = "m5stack-core2",
-    .start = nullptr,
-    .stop = nullptr,
-    .drivers = nullptr,
-    .symbols = nullptr,
-    .internal = nullptr
-};
-
-}
diff --git a/Devices/m5stack-cores3/CMakeLists.txt b/Devices/m5stack-cores3/CMakeLists.txt
deleted file mode 100644
index 50dfa717c..000000000
--- a/Devices/m5stack-cores3/CMakeLists.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-file(GLOB_RECURSE SOURCE_FILES source/*.c*)
-
-idf_component_register(
-    SRCS ${SOURCE_FILES}
-    REQUIRES TactilityKernel axp2101-module
-)
diff --git a/Devices/m5stack-cores3/devicetree.yaml b/Devices/m5stack-cores3/module.yaml
similarity index 95%
rename from Devices/m5stack-cores3/devicetree.yaml
rename to Devices/m5stack-cores3/module.yaml
index 348e3507e..f20153421 100644
--- a/Devices/m5stack-cores3/devicetree.yaml
+++ b/Devices/m5stack-cores3/module.yaml
@@ -10,3 +10,4 @@ dependencies:
 - Drivers/ft5x06-module
 - Drivers/ili9341-module
 dts: m5stack,cores3.dts
+dts-only: true
diff --git a/Devices/m5stack-cores3/source/module.cpp b/Devices/m5stack-cores3/source/module.cpp
deleted file mode 100644
index d55b1a78d..000000000
--- a/Devices/m5stack-cores3/source/module.cpp
+++ /dev/null
@@ -1,14 +0,0 @@
-#include <tactility/module.h>
-
-extern "C" {
-
-Module m5stack_cores3_module = {
-    .name = "m5stack-cores3",
-    .start = nullptr,
-    .stop = nullptr,
-    .drivers = nullptr,
-    .symbols = nullptr,
-    .internal = nullptr
-};
-
-}
diff --git a/Devices/m5stack-papers3/devicetree.yaml b/Devices/m5stack-papers3/module.yaml
similarity index 100%
rename from Devices/m5stack-papers3/devicetree.yaml
rename to Devices/m5stack-papers3/module.yaml
diff --git a/Devices/m5stack-stackchan/devicetree.yaml b/Devices/m5stack-stackchan/module.yaml
similarity index 100%
rename from Devices/m5stack-stackchan/devicetree.yaml
rename to Devices/m5stack-stackchan/module.yaml
diff --git a/Devices/m5stack-stickc-plus2/devicetree.yaml b/Devices/m5stack-stickc-plus2/module.yaml
similarity index 100%
rename from Devices/m5stack-stickc-plus2/devicetree.yaml
rename to Devices/m5stack-stickc-plus2/module.yaml
diff --git a/Devices/m5stack-sticks3/CMakeLists.txt b/Devices/m5stack-sticks3/CMakeLists.txt
deleted file mode 100644
index 09a2fdee3..000000000
--- a/Devices/m5stack-sticks3/CMakeLists.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-file(GLOB_RECURSE SOURCE_FILES source/*.c*)
-
-idf_component_register(
-    SRCS ${SOURCE_FILES}
-    INCLUDE_DIRS "source"
-    REQUIRES TactilityKernel
-)
diff --git a/Devices/m5stack-sticks3/devicetree.yaml b/Devices/m5stack-sticks3/module.yaml
similarity index 94%
rename from Devices/m5stack-sticks3/devicetree.yaml
rename to Devices/m5stack-sticks3/module.yaml
index 90a765793..f7b87f393 100644
--- a/Devices/m5stack-sticks3/devicetree.yaml
+++ b/Devices/m5stack-sticks3/module.yaml
@@ -7,3 +7,4 @@ dependencies:
   - Drivers/st7789-module
   - Drivers/button-control-module
 dts: m5stack,sticks3.dts
+dts-only: true
diff --git a/Devices/m5stack-sticks3/source/module.cpp b/Devices/m5stack-sticks3/source/module.cpp
deleted file mode 100644
index 88186e6fd..000000000
--- a/Devices/m5stack-sticks3/source/module.cpp
+++ /dev/null
@@ -1,14 +0,0 @@
-#include <tactility/module.h>
-
-extern "C" {
-
-Module m5stack_sticks3_module = {
-    .name = "m5stack-sticks3",
-    .start = nullptr,
-    .stop = nullptr,
-    .drivers = nullptr,
-    .symbols = nullptr,
-    .internal = nullptr
-};
-
-}
diff --git a/Devices/m5stack-tab5/devicetree.yaml b/Devices/m5stack-tab5/module.yaml
similarity index 100%
rename from Devices/m5stack-tab5/devicetree.yaml
rename to Devices/m5stack-tab5/module.yaml
diff --git a/Devices/simulator/devicetree.yaml b/Devices/simulator/module.yaml
similarity index 100%
rename from Devices/simulator/devicetree.yaml
rename to Devices/simulator/module.yaml
diff --git a/Devices/tulip-4r11/CMakeLists.txt b/Devices/tulip-4r11/CMakeLists.txt
deleted file mode 100644
index 09a2fdee3..000000000
--- a/Devices/tulip-4r11/CMakeLists.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-file(GLOB_RECURSE SOURCE_FILES source/*.c*)
-
-idf_component_register(
-    SRCS ${SOURCE_FILES}
-    INCLUDE_DIRS "source"
-    REQUIRES TactilityKernel
-)
diff --git a/Devices/tulip-4r11/devicetree.yaml b/Devices/tulip-4r11/module.yaml
similarity index 92%
rename from Devices/tulip-4r11/devicetree.yaml
rename to Devices/tulip-4r11/module.yaml
index 465ddb55b..1f9312757 100644
--- a/Devices/tulip-4r11/devicetree.yaml
+++ b/Devices/tulip-4r11/module.yaml
@@ -5,3 +5,4 @@ dependencies:
   - Drivers/dummy-i2s-amp-module
   - Drivers/audio-stream-module
 dts: tulip-4r11.dts
+dts-only: true
diff --git a/Devices/tulip-4r11/source/module.cpp b/Devices/tulip-4r11/source/module.cpp
deleted file mode 100644
index dbf68376b..000000000
--- a/Devices/tulip-4r11/source/module.cpp
+++ /dev/null
@@ -1,14 +0,0 @@
-#include <tactility/module.h>
-
-extern "C" {
-
-Module tulip_4r11_module = {
-    .name = "tulip-4r11",
-    .start = nullptr,
-    .stop = nullptr,
-    .drivers = nullptr,
-    .symbols = nullptr,
-    .internal = nullptr
-};
-
-}
diff --git a/Devices/unphone/devicetree.yaml b/Devices/unphone/module.yaml
similarity index 100%
rename from Devices/unphone/devicetree.yaml
rename to Devices/unphone/module.yaml
diff --git a/Devices/waveshare-esp32-s3-geek/CMakeLists.txt b/Devices/waveshare-esp32-s3-geek/CMakeLists.txt
deleted file mode 100644
index 09a2fdee3..000000000
--- a/Devices/waveshare-esp32-s3-geek/CMakeLists.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-file(GLOB_RECURSE SOURCE_FILES source/*.c*)
-
-idf_component_register(
-    SRCS ${SOURCE_FILES}
-    INCLUDE_DIRS "source"
-    REQUIRES TactilityKernel
-)
diff --git a/Devices/waveshare-esp32-s3-geek/devicetree.yaml b/Devices/waveshare-esp32-s3-geek/module.yaml
similarity index 90%
rename from Devices/waveshare-esp32-s3-geek/devicetree.yaml
rename to Devices/waveshare-esp32-s3-geek/module.yaml
index 094aef947..3b36dc2c2 100644
--- a/Devices/waveshare-esp32-s3-geek/devicetree.yaml
+++ b/Devices/waveshare-esp32-s3-geek/module.yaml
@@ -3,3 +3,4 @@ dependencies:
   - Drivers/st7789-module
   - Drivers/button-control-module
 dts: waveshare,esp32-s3-geek.dts
+dts-only: true
diff --git a/Devices/waveshare-esp32-s3-geek/source/module.cpp b/Devices/waveshare-esp32-s3-geek/source/module.cpp
deleted file mode 100644
index 2da417d10..000000000
--- a/Devices/waveshare-esp32-s3-geek/source/module.cpp
+++ /dev/null
@@ -1,14 +0,0 @@
-#include <tactility/module.h>
-
-extern "C" {
-
-Module waveshare_esp32_s3_geek_module = {
-    .name = "waveshare-esp32-s3-geek",
-    .start = nullptr,
-    .stop = nullptr,
-    .drivers = nullptr,
-    .symbols = nullptr,
-    .internal = nullptr
-};
-
-}
diff --git a/Devices/waveshare-s3-lcd-13/CMakeLists.txt b/Devices/waveshare-s3-lcd-13/CMakeLists.txt
deleted file mode 100644
index a7d3e6712..000000000
--- a/Devices/waveshare-s3-lcd-13/CMakeLists.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-file(GLOB_RECURSE SOURCE_FILES source/*.c*)
-
-idf_component_register(
-    SRCS ${SOURCE_FILES}
-    REQUIRES TactilityKernel
-)
diff --git a/Devices/waveshare-s3-lcd-13/devicetree.yaml b/Devices/waveshare-s3-lcd-13/module.yaml
similarity index 88%
rename from Devices/waveshare-s3-lcd-13/devicetree.yaml
rename to Devices/waveshare-s3-lcd-13/module.yaml
index eea0d0d89..88c81fa68 100644
--- a/Devices/waveshare-s3-lcd-13/devicetree.yaml
+++ b/Devices/waveshare-s3-lcd-13/module.yaml
@@ -3,3 +3,4 @@ dependencies:
 - Drivers/qmi8658-module
 - Drivers/st7789-module
 dts: waveshare,s3-lcd-13.dts
+dts-only: true
diff --git a/Devices/waveshare-s3-lcd-13/source/module.cpp b/Devices/waveshare-s3-lcd-13/source/module.cpp
deleted file mode 100644
index 4b5a9f300..000000000
--- a/Devices/waveshare-s3-lcd-13/source/module.cpp
+++ /dev/null
@@ -1,14 +0,0 @@
-#include <tactility/module.h>
-
-extern "C" {
-
-Module waveshare_s3_lcd_13_module = {
-    .name = "waveshare-s3-lcd-13",
-    .start = nullptr,
-    .stop = nullptr,
-    .drivers = nullptr,
-    .symbols = nullptr,
-    .internal = nullptr
-};
-
-}
diff --git a/Devices/waveshare-s3-touch-lcd-128/CMakeLists.txt b/Devices/waveshare-s3-touch-lcd-128/CMakeLists.txt
deleted file mode 100644
index 09a2fdee3..000000000
--- a/Devices/waveshare-s3-touch-lcd-128/CMakeLists.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-file(GLOB_RECURSE SOURCE_FILES source/*.c*)
-
-idf_component_register(
-    SRCS ${SOURCE_FILES}
-    INCLUDE_DIRS "source"
-    REQUIRES TactilityKernel
-)
diff --git a/Devices/waveshare-s3-touch-lcd-128/devicetree.yaml b/Devices/waveshare-s3-touch-lcd-128/module.yaml
similarity index 90%
rename from Devices/waveshare-s3-touch-lcd-128/devicetree.yaml
rename to Devices/waveshare-s3-touch-lcd-128/module.yaml
index bf6b838d7..0d6ff2659 100644
--- a/Devices/waveshare-s3-touch-lcd-128/devicetree.yaml
+++ b/Devices/waveshare-s3-touch-lcd-128/module.yaml
@@ -4,3 +4,4 @@ dependencies:
 - Drivers/cst816t-module
 - Drivers/gc9a01-module
 dts: waveshare,s3-touch-lcd-128.dts
+dts-only: true
diff --git a/Devices/waveshare-s3-touch-lcd-128/source/module.cpp b/Devices/waveshare-s3-touch-lcd-128/source/module.cpp
deleted file mode 100644
index a358cf8d6..000000000
--- a/Devices/waveshare-s3-touch-lcd-128/source/module.cpp
+++ /dev/null
@@ -1,14 +0,0 @@
-#include <tactility/module.h>
-
-extern "C" {
-
-Module waveshare_s3_touch_lcd_128_module = {
-    .name = "waveshare-s3-touch-lcd-128",
-    .start = nullptr,
-    .stop = nullptr,
-    .drivers = nullptr,
-    .symbols = nullptr,
-    .internal = nullptr
-};
-
-}
diff --git a/Devices/waveshare-s3-touch-lcd-147/CMakeLists.txt b/Devices/waveshare-s3-touch-lcd-147/CMakeLists.txt
deleted file mode 100644
index 09a2fdee3..000000000
--- a/Devices/waveshare-s3-touch-lcd-147/CMakeLists.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-file(GLOB_RECURSE SOURCE_FILES source/*.c*)
-
-idf_component_register(
-    SRCS ${SOURCE_FILES}
-    INCLUDE_DIRS "source"
-    REQUIRES TactilityKernel
-)
diff --git a/Devices/waveshare-s3-touch-lcd-147/devicetree.yaml b/Devices/waveshare-s3-touch-lcd-147/module.yaml
similarity index 91%
rename from Devices/waveshare-s3-touch-lcd-147/devicetree.yaml
rename to Devices/waveshare-s3-touch-lcd-147/module.yaml
index eab1c9d48..81afafa55 100644
--- a/Devices/waveshare-s3-touch-lcd-147/devicetree.yaml
+++ b/Devices/waveshare-s3-touch-lcd-147/module.yaml
@@ -4,3 +4,4 @@ dependencies:
   - Drivers/button-control-module
   - Drivers/jd9853-module
 dts: waveshare,s3-touch-lcd-147.dts
+dts-only: true
diff --git a/Devices/waveshare-s3-touch-lcd-147/source/module.cpp b/Devices/waveshare-s3-touch-lcd-147/source/module.cpp
deleted file mode 100644
index ecd25fabc..000000000
--- a/Devices/waveshare-s3-touch-lcd-147/source/module.cpp
+++ /dev/null
@@ -1,14 +0,0 @@
-#include <tactility/module.h>
-
-extern "C" {
-
-Module waveshare_s3_touch_lcd_147_module = {
-    .name = "waveshare-s3-touch-lcd-147",
-    .start = nullptr,
-    .stop = nullptr,
-    .drivers = nullptr,
-    .symbols = nullptr,
-    .internal = nullptr
-};
-
-}
diff --git a/Devices/waveshare-s3-touch-lcd-43/CMakeLists.txt b/Devices/waveshare-s3-touch-lcd-43/CMakeLists.txt
deleted file mode 100644
index 09a2fdee3..000000000
--- a/Devices/waveshare-s3-touch-lcd-43/CMakeLists.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-file(GLOB_RECURSE SOURCE_FILES source/*.c*)
-
-idf_component_register(
-    SRCS ${SOURCE_FILES}
-    INCLUDE_DIRS "source"
-    REQUIRES TactilityKernel
-)
diff --git a/Devices/waveshare-s3-touch-lcd-43/devicetree.yaml b/Devices/waveshare-s3-touch-lcd-43/module.yaml
similarity index 91%
rename from Devices/waveshare-s3-touch-lcd-43/devicetree.yaml
rename to Devices/waveshare-s3-touch-lcd-43/module.yaml
index 0e44f0a82..66e837afb 100644
--- a/Devices/waveshare-s3-touch-lcd-43/devicetree.yaml
+++ b/Devices/waveshare-s3-touch-lcd-43/module.yaml
@@ -4,3 +4,4 @@ dependencies:
   - Drivers/gt911-module
   - Drivers/rgb-display-module
 dts: waveshare,s3-touch-lcd-43.dts
+dts-only: true
diff --git a/Devices/waveshare-s3-touch-lcd-43/source/module.cpp b/Devices/waveshare-s3-touch-lcd-43/source/module.cpp
deleted file mode 100644
index 16376aa0b..000000000
--- a/Devices/waveshare-s3-touch-lcd-43/source/module.cpp
+++ /dev/null
@@ -1,14 +0,0 @@
-#include <tactility/module.h>
-
-extern "C" {
-
-Module waveshare_s3_touch_lcd_43_module = {
-    .name = "waveshare-s3-touch-lcd-43",
-    .start = nullptr,
-    .stop = nullptr,
-    .drivers = nullptr,
-    .symbols = nullptr,
-    .internal = nullptr
-};
-
-}
diff --git a/Devices/wireless-tag-wt32-sc01-plus/CMakeLists.txt b/Devices/wireless-tag-wt32-sc01-plus/CMakeLists.txt
deleted file mode 100644
index 09a2fdee3..000000000
--- a/Devices/wireless-tag-wt32-sc01-plus/CMakeLists.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-file(GLOB_RECURSE SOURCE_FILES source/*.c*)
-
-idf_component_register(
-    SRCS ${SOURCE_FILES}
-    INCLUDE_DIRS "source"
-    REQUIRES TactilityKernel
-)
diff --git a/Devices/wireless-tag-wt32-sc01-plus/devicetree.yaml b/Devices/wireless-tag-wt32-sc01-plus/module.yaml
similarity index 90%
rename from Devices/wireless-tag-wt32-sc01-plus/devicetree.yaml
rename to Devices/wireless-tag-wt32-sc01-plus/module.yaml
index 4f1b84b33..40646aead 100644
--- a/Devices/wireless-tag-wt32-sc01-plus/devicetree.yaml
+++ b/Devices/wireless-tag-wt32-sc01-plus/module.yaml
@@ -3,3 +3,4 @@ dependencies:
   - Drivers/ft6x36-module
   - Drivers/st7796-i8080-module
 dts: wireless-tag,wt32-sc01-plus.dts
+dts-only: true
diff --git a/Devices/wireless-tag-wt32-sc01-plus/source/module.cpp b/Devices/wireless-tag-wt32-sc01-plus/source/module.cpp
deleted file mode 100644
index 305706d45..000000000
--- a/Devices/wireless-tag-wt32-sc01-plus/source/module.cpp
+++ /dev/null
@@ -1,14 +0,0 @@
-#include <tactility/module.h>
-
-extern "C" {
-
-Module wireless_tag_wt32_sc01_plus_module = {
-    .name = "wireless-tag-wt32-sc01-plus",
-    .start = nullptr,
-    .stop = nullptr,
-    .drivers = nullptr,
-    .symbols = nullptr,
-    .internal = nullptr
-};
-
-}
diff --git a/Documentation/ideas.md b/Documentation/ideas.md
index 3a4c2f58f..d07b0d7fa 100644
--- a/Documentation/ideas.md
+++ b/Documentation/ideas.md
@@ -4,8 +4,6 @@
 
 - Tactility/Source/service/autorotate/AutoRotate.cpp  
   TODO: Display settings app might be saving DisplaySettings at the same time. This might corrupt the settings file.
-- Try out speed optimizations: https://docs.espressif.com/projects/esp-faq/en/latest/software-framework/peripherals/lcd.html
-  (relates to CONFIG_ESP32S3_DATA_CACHE_LINE_64B that is in use for RGB displays via the `device.properties` fix/workaround)
 
 ## Higher Priority
 
@@ -16,18 +14,11 @@
 - Add bold fonts for e-ink readability improvement
 - Improve Setup: Add keyboard/keypad navigation explanation
 - Drivers/audio-codec-module is not a module. Move it somewhere else. Or make it an actual module.
-- LilyGO T-Dongle S3: 1 button control, stop auto-launching web server
 - Improve SPI kernel driver (implement read, write, transactions)
-- Add font design tokens such as "regular", "title" and "smaller". Perhaps via the LVGL kernel module.
 - TCA9534 keyboards should use interrupts
 - External app loading: Check the version of Tactility and check ESP target hardware to check for compatibility
   Check during installation process, but also when starting (SD card might have old app install from before Tactility OS update)
-- Make a URL handler. Use it for handling local files. Match file types with apps.
-  Create some kind of "intent" handler like on Android.
-  The intent can have an action (e.g. view), a URL and an optional bundle.
-  The manifest can provide the intent handler
 - Support direct installation of an `.app` file with `tactility.py install helloworld.app <ip>`
-- Support `tactility.py target <ip>` to remember the device IP address.
 - minitar/untarFile(): "entry->metadata.path" can escape its confined path (e.g. "../something")
 
 ## Medium Priority
@@ -50,6 +41,14 @@
 - Bug: Crash handling app cannot be exited with an EncoderDevice. (current work-around is to manually reset the device)
 - Refactor HttpServer into C code and move implementation to http-module
 - Use GPS time to set/update the current time
+- Make a URL handler. Use it for handling local files. Match file types with apps.
+  Create some kind of "intent" handler like on Android.
+  The intent can have an action (e.g. view), a URL and an optional bundle.
+  The manifest can provide the intent handler
+- LilyGO T-Dongle S3: 1 button control, stop auto-launching web server
+- Core2: support power off via software
+- Try out speed optimizations: https://docs.espressif.com/projects/esp-faq/en/latest/software-framework/peripherals/lcd.html
+  (relates to CONFIG_ESP32S3_DATA_CACHE_LINE_64B that is in use for RGB displays via the `device.properties` fix/workaround)
 
 ## Lower Priority
 
diff --git a/Drivers/audio-stream-module/devicetree.yaml b/Drivers/audio-stream-module/module.yaml
similarity index 100%
rename from Drivers/audio-stream-module/devicetree.yaml
rename to Drivers/audio-stream-module/module.yaml
diff --git a/Drivers/aw88298-module/devicetree.yaml b/Drivers/aw88298-module/module.yaml
similarity index 100%
rename from Drivers/aw88298-module/devicetree.yaml
rename to Drivers/aw88298-module/module.yaml
diff --git a/Drivers/aw9523b-module/devicetree.yaml b/Drivers/aw9523b-module/module.yaml
similarity index 100%
rename from Drivers/aw9523b-module/devicetree.yaml
rename to Drivers/aw9523b-module/module.yaml
diff --git a/Drivers/axp192-module/devicetree.yaml b/Drivers/axp192-module/module.yaml
similarity index 100%
rename from Drivers/axp192-module/devicetree.yaml
rename to Drivers/axp192-module/module.yaml
diff --git a/Drivers/axp2101-module/devicetree.yaml b/Drivers/axp2101-module/module.yaml
similarity index 100%
rename from Drivers/axp2101-module/devicetree.yaml
rename to Drivers/axp2101-module/module.yaml
diff --git a/Drivers/axs5106-module/devicetree.yaml b/Drivers/axs5106-module/module.yaml
similarity index 100%
rename from Drivers/axs5106-module/devicetree.yaml
rename to Drivers/axs5106-module/module.yaml
diff --git a/Drivers/bm8563-module/devicetree.yaml b/Drivers/bm8563-module/module.yaml
similarity index 100%
rename from Drivers/bm8563-module/devicetree.yaml
rename to Drivers/bm8563-module/module.yaml
diff --git a/Drivers/bmi270-module/devicetree.yaml b/Drivers/bmi270-module/module.yaml
similarity index 100%
rename from Drivers/bmi270-module/devicetree.yaml
rename to Drivers/bmi270-module/module.yaml
diff --git a/Drivers/bq24295-module/devicetree.yaml b/Drivers/bq24295-module/module.yaml
similarity index 100%
rename from Drivers/bq24295-module/devicetree.yaml
rename to Drivers/bq24295-module/module.yaml
diff --git a/Drivers/bq25896-module/devicetree.yaml b/Drivers/bq25896-module/module.yaml
similarity index 100%
rename from Drivers/bq25896-module/devicetree.yaml
rename to Drivers/bq25896-module/module.yaml
diff --git a/Drivers/bq27220-module/devicetree.yaml b/Drivers/bq27220-module/module.yaml
similarity index 100%
rename from Drivers/bq27220-module/devicetree.yaml
rename to Drivers/bq27220-module/module.yaml
diff --git a/Drivers/button-control-module/devicetree.yaml b/Drivers/button-control-module/module.yaml
similarity index 100%
rename from Drivers/button-control-module/devicetree.yaml
rename to Drivers/button-control-module/module.yaml
diff --git a/Drivers/ch422g-module/devicetree.yaml b/Drivers/ch422g-module/module.yaml
similarity index 100%
rename from Drivers/ch422g-module/devicetree.yaml
rename to Drivers/ch422g-module/module.yaml
diff --git a/Drivers/cst328-module/devicetree.yaml b/Drivers/cst328-module/module.yaml
similarity index 100%
rename from Drivers/cst328-module/devicetree.yaml
rename to Drivers/cst328-module/module.yaml
diff --git a/Drivers/cst66xx-module/devicetree.yaml b/Drivers/cst66xx-module/module.yaml
similarity index 100%
rename from Drivers/cst66xx-module/devicetree.yaml
rename to Drivers/cst66xx-module/module.yaml
diff --git a/Drivers/cst816s-module/devicetree.yaml b/Drivers/cst816s-module/module.yaml
similarity index 100%
rename from Drivers/cst816s-module/devicetree.yaml
rename to Drivers/cst816s-module/module.yaml
diff --git a/Drivers/cst816t-module/devicetree.yaml b/Drivers/cst816t-module/module.yaml
similarity index 100%
rename from Drivers/cst816t-module/devicetree.yaml
rename to Drivers/cst816t-module/module.yaml
diff --git a/Drivers/drv2605-module/devicetree.yaml b/Drivers/drv2605-module/module.yaml
similarity index 100%
rename from Drivers/drv2605-module/devicetree.yaml
rename to Drivers/drv2605-module/module.yaml
diff --git a/Drivers/dummy-i2s-amp-module/devicetree.yaml b/Drivers/dummy-i2s-amp-module/module.yaml
similarity index 100%
rename from Drivers/dummy-i2s-amp-module/devicetree.yaml
rename to Drivers/dummy-i2s-amp-module/module.yaml
diff --git a/Drivers/es7210-module/devicetree.yaml b/Drivers/es7210-module/module.yaml
similarity index 100%
rename from Drivers/es7210-module/devicetree.yaml
rename to Drivers/es7210-module/module.yaml
diff --git a/Drivers/es8311-module/devicetree.yaml b/Drivers/es8311-module/module.yaml
similarity index 100%
rename from Drivers/es8311-module/devicetree.yaml
rename to Drivers/es8311-module/module.yaml
diff --git a/Drivers/es8388-module/devicetree.yaml b/Drivers/es8388-module/module.yaml
similarity index 100%
rename from Drivers/es8388-module/devicetree.yaml
rename to Drivers/es8388-module/module.yaml
diff --git a/Drivers/esp-epaper-module/devicetree.yaml b/Drivers/esp-epaper-module/module.yaml
similarity index 100%
rename from Drivers/esp-epaper-module/devicetree.yaml
rename to Drivers/esp-epaper-module/module.yaml
diff --git a/Drivers/esp32-dac-speaker-module/devicetree.yaml b/Drivers/esp32-dac-speaker-module/module.yaml
similarity index 100%
rename from Drivers/esp32-dac-speaker-module/devicetree.yaml
rename to Drivers/esp32-dac-speaker-module/module.yaml
diff --git a/Drivers/ft5x06-module/devicetree.yaml b/Drivers/ft5x06-module/module.yaml
similarity index 100%
rename from Drivers/ft5x06-module/devicetree.yaml
rename to Drivers/ft5x06-module/module.yaml
diff --git a/Drivers/ft6x36-module/devicetree.yaml b/Drivers/ft6x36-module/module.yaml
similarity index 100%
rename from Drivers/ft6x36-module/devicetree.yaml
rename to Drivers/ft6x36-module/module.yaml
diff --git a/Drivers/gc9a01-module/devicetree.yaml b/Drivers/gc9a01-module/module.yaml
similarity index 100%
rename from Drivers/gc9a01-module/devicetree.yaml
rename to Drivers/gc9a01-module/module.yaml
diff --git a/Drivers/gdeq031t10-module/devicetree.yaml b/Drivers/gdeq031t10-module/module.yaml
similarity index 100%
rename from Drivers/gdeq031t10-module/devicetree.yaml
rename to Drivers/gdeq031t10-module/module.yaml
diff --git a/Drivers/gpio-encoder-module/devicetree.yaml b/Drivers/gpio-encoder-module/module.yaml
similarity index 100%
rename from Drivers/gpio-encoder-module/devicetree.yaml
rename to Drivers/gpio-encoder-module/module.yaml
diff --git a/Drivers/gpio-trackball-module/devicetree.yaml b/Drivers/gpio-trackball-module/module.yaml
similarity index 100%
rename from Drivers/gpio-trackball-module/devicetree.yaml
rename to Drivers/gpio-trackball-module/module.yaml
diff --git a/Drivers/gps-generic-module/devicetree.yaml b/Drivers/gps-generic-module/module.yaml
similarity index 100%
rename from Drivers/gps-generic-module/devicetree.yaml
rename to Drivers/gps-generic-module/module.yaml
diff --git a/Drivers/gps-meshtastic-module/devicetree.yaml b/Drivers/gps-meshtastic-module/module.yaml
similarity index 100%
rename from Drivers/gps-meshtastic-module/devicetree.yaml
rename to Drivers/gps-meshtastic-module/module.yaml
diff --git a/Drivers/gt911-module/devicetree.yaml b/Drivers/gt911-module/module.yaml
similarity index 100%
rename from Drivers/gt911-module/devicetree.yaml
rename to Drivers/gt911-module/module.yaml
diff --git a/Drivers/hx8357-module/devicetree.yaml b/Drivers/hx8357-module/module.yaml
similarity index 100%
rename from Drivers/hx8357-module/devicetree.yaml
rename to Drivers/hx8357-module/module.yaml
diff --git a/Drivers/ili9341-module/devicetree.yaml b/Drivers/ili9341-module/module.yaml
similarity index 100%
rename from Drivers/ili9341-module/devicetree.yaml
rename to Drivers/ili9341-module/module.yaml
diff --git a/Drivers/ili9488-module/devicetree.yaml b/Drivers/ili9488-module/module.yaml
similarity index 100%
rename from Drivers/ili9488-module/devicetree.yaml
rename to Drivers/ili9488-module/module.yaml
diff --git a/Drivers/ili9881c-module/devicetree.yaml b/Drivers/ili9881c-module/module.yaml
similarity index 100%
rename from Drivers/ili9881c-module/devicetree.yaml
rename to Drivers/ili9881c-module/module.yaml
diff --git a/Drivers/ina226-module/devicetree.yaml b/Drivers/ina226-module/module.yaml
similarity index 100%
rename from Drivers/ina226-module/devicetree.yaml
rename to Drivers/ina226-module/module.yaml
diff --git a/Drivers/jd9165-module/devicetree.yaml b/Drivers/jd9165-module/module.yaml
similarity index 100%
rename from Drivers/jd9165-module/devicetree.yaml
rename to Drivers/jd9165-module/module.yaml
diff --git a/Drivers/jd9853-module/devicetree.yaml b/Drivers/jd9853-module/module.yaml
similarity index 100%
rename from Drivers/jd9853-module/devicetree.yaml
rename to Drivers/jd9853-module/module.yaml
diff --git a/Drivers/lilygo-module/devicetree.yaml b/Drivers/lilygo-module/module.yaml
similarity index 100%
rename from Drivers/lilygo-module/devicetree.yaml
rename to Drivers/lilygo-module/module.yaml
diff --git a/Drivers/m5pm1-module/devicetree.yaml b/Drivers/m5pm1-module/module.yaml
similarity index 100%
rename from Drivers/m5pm1-module/devicetree.yaml
rename to Drivers/m5pm1-module/module.yaml
diff --git a/Drivers/m5stack-module/devicetree.yaml b/Drivers/m5stack-module/module.yaml
similarity index 100%
rename from Drivers/m5stack-module/devicetree.yaml
rename to Drivers/m5stack-module/module.yaml
diff --git a/Drivers/mpu6886-module/devicetree.yaml b/Drivers/mpu6886-module/module.yaml
similarity index 100%
rename from Drivers/mpu6886-module/devicetree.yaml
rename to Drivers/mpu6886-module/module.yaml
diff --git a/Drivers/pdm-mic-module/devicetree.yaml b/Drivers/pdm-mic-module/module.yaml
similarity index 100%
rename from Drivers/pdm-mic-module/devicetree.yaml
rename to Drivers/pdm-mic-module/module.yaml
diff --git a/Drivers/pi4ioe5v6408-module/devicetree.yaml b/Drivers/pi4ioe5v6408-module/module.yaml
similarity index 100%
rename from Drivers/pi4ioe5v6408-module/devicetree.yaml
rename to Drivers/pi4ioe5v6408-module/module.yaml
diff --git a/Drivers/py32ioexpander-module/devicetree.yaml b/Drivers/py32ioexpander-module/module.yaml
similarity index 100%
rename from Drivers/py32ioexpander-module/devicetree.yaml
rename to Drivers/py32ioexpander-module/module.yaml
diff --git a/Drivers/qmi8658-module/devicetree.yaml b/Drivers/qmi8658-module/module.yaml
similarity index 100%
rename from Drivers/qmi8658-module/devicetree.yaml
rename to Drivers/qmi8658-module/module.yaml
diff --git a/Drivers/rgb-display-module/devicetree.yaml b/Drivers/rgb-display-module/module.yaml
similarity index 100%
rename from Drivers/rgb-display-module/devicetree.yaml
rename to Drivers/rgb-display-module/module.yaml
diff --git a/Drivers/rx8130ce-module/devicetree.yaml b/Drivers/rx8130ce-module/module.yaml
similarity index 100%
rename from Drivers/rx8130ce-module/devicetree.yaml
rename to Drivers/rx8130ce-module/module.yaml
diff --git a/Drivers/sc2356-module/devicetree.yaml b/Drivers/sc2356-module/module.yaml
similarity index 100%
rename from Drivers/sc2356-module/devicetree.yaml
rename to Drivers/sc2356-module/module.yaml
diff --git a/Drivers/ssd1306-module/devicetree.yaml b/Drivers/ssd1306-module/module.yaml
similarity index 100%
rename from Drivers/ssd1306-module/devicetree.yaml
rename to Drivers/ssd1306-module/module.yaml
diff --git a/Drivers/st7121-module/devicetree.yaml b/Drivers/st7121-module/module.yaml
similarity index 100%
rename from Drivers/st7121-module/devicetree.yaml
rename to Drivers/st7121-module/module.yaml
diff --git a/Drivers/st7123-module/devicetree.yaml b/Drivers/st7123-module/module.yaml
similarity index 100%
rename from Drivers/st7123-module/devicetree.yaml
rename to Drivers/st7123-module/module.yaml
diff --git a/Drivers/st7701-module/devicetree.yaml b/Drivers/st7701-module/module.yaml
similarity index 100%
rename from Drivers/st7701-module/devicetree.yaml
rename to Drivers/st7701-module/module.yaml
diff --git a/Drivers/st7735-module/devicetree.yaml b/Drivers/st7735-module/module.yaml
similarity index 100%
rename from Drivers/st7735-module/devicetree.yaml
rename to Drivers/st7735-module/module.yaml
diff --git a/Drivers/st7789-i8080-module/devicetree.yaml b/Drivers/st7789-i8080-module/module.yaml
similarity index 100%
rename from Drivers/st7789-i8080-module/devicetree.yaml
rename to Drivers/st7789-i8080-module/module.yaml
diff --git a/Drivers/st7789-module/devicetree.yaml b/Drivers/st7789-module/module.yaml
similarity index 100%
rename from Drivers/st7789-module/devicetree.yaml
rename to Drivers/st7789-module/module.yaml
diff --git a/Drivers/st7789-soft-i8080-module/devicetree.yaml b/Drivers/st7789-soft-i8080-module/module.yaml
similarity index 100%
rename from Drivers/st7789-soft-i8080-module/devicetree.yaml
rename to Drivers/st7789-soft-i8080-module/module.yaml
diff --git a/Drivers/st7796-i8080-module/devicetree.yaml b/Drivers/st7796-i8080-module/module.yaml
similarity index 100%
rename from Drivers/st7796-i8080-module/devicetree.yaml
rename to Drivers/st7796-i8080-module/module.yaml
diff --git a/Drivers/st7796-module/devicetree.yaml b/Drivers/st7796-module/module.yaml
similarity index 100%
rename from Drivers/st7796-module/devicetree.yaml
rename to Drivers/st7796-module/module.yaml
diff --git a/Drivers/sx126x-module/devicetree.yaml b/Drivers/sx126x-module/module.yaml
similarity index 100%
rename from Drivers/sx126x-module/devicetree.yaml
rename to Drivers/sx126x-module/module.yaml
diff --git a/Drivers/sy6970-module/devicetree.yaml b/Drivers/sy6970-module/module.yaml
similarity index 100%
rename from Drivers/sy6970-module/devicetree.yaml
rename to Drivers/sy6970-module/module.yaml
diff --git a/Drivers/tca8418-module/devicetree.yaml b/Drivers/tca8418-module/module.yaml
similarity index 100%
rename from Drivers/tca8418-module/devicetree.yaml
rename to Drivers/tca8418-module/module.yaml
diff --git a/Drivers/tca9534-module/devicetree.yaml b/Drivers/tca9534-module/module.yaml
similarity index 100%
rename from Drivers/tca9534-module/devicetree.yaml
rename to Drivers/tca9534-module/module.yaml
diff --git a/Drivers/tca95xx-16bit-module/devicetree.yaml b/Drivers/tca95xx-16bit-module/module.yaml
similarity index 100%
rename from Drivers/tca95xx-16bit-module/devicetree.yaml
rename to Drivers/tca95xx-16bit-module/module.yaml
diff --git a/Drivers/xl9555-module/devicetree.yaml b/Drivers/xl9555-module/module.yaml
similarity index 100%
rename from Drivers/xl9555-module/devicetree.yaml
rename to Drivers/xl9555-module/module.yaml
diff --git a/Drivers/xpt2046-module/devicetree.yaml b/Drivers/xpt2046-module/module.yaml
similarity index 100%
rename from Drivers/xpt2046-module/devicetree.yaml
rename to Drivers/xpt2046-module/module.yaml
diff --git a/Drivers/xpt2046-softspi-module/devicetree.yaml b/Drivers/xpt2046-softspi-module/module.yaml
similarity index 100%
rename from Drivers/xpt2046-softspi-module/devicetree.yaml
rename to Drivers/xpt2046-softspi-module/module.yaml
diff --git a/Modules/app-esp32-module/devicetree.yaml b/Modules/app-esp32-module/module.yaml
similarity index 100%
rename from Modules/app-esp32-module/devicetree.yaml
rename to Modules/app-esp32-module/module.yaml
diff --git a/Modules/app-module/devicetree.yaml b/Modules/app-module/module.yaml
similarity index 100%
rename from Modules/app-module/devicetree.yaml
rename to Modules/app-module/module.yaml
diff --git a/Modules/coreutils-module/devicetree.yaml b/Modules/coreutils-module/module.yaml
similarity index 100%
rename from Modules/coreutils-module/devicetree.yaml
rename to Modules/coreutils-module/module.yaml
diff --git a/Modules/gps-module/devicetree.yaml b/Modules/gps-module/module.yaml
similarity index 100%
rename from Modules/gps-module/devicetree.yaml
rename to Modules/gps-module/module.yaml
diff --git a/Modules/lvgl-window-manager-module/devicetree.yaml b/Modules/lvgl-window-manager-module/module.yaml
similarity index 100%
rename from Modules/lvgl-window-manager-module/devicetree.yaml
rename to Modules/lvgl-window-manager-module/module.yaml
diff --git a/Modules/service-module/devicetree.yaml b/Modules/service-module/module.yaml
similarity index 100%
rename from Modules/service-module/devicetree.yaml
rename to Modules/service-module/module.yaml
diff --git a/Platforms/platform-esp32/devicetree.yaml b/Platforms/platform-esp32/module.yaml
similarity index 100%
rename from Platforms/platform-esp32/devicetree.yaml
rename to Platforms/platform-esp32/module.yaml
diff --git a/Platforms/platform-posix/devicetree.yaml b/Platforms/platform-posix/module.yaml
similarity index 100%
rename from Platforms/platform-posix/devicetree.yaml
rename to Platforms/platform-posix/module.yaml
diff --git a/Tactility/CMakeLists.txt b/Tactility/CMakeLists.txt
index f5db84756..b48d28aa5 100644
--- a/Tactility/CMakeLists.txt
+++ b/Tactility/CMakeLists.txt
@@ -114,10 +114,10 @@ execute_process(
 #
 
 # REQUIRES_LIST below is computed once, at configure time. Without this, editing
-# devicetree.yaml (e.g. adding a driver dependency) doesn't trigger a cmake reconfigure,
+# module.yaml (e.g. adding a driver dependency) doesn't trigger a cmake reconfigure,
 # so the new component's include dirs never reach the compiler until a fullclean.
 set_property(DIRECTORY APPEND PROPERTY CMAKE_CONFIGURE_DEPENDS
-    "${DEVICETREE_LOCATION}/devicetree.yaml"
+    "${DEVICETREE_LOCATION}/module.yaml"
     "${DEVICETREE_LOCATION}/device.properties" # due to the "hardware.bluetooth = true" search in this file from this CMakeLists.txt
 )
 
diff --git a/TactilityKernel/devicetree.yaml b/TactilityKernel/module.yaml
similarity index 100%
rename from TactilityKernel/devicetree.yaml
rename to TactilityKernel/module.yaml