diff --git a/Boards/WaveshareS3Touch43/Source/WaveshareS3Touch43.cpp b/Boards/WaveshareS3Touch43/Source/WaveshareS3Touch43.cpp
index 568ba8e4..a0ba71ef 100644
--- a/Boards/WaveshareS3Touch43/Source/WaveshareS3Touch43.cpp
+++ b/Boards/WaveshareS3Touch43/Source/WaveshareS3Touch43.cpp
@@ -1,13 +1,19 @@
-#include "hal/WaveshareDisplay.h"
-#include "hal/WaveshareSdCard.h"
+#include "devices/Display.h"
+#include "devices/SdCard.h"
 
 #include <Tactility/hal/Configuration.h>
 
 using namespace tt::hal;
 
+static DeviceVector createDevices() {
+    return {
+        createDisplay(),
+        createSdCard()
+    };
+}
+
 extern const Configuration waveshare_s3_touch_43 = {
-    .createDisplay = createDisplay,
-    .sdcard = createSdCard(),
+    .createDevices = createDevices,
     .i2c = {
         // There is only 1 (internal for touch, and also serves as "I2C-OUT" port)
         // Note: You could repurpose 1 or more UART interfaces as I2C interfaces
diff --git a/Boards/WaveshareS3Touch43/Source/hal/WaveshareDisplay.cpp b/Boards/WaveshareS3Touch43/Source/devices/Display.cpp
similarity index 98%
rename from Boards/WaveshareS3Touch43/Source/hal/WaveshareDisplay.cpp
rename to Boards/WaveshareS3Touch43/Source/devices/Display.cpp
index 3f86473f..85ff2ede 100644
--- a/Boards/WaveshareS3Touch43/Source/hal/WaveshareDisplay.cpp
+++ b/Boards/WaveshareS3Touch43/Source/devices/Display.cpp
@@ -1,4 +1,4 @@
-#include "WaveshareDisplay.h"
+#include "Display.h"
 
 #include <Gt911Touch.h>
 #include <RgbDisplay.h>
diff --git a/Boards/WaveshareS3Touch43/Source/hal/WaveshareDisplay.h b/Boards/WaveshareS3Touch43/Source/devices/Display.h
similarity index 100%
rename from Boards/WaveshareS3Touch43/Source/hal/WaveshareDisplay.h
rename to Boards/WaveshareS3Touch43/Source/devices/Display.h
diff --git a/Boards/WaveshareS3Touch43/Source/hal/WaveshareSdCard.cpp b/Boards/WaveshareS3Touch43/Source/devices/SdCard.cpp
similarity index 93%
rename from Boards/WaveshareS3Touch43/Source/hal/WaveshareSdCard.cpp
rename to Boards/WaveshareS3Touch43/Source/devices/SdCard.cpp
index 885ba208..a27db36c 100644
--- a/Boards/WaveshareS3Touch43/Source/hal/WaveshareSdCard.cpp
+++ b/Boards/WaveshareS3Touch43/Source/devices/SdCard.cpp
@@ -1,4 +1,4 @@
-#include "WaveshareSdCard.h"
+#include "SdCard.h"
 
 #include <Tactility/hal/sdcard/SpiSdCardDevice.h>
 
diff --git a/Boards/WaveshareS3Touch43/Source/hal/WaveshareSdCard.h b/Boards/WaveshareS3Touch43/Source/devices/SdCard.h
similarity index 100%
rename from Boards/WaveshareS3Touch43/Source/hal/WaveshareSdCard.h
rename to Boards/WaveshareS3Touch43/Source/devices/SdCard.h