diff --git a/Buildscripts/CDN/generate-files.py b/Buildscripts/CDN/generate-files.py
index 0dd1f86e..0dd92ddb 100644
--- a/Buildscripts/CDN/generate-files.py
+++ b/Buildscripts/CDN/generate-files.py
@@ -7,7 +7,7 @@ import shutil
 from configparser import ConfigParser, RawConfigParser
 
 VERBOSE = False
-DEVICES_FOLDER = "Boards"
+DEVICES_FOLDER = "Devices"
 
 @dataclass
 class IndexEntry:
@@ -219,4 +219,4 @@ if __name__ == "__main__":
     if "--verbose" in sys.argv:
         VERBOSE = True
         sys.argv.remove("--verbose")
-    main(in_path=sys.argv[1], out_path=sys.argv[2], version=sys.argv[3])
\ No newline at end of file
+    main(in_path=sys.argv[1], out_path=sys.argv[2], version=sys.argv[3])
diff --git a/Buildscripts/board.cmake b/Buildscripts/board.cmake
deleted file mode 100644
index dc435436..00000000
--- a/Buildscripts/board.cmake
+++ /dev/null
@@ -1,30 +0,0 @@
-if (NOT WIN32)
-    string(ASCII 27 Esc)
-    set(ColorReset "${Esc}[m")
-    set(Cyan "${Esc}[36m")
-else ()
-    set(ColorReset "")
-    set(Cyan "")
-endif ()
-
-function(INIT_TACTILITY_GLOBALS SDKCONFIG_FILE)
-    get_filename_component(SDKCONFIG_FILE_ABS ${SDKCONFIG_FILE} ABSOLUTE)
-    # Find the board identifier in the sdkconfig file
-    if (NOT EXISTS ${SDKCONFIG_FILE_ABS})
-        message(FATAL_ERROR "sdkconfig file not found:\nMake sure you select a device by running \"python device.py [device-id]\"\n")
-    endif ()
-    file(READ ${SDKCONFIG_FILE_ABS} sdkconfig_text)
-    string(REGEX MATCH "(CONFIG_TT_BOARD_ID\=\"[a-z0-9_\-]*\")" sdkconfig_board_id "${sdkconfig_text}")
-    if (sdkconfig_board_id STREQUAL "")
-        message(FATAL_ERROR "CONFIG_TT_BOARD_ID not found in sdkconfig:\nMake sure you select a device with 'python device.py device-id'")
-    endif ()
-    string(LENGTH ${sdkconfig_board_id} sdkconfig_board_id_length)
-    set(id_length 0)
-    math(EXPR id_length "${sdkconfig_board_id_length} - 21")
-    string(SUBSTRING ${sdkconfig_board_id} 20 ${id_length} board_id)
-    message("Board name: ${Cyan}${board_id}${ColorReset}")
-    set(TACTILITY_BOARD_PROJECT ${board_id})
-    message("Board path: ${Cyan}Boards/${TACTILITY_BOARD_PROJECT}${ColorReset}\n")
-    set_property(GLOBAL PROPERTY TACTILITY_BOARD_PROJECT ${TACTILITY_BOARD_PROJECT})
-    set_property(GLOBAL PROPERTY TACTILITY_BOARD_ID ${board_id})
-endfunction()
diff --git a/Buildscripts/device.cmake b/Buildscripts/device.cmake
new file mode 100644
index 00000000..5bd5189e
--- /dev/null
+++ b/Buildscripts/device.cmake
@@ -0,0 +1,32 @@
+if (NOT WIN32)
+    string(ASCII 27 Esc)
+    set(ColorReset "${Esc}[m")
+    set(Cyan "${Esc}[36m")
+else ()
+    set(ColorReset "")
+    set(Cyan "")
+endif ()
+
+function(INIT_TACTILITY_GLOBALS SDKCONFIG_FILE)
+    get_filename_component(SDKCONFIG_FILE_ABS ${SDKCONFIG_FILE} ABSOLUTE)
+    # Find the device identifier in the sdkconfig file
+    if (NOT EXISTS ${SDKCONFIG_FILE_ABS})
+        message(FATAL_ERROR "sdkconfig file not found:\nMake sure you select a device by running \"python device.py [device-id]\"\n")
+    endif ()
+    file(READ ${SDKCONFIG_FILE_ABS} sdkconfig_text)
+    string(REGEX MATCH "(CONFIG_TT_DEVICE_ID\=\"[a-z0-9_\-]*\")" sdkconfig_device_id "${sdkconfig_text}")
+    if (sdkconfig_device_id STREQUAL "CONFIG_TT_DEVICE_ID=\"\"" OR sdkconfig_device_id STREQUAL "")
+        message(FATAL_ERROR "CONFIG_TT_DEVICE_ID not found in sdkconfig:\nMake sure you select a device with 'python device.py device-id'")
+    endif ()
+    string(LENGTH ${sdkconfig_device_id} sdkconfig_device_id_length)
+    set(id_length 0)
+    # Total length minus chars of 'CONFIG_TT_DEVICE_ID=""'
+    math(EXPR id_length "${sdkconfig_device_id_length} - 22")
+    # Skip 'CONFIG_TT_DEVICE_ID="' then read the relevant (remaining) chars
+    string(SUBSTRING ${sdkconfig_device_id} 21 ${id_length} device_id)
+    message("Device identifier: ${Cyan}${device_id}${ColorReset}")
+    set(TACTILITY_DEVICE_PROJECT ${device_id})
+    message("Device project path: ${Cyan}Devices/${TACTILITY_DEVICE_PROJECT}${ColorReset}\n")
+    set_property(GLOBAL PROPERTY TACTILITY_DEVICE_PROJECT ${TACTILITY_DEVICE_PROJECT})
+    set_property(GLOBAL PROPERTY TACTILITY_DEVICE_ID ${device_id})
+endfunction()
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5b2e4d8e..7355c21a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -24,15 +24,15 @@ if (DEFINED ENV{ESP_IDF_VERSION})
     message("Using ESP-IDF ${Cyan}v$ENV{ESP_IDF_VERSION}${ColorReset}")
     include($ENV{IDF_PATH}/tools/cmake/project.cmake)
 
-    include("Buildscripts/board.cmake")
+    include("Buildscripts/device.cmake")
 
     init_tactility_globals("sdkconfig")
-    get_property(TACTILITY_BOARD_PROJECT GLOBAL PROPERTY TACTILITY_BOARD_PROJECT)
+    get_property(TACTILITY_DEVICE_PROJECT GLOBAL PROPERTY TACTILITY_DEVICE_PROJECT)
 
     set(COMPONENTS Firmware)
     set(EXTRA_COMPONENT_DIRS
         "Firmware"
-        "Boards/${TACTILITY_BOARD_PROJECT}"
+        "Devices/${TACTILITY_DEVICE_PROJECT}"
         "Drivers"
         "Tactility"
         "TactilityC"
@@ -60,8 +60,8 @@ if (DEFINED ENV{ESP_IDF_VERSION})
 
 else ()
     message("Building for sim target")
-    add_compile_definitions(CONFIG_TT_BOARD_ID="simulator")
-    add_compile_definitions(CONFIG_TT_BOARD_NAME="Simulator")
+    add_compile_definitions(CONFIG_TT_DEVICE_ID="simulator")
+    add_compile_definitions(CONFIG_TT_DEVICE_NAME="Simulator")
 endif ()
 
 project(Tactility)
@@ -70,12 +70,12 @@ project(Tactility)
 if (NOT DEFINED ENV{ESP_IDF_VERSION})
     add_subdirectory(Tactility)
     add_subdirectory(TactilityCore)
-    add_subdirectory(Boards/simulator)
+    add_subdirectory(Devices/simulator)
 endif ()
 
 if (NOT DEFINED ENV{ESP_IDF_VERSION})
     # FreeRTOS
-    set(FREERTOS_CONFIG_FILE_DIRECTORY ${PROJECT_SOURCE_DIR}/Boards/simulator/Source CACHE STRING "")
+    set(FREERTOS_CONFIG_FILE_DIRECTORY ${PROJECT_SOURCE_DIR}/Devices/simulator/Source CACHE STRING "")
     set(FREERTOS_PORT GCC_POSIX CACHE STRING "")
 
     add_subdirectory(Libraries/cJSON)
@@ -86,7 +86,7 @@ if (NOT DEFINED ENV{ESP_IDF_VERSION})
     add_subdirectory(Libraries/minmea)
     target_compile_definitions(freertos_kernel PUBLIC "projCOVERAGE_TEST=0")
     target_include_directories(freertos_kernel
-        PUBLIC Boards/simulator/Source # for FreeRTOSConfig.h
+        PUBLIC Devices/Simulator/Source # for FreeRTOSConfig.h
     )
 
     # EmbedTLS
diff --git a/Boards/btt-panda-touch/CMakeLists.txt b/Devices/btt-panda-touch/CMakeLists.txt
similarity index 100%
rename from Boards/btt-panda-touch/CMakeLists.txt
rename to Devices/btt-panda-touch/CMakeLists.txt
diff --git a/Boards/btt-panda-touch/Source/Configuration.cpp b/Devices/btt-panda-touch/Source/Configuration.cpp
similarity index 100%
rename from Boards/btt-panda-touch/Source/Configuration.cpp
rename to Devices/btt-panda-touch/Source/Configuration.cpp
diff --git a/Boards/btt-panda-touch/Source/devices/Display.cpp b/Devices/btt-panda-touch/Source/devices/Display.cpp
similarity index 100%
rename from Boards/btt-panda-touch/Source/devices/Display.cpp
rename to Devices/btt-panda-touch/Source/devices/Display.cpp
diff --git a/Boards/btt-panda-touch/Source/devices/Display.h b/Devices/btt-panda-touch/Source/devices/Display.h
similarity index 100%
rename from Boards/btt-panda-touch/Source/devices/Display.h
rename to Devices/btt-panda-touch/Source/devices/Display.h
diff --git a/Boards/btt-panda-touch/device.properties b/Devices/btt-panda-touch/device.properties
similarity index 100%
rename from Boards/btt-panda-touch/device.properties
rename to Devices/btt-panda-touch/device.properties
diff --git a/Boards/cyd-2432s024c/CMakeLists.txt b/Devices/cyd-2432s024c/CMakeLists.txt
similarity index 100%
rename from Boards/cyd-2432s024c/CMakeLists.txt
rename to Devices/cyd-2432s024c/CMakeLists.txt
diff --git a/Boards/cyd-2432s024c/Source/Configuration.cpp b/Devices/cyd-2432s024c/Source/Configuration.cpp
similarity index 100%
rename from Boards/cyd-2432s024c/Source/Configuration.cpp
rename to Devices/cyd-2432s024c/Source/Configuration.cpp
diff --git a/Boards/cyd-2432s024c/Source/devices/Display.cpp b/Devices/cyd-2432s024c/Source/devices/Display.cpp
similarity index 100%
rename from Boards/cyd-2432s024c/Source/devices/Display.cpp
rename to Devices/cyd-2432s024c/Source/devices/Display.cpp
diff --git a/Boards/cyd-2432s024c/Source/devices/Display.h b/Devices/cyd-2432s024c/Source/devices/Display.h
similarity index 100%
rename from Boards/cyd-2432s024c/Source/devices/Display.h
rename to Devices/cyd-2432s024c/Source/devices/Display.h
diff --git a/Boards/cyd-2432s024c/Source/devices/SdCard.cpp b/Devices/cyd-2432s024c/Source/devices/SdCard.cpp
similarity index 100%
rename from Boards/cyd-2432s024c/Source/devices/SdCard.cpp
rename to Devices/cyd-2432s024c/Source/devices/SdCard.cpp
diff --git a/Boards/cyd-2432s024c/Source/devices/SdCard.h b/Devices/cyd-2432s024c/Source/devices/SdCard.h
similarity index 100%
rename from Boards/cyd-2432s024c/Source/devices/SdCard.h
rename to Devices/cyd-2432s024c/Source/devices/SdCard.h
diff --git a/Boards/cyd-2432s024c/device.properties b/Devices/cyd-2432s024c/device.properties
similarity index 100%
rename from Boards/cyd-2432s024c/device.properties
rename to Devices/cyd-2432s024c/device.properties
diff --git a/Boards/cyd-2432s028r/CMakeLists.txt b/Devices/cyd-2432s028r/CMakeLists.txt
similarity index 100%
rename from Boards/cyd-2432s028r/CMakeLists.txt
rename to Devices/cyd-2432s028r/CMakeLists.txt
diff --git a/Boards/cyd-2432s028r/Source/Configuration.cpp b/Devices/cyd-2432s028r/Source/Configuration.cpp
similarity index 100%
rename from Boards/cyd-2432s028r/Source/Configuration.cpp
rename to Devices/cyd-2432s028r/Source/Configuration.cpp
diff --git a/Boards/cyd-2432s028r/Source/devices/Display.cpp b/Devices/cyd-2432s028r/Source/devices/Display.cpp
similarity index 100%
rename from Boards/cyd-2432s028r/Source/devices/Display.cpp
rename to Devices/cyd-2432s028r/Source/devices/Display.cpp
diff --git a/Boards/cyd-2432s028r/Source/devices/Display.h b/Devices/cyd-2432s028r/Source/devices/Display.h
similarity index 100%
rename from Boards/cyd-2432s028r/Source/devices/Display.h
rename to Devices/cyd-2432s028r/Source/devices/Display.h
diff --git a/Boards/cyd-2432s028r/Source/devices/SdCard.cpp b/Devices/cyd-2432s028r/Source/devices/SdCard.cpp
similarity index 100%
rename from Boards/cyd-2432s028r/Source/devices/SdCard.cpp
rename to Devices/cyd-2432s028r/Source/devices/SdCard.cpp
diff --git a/Boards/cyd-2432s028r/Source/devices/SdCard.h b/Devices/cyd-2432s028r/Source/devices/SdCard.h
similarity index 100%
rename from Boards/cyd-2432s028r/Source/devices/SdCard.h
rename to Devices/cyd-2432s028r/Source/devices/SdCard.h
diff --git a/Boards/cyd-2432s028r/device.properties b/Devices/cyd-2432s028r/device.properties
similarity index 100%
rename from Boards/cyd-2432s028r/device.properties
rename to Devices/cyd-2432s028r/device.properties
diff --git a/Boards/cyd-2432s028rv3/CMakeLists.txt b/Devices/cyd-2432s028rv3/CMakeLists.txt
similarity index 100%
rename from Boards/cyd-2432s028rv3/CMakeLists.txt
rename to Devices/cyd-2432s028rv3/CMakeLists.txt
diff --git a/Boards/cyd-2432s028rv3/Source/Configuration.cpp b/Devices/cyd-2432s028rv3/Source/Configuration.cpp
similarity index 100%
rename from Boards/cyd-2432s028rv3/Source/Configuration.cpp
rename to Devices/cyd-2432s028rv3/Source/Configuration.cpp
diff --git a/Boards/cyd-2432s028rv3/Source/devices/Display.cpp b/Devices/cyd-2432s028rv3/Source/devices/Display.cpp
similarity index 100%
rename from Boards/cyd-2432s028rv3/Source/devices/Display.cpp
rename to Devices/cyd-2432s028rv3/Source/devices/Display.cpp
diff --git a/Boards/cyd-2432s028rv3/Source/devices/Display.h b/Devices/cyd-2432s028rv3/Source/devices/Display.h
similarity index 100%
rename from Boards/cyd-2432s028rv3/Source/devices/Display.h
rename to Devices/cyd-2432s028rv3/Source/devices/Display.h
diff --git a/Boards/cyd-2432s028rv3/Source/devices/SdCard.cpp b/Devices/cyd-2432s028rv3/Source/devices/SdCard.cpp
similarity index 100%
rename from Boards/cyd-2432s028rv3/Source/devices/SdCard.cpp
rename to Devices/cyd-2432s028rv3/Source/devices/SdCard.cpp
diff --git a/Boards/cyd-2432s028rv3/Source/devices/SdCard.h b/Devices/cyd-2432s028rv3/Source/devices/SdCard.h
similarity index 100%
rename from Boards/cyd-2432s028rv3/Source/devices/SdCard.h
rename to Devices/cyd-2432s028rv3/Source/devices/SdCard.h
diff --git a/Boards/cyd-2432s028rv3/device.properties b/Devices/cyd-2432s028rv3/device.properties
similarity index 100%
rename from Boards/cyd-2432s028rv3/device.properties
rename to Devices/cyd-2432s028rv3/device.properties
diff --git a/Boards/cyd-2432s032c/CMakeLists.txt b/Devices/cyd-2432s032c/CMakeLists.txt
similarity index 100%
rename from Boards/cyd-2432s032c/CMakeLists.txt
rename to Devices/cyd-2432s032c/CMakeLists.txt
diff --git a/Boards/cyd-2432s032c/Source/Configuration.cpp b/Devices/cyd-2432s032c/Source/Configuration.cpp
similarity index 100%
rename from Boards/cyd-2432s032c/Source/Configuration.cpp
rename to Devices/cyd-2432s032c/Source/Configuration.cpp
diff --git a/Boards/cyd-2432s032c/Source/devices/Display.cpp b/Devices/cyd-2432s032c/Source/devices/Display.cpp
similarity index 100%
rename from Boards/cyd-2432s032c/Source/devices/Display.cpp
rename to Devices/cyd-2432s032c/Source/devices/Display.cpp
diff --git a/Boards/cyd-2432s032c/Source/devices/Display.h b/Devices/cyd-2432s032c/Source/devices/Display.h
similarity index 100%
rename from Boards/cyd-2432s032c/Source/devices/Display.h
rename to Devices/cyd-2432s032c/Source/devices/Display.h
diff --git a/Boards/cyd-2432s032c/Source/devices/SdCard.cpp b/Devices/cyd-2432s032c/Source/devices/SdCard.cpp
similarity index 100%
rename from Boards/cyd-2432s032c/Source/devices/SdCard.cpp
rename to Devices/cyd-2432s032c/Source/devices/SdCard.cpp
diff --git a/Boards/cyd-2432s032c/Source/devices/SdCard.h b/Devices/cyd-2432s032c/Source/devices/SdCard.h
similarity index 100%
rename from Boards/cyd-2432s032c/Source/devices/SdCard.h
rename to Devices/cyd-2432s032c/Source/devices/SdCard.h
diff --git a/Boards/cyd-2432s032c/device.properties b/Devices/cyd-2432s032c/device.properties
similarity index 100%
rename from Boards/cyd-2432s032c/device.properties
rename to Devices/cyd-2432s032c/device.properties
diff --git a/Boards/cyd-4848s040c/CMakeLists.txt b/Devices/cyd-4848s040c/CMakeLists.txt
similarity index 100%
rename from Boards/cyd-4848s040c/CMakeLists.txt
rename to Devices/cyd-4848s040c/CMakeLists.txt
diff --git a/Boards/cyd-4848s040c/Source/Configuration.cpp b/Devices/cyd-4848s040c/Source/Configuration.cpp
similarity index 100%
rename from Boards/cyd-4848s040c/Source/Configuration.cpp
rename to Devices/cyd-4848s040c/Source/Configuration.cpp
diff --git a/Boards/cyd-4848s040c/Source/devices/SdCard.cpp b/Devices/cyd-4848s040c/Source/devices/SdCard.cpp
similarity index 100%
rename from Boards/cyd-4848s040c/Source/devices/SdCard.cpp
rename to Devices/cyd-4848s040c/Source/devices/SdCard.cpp
diff --git a/Boards/cyd-4848s040c/Source/devices/SdCard.h b/Devices/cyd-4848s040c/Source/devices/SdCard.h
similarity index 100%
rename from Boards/cyd-4848s040c/Source/devices/SdCard.h
rename to Devices/cyd-4848s040c/Source/devices/SdCard.h
diff --git a/Boards/cyd-4848s040c/Source/devices/St7701Display.cpp b/Devices/cyd-4848s040c/Source/devices/St7701Display.cpp
similarity index 100%
rename from Boards/cyd-4848s040c/Source/devices/St7701Display.cpp
rename to Devices/cyd-4848s040c/Source/devices/St7701Display.cpp
diff --git a/Boards/cyd-4848s040c/Source/devices/St7701Display.h b/Devices/cyd-4848s040c/Source/devices/St7701Display.h
similarity index 100%
rename from Boards/cyd-4848s040c/Source/devices/St7701Display.h
rename to Devices/cyd-4848s040c/Source/devices/St7701Display.h
diff --git a/Boards/cyd-4848s040c/device.properties b/Devices/cyd-4848s040c/device.properties
similarity index 100%
rename from Boards/cyd-4848s040c/device.properties
rename to Devices/cyd-4848s040c/device.properties
diff --git a/Boards/cyd-8048s043c/CMakeLists.txt b/Devices/cyd-8048s043c/CMakeLists.txt
similarity index 100%
rename from Boards/cyd-8048s043c/CMakeLists.txt
rename to Devices/cyd-8048s043c/CMakeLists.txt
diff --git a/Boards/cyd-8048s043c/Source/Configuration.cpp b/Devices/cyd-8048s043c/Source/Configuration.cpp
similarity index 100%
rename from Boards/cyd-8048s043c/Source/Configuration.cpp
rename to Devices/cyd-8048s043c/Source/Configuration.cpp
diff --git a/Boards/cyd-8048s043c/Source/devices/Display.cpp b/Devices/cyd-8048s043c/Source/devices/Display.cpp
similarity index 100%
rename from Boards/cyd-8048s043c/Source/devices/Display.cpp
rename to Devices/cyd-8048s043c/Source/devices/Display.cpp
diff --git a/Boards/cyd-8048s043c/Source/devices/Display.h b/Devices/cyd-8048s043c/Source/devices/Display.h
similarity index 100%
rename from Boards/cyd-8048s043c/Source/devices/Display.h
rename to Devices/cyd-8048s043c/Source/devices/Display.h
diff --git a/Boards/cyd-8048s043c/Source/devices/SdCard.cpp b/Devices/cyd-8048s043c/Source/devices/SdCard.cpp
similarity index 100%
rename from Boards/cyd-8048s043c/Source/devices/SdCard.cpp
rename to Devices/cyd-8048s043c/Source/devices/SdCard.cpp
diff --git a/Boards/cyd-8048s043c/Source/devices/SdCard.h b/Devices/cyd-8048s043c/Source/devices/SdCard.h
similarity index 100%
rename from Boards/cyd-8048s043c/Source/devices/SdCard.h
rename to Devices/cyd-8048s043c/Source/devices/SdCard.h
diff --git a/Boards/cyd-8048s043c/device.properties b/Devices/cyd-8048s043c/device.properties
similarity index 100%
rename from Boards/cyd-8048s043c/device.properties
rename to Devices/cyd-8048s043c/device.properties
diff --git a/Boards/cyd-e32r28t/CMakeLists.txt b/Devices/cyd-e32r28t/CMakeLists.txt
similarity index 100%
rename from Boards/cyd-e32r28t/CMakeLists.txt
rename to Devices/cyd-e32r28t/CMakeLists.txt
diff --git a/Boards/cyd-e32r28t/Source/Configuration.cpp b/Devices/cyd-e32r28t/Source/Configuration.cpp
similarity index 100%
rename from Boards/cyd-e32r28t/Source/Configuration.cpp
rename to Devices/cyd-e32r28t/Source/Configuration.cpp
diff --git a/Boards/cyd-e32r28t/Source/devices/Display.cpp b/Devices/cyd-e32r28t/Source/devices/Display.cpp
similarity index 100%
rename from Boards/cyd-e32r28t/Source/devices/Display.cpp
rename to Devices/cyd-e32r28t/Source/devices/Display.cpp
diff --git a/Boards/cyd-e32r28t/Source/devices/Display.h b/Devices/cyd-e32r28t/Source/devices/Display.h
similarity index 100%
rename from Boards/cyd-e32r28t/Source/devices/Display.h
rename to Devices/cyd-e32r28t/Source/devices/Display.h
diff --git a/Boards/cyd-e32r28t/Source/devices/SdCard.cpp b/Devices/cyd-e32r28t/Source/devices/SdCard.cpp
similarity index 100%
rename from Boards/cyd-e32r28t/Source/devices/SdCard.cpp
rename to Devices/cyd-e32r28t/Source/devices/SdCard.cpp
diff --git a/Boards/cyd-e32r28t/Source/devices/SdCard.h b/Devices/cyd-e32r28t/Source/devices/SdCard.h
similarity index 100%
rename from Boards/cyd-e32r28t/Source/devices/SdCard.h
rename to Devices/cyd-e32r28t/Source/devices/SdCard.h
diff --git a/Boards/cyd-e32r28t/device.properties b/Devices/cyd-e32r28t/device.properties
similarity index 100%
rename from Boards/cyd-e32r28t/device.properties
rename to Devices/cyd-e32r28t/device.properties
diff --git a/Boards/cyd-e32r32p/CMakeLists.txt b/Devices/cyd-e32r32p/CMakeLists.txt
similarity index 100%
rename from Boards/cyd-e32r32p/CMakeLists.txt
rename to Devices/cyd-e32r32p/CMakeLists.txt
diff --git a/Boards/cyd-e32r32p/Source/Configuration.cpp b/Devices/cyd-e32r32p/Source/Configuration.cpp
similarity index 100%
rename from Boards/cyd-e32r32p/Source/Configuration.cpp
rename to Devices/cyd-e32r32p/Source/Configuration.cpp
diff --git a/Boards/cyd-e32r32p/Source/devices/Display.cpp b/Devices/cyd-e32r32p/Source/devices/Display.cpp
similarity index 100%
rename from Boards/cyd-e32r32p/Source/devices/Display.cpp
rename to Devices/cyd-e32r32p/Source/devices/Display.cpp
diff --git a/Boards/cyd-e32r32p/Source/devices/Display.h b/Devices/cyd-e32r32p/Source/devices/Display.h
similarity index 100%
rename from Boards/cyd-e32r32p/Source/devices/Display.h
rename to Devices/cyd-e32r32p/Source/devices/Display.h
diff --git a/Boards/cyd-e32r32p/Source/devices/Power.cpp b/Devices/cyd-e32r32p/Source/devices/Power.cpp
similarity index 100%
rename from Boards/cyd-e32r32p/Source/devices/Power.cpp
rename to Devices/cyd-e32r32p/Source/devices/Power.cpp
diff --git a/Boards/cyd-e32r32p/Source/devices/Power.h b/Devices/cyd-e32r32p/Source/devices/Power.h
similarity index 100%
rename from Boards/cyd-e32r32p/Source/devices/Power.h
rename to Devices/cyd-e32r32p/Source/devices/Power.h
diff --git a/Boards/cyd-e32r32p/Source/devices/SdCard.cpp b/Devices/cyd-e32r32p/Source/devices/SdCard.cpp
similarity index 100%
rename from Boards/cyd-e32r32p/Source/devices/SdCard.cpp
rename to Devices/cyd-e32r32p/Source/devices/SdCard.cpp
diff --git a/Boards/cyd-e32r32p/Source/devices/SdCard.h b/Devices/cyd-e32r32p/Source/devices/SdCard.h
similarity index 100%
rename from Boards/cyd-e32r32p/Source/devices/SdCard.h
rename to Devices/cyd-e32r32p/Source/devices/SdCard.h
diff --git a/Boards/cyd-e32r32p/device.properties b/Devices/cyd-e32r32p/device.properties
similarity index 100%
rename from Boards/cyd-e32r32p/device.properties
rename to Devices/cyd-e32r32p/device.properties
diff --git a/Boards/cyd-jc2432w328c/CMakeLists.txt b/Devices/cyd-jc2432w328c/CMakeLists.txt
similarity index 100%
rename from Boards/cyd-jc2432w328c/CMakeLists.txt
rename to Devices/cyd-jc2432w328c/CMakeLists.txt
diff --git a/Boards/cyd-jc2432w328c/Source/Configuration.cpp b/Devices/cyd-jc2432w328c/Source/Configuration.cpp
similarity index 100%
rename from Boards/cyd-jc2432w328c/Source/Configuration.cpp
rename to Devices/cyd-jc2432w328c/Source/Configuration.cpp
diff --git a/Boards/cyd-jc2432w328c/Source/devices/Display.cpp b/Devices/cyd-jc2432w328c/Source/devices/Display.cpp
similarity index 100%
rename from Boards/cyd-jc2432w328c/Source/devices/Display.cpp
rename to Devices/cyd-jc2432w328c/Source/devices/Display.cpp
diff --git a/Boards/cyd-jc2432w328c/Source/devices/Display.h b/Devices/cyd-jc2432w328c/Source/devices/Display.h
similarity index 100%
rename from Boards/cyd-jc2432w328c/Source/devices/Display.h
rename to Devices/cyd-jc2432w328c/Source/devices/Display.h
diff --git a/Boards/cyd-jc2432w328c/Source/devices/SdCard.cpp b/Devices/cyd-jc2432w328c/Source/devices/SdCard.cpp
similarity index 100%
rename from Boards/cyd-jc2432w328c/Source/devices/SdCard.cpp
rename to Devices/cyd-jc2432w328c/Source/devices/SdCard.cpp
diff --git a/Boards/cyd-jc2432w328c/Source/devices/SdCard.h b/Devices/cyd-jc2432w328c/Source/devices/SdCard.h
similarity index 100%
rename from Boards/cyd-jc2432w328c/Source/devices/SdCard.h
rename to Devices/cyd-jc2432w328c/Source/devices/SdCard.h
diff --git a/Boards/cyd-jc2432w328c/device.properties b/Devices/cyd-jc2432w328c/device.properties
similarity index 100%
rename from Boards/cyd-jc2432w328c/device.properties
rename to Devices/cyd-jc2432w328c/device.properties
diff --git a/Boards/cyd-jc8048w550c/CMakeLists.txt b/Devices/cyd-jc8048w550c/CMakeLists.txt
similarity index 100%
rename from Boards/cyd-jc8048w550c/CMakeLists.txt
rename to Devices/cyd-jc8048w550c/CMakeLists.txt
diff --git a/Boards/cyd-jc8048w550c/Source/Configuration.cpp b/Devices/cyd-jc8048w550c/Source/Configuration.cpp
similarity index 100%
rename from Boards/cyd-jc8048w550c/Source/Configuration.cpp
rename to Devices/cyd-jc8048w550c/Source/Configuration.cpp
diff --git a/Boards/cyd-jc8048w550c/Source/devices/Display.cpp b/Devices/cyd-jc8048w550c/Source/devices/Display.cpp
similarity index 100%
rename from Boards/cyd-jc8048w550c/Source/devices/Display.cpp
rename to Devices/cyd-jc8048w550c/Source/devices/Display.cpp
diff --git a/Boards/cyd-jc8048w550c/Source/devices/Display.h b/Devices/cyd-jc8048w550c/Source/devices/Display.h
similarity index 100%
rename from Boards/cyd-jc8048w550c/Source/devices/Display.h
rename to Devices/cyd-jc8048w550c/Source/devices/Display.h
diff --git a/Boards/cyd-jc8048w550c/Source/devices/SdCard.cpp b/Devices/cyd-jc8048w550c/Source/devices/SdCard.cpp
similarity index 100%
rename from Boards/cyd-jc8048w550c/Source/devices/SdCard.cpp
rename to Devices/cyd-jc8048w550c/Source/devices/SdCard.cpp
diff --git a/Boards/cyd-jc8048w550c/Source/devices/SdCard.h b/Devices/cyd-jc8048w550c/Source/devices/SdCard.h
similarity index 100%
rename from Boards/cyd-jc8048w550c/Source/devices/SdCard.h
rename to Devices/cyd-jc8048w550c/Source/devices/SdCard.h
diff --git a/Boards/cyd-jc8048w550c/device.properties b/Devices/cyd-jc8048w550c/device.properties
similarity index 100%
rename from Boards/cyd-jc8048w550c/device.properties
rename to Devices/cyd-jc8048w550c/device.properties
diff --git a/Boards/elecrow-crowpanel-advance-28/CMakeLists.txt b/Devices/elecrow-crowpanel-advance-28/CMakeLists.txt
similarity index 100%
rename from Boards/elecrow-crowpanel-advance-28/CMakeLists.txt
rename to Devices/elecrow-crowpanel-advance-28/CMakeLists.txt
diff --git a/Boards/elecrow-crowpanel-advance-28/Source/Configuration.cpp b/Devices/elecrow-crowpanel-advance-28/Source/Configuration.cpp
similarity index 100%
rename from Boards/elecrow-crowpanel-advance-28/Source/Configuration.cpp
rename to Devices/elecrow-crowpanel-advance-28/Source/Configuration.cpp
diff --git a/Boards/elecrow-crowpanel-advance-28/Source/devices/Display.cpp b/Devices/elecrow-crowpanel-advance-28/Source/devices/Display.cpp
similarity index 100%
rename from Boards/elecrow-crowpanel-advance-28/Source/devices/Display.cpp
rename to Devices/elecrow-crowpanel-advance-28/Source/devices/Display.cpp
diff --git a/Boards/elecrow-crowpanel-advance-28/Source/devices/Display.h b/Devices/elecrow-crowpanel-advance-28/Source/devices/Display.h
similarity index 100%
rename from Boards/elecrow-crowpanel-advance-28/Source/devices/Display.h
rename to Devices/elecrow-crowpanel-advance-28/Source/devices/Display.h
diff --git a/Boards/elecrow-crowpanel-advance-28/Source/devices/SdCard.cpp b/Devices/elecrow-crowpanel-advance-28/Source/devices/SdCard.cpp
similarity index 100%
rename from Boards/elecrow-crowpanel-advance-28/Source/devices/SdCard.cpp
rename to Devices/elecrow-crowpanel-advance-28/Source/devices/SdCard.cpp
diff --git a/Boards/elecrow-crowpanel-advance-28/Source/devices/SdCard.h b/Devices/elecrow-crowpanel-advance-28/Source/devices/SdCard.h
similarity index 100%
rename from Boards/elecrow-crowpanel-advance-28/Source/devices/SdCard.h
rename to Devices/elecrow-crowpanel-advance-28/Source/devices/SdCard.h
diff --git a/Boards/elecrow-crowpanel-advance-28/device.properties b/Devices/elecrow-crowpanel-advance-28/device.properties
similarity index 100%
rename from Boards/elecrow-crowpanel-advance-28/device.properties
rename to Devices/elecrow-crowpanel-advance-28/device.properties
diff --git a/Boards/elecrow-crowpanel-advance-35/CMakeLists.txt b/Devices/elecrow-crowpanel-advance-35/CMakeLists.txt
similarity index 100%
rename from Boards/elecrow-crowpanel-advance-35/CMakeLists.txt
rename to Devices/elecrow-crowpanel-advance-35/CMakeLists.txt
diff --git a/Boards/elecrow-crowpanel-advance-35/Source/Configuration.cpp b/Devices/elecrow-crowpanel-advance-35/Source/Configuration.cpp
similarity index 100%
rename from Boards/elecrow-crowpanel-advance-35/Source/Configuration.cpp
rename to Devices/elecrow-crowpanel-advance-35/Source/Configuration.cpp
diff --git a/Boards/elecrow-crowpanel-advance-35/Source/devices/Display.cpp b/Devices/elecrow-crowpanel-advance-35/Source/devices/Display.cpp
similarity index 100%
rename from Boards/elecrow-crowpanel-advance-35/Source/devices/Display.cpp
rename to Devices/elecrow-crowpanel-advance-35/Source/devices/Display.cpp
diff --git a/Boards/elecrow-crowpanel-advance-35/Source/devices/Display.h b/Devices/elecrow-crowpanel-advance-35/Source/devices/Display.h
similarity index 100%
rename from Boards/elecrow-crowpanel-advance-35/Source/devices/Display.h
rename to Devices/elecrow-crowpanel-advance-35/Source/devices/Display.h
diff --git a/Boards/elecrow-crowpanel-advance-35/Source/devices/SdCard.cpp b/Devices/elecrow-crowpanel-advance-35/Source/devices/SdCard.cpp
similarity index 100%
rename from Boards/elecrow-crowpanel-advance-35/Source/devices/SdCard.cpp
rename to Devices/elecrow-crowpanel-advance-35/Source/devices/SdCard.cpp
diff --git a/Boards/elecrow-crowpanel-advance-35/Source/devices/SdCard.h b/Devices/elecrow-crowpanel-advance-35/Source/devices/SdCard.h
similarity index 100%
rename from Boards/elecrow-crowpanel-advance-35/Source/devices/SdCard.h
rename to Devices/elecrow-crowpanel-advance-35/Source/devices/SdCard.h
diff --git a/Boards/elecrow-crowpanel-advance-35/device.properties b/Devices/elecrow-crowpanel-advance-35/device.properties
similarity index 100%
rename from Boards/elecrow-crowpanel-advance-35/device.properties
rename to Devices/elecrow-crowpanel-advance-35/device.properties
diff --git a/Boards/elecrow-crowpanel-advance-50/CMakeLists.txt b/Devices/elecrow-crowpanel-advance-50/CMakeLists.txt
similarity index 100%
rename from Boards/elecrow-crowpanel-advance-50/CMakeLists.txt
rename to Devices/elecrow-crowpanel-advance-50/CMakeLists.txt
diff --git a/Boards/elecrow-crowpanel-advance-50/Source/Configuration.cpp b/Devices/elecrow-crowpanel-advance-50/Source/Configuration.cpp
similarity index 100%
rename from Boards/elecrow-crowpanel-advance-50/Source/Configuration.cpp
rename to Devices/elecrow-crowpanel-advance-50/Source/Configuration.cpp
diff --git a/Boards/elecrow-crowpanel-advance-50/Source/devices/Display.cpp b/Devices/elecrow-crowpanel-advance-50/Source/devices/Display.cpp
similarity index 100%
rename from Boards/elecrow-crowpanel-advance-50/Source/devices/Display.cpp
rename to Devices/elecrow-crowpanel-advance-50/Source/devices/Display.cpp
diff --git a/Boards/elecrow-crowpanel-advance-50/Source/devices/Display.h b/Devices/elecrow-crowpanel-advance-50/Source/devices/Display.h
similarity index 100%
rename from Boards/elecrow-crowpanel-advance-50/Source/devices/Display.h
rename to Devices/elecrow-crowpanel-advance-50/Source/devices/Display.h
diff --git a/Boards/elecrow-crowpanel-advance-50/Source/devices/SdCard.cpp b/Devices/elecrow-crowpanel-advance-50/Source/devices/SdCard.cpp
similarity index 100%
rename from Boards/elecrow-crowpanel-advance-50/Source/devices/SdCard.cpp
rename to Devices/elecrow-crowpanel-advance-50/Source/devices/SdCard.cpp
diff --git a/Boards/elecrow-crowpanel-advance-50/Source/devices/SdCard.h b/Devices/elecrow-crowpanel-advance-50/Source/devices/SdCard.h
similarity index 100%
rename from Boards/elecrow-crowpanel-advance-50/Source/devices/SdCard.h
rename to Devices/elecrow-crowpanel-advance-50/Source/devices/SdCard.h
diff --git a/Boards/elecrow-crowpanel-advance-50/device.properties b/Devices/elecrow-crowpanel-advance-50/device.properties
similarity index 100%
rename from Boards/elecrow-crowpanel-advance-50/device.properties
rename to Devices/elecrow-crowpanel-advance-50/device.properties
diff --git a/Boards/elecrow-crowpanel-basic-28/CMakeLists.txt b/Devices/elecrow-crowpanel-basic-28/CMakeLists.txt
similarity index 100%
rename from Boards/elecrow-crowpanel-basic-28/CMakeLists.txt
rename to Devices/elecrow-crowpanel-basic-28/CMakeLists.txt
diff --git a/Boards/elecrow-crowpanel-basic-28/Source/Configuration.cpp b/Devices/elecrow-crowpanel-basic-28/Source/Configuration.cpp
similarity index 100%
rename from Boards/elecrow-crowpanel-basic-28/Source/Configuration.cpp
rename to Devices/elecrow-crowpanel-basic-28/Source/Configuration.cpp
diff --git a/Boards/elecrow-crowpanel-basic-28/Source/devices/Display.cpp b/Devices/elecrow-crowpanel-basic-28/Source/devices/Display.cpp
similarity index 100%
rename from Boards/elecrow-crowpanel-basic-28/Source/devices/Display.cpp
rename to Devices/elecrow-crowpanel-basic-28/Source/devices/Display.cpp
diff --git a/Boards/elecrow-crowpanel-basic-28/Source/devices/Display.h b/Devices/elecrow-crowpanel-basic-28/Source/devices/Display.h
similarity index 100%
rename from Boards/elecrow-crowpanel-basic-28/Source/devices/Display.h
rename to Devices/elecrow-crowpanel-basic-28/Source/devices/Display.h
diff --git a/Boards/elecrow-crowpanel-basic-28/Source/devices/SdCard.cpp b/Devices/elecrow-crowpanel-basic-28/Source/devices/SdCard.cpp
similarity index 100%
rename from Boards/elecrow-crowpanel-basic-28/Source/devices/SdCard.cpp
rename to Devices/elecrow-crowpanel-basic-28/Source/devices/SdCard.cpp
diff --git a/Boards/elecrow-crowpanel-basic-28/Source/devices/SdCard.h b/Devices/elecrow-crowpanel-basic-28/Source/devices/SdCard.h
similarity index 100%
rename from Boards/elecrow-crowpanel-basic-28/Source/devices/SdCard.h
rename to Devices/elecrow-crowpanel-basic-28/Source/devices/SdCard.h
diff --git a/Boards/elecrow-crowpanel-basic-28/device.properties b/Devices/elecrow-crowpanel-basic-28/device.properties
similarity index 100%
rename from Boards/elecrow-crowpanel-basic-28/device.properties
rename to Devices/elecrow-crowpanel-basic-28/device.properties
diff --git a/Boards/elecrow-crowpanel-basic-35/CMakeLists.txt b/Devices/elecrow-crowpanel-basic-35/CMakeLists.txt
similarity index 100%
rename from Boards/elecrow-crowpanel-basic-35/CMakeLists.txt
rename to Devices/elecrow-crowpanel-basic-35/CMakeLists.txt
diff --git a/Boards/elecrow-crowpanel-basic-35/Source/Configuration.cpp b/Devices/elecrow-crowpanel-basic-35/Source/Configuration.cpp
similarity index 100%
rename from Boards/elecrow-crowpanel-basic-35/Source/Configuration.cpp
rename to Devices/elecrow-crowpanel-basic-35/Source/Configuration.cpp
diff --git a/Boards/elecrow-crowpanel-basic-35/Source/devices/Display.cpp b/Devices/elecrow-crowpanel-basic-35/Source/devices/Display.cpp
similarity index 100%
rename from Boards/elecrow-crowpanel-basic-35/Source/devices/Display.cpp
rename to Devices/elecrow-crowpanel-basic-35/Source/devices/Display.cpp
diff --git a/Boards/elecrow-crowpanel-basic-35/Source/devices/Display.h b/Devices/elecrow-crowpanel-basic-35/Source/devices/Display.h
similarity index 100%
rename from Boards/elecrow-crowpanel-basic-35/Source/devices/Display.h
rename to Devices/elecrow-crowpanel-basic-35/Source/devices/Display.h
diff --git a/Boards/elecrow-crowpanel-basic-35/Source/devices/SdCard.cpp b/Devices/elecrow-crowpanel-basic-35/Source/devices/SdCard.cpp
similarity index 100%
rename from Boards/elecrow-crowpanel-basic-35/Source/devices/SdCard.cpp
rename to Devices/elecrow-crowpanel-basic-35/Source/devices/SdCard.cpp
diff --git a/Boards/elecrow-crowpanel-basic-35/Source/devices/SdCard.h b/Devices/elecrow-crowpanel-basic-35/Source/devices/SdCard.h
similarity index 100%
rename from Boards/elecrow-crowpanel-basic-35/Source/devices/SdCard.h
rename to Devices/elecrow-crowpanel-basic-35/Source/devices/SdCard.h
diff --git a/Boards/elecrow-crowpanel-basic-35/device.properties b/Devices/elecrow-crowpanel-basic-35/device.properties
similarity index 100%
rename from Boards/elecrow-crowpanel-basic-35/device.properties
rename to Devices/elecrow-crowpanel-basic-35/device.properties
diff --git a/Boards/elecrow-crowpanel-basic-50/CMakeLists.txt b/Devices/elecrow-crowpanel-basic-50/CMakeLists.txt
similarity index 100%
rename from Boards/elecrow-crowpanel-basic-50/CMakeLists.txt
rename to Devices/elecrow-crowpanel-basic-50/CMakeLists.txt
diff --git a/Boards/elecrow-crowpanel-basic-50/Source/Configuration.cpp b/Devices/elecrow-crowpanel-basic-50/Source/Configuration.cpp
similarity index 100%
rename from Boards/elecrow-crowpanel-basic-50/Source/Configuration.cpp
rename to Devices/elecrow-crowpanel-basic-50/Source/Configuration.cpp
diff --git a/Boards/elecrow-crowpanel-basic-50/Source/devices/Display.cpp b/Devices/elecrow-crowpanel-basic-50/Source/devices/Display.cpp
similarity index 100%
rename from Boards/elecrow-crowpanel-basic-50/Source/devices/Display.cpp
rename to Devices/elecrow-crowpanel-basic-50/Source/devices/Display.cpp
diff --git a/Boards/elecrow-crowpanel-basic-50/Source/devices/Display.h b/Devices/elecrow-crowpanel-basic-50/Source/devices/Display.h
similarity index 100%
rename from Boards/elecrow-crowpanel-basic-50/Source/devices/Display.h
rename to Devices/elecrow-crowpanel-basic-50/Source/devices/Display.h
diff --git a/Boards/elecrow-crowpanel-basic-50/Source/devices/SdCard.cpp b/Devices/elecrow-crowpanel-basic-50/Source/devices/SdCard.cpp
similarity index 100%
rename from Boards/elecrow-crowpanel-basic-50/Source/devices/SdCard.cpp
rename to Devices/elecrow-crowpanel-basic-50/Source/devices/SdCard.cpp
diff --git a/Boards/elecrow-crowpanel-basic-50/Source/devices/SdCard.h b/Devices/elecrow-crowpanel-basic-50/Source/devices/SdCard.h
similarity index 100%
rename from Boards/elecrow-crowpanel-basic-50/Source/devices/SdCard.h
rename to Devices/elecrow-crowpanel-basic-50/Source/devices/SdCard.h
diff --git a/Boards/elecrow-crowpanel-basic-50/device.properties b/Devices/elecrow-crowpanel-basic-50/device.properties
similarity index 100%
rename from Boards/elecrow-crowpanel-basic-50/device.properties
rename to Devices/elecrow-crowpanel-basic-50/device.properties
diff --git a/Boards/heltec-wifi-lora-32-v3/CMakeLists.txt b/Devices/heltec-wifi-lora-32-v3/CMakeLists.txt
similarity index 100%
rename from Boards/heltec-wifi-lora-32-v3/CMakeLists.txt
rename to Devices/heltec-wifi-lora-32-v3/CMakeLists.txt
diff --git a/Boards/heltec-wifi-lora-32-v3/Source/Configuration.cpp b/Devices/heltec-wifi-lora-32-v3/Source/Configuration.cpp
similarity index 100%
rename from Boards/heltec-wifi-lora-32-v3/Source/Configuration.cpp
rename to Devices/heltec-wifi-lora-32-v3/Source/Configuration.cpp
diff --git a/Boards/heltec-wifi-lora-32-v3/Source/devices/Constants.h b/Devices/heltec-wifi-lora-32-v3/Source/devices/Constants.h
similarity index 100%
rename from Boards/heltec-wifi-lora-32-v3/Source/devices/Constants.h
rename to Devices/heltec-wifi-lora-32-v3/Source/devices/Constants.h
diff --git a/Boards/heltec-wifi-lora-32-v3/Source/devices/Display.cpp b/Devices/heltec-wifi-lora-32-v3/Source/devices/Display.cpp
similarity index 100%
rename from Boards/heltec-wifi-lora-32-v3/Source/devices/Display.cpp
rename to Devices/heltec-wifi-lora-32-v3/Source/devices/Display.cpp
diff --git a/Boards/heltec-wifi-lora-32-v3/Source/devices/Display.h b/Devices/heltec-wifi-lora-32-v3/Source/devices/Display.h
similarity index 100%
rename from Boards/heltec-wifi-lora-32-v3/Source/devices/Display.h
rename to Devices/heltec-wifi-lora-32-v3/Source/devices/Display.h
diff --git a/Boards/heltec-wifi-lora-32-v3/Source/devices/Power.cpp b/Devices/heltec-wifi-lora-32-v3/Source/devices/Power.cpp
similarity index 100%
rename from Boards/heltec-wifi-lora-32-v3/Source/devices/Power.cpp
rename to Devices/heltec-wifi-lora-32-v3/Source/devices/Power.cpp
diff --git a/Boards/heltec-wifi-lora-32-v3/Source/devices/Power.h b/Devices/heltec-wifi-lora-32-v3/Source/devices/Power.h
similarity index 100%
rename from Boards/heltec-wifi-lora-32-v3/Source/devices/Power.h
rename to Devices/heltec-wifi-lora-32-v3/Source/devices/Power.h
diff --git a/Boards/heltec-wifi-lora-32-v3/device.properties b/Devices/heltec-wifi-lora-32-v3/device.properties
similarity index 100%
rename from Boards/heltec-wifi-lora-32-v3/device.properties
rename to Devices/heltec-wifi-lora-32-v3/device.properties
diff --git a/Boards/lilygo-tdeck/CMakeLists.txt b/Devices/lilygo-tdeck/CMakeLists.txt
similarity index 100%
rename from Boards/lilygo-tdeck/CMakeLists.txt
rename to Devices/lilygo-tdeck/CMakeLists.txt
diff --git a/Boards/lilygo-tdeck/Source/Configuration.cpp b/Devices/lilygo-tdeck/Source/Configuration.cpp
similarity index 100%
rename from Boards/lilygo-tdeck/Source/Configuration.cpp
rename to Devices/lilygo-tdeck/Source/Configuration.cpp
diff --git a/Boards/lilygo-tdeck/Source/Init.cpp b/Devices/lilygo-tdeck/Source/Init.cpp
similarity index 100%
rename from Boards/lilygo-tdeck/Source/Init.cpp
rename to Devices/lilygo-tdeck/Source/Init.cpp
diff --git a/Boards/lilygo-tdeck/Source/devices/Display.cpp b/Devices/lilygo-tdeck/Source/devices/Display.cpp
similarity index 100%
rename from Boards/lilygo-tdeck/Source/devices/Display.cpp
rename to Devices/lilygo-tdeck/Source/devices/Display.cpp
diff --git a/Boards/lilygo-tdeck/Source/devices/Display.h b/Devices/lilygo-tdeck/Source/devices/Display.h
similarity index 100%
rename from Boards/lilygo-tdeck/Source/devices/Display.h
rename to Devices/lilygo-tdeck/Source/devices/Display.h
diff --git a/Boards/lilygo-tdeck/Source/devices/Power.cpp b/Devices/lilygo-tdeck/Source/devices/Power.cpp
similarity index 100%
rename from Boards/lilygo-tdeck/Source/devices/Power.cpp
rename to Devices/lilygo-tdeck/Source/devices/Power.cpp
diff --git a/Boards/lilygo-tdeck/Source/devices/Power.h b/Devices/lilygo-tdeck/Source/devices/Power.h
similarity index 100%
rename from Boards/lilygo-tdeck/Source/devices/Power.h
rename to Devices/lilygo-tdeck/Source/devices/Power.h
diff --git a/Boards/lilygo-tdeck/Source/devices/Sdcard.cpp b/Devices/lilygo-tdeck/Source/devices/Sdcard.cpp
similarity index 100%
rename from Boards/lilygo-tdeck/Source/devices/Sdcard.cpp
rename to Devices/lilygo-tdeck/Source/devices/Sdcard.cpp
diff --git a/Boards/lilygo-tdeck/Source/devices/Sdcard.h b/Devices/lilygo-tdeck/Source/devices/Sdcard.h
similarity index 100%
rename from Boards/lilygo-tdeck/Source/devices/Sdcard.h
rename to Devices/lilygo-tdeck/Source/devices/Sdcard.h
diff --git a/Boards/lilygo-tdeck/Source/devices/TdeckKeyboard.cpp b/Devices/lilygo-tdeck/Source/devices/TdeckKeyboard.cpp
similarity index 100%
rename from Boards/lilygo-tdeck/Source/devices/TdeckKeyboard.cpp
rename to Devices/lilygo-tdeck/Source/devices/TdeckKeyboard.cpp
diff --git a/Boards/lilygo-tdeck/Source/devices/TdeckKeyboard.h b/Devices/lilygo-tdeck/Source/devices/TdeckKeyboard.h
similarity index 100%
rename from Boards/lilygo-tdeck/Source/devices/TdeckKeyboard.h
rename to Devices/lilygo-tdeck/Source/devices/TdeckKeyboard.h
diff --git a/Boards/lilygo-tdeck/device.properties b/Devices/lilygo-tdeck/device.properties
similarity index 100%
rename from Boards/lilygo-tdeck/device.properties
rename to Devices/lilygo-tdeck/device.properties
diff --git a/Boards/lilygo-tdisplay-s3/CMakeLists.txt b/Devices/lilygo-tdisplay-s3/CMakeLists.txt
similarity index 100%
rename from Boards/lilygo-tdisplay-s3/CMakeLists.txt
rename to Devices/lilygo-tdisplay-s3/CMakeLists.txt
diff --git a/Boards/lilygo-tdisplay-s3/Source/Configuration.cpp b/Devices/lilygo-tdisplay-s3/Source/Configuration.cpp
similarity index 100%
rename from Boards/lilygo-tdisplay-s3/Source/Configuration.cpp
rename to Devices/lilygo-tdisplay-s3/Source/Configuration.cpp
diff --git a/Boards/lilygo-tdisplay-s3/Source/Init.cpp b/Devices/lilygo-tdisplay-s3/Source/Init.cpp
similarity index 100%
rename from Boards/lilygo-tdisplay-s3/Source/Init.cpp
rename to Devices/lilygo-tdisplay-s3/Source/Init.cpp
diff --git a/Boards/lilygo-tdisplay-s3/Source/devices/Display.cpp b/Devices/lilygo-tdisplay-s3/Source/devices/Display.cpp
similarity index 100%
rename from Boards/lilygo-tdisplay-s3/Source/devices/Display.cpp
rename to Devices/lilygo-tdisplay-s3/Source/devices/Display.cpp
diff --git a/Boards/lilygo-tdisplay-s3/Source/devices/Display.h b/Devices/lilygo-tdisplay-s3/Source/devices/Display.h
similarity index 100%
rename from Boards/lilygo-tdisplay-s3/Source/devices/Display.h
rename to Devices/lilygo-tdisplay-s3/Source/devices/Display.h
diff --git a/Boards/lilygo-tdisplay-s3/Source/devices/Power.cpp b/Devices/lilygo-tdisplay-s3/Source/devices/Power.cpp
similarity index 100%
rename from Boards/lilygo-tdisplay-s3/Source/devices/Power.cpp
rename to Devices/lilygo-tdisplay-s3/Source/devices/Power.cpp
diff --git a/Boards/lilygo-tdisplay-s3/Source/devices/Power.h b/Devices/lilygo-tdisplay-s3/Source/devices/Power.h
similarity index 100%
rename from Boards/lilygo-tdisplay-s3/Source/devices/Power.h
rename to Devices/lilygo-tdisplay-s3/Source/devices/Power.h
diff --git a/Boards/lilygo-tdisplay-s3/device.properties b/Devices/lilygo-tdisplay-s3/device.properties
similarity index 100%
rename from Boards/lilygo-tdisplay-s3/device.properties
rename to Devices/lilygo-tdisplay-s3/device.properties
diff --git a/Boards/lilygo-tdisplay/CMakeLists.txt b/Devices/lilygo-tdisplay/CMakeLists.txt
similarity index 100%
rename from Boards/lilygo-tdisplay/CMakeLists.txt
rename to Devices/lilygo-tdisplay/CMakeLists.txt
diff --git a/Boards/lilygo-tdisplay/Source/Configuration.cpp b/Devices/lilygo-tdisplay/Source/Configuration.cpp
similarity index 100%
rename from Boards/lilygo-tdisplay/Source/Configuration.cpp
rename to Devices/lilygo-tdisplay/Source/Configuration.cpp
diff --git a/Boards/lilygo-tdisplay/Source/devices/Display.cpp b/Devices/lilygo-tdisplay/Source/devices/Display.cpp
similarity index 100%
rename from Boards/lilygo-tdisplay/Source/devices/Display.cpp
rename to Devices/lilygo-tdisplay/Source/devices/Display.cpp
diff --git a/Boards/lilygo-tdisplay/Source/devices/Display.h b/Devices/lilygo-tdisplay/Source/devices/Display.h
similarity index 100%
rename from Boards/lilygo-tdisplay/Source/devices/Display.h
rename to Devices/lilygo-tdisplay/Source/devices/Display.h
diff --git a/Boards/lilygo-tdisplay/device.properties b/Devices/lilygo-tdisplay/device.properties
similarity index 100%
rename from Boards/lilygo-tdisplay/device.properties
rename to Devices/lilygo-tdisplay/device.properties
diff --git a/Boards/lilygo-tdongle-s3/CMakeLists.txt b/Devices/lilygo-tdongle-s3/CMakeLists.txt
similarity index 100%
rename from Boards/lilygo-tdongle-s3/CMakeLists.txt
rename to Devices/lilygo-tdongle-s3/CMakeLists.txt
diff --git a/Boards/lilygo-tdongle-s3/Source/Configuration.cpp b/Devices/lilygo-tdongle-s3/Source/Configuration.cpp
similarity index 100%
rename from Boards/lilygo-tdongle-s3/Source/Configuration.cpp
rename to Devices/lilygo-tdongle-s3/Source/Configuration.cpp
diff --git a/Boards/lilygo-tdongle-s3/Source/Init.cpp b/Devices/lilygo-tdongle-s3/Source/Init.cpp
similarity index 100%
rename from Boards/lilygo-tdongle-s3/Source/Init.cpp
rename to Devices/lilygo-tdongle-s3/Source/Init.cpp
diff --git a/Boards/lilygo-tdongle-s3/Source/devices/Display.cpp b/Devices/lilygo-tdongle-s3/Source/devices/Display.cpp
similarity index 100%
rename from Boards/lilygo-tdongle-s3/Source/devices/Display.cpp
rename to Devices/lilygo-tdongle-s3/Source/devices/Display.cpp
diff --git a/Boards/lilygo-tdongle-s3/Source/devices/Display.h b/Devices/lilygo-tdongle-s3/Source/devices/Display.h
similarity index 100%
rename from Boards/lilygo-tdongle-s3/Source/devices/Display.h
rename to Devices/lilygo-tdongle-s3/Source/devices/Display.h
diff --git a/Boards/lilygo-tdongle-s3/Source/devices/Sdcard.cpp b/Devices/lilygo-tdongle-s3/Source/devices/Sdcard.cpp
similarity index 100%
rename from Boards/lilygo-tdongle-s3/Source/devices/Sdcard.cpp
rename to Devices/lilygo-tdongle-s3/Source/devices/Sdcard.cpp
diff --git a/Boards/lilygo-tdongle-s3/Source/devices/Sdcard.h b/Devices/lilygo-tdongle-s3/Source/devices/Sdcard.h
similarity index 100%
rename from Boards/lilygo-tdongle-s3/Source/devices/Sdcard.h
rename to Devices/lilygo-tdongle-s3/Source/devices/Sdcard.h
diff --git a/Boards/lilygo-tdongle-s3/device.properties b/Devices/lilygo-tdongle-s3/device.properties
similarity index 100%
rename from Boards/lilygo-tdongle-s3/device.properties
rename to Devices/lilygo-tdongle-s3/device.properties
diff --git a/Boards/lilygo-tlora-pager/CMakeLists.txt b/Devices/lilygo-tlora-pager/CMakeLists.txt
similarity index 100%
rename from Boards/lilygo-tlora-pager/CMakeLists.txt
rename to Devices/lilygo-tlora-pager/CMakeLists.txt
diff --git a/Boards/lilygo-tlora-pager/Source/Configuration.cpp b/Devices/lilygo-tlora-pager/Source/Configuration.cpp
similarity index 100%
rename from Boards/lilygo-tlora-pager/Source/Configuration.cpp
rename to Devices/lilygo-tlora-pager/Source/Configuration.cpp
diff --git a/Boards/lilygo-tlora-pager/Source/Init.cpp b/Devices/lilygo-tlora-pager/Source/Init.cpp
similarity index 100%
rename from Boards/lilygo-tlora-pager/Source/Init.cpp
rename to Devices/lilygo-tlora-pager/Source/Init.cpp
diff --git a/Boards/lilygo-tlora-pager/Source/devices/Display.cpp b/Devices/lilygo-tlora-pager/Source/devices/Display.cpp
similarity index 100%
rename from Boards/lilygo-tlora-pager/Source/devices/Display.cpp
rename to Devices/lilygo-tlora-pager/Source/devices/Display.cpp
diff --git a/Boards/lilygo-tlora-pager/Source/devices/Display.h b/Devices/lilygo-tlora-pager/Source/devices/Display.h
similarity index 100%
rename from Boards/lilygo-tlora-pager/Source/devices/Display.h
rename to Devices/lilygo-tlora-pager/Source/devices/Display.h
diff --git a/Boards/lilygo-tlora-pager/Source/devices/SdCard.cpp b/Devices/lilygo-tlora-pager/Source/devices/SdCard.cpp
similarity index 100%
rename from Boards/lilygo-tlora-pager/Source/devices/SdCard.cpp
rename to Devices/lilygo-tlora-pager/Source/devices/SdCard.cpp
diff --git a/Boards/lilygo-tlora-pager/Source/devices/SdCard.h b/Devices/lilygo-tlora-pager/Source/devices/SdCard.h
similarity index 100%
rename from Boards/lilygo-tlora-pager/Source/devices/SdCard.h
rename to Devices/lilygo-tlora-pager/Source/devices/SdCard.h
diff --git a/Boards/lilygo-tlora-pager/Source/devices/TpagerEncoder.cpp b/Devices/lilygo-tlora-pager/Source/devices/TpagerEncoder.cpp
similarity index 100%
rename from Boards/lilygo-tlora-pager/Source/devices/TpagerEncoder.cpp
rename to Devices/lilygo-tlora-pager/Source/devices/TpagerEncoder.cpp
diff --git a/Boards/lilygo-tlora-pager/Source/devices/TpagerEncoder.h b/Devices/lilygo-tlora-pager/Source/devices/TpagerEncoder.h
similarity index 100%
rename from Boards/lilygo-tlora-pager/Source/devices/TpagerEncoder.h
rename to Devices/lilygo-tlora-pager/Source/devices/TpagerEncoder.h
diff --git a/Boards/lilygo-tlora-pager/Source/devices/TpagerKeyboard.cpp b/Devices/lilygo-tlora-pager/Source/devices/TpagerKeyboard.cpp
similarity index 100%
rename from Boards/lilygo-tlora-pager/Source/devices/TpagerKeyboard.cpp
rename to Devices/lilygo-tlora-pager/Source/devices/TpagerKeyboard.cpp
diff --git a/Boards/lilygo-tlora-pager/Source/devices/TpagerKeyboard.h b/Devices/lilygo-tlora-pager/Source/devices/TpagerKeyboard.h
similarity index 100%
rename from Boards/lilygo-tlora-pager/Source/devices/TpagerKeyboard.h
rename to Devices/lilygo-tlora-pager/Source/devices/TpagerKeyboard.h
diff --git a/Boards/lilygo-tlora-pager/Source/devices/TpagerPower.cpp b/Devices/lilygo-tlora-pager/Source/devices/TpagerPower.cpp
similarity index 100%
rename from Boards/lilygo-tlora-pager/Source/devices/TpagerPower.cpp
rename to Devices/lilygo-tlora-pager/Source/devices/TpagerPower.cpp
diff --git a/Boards/lilygo-tlora-pager/Source/devices/TpagerPower.h b/Devices/lilygo-tlora-pager/Source/devices/TpagerPower.h
similarity index 100%
rename from Boards/lilygo-tlora-pager/Source/devices/TpagerPower.h
rename to Devices/lilygo-tlora-pager/Source/devices/TpagerPower.h
diff --git a/Boards/lilygo-tlora-pager/device.properties b/Devices/lilygo-tlora-pager/device.properties
similarity index 100%
rename from Boards/lilygo-tlora-pager/device.properties
rename to Devices/lilygo-tlora-pager/device.properties
diff --git a/Boards/m5stack-cardputer-adv/CMakeLists.txt b/Devices/m5stack-cardputer-adv/CMakeLists.txt
similarity index 100%
rename from Boards/m5stack-cardputer-adv/CMakeLists.txt
rename to Devices/m5stack-cardputer-adv/CMakeLists.txt
diff --git a/Boards/m5stack-cardputer-adv/Source/Configuration.cpp b/Devices/m5stack-cardputer-adv/Source/Configuration.cpp
similarity index 100%
rename from Boards/m5stack-cardputer-adv/Source/Configuration.cpp
rename to Devices/m5stack-cardputer-adv/Source/Configuration.cpp
diff --git a/Boards/m5stack-cardputer-adv/Source/devices/CardputerKeyboard.cpp b/Devices/m5stack-cardputer-adv/Source/devices/CardputerKeyboard.cpp
similarity index 100%
rename from Boards/m5stack-cardputer-adv/Source/devices/CardputerKeyboard.cpp
rename to Devices/m5stack-cardputer-adv/Source/devices/CardputerKeyboard.cpp
diff --git a/Boards/m5stack-cardputer-adv/Source/devices/CardputerKeyboard.h b/Devices/m5stack-cardputer-adv/Source/devices/CardputerKeyboard.h
similarity index 100%
rename from Boards/m5stack-cardputer-adv/Source/devices/CardputerKeyboard.h
rename to Devices/m5stack-cardputer-adv/Source/devices/CardputerKeyboard.h
diff --git a/Boards/m5stack-cardputer-adv/Source/devices/CardputerPower.cpp b/Devices/m5stack-cardputer-adv/Source/devices/CardputerPower.cpp
similarity index 100%
rename from Boards/m5stack-cardputer-adv/Source/devices/CardputerPower.cpp
rename to Devices/m5stack-cardputer-adv/Source/devices/CardputerPower.cpp
diff --git a/Boards/m5stack-cardputer-adv/Source/devices/CardputerPower.h b/Devices/m5stack-cardputer-adv/Source/devices/CardputerPower.h
similarity index 100%
rename from Boards/m5stack-cardputer-adv/Source/devices/CardputerPower.h
rename to Devices/m5stack-cardputer-adv/Source/devices/CardputerPower.h
diff --git a/Boards/m5stack-cardputer-adv/Source/devices/Display.cpp b/Devices/m5stack-cardputer-adv/Source/devices/Display.cpp
similarity index 100%
rename from Boards/m5stack-cardputer-adv/Source/devices/Display.cpp
rename to Devices/m5stack-cardputer-adv/Source/devices/Display.cpp
diff --git a/Boards/m5stack-cardputer-adv/Source/devices/Display.h b/Devices/m5stack-cardputer-adv/Source/devices/Display.h
similarity index 100%
rename from Boards/m5stack-cardputer-adv/Source/devices/Display.h
rename to Devices/m5stack-cardputer-adv/Source/devices/Display.h
diff --git a/Boards/m5stack-cardputer-adv/Source/devices/SdCard.cpp b/Devices/m5stack-cardputer-adv/Source/devices/SdCard.cpp
similarity index 100%
rename from Boards/m5stack-cardputer-adv/Source/devices/SdCard.cpp
rename to Devices/m5stack-cardputer-adv/Source/devices/SdCard.cpp
diff --git a/Boards/m5stack-cardputer-adv/Source/devices/SdCard.h b/Devices/m5stack-cardputer-adv/Source/devices/SdCard.h
similarity index 100%
rename from Boards/m5stack-cardputer-adv/Source/devices/SdCard.h
rename to Devices/m5stack-cardputer-adv/Source/devices/SdCard.h
diff --git a/Boards/m5stack-cardputer-adv/device.properties b/Devices/m5stack-cardputer-adv/device.properties
similarity index 100%
rename from Boards/m5stack-cardputer-adv/device.properties
rename to Devices/m5stack-cardputer-adv/device.properties
diff --git a/Boards/m5stack-cardputer/CMakeLists.txt b/Devices/m5stack-cardputer/CMakeLists.txt
similarity index 100%
rename from Boards/m5stack-cardputer/CMakeLists.txt
rename to Devices/m5stack-cardputer/CMakeLists.txt
diff --git a/Boards/m5stack-cardputer/Source/Configuration.cpp b/Devices/m5stack-cardputer/Source/Configuration.cpp
similarity index 100%
rename from Boards/m5stack-cardputer/Source/Configuration.cpp
rename to Devices/m5stack-cardputer/Source/Configuration.cpp
diff --git a/Boards/m5stack-cardputer/Source/devices/CardputerEncoder.cpp b/Devices/m5stack-cardputer/Source/devices/CardputerEncoder.cpp
similarity index 100%
rename from Boards/m5stack-cardputer/Source/devices/CardputerEncoder.cpp
rename to Devices/m5stack-cardputer/Source/devices/CardputerEncoder.cpp
diff --git a/Boards/m5stack-cardputer/Source/devices/CardputerEncoder.h b/Devices/m5stack-cardputer/Source/devices/CardputerEncoder.h
similarity index 100%
rename from Boards/m5stack-cardputer/Source/devices/CardputerEncoder.h
rename to Devices/m5stack-cardputer/Source/devices/CardputerEncoder.h
diff --git a/Boards/m5stack-cardputer/Source/devices/CardputerKeyboard.cpp b/Devices/m5stack-cardputer/Source/devices/CardputerKeyboard.cpp
similarity index 100%
rename from Boards/m5stack-cardputer/Source/devices/CardputerKeyboard.cpp
rename to Devices/m5stack-cardputer/Source/devices/CardputerKeyboard.cpp
diff --git a/Boards/m5stack-cardputer/Source/devices/CardputerKeyboard.h b/Devices/m5stack-cardputer/Source/devices/CardputerKeyboard.h
similarity index 100%
rename from Boards/m5stack-cardputer/Source/devices/CardputerKeyboard.h
rename to Devices/m5stack-cardputer/Source/devices/CardputerKeyboard.h
diff --git a/Boards/m5stack-cardputer/Source/devices/CardputerPower.cpp b/Devices/m5stack-cardputer/Source/devices/CardputerPower.cpp
similarity index 100%
rename from Boards/m5stack-cardputer/Source/devices/CardputerPower.cpp
rename to Devices/m5stack-cardputer/Source/devices/CardputerPower.cpp
diff --git a/Boards/m5stack-cardputer/Source/devices/CardputerPower.h b/Devices/m5stack-cardputer/Source/devices/CardputerPower.h
similarity index 100%
rename from Boards/m5stack-cardputer/Source/devices/CardputerPower.h
rename to Devices/m5stack-cardputer/Source/devices/CardputerPower.h
diff --git a/Boards/m5stack-cardputer/Source/devices/Display.cpp b/Devices/m5stack-cardputer/Source/devices/Display.cpp
similarity index 100%
rename from Boards/m5stack-cardputer/Source/devices/Display.cpp
rename to Devices/m5stack-cardputer/Source/devices/Display.cpp
diff --git a/Boards/m5stack-cardputer/Source/devices/Display.h b/Devices/m5stack-cardputer/Source/devices/Display.h
similarity index 100%
rename from Boards/m5stack-cardputer/Source/devices/Display.h
rename to Devices/m5stack-cardputer/Source/devices/Display.h
diff --git a/Boards/m5stack-cardputer/Source/devices/SdCard.cpp b/Devices/m5stack-cardputer/Source/devices/SdCard.cpp
similarity index 100%
rename from Boards/m5stack-cardputer/Source/devices/SdCard.cpp
rename to Devices/m5stack-cardputer/Source/devices/SdCard.cpp
diff --git a/Boards/m5stack-cardputer/Source/devices/SdCard.h b/Devices/m5stack-cardputer/Source/devices/SdCard.h
similarity index 100%
rename from Boards/m5stack-cardputer/Source/devices/SdCard.h
rename to Devices/m5stack-cardputer/Source/devices/SdCard.h
diff --git a/Boards/m5stack-cardputer/Source/keyboard/README.md b/Devices/m5stack-cardputer/Source/keyboard/README.md
similarity index 100%
rename from Boards/m5stack-cardputer/Source/keyboard/README.md
rename to Devices/m5stack-cardputer/Source/keyboard/README.md
diff --git a/Boards/m5stack-cardputer/Source/keyboard/keyboard.cpp b/Devices/m5stack-cardputer/Source/keyboard/keyboard.cpp
similarity index 100%
rename from Boards/m5stack-cardputer/Source/keyboard/keyboard.cpp
rename to Devices/m5stack-cardputer/Source/keyboard/keyboard.cpp
diff --git a/Boards/m5stack-cardputer/Source/keyboard/keyboard.h b/Devices/m5stack-cardputer/Source/keyboard/keyboard.h
similarity index 100%
rename from Boards/m5stack-cardputer/Source/keyboard/keyboard.h
rename to Devices/m5stack-cardputer/Source/keyboard/keyboard.h
diff --git a/Boards/m5stack-cardputer/Source/keyboard/keymap.h b/Devices/m5stack-cardputer/Source/keyboard/keymap.h
similarity index 100%
rename from Boards/m5stack-cardputer/Source/keyboard/keymap.h
rename to Devices/m5stack-cardputer/Source/keyboard/keymap.h
diff --git a/Boards/m5stack-cardputer/device.properties b/Devices/m5stack-cardputer/device.properties
similarity index 100%
rename from Boards/m5stack-cardputer/device.properties
rename to Devices/m5stack-cardputer/device.properties
diff --git a/Boards/m5stack-core2/CMakeLists.txt b/Devices/m5stack-core2/CMakeLists.txt
similarity index 100%
rename from Boards/m5stack-core2/CMakeLists.txt
rename to Devices/m5stack-core2/CMakeLists.txt
diff --git a/Boards/m5stack-core2/Source/Configuration.cpp b/Devices/m5stack-core2/Source/Configuration.cpp
similarity index 100%
rename from Boards/m5stack-core2/Source/Configuration.cpp
rename to Devices/m5stack-core2/Source/Configuration.cpp
diff --git a/Boards/m5stack-core2/Source/devices/Display.cpp b/Devices/m5stack-core2/Source/devices/Display.cpp
similarity index 100%
rename from Boards/m5stack-core2/Source/devices/Display.cpp
rename to Devices/m5stack-core2/Source/devices/Display.cpp
diff --git a/Boards/m5stack-core2/Source/devices/Display.h b/Devices/m5stack-core2/Source/devices/Display.h
similarity index 100%
rename from Boards/m5stack-core2/Source/devices/Display.h
rename to Devices/m5stack-core2/Source/devices/Display.h
diff --git a/Boards/m5stack-core2/Source/devices/Power.cpp b/Devices/m5stack-core2/Source/devices/Power.cpp
similarity index 100%
rename from Boards/m5stack-core2/Source/devices/Power.cpp
rename to Devices/m5stack-core2/Source/devices/Power.cpp
diff --git a/Boards/m5stack-core2/Source/devices/Power.h b/Devices/m5stack-core2/Source/devices/Power.h
similarity index 100%
rename from Boards/m5stack-core2/Source/devices/Power.h
rename to Devices/m5stack-core2/Source/devices/Power.h
diff --git a/Boards/m5stack-core2/Source/devices/SdCard.cpp b/Devices/m5stack-core2/Source/devices/SdCard.cpp
similarity index 100%
rename from Boards/m5stack-core2/Source/devices/SdCard.cpp
rename to Devices/m5stack-core2/Source/devices/SdCard.cpp
diff --git a/Boards/m5stack-core2/Source/devices/SdCard.h b/Devices/m5stack-core2/Source/devices/SdCard.h
similarity index 100%
rename from Boards/m5stack-core2/Source/devices/SdCard.h
rename to Devices/m5stack-core2/Source/devices/SdCard.h
diff --git a/Boards/m5stack-core2/device.properties b/Devices/m5stack-core2/device.properties
similarity index 100%
rename from Boards/m5stack-core2/device.properties
rename to Devices/m5stack-core2/device.properties
diff --git a/Boards/m5stack-cores3/CMakeLists.txt b/Devices/m5stack-cores3/CMakeLists.txt
similarity index 100%
rename from Boards/m5stack-cores3/CMakeLists.txt
rename to Devices/m5stack-cores3/CMakeLists.txt
diff --git a/Boards/m5stack-cores3/Source/Configuration.cpp b/Devices/m5stack-cores3/Source/Configuration.cpp
similarity index 100%
rename from Boards/m5stack-cores3/Source/Configuration.cpp
rename to Devices/m5stack-cores3/Source/Configuration.cpp
diff --git a/Boards/m5stack-cores3/Source/InitBoot.cpp b/Devices/m5stack-cores3/Source/InitBoot.cpp
similarity index 100%
rename from Boards/m5stack-cores3/Source/InitBoot.cpp
rename to Devices/m5stack-cores3/Source/InitBoot.cpp
diff --git a/Boards/m5stack-cores3/Source/InitBoot.h b/Devices/m5stack-cores3/Source/InitBoot.h
similarity index 100%
rename from Boards/m5stack-cores3/Source/InitBoot.h
rename to Devices/m5stack-cores3/Source/InitBoot.h
diff --git a/Boards/m5stack-cores3/Source/devices/Display.cpp b/Devices/m5stack-cores3/Source/devices/Display.cpp
similarity index 100%
rename from Boards/m5stack-cores3/Source/devices/Display.cpp
rename to Devices/m5stack-cores3/Source/devices/Display.cpp
diff --git a/Boards/m5stack-cores3/Source/devices/Display.h b/Devices/m5stack-cores3/Source/devices/Display.h
similarity index 100%
rename from Boards/m5stack-cores3/Source/devices/Display.h
rename to Devices/m5stack-cores3/Source/devices/Display.h
diff --git a/Boards/m5stack-cores3/Source/devices/SdCard.cpp b/Devices/m5stack-cores3/Source/devices/SdCard.cpp
similarity index 100%
rename from Boards/m5stack-cores3/Source/devices/SdCard.cpp
rename to Devices/m5stack-cores3/Source/devices/SdCard.cpp
diff --git a/Boards/m5stack-cores3/Source/devices/SdCard.h b/Devices/m5stack-cores3/Source/devices/SdCard.h
similarity index 100%
rename from Boards/m5stack-cores3/Source/devices/SdCard.h
rename to Devices/m5stack-cores3/Source/devices/SdCard.h
diff --git a/Boards/m5stack-cores3/device.properties b/Devices/m5stack-cores3/device.properties
similarity index 100%
rename from Boards/m5stack-cores3/device.properties
rename to Devices/m5stack-cores3/device.properties
diff --git a/Boards/m5stack-stickc-plus/CMakeLists.txt b/Devices/m5stack-stickc-plus/CMakeLists.txt
similarity index 100%
rename from Boards/m5stack-stickc-plus/CMakeLists.txt
rename to Devices/m5stack-stickc-plus/CMakeLists.txt
diff --git a/Boards/m5stack-stickc-plus/Source/Configuration.cpp b/Devices/m5stack-stickc-plus/Source/Configuration.cpp
similarity index 100%
rename from Boards/m5stack-stickc-plus/Source/Configuration.cpp
rename to Devices/m5stack-stickc-plus/Source/Configuration.cpp
diff --git a/Boards/m5stack-stickc-plus/Source/devices/Display.cpp b/Devices/m5stack-stickc-plus/Source/devices/Display.cpp
similarity index 100%
rename from Boards/m5stack-stickc-plus/Source/devices/Display.cpp
rename to Devices/m5stack-stickc-plus/Source/devices/Display.cpp
diff --git a/Boards/m5stack-stickc-plus/Source/devices/Display.h b/Devices/m5stack-stickc-plus/Source/devices/Display.h
similarity index 100%
rename from Boards/m5stack-stickc-plus/Source/devices/Display.h
rename to Devices/m5stack-stickc-plus/Source/devices/Display.h
diff --git a/Boards/m5stack-stickc-plus/Source/devices/Power.cpp b/Devices/m5stack-stickc-plus/Source/devices/Power.cpp
similarity index 100%
rename from Boards/m5stack-stickc-plus/Source/devices/Power.cpp
rename to Devices/m5stack-stickc-plus/Source/devices/Power.cpp
diff --git a/Boards/m5stack-stickc-plus/Source/devices/Power.h b/Devices/m5stack-stickc-plus/Source/devices/Power.h
similarity index 100%
rename from Boards/m5stack-stickc-plus/Source/devices/Power.h
rename to Devices/m5stack-stickc-plus/Source/devices/Power.h
diff --git a/Boards/m5stack-stickc-plus/device.properties b/Devices/m5stack-stickc-plus/device.properties
similarity index 100%
rename from Boards/m5stack-stickc-plus/device.properties
rename to Devices/m5stack-stickc-plus/device.properties
diff --git a/Boards/m5stack-stickc-plus2/CMakeLists.txt b/Devices/m5stack-stickc-plus2/CMakeLists.txt
similarity index 100%
rename from Boards/m5stack-stickc-plus2/CMakeLists.txt
rename to Devices/m5stack-stickc-plus2/CMakeLists.txt
diff --git a/Boards/m5stack-stickc-plus2/Source/Configuration.cpp b/Devices/m5stack-stickc-plus2/Source/Configuration.cpp
similarity index 100%
rename from Boards/m5stack-stickc-plus2/Source/Configuration.cpp
rename to Devices/m5stack-stickc-plus2/Source/Configuration.cpp
diff --git a/Boards/m5stack-stickc-plus2/Source/devices/Display.cpp b/Devices/m5stack-stickc-plus2/Source/devices/Display.cpp
similarity index 100%
rename from Boards/m5stack-stickc-plus2/Source/devices/Display.cpp
rename to Devices/m5stack-stickc-plus2/Source/devices/Display.cpp
diff --git a/Boards/m5stack-stickc-plus2/Source/devices/Display.h b/Devices/m5stack-stickc-plus2/Source/devices/Display.h
similarity index 100%
rename from Boards/m5stack-stickc-plus2/Source/devices/Display.h
rename to Devices/m5stack-stickc-plus2/Source/devices/Display.h
diff --git a/Boards/m5stack-stickc-plus2/device.properties b/Devices/m5stack-stickc-plus2/device.properties
similarity index 100%
rename from Boards/m5stack-stickc-plus2/device.properties
rename to Devices/m5stack-stickc-plus2/device.properties
diff --git a/Boards/simulator/CMakeLists.txt b/Devices/simulator/CMakeLists.txt
similarity index 100%
rename from Boards/simulator/CMakeLists.txt
rename to Devices/simulator/CMakeLists.txt
diff --git a/Boards/simulator/Source/FreeRTOSConfig.h b/Devices/simulator/Source/FreeRTOSConfig.h
similarity index 100%
rename from Boards/simulator/Source/FreeRTOSConfig.h
rename to Devices/simulator/Source/FreeRTOSConfig.h
diff --git a/Boards/simulator/Source/LvglTask.cpp b/Devices/simulator/Source/LvglTask.cpp
similarity index 100%
rename from Boards/simulator/Source/LvglTask.cpp
rename to Devices/simulator/Source/LvglTask.cpp
diff --git a/Boards/simulator/Source/LvglTask.h b/Devices/simulator/Source/LvglTask.h
similarity index 100%
rename from Boards/simulator/Source/LvglTask.h
rename to Devices/simulator/Source/LvglTask.h
diff --git a/Boards/simulator/Source/Main.cpp b/Devices/simulator/Source/Main.cpp
similarity index 100%
rename from Boards/simulator/Source/Main.cpp
rename to Devices/simulator/Source/Main.cpp
diff --git a/Boards/simulator/Source/Main.h b/Devices/simulator/Source/Main.h
similarity index 100%
rename from Boards/simulator/Source/Main.h
rename to Devices/simulator/Source/Main.h
diff --git a/Boards/simulator/Source/Simulator.cpp b/Devices/simulator/Source/Simulator.cpp
similarity index 100%
rename from Boards/simulator/Source/Simulator.cpp
rename to Devices/simulator/Source/Simulator.cpp
diff --git a/Boards/simulator/Source/Simulator.h b/Devices/simulator/Source/Simulator.h
similarity index 100%
rename from Boards/simulator/Source/Simulator.h
rename to Devices/simulator/Source/Simulator.h
diff --git a/Boards/simulator/Source/hal/SdlDisplay.h b/Devices/simulator/Source/hal/SdlDisplay.h
similarity index 100%
rename from Boards/simulator/Source/hal/SdlDisplay.h
rename to Devices/simulator/Source/hal/SdlDisplay.h
diff --git a/Boards/simulator/Source/hal/SdlKeyboard.h b/Devices/simulator/Source/hal/SdlKeyboard.h
similarity index 100%
rename from Boards/simulator/Source/hal/SdlKeyboard.h
rename to Devices/simulator/Source/hal/SdlKeyboard.h
diff --git a/Boards/simulator/Source/hal/SdlTouch.h b/Devices/simulator/Source/hal/SdlTouch.h
similarity index 100%
rename from Boards/simulator/Source/hal/SdlTouch.h
rename to Devices/simulator/Source/hal/SdlTouch.h
diff --git a/Boards/simulator/Source/hal/SimulatorPower.cpp b/Devices/simulator/Source/hal/SimulatorPower.cpp
similarity index 100%
rename from Boards/simulator/Source/hal/SimulatorPower.cpp
rename to Devices/simulator/Source/hal/SimulatorPower.cpp
diff --git a/Boards/simulator/Source/hal/SimulatorPower.h b/Devices/simulator/Source/hal/SimulatorPower.h
similarity index 100%
rename from Boards/simulator/Source/hal/SimulatorPower.h
rename to Devices/simulator/Source/hal/SimulatorPower.h
diff --git a/Boards/simulator/Source/hal/SimulatorSdCard.h b/Devices/simulator/Source/hal/SimulatorSdCard.h
similarity index 100%
rename from Boards/simulator/Source/hal/SimulatorSdCard.h
rename to Devices/simulator/Source/hal/SimulatorSdCard.h
diff --git a/Boards/unphone/CMakeLists.txt b/Devices/unphone/CMakeLists.txt
similarity index 100%
rename from Boards/unphone/CMakeLists.txt
rename to Devices/unphone/CMakeLists.txt
diff --git a/Boards/unphone/Source/Configuration.cpp b/Devices/unphone/Source/Configuration.cpp
similarity index 100%
rename from Boards/unphone/Source/Configuration.cpp
rename to Devices/unphone/Source/Configuration.cpp
diff --git a/Boards/unphone/Source/InitBoot.cpp b/Devices/unphone/Source/InitBoot.cpp
similarity index 100%
rename from Boards/unphone/Source/InitBoot.cpp
rename to Devices/unphone/Source/InitBoot.cpp
diff --git a/Boards/unphone/Source/UnPhoneFeatures.cpp b/Devices/unphone/Source/UnPhoneFeatures.cpp
similarity index 100%
rename from Boards/unphone/Source/UnPhoneFeatures.cpp
rename to Devices/unphone/Source/UnPhoneFeatures.cpp
diff --git a/Boards/unphone/Source/UnPhoneFeatures.h b/Devices/unphone/Source/UnPhoneFeatures.h
similarity index 100%
rename from Boards/unphone/Source/UnPhoneFeatures.h
rename to Devices/unphone/Source/UnPhoneFeatures.h
diff --git a/Boards/unphone/Source/devices/Hx8357Display.cpp b/Devices/unphone/Source/devices/Hx8357Display.cpp
similarity index 100%
rename from Boards/unphone/Source/devices/Hx8357Display.cpp
rename to Devices/unphone/Source/devices/Hx8357Display.cpp
diff --git a/Boards/unphone/Source/devices/Hx8357Display.h b/Devices/unphone/Source/devices/Hx8357Display.h
similarity index 100%
rename from Boards/unphone/Source/devices/Hx8357Display.h
rename to Devices/unphone/Source/devices/Hx8357Display.h
diff --git a/Boards/unphone/Source/devices/SdCard.cpp b/Devices/unphone/Source/devices/SdCard.cpp
similarity index 100%
rename from Boards/unphone/Source/devices/SdCard.cpp
rename to Devices/unphone/Source/devices/SdCard.cpp
diff --git a/Boards/unphone/Source/devices/SdCard.h b/Devices/unphone/Source/devices/SdCard.h
similarity index 100%
rename from Boards/unphone/Source/devices/SdCard.h
rename to Devices/unphone/Source/devices/SdCard.h
diff --git a/Boards/unphone/Source/devices/Touch.cpp b/Devices/unphone/Source/devices/Touch.cpp
similarity index 100%
rename from Boards/unphone/Source/devices/Touch.cpp
rename to Devices/unphone/Source/devices/Touch.cpp
diff --git a/Boards/unphone/Source/devices/Touch.h b/Devices/unphone/Source/devices/Touch.h
similarity index 100%
rename from Boards/unphone/Source/devices/Touch.h
rename to Devices/unphone/Source/devices/Touch.h
diff --git a/Boards/unphone/Source/hx8357/README.md b/Devices/unphone/Source/hx8357/README.md
similarity index 100%
rename from Boards/unphone/Source/hx8357/README.md
rename to Devices/unphone/Source/hx8357/README.md
diff --git a/Boards/unphone/Source/hx8357/disp_spi.c b/Devices/unphone/Source/hx8357/disp_spi.c
similarity index 100%
rename from Boards/unphone/Source/hx8357/disp_spi.c
rename to Devices/unphone/Source/hx8357/disp_spi.c
diff --git a/Boards/unphone/Source/hx8357/disp_spi.h b/Devices/unphone/Source/hx8357/disp_spi.h
similarity index 100%
rename from Boards/unphone/Source/hx8357/disp_spi.h
rename to Devices/unphone/Source/hx8357/disp_spi.h
diff --git a/Boards/unphone/Source/hx8357/hx8357.c b/Devices/unphone/Source/hx8357/hx8357.c
similarity index 100%
rename from Boards/unphone/Source/hx8357/hx8357.c
rename to Devices/unphone/Source/hx8357/hx8357.c
diff --git a/Boards/unphone/Source/hx8357/hx8357.h b/Devices/unphone/Source/hx8357/hx8357.h
similarity index 100%
rename from Boards/unphone/Source/hx8357/hx8357.h
rename to Devices/unphone/Source/hx8357/hx8357.h
diff --git a/Boards/unphone/Source/lvgl_spi_conf.h b/Devices/unphone/Source/lvgl_spi_conf.h
similarity index 100%
rename from Boards/unphone/Source/lvgl_spi_conf.h
rename to Devices/unphone/Source/lvgl_spi_conf.h
diff --git a/Boards/unphone/device.properties b/Devices/unphone/device.properties
similarity index 100%
rename from Boards/unphone/device.properties
rename to Devices/unphone/device.properties
diff --git a/Boards/waveshare-esp32-s3-geek/CMakeLists.txt b/Devices/waveshare-esp32-s3-geek/CMakeLists.txt
similarity index 100%
rename from Boards/waveshare-esp32-s3-geek/CMakeLists.txt
rename to Devices/waveshare-esp32-s3-geek/CMakeLists.txt
diff --git a/Boards/waveshare-esp32-s3-geek/Source/Configuration.cpp b/Devices/waveshare-esp32-s3-geek/Source/Configuration.cpp
similarity index 100%
rename from Boards/waveshare-esp32-s3-geek/Source/Configuration.cpp
rename to Devices/waveshare-esp32-s3-geek/Source/Configuration.cpp
diff --git a/Boards/waveshare-esp32-s3-geek/Source/devices/Display.cpp b/Devices/waveshare-esp32-s3-geek/Source/devices/Display.cpp
similarity index 100%
rename from Boards/waveshare-esp32-s3-geek/Source/devices/Display.cpp
rename to Devices/waveshare-esp32-s3-geek/Source/devices/Display.cpp
diff --git a/Boards/waveshare-esp32-s3-geek/Source/devices/Display.h b/Devices/waveshare-esp32-s3-geek/Source/devices/Display.h
similarity index 100%
rename from Boards/waveshare-esp32-s3-geek/Source/devices/Display.h
rename to Devices/waveshare-esp32-s3-geek/Source/devices/Display.h
diff --git a/Boards/waveshare-esp32-s3-geek/Source/devices/SdCard.cpp b/Devices/waveshare-esp32-s3-geek/Source/devices/SdCard.cpp
similarity index 100%
rename from Boards/waveshare-esp32-s3-geek/Source/devices/SdCard.cpp
rename to Devices/waveshare-esp32-s3-geek/Source/devices/SdCard.cpp
diff --git a/Boards/waveshare-esp32-s3-geek/Source/devices/SdCard.h b/Devices/waveshare-esp32-s3-geek/Source/devices/SdCard.h
similarity index 100%
rename from Boards/waveshare-esp32-s3-geek/Source/devices/SdCard.h
rename to Devices/waveshare-esp32-s3-geek/Source/devices/SdCard.h
diff --git a/Boards/waveshare-esp32-s3-geek/device.properties b/Devices/waveshare-esp32-s3-geek/device.properties
similarity index 100%
rename from Boards/waveshare-esp32-s3-geek/device.properties
rename to Devices/waveshare-esp32-s3-geek/device.properties
diff --git a/Boards/waveshare-s3-lcd-13/CMakeLists.txt b/Devices/waveshare-s3-lcd-13/CMakeLists.txt
similarity index 100%
rename from Boards/waveshare-s3-lcd-13/CMakeLists.txt
rename to Devices/waveshare-s3-lcd-13/CMakeLists.txt
diff --git a/Boards/waveshare-s3-lcd-13/Source/Configuration.cpp b/Devices/waveshare-s3-lcd-13/Source/Configuration.cpp
similarity index 100%
rename from Boards/waveshare-s3-lcd-13/Source/Configuration.cpp
rename to Devices/waveshare-s3-lcd-13/Source/Configuration.cpp
diff --git a/Boards/waveshare-s3-lcd-13/Source/devices/Display.cpp b/Devices/waveshare-s3-lcd-13/Source/devices/Display.cpp
similarity index 100%
rename from Boards/waveshare-s3-lcd-13/Source/devices/Display.cpp
rename to Devices/waveshare-s3-lcd-13/Source/devices/Display.cpp
diff --git a/Boards/waveshare-s3-lcd-13/Source/devices/Display.h b/Devices/waveshare-s3-lcd-13/Source/devices/Display.h
similarity index 100%
rename from Boards/waveshare-s3-lcd-13/Source/devices/Display.h
rename to Devices/waveshare-s3-lcd-13/Source/devices/Display.h
diff --git a/Boards/waveshare-s3-lcd-13/Source/devices/SdCard.cpp b/Devices/waveshare-s3-lcd-13/Source/devices/SdCard.cpp
similarity index 100%
rename from Boards/waveshare-s3-lcd-13/Source/devices/SdCard.cpp
rename to Devices/waveshare-s3-lcd-13/Source/devices/SdCard.cpp
diff --git a/Boards/waveshare-s3-lcd-13/Source/devices/SdCard.h b/Devices/waveshare-s3-lcd-13/Source/devices/SdCard.h
similarity index 100%
rename from Boards/waveshare-s3-lcd-13/Source/devices/SdCard.h
rename to Devices/waveshare-s3-lcd-13/Source/devices/SdCard.h
diff --git a/Boards/waveshare-s3-lcd-13/device.properties b/Devices/waveshare-s3-lcd-13/device.properties
similarity index 100%
rename from Boards/waveshare-s3-lcd-13/device.properties
rename to Devices/waveshare-s3-lcd-13/device.properties
diff --git a/Boards/waveshare-s3-touch-lcd-128/CMakeLists.txt b/Devices/waveshare-s3-touch-lcd-128/CMakeLists.txt
similarity index 100%
rename from Boards/waveshare-s3-touch-lcd-128/CMakeLists.txt
rename to Devices/waveshare-s3-touch-lcd-128/CMakeLists.txt
diff --git a/Boards/waveshare-s3-touch-lcd-128/Source/Configuration.cpp b/Devices/waveshare-s3-touch-lcd-128/Source/Configuration.cpp
similarity index 100%
rename from Boards/waveshare-s3-touch-lcd-128/Source/Configuration.cpp
rename to Devices/waveshare-s3-touch-lcd-128/Source/Configuration.cpp
diff --git a/Boards/waveshare-s3-touch-lcd-128/Source/devices/Display.cpp b/Devices/waveshare-s3-touch-lcd-128/Source/devices/Display.cpp
similarity index 100%
rename from Boards/waveshare-s3-touch-lcd-128/Source/devices/Display.cpp
rename to Devices/waveshare-s3-touch-lcd-128/Source/devices/Display.cpp
diff --git a/Boards/waveshare-s3-touch-lcd-128/Source/devices/Display.h b/Devices/waveshare-s3-touch-lcd-128/Source/devices/Display.h
similarity index 100%
rename from Boards/waveshare-s3-touch-lcd-128/Source/devices/Display.h
rename to Devices/waveshare-s3-touch-lcd-128/Source/devices/Display.h
diff --git a/Boards/waveshare-s3-touch-lcd-128/Source/devices/SdCard.cpp b/Devices/waveshare-s3-touch-lcd-128/Source/devices/SdCard.cpp
similarity index 100%
rename from Boards/waveshare-s3-touch-lcd-128/Source/devices/SdCard.cpp
rename to Devices/waveshare-s3-touch-lcd-128/Source/devices/SdCard.cpp
diff --git a/Boards/waveshare-s3-touch-lcd-128/Source/devices/SdCard.h b/Devices/waveshare-s3-touch-lcd-128/Source/devices/SdCard.h
similarity index 100%
rename from Boards/waveshare-s3-touch-lcd-128/Source/devices/SdCard.h
rename to Devices/waveshare-s3-touch-lcd-128/Source/devices/SdCard.h
diff --git a/Boards/waveshare-s3-touch-lcd-128/device.properties b/Devices/waveshare-s3-touch-lcd-128/device.properties
similarity index 100%
rename from Boards/waveshare-s3-touch-lcd-128/device.properties
rename to Devices/waveshare-s3-touch-lcd-128/device.properties
diff --git a/Boards/waveshare-s3-touch-lcd-147/CMakeLists.txt b/Devices/waveshare-s3-touch-lcd-147/CMakeLists.txt
similarity index 100%
rename from Boards/waveshare-s3-touch-lcd-147/CMakeLists.txt
rename to Devices/waveshare-s3-touch-lcd-147/CMakeLists.txt
diff --git a/Boards/waveshare-s3-touch-lcd-147/Source/Configuration.cpp b/Devices/waveshare-s3-touch-lcd-147/Source/Configuration.cpp
similarity index 100%
rename from Boards/waveshare-s3-touch-lcd-147/Source/Configuration.cpp
rename to Devices/waveshare-s3-touch-lcd-147/Source/Configuration.cpp
diff --git a/Boards/waveshare-s3-touch-lcd-147/Source/Init.cpp b/Devices/waveshare-s3-touch-lcd-147/Source/Init.cpp
similarity index 100%
rename from Boards/waveshare-s3-touch-lcd-147/Source/Init.cpp
rename to Devices/waveshare-s3-touch-lcd-147/Source/Init.cpp
diff --git a/Boards/waveshare-s3-touch-lcd-147/Source/devices/Axs5106Touch.cpp b/Devices/waveshare-s3-touch-lcd-147/Source/devices/Axs5106Touch.cpp
similarity index 100%
rename from Boards/waveshare-s3-touch-lcd-147/Source/devices/Axs5106Touch.cpp
rename to Devices/waveshare-s3-touch-lcd-147/Source/devices/Axs5106Touch.cpp
diff --git a/Boards/waveshare-s3-touch-lcd-147/Source/devices/Axs5106Touch.h b/Devices/waveshare-s3-touch-lcd-147/Source/devices/Axs5106Touch.h
similarity index 100%
rename from Boards/waveshare-s3-touch-lcd-147/Source/devices/Axs5106Touch.h
rename to Devices/waveshare-s3-touch-lcd-147/Source/devices/Axs5106Touch.h
diff --git a/Boards/waveshare-s3-touch-lcd-147/Source/devices/Display.cpp b/Devices/waveshare-s3-touch-lcd-147/Source/devices/Display.cpp
similarity index 100%
rename from Boards/waveshare-s3-touch-lcd-147/Source/devices/Display.cpp
rename to Devices/waveshare-s3-touch-lcd-147/Source/devices/Display.cpp
diff --git a/Boards/waveshare-s3-touch-lcd-147/Source/devices/Display.h b/Devices/waveshare-s3-touch-lcd-147/Source/devices/Display.h
similarity index 100%
rename from Boards/waveshare-s3-touch-lcd-147/Source/devices/Display.h
rename to Devices/waveshare-s3-touch-lcd-147/Source/devices/Display.h
diff --git a/Boards/waveshare-s3-touch-lcd-147/Source/devices/Jd9853Display.cpp b/Devices/waveshare-s3-touch-lcd-147/Source/devices/Jd9853Display.cpp
similarity index 100%
rename from Boards/waveshare-s3-touch-lcd-147/Source/devices/Jd9853Display.cpp
rename to Devices/waveshare-s3-touch-lcd-147/Source/devices/Jd9853Display.cpp
diff --git a/Boards/waveshare-s3-touch-lcd-147/Source/devices/Jd9853Display.h b/Devices/waveshare-s3-touch-lcd-147/Source/devices/Jd9853Display.h
similarity index 100%
rename from Boards/waveshare-s3-touch-lcd-147/Source/devices/Jd9853Display.h
rename to Devices/waveshare-s3-touch-lcd-147/Source/devices/Jd9853Display.h
diff --git a/Boards/waveshare-s3-touch-lcd-147/Source/devices/Sdcard.cpp b/Devices/waveshare-s3-touch-lcd-147/Source/devices/Sdcard.cpp
similarity index 100%
rename from Boards/waveshare-s3-touch-lcd-147/Source/devices/Sdcard.cpp
rename to Devices/waveshare-s3-touch-lcd-147/Source/devices/Sdcard.cpp
diff --git a/Boards/waveshare-s3-touch-lcd-147/Source/devices/Sdcard.h b/Devices/waveshare-s3-touch-lcd-147/Source/devices/Sdcard.h
similarity index 100%
rename from Boards/waveshare-s3-touch-lcd-147/Source/devices/Sdcard.h
rename to Devices/waveshare-s3-touch-lcd-147/Source/devices/Sdcard.h
diff --git a/Boards/waveshare-s3-touch-lcd-147/device.properties b/Devices/waveshare-s3-touch-lcd-147/device.properties
similarity index 100%
rename from Boards/waveshare-s3-touch-lcd-147/device.properties
rename to Devices/waveshare-s3-touch-lcd-147/device.properties
diff --git a/Boards/waveshare-s3-touch-lcd-43/CMakeLists.txt b/Devices/waveshare-s3-touch-lcd-43/CMakeLists.txt
similarity index 100%
rename from Boards/waveshare-s3-touch-lcd-43/CMakeLists.txt
rename to Devices/waveshare-s3-touch-lcd-43/CMakeLists.txt
diff --git a/Boards/waveshare-s3-touch-lcd-43/Source/Configuration.cpp b/Devices/waveshare-s3-touch-lcd-43/Source/Configuration.cpp
similarity index 100%
rename from Boards/waveshare-s3-touch-lcd-43/Source/Configuration.cpp
rename to Devices/waveshare-s3-touch-lcd-43/Source/Configuration.cpp
diff --git a/Boards/waveshare-s3-touch-lcd-43/Source/devices/Display.cpp b/Devices/waveshare-s3-touch-lcd-43/Source/devices/Display.cpp
similarity index 100%
rename from Boards/waveshare-s3-touch-lcd-43/Source/devices/Display.cpp
rename to Devices/waveshare-s3-touch-lcd-43/Source/devices/Display.cpp
diff --git a/Boards/waveshare-s3-touch-lcd-43/Source/devices/Display.h b/Devices/waveshare-s3-touch-lcd-43/Source/devices/Display.h
similarity index 100%
rename from Boards/waveshare-s3-touch-lcd-43/Source/devices/Display.h
rename to Devices/waveshare-s3-touch-lcd-43/Source/devices/Display.h
diff --git a/Boards/waveshare-s3-touch-lcd-43/Source/devices/SdCard.cpp b/Devices/waveshare-s3-touch-lcd-43/Source/devices/SdCard.cpp
similarity index 100%
rename from Boards/waveshare-s3-touch-lcd-43/Source/devices/SdCard.cpp
rename to Devices/waveshare-s3-touch-lcd-43/Source/devices/SdCard.cpp
diff --git a/Boards/waveshare-s3-touch-lcd-43/Source/devices/SdCard.h b/Devices/waveshare-s3-touch-lcd-43/Source/devices/SdCard.h
similarity index 100%
rename from Boards/waveshare-s3-touch-lcd-43/Source/devices/SdCard.h
rename to Devices/waveshare-s3-touch-lcd-43/Source/devices/SdCard.h
diff --git a/Boards/waveshare-s3-touch-lcd-43/device.properties b/Devices/waveshare-s3-touch-lcd-43/device.properties
similarity index 100%
rename from Boards/waveshare-s3-touch-lcd-43/device.properties
rename to Devices/waveshare-s3-touch-lcd-43/device.properties
diff --git a/Documentation/ideas.md b/Documentation/ideas.md
index d15cae4d..2b7a45aa 100644
--- a/Documentation/ideas.md
+++ b/Documentation/ideas.md
@@ -2,6 +2,11 @@
 
 ## Before release
 
+- Create function that tests available memory and logs when it's low:
+    - Add low memory warning when calling DevelopmentService::handleAppInstall()
+    - Add low memory warning when calling tt::app::install
+    - Add statusbar icon that shows low/critical memory warnings
+- CDN upload should mention upload timestamp (at least for snapshot builds)
 - Change ButtonControl to work with interrupts and xQueue
 - TCA9534 keyboards should use interrupts
 - GT911 drivers should use interrupts if it's stable
@@ -42,10 +47,9 @@
 ## Medium Priority
 
 - Diceware app has large "+" and "-' buttons on Cardputer. It should be smaller.
-- Create PwmRgbLedDevice class and implement it for all CYD boards
+- Create PwmRgbLedDevice class and implement it for all CYD devices
 - TactilityTool: Make API compatibility table (and check for compatibility in the tool itself)
 - Improve EspLcdDisplay to contain all the standard configuration options, and implement a default init function. Add a configuration class.
-- Statusbar icon that shows low/critical memory warnings
 - Make WiFi setup app that starts an access point and hosts a webpage to set up the device.
   This will be useful for devices without a screen, a small screen or a non-touch screen.
 - Unify the way displays are dimmed. Some implementations turn off the display when it's fully dimmed. Make this a separate functionality.
@@ -91,7 +95,7 @@
 - Audio player app
 - Audio recording app
 - OTA updates
-- T-Deck Plus: Create separate board config?
+- T-Deck Plus: Create separate device config?
 - Support for displays with different DPI. Consider the layer-based system like on Android.
 - If present, use LED to show boot/wifi status
 - Capacity based on voltage: estimation for various devices uses a linear voltage curve, but it should use a battery discharge curve.
diff --git a/Firmware/CMakeLists.txt b/Firmware/CMakeLists.txt
index f791b19f..ca300ff1 100644
--- a/Firmware/CMakeLists.txt
+++ b/Firmware/CMakeLists.txt
@@ -3,15 +3,15 @@ cmake_minimum_required(VERSION 3.20)
 file(GLOB_RECURSE SOURCE_FILES "Source/*.c*")
 
 if (DEFINED ENV{ESP_IDF_VERSION})
-    # Read board id/project
-    include("../Buildscripts/board.cmake")
+    # Read device id/project
+    include("../Buildscripts/device.cmake")
     init_tactility_globals("../sdkconfig")
-    get_property(TACTILITY_BOARD_PROJECT GLOBAL PROPERTY TACTILITY_BOARD_PROJECT)
+    get_property(TACTILITY_DEVICE_PROJECT GLOBAL PROPERTY TACTILITY_DEVICE_PROJECT)
 
     idf_component_register(
         SRCS ${SOURCE_FILES}
-        REQUIRES ${BOARD_COMPONENTS}
-        REQUIRES Tactility TactilityC ${TACTILITY_BOARD_PROJECT}
+        REQUIRES ${DEVICE_COMPONENTS}
+        REQUIRES Tactility TactilityC ${TACTILITY_DEVICE_PROJECT}
     )
 else ()
 
@@ -25,4 +25,4 @@ else ()
 
     add_definitions(-D_Nullable=)
     add_definitions(-D_Nonnull=)
-endif ()
\ No newline at end of file
+endif ()
diff --git a/Firmware/Kconfig b/Firmware/Kconfig
index fa90ea66..871c980d 100644
--- a/Firmware/Kconfig
+++ b/Firmware/Kconfig
@@ -1,88 +1,88 @@
 # Kconfig file for Tactility example app
 menu "Tactility App"
-    config TT_BOARD_NAME
-        string "Board Name"
+    config TT_DEVICE_NAME
+        string "Device Name"
         default ""
-    config TT_BOARD_ID
-        string "Board ID"
+    config TT_DEVICE_ID
+        string "Device Identifier"
         default ""
     choice
-        prompt "Board"
-        default TT_BOARD_CUSTOM
-        config TT_BOARD_CUSTOM
+        prompt "Device"
+        default TT_DEVICE_CUSTOM
+        config TT_DEVICE_CUSTOM
             bool "Custom"
-        config TT_BOARD_BTT_PANDA_TOUCH
+        config TT_DEVICE_BTT_PANDA_TOUCH
             bool "BigTreeTech Panda Touch"
-        config TT_BOARD_CYD_2432S024C
+        config TT_DEVICE_CYD_2432S024C
             bool "CYD 2432S024C"
-        config TT_BOARD_CYD_2432S028R
+        config TT_DEVICE_CYD_2432S028R
             bool "CYD 2432S028R"
-        config TT_BOARD_CYD_2432S028RV3
+        config TT_DEVICE_CYD_2432S028RV3
             bool "CYD 2432S028RV3"
-        config TT_BOARD_CYD_E32R28T
+        config TT_DEVICE_CYD_E32R28T
             bool "CYD E32R28T"
-        config TT_BOARD_CYD_E32R32P
+        config TT_DEVICE_CYD_E32R32P
             bool "CYD E32R32P"
-        config TT_BOARD_CYD_2432S032C
+        config TT_DEVICE_CYD_2432S032C
             bool "CYD 2432S032C"
-        config TT_BOARD_CYD_8048S043C
+        config TT_DEVICE_CYD_8048S043C
             bool "CYD 8048S043C"
-        config TT_BOARD_CYD_JC2432W328C
+        config TT_DEVICE_CYD_JC2432W328C
             bool "CYD JC2432W328C"
-        config TT_BOARD_CYD_JC8048W550C
+        config TT_DEVICE_CYD_JC8048W550C
             bool "CYD JC8048W550C"
-        config TT_BOARD_CYD_4848S040C
+        config TT_DEVICE_CYD_4848S040C
             bool "CYD 4848S040C"
-        config TT_BOARD_ELECROW_CROWPANEL_ADVANCE_28
+        config TT_DEVICE_ELECROW_CROWPANEL_ADVANCE_28
             bool "Elecrow CrowPanel Advance 2.8"
-        config TT_BOARD_ELECROW_CROWPANEL_ADVANCE_35
+        config TT_DEVICE_ELECROW_CROWPANEL_ADVANCE_35
             bool "Elecrow CrowPanel Advance 3.5"
-        config TT_BOARD_ELECROW_CROWPANEL_ADVANCE_50
+        config TT_DEVICE_ELECROW_CROWPANEL_ADVANCE_50
             bool "Elecrow CrowPanel Advance 5.0"
-        config TT_BOARD_ELECROW_CROWPANEL_BASIC_28
+        config TT_DEVICE_ELECROW_CROWPANEL_BASIC_28
             bool "Elecrow CrowPanel Basic 2.8"
-        config TT_BOARD_ELECROW_CROWPANEL_BASIC_35
+        config TT_DEVICE_ELECROW_CROWPANEL_BASIC_35
             bool "Elecrow CrowPanel Basic 3.5"
-        config TT_BOARD_ELECROW_CROWPANEL_BASIC_50
+        config TT_DEVICE_ELECROW_CROWPANEL_BASIC_50
             bool "Elecrow CrowPanel Basic 5.0"
-        config TT_BOARD_HELTEC_V3
+        config TT_DEVICE_HELTEC_V3
             bool "Heltec v3"
-        config TT_BOARD_LILYGO_TDECK
+        config TT_DEVICE_LILYGO_TDECK
             bool "LilyGo T-Deck"
-        config TT_BOARD_LILYGO_TDONGLE_S3
+        config TT_DEVICE_LILYGO_TDONGLE_S3
             bool "LilyGo T-Dongle S3"
-        config TT_BOARD_LILYGO_TLORA_PAGER
+        config TT_DEVICE_LILYGO_TLORA_PAGER
             bool "LilyGo T-Lora Pager"
-        config TT_BOARD_LILYGO_TDISPLAY
+        config TT_DEVICE_LILYGO_TDISPLAY
             bool "LilyGo T-Display"
-        config TT_BOARD_M5STACK_CARDPUTER
+        config TT_DEVICE_M5STACK_CARDPUTER
             bool "M5Stack Cardputer"
-        config TT_BOARD_M5STACK_CARDPUTER_ADV
+        config TT_DEVICE_M5STACK_CARDPUTER_ADV
             bool "M5Stack Cardputer Adv"
-        config TT_BOARD_M5STACK_CORE2
+        config TT_DEVICE_M5STACK_CORE2
             bool "M5Stack Core2"
-        config TT_BOARD_M5STACK_CORES3
+        config TT_DEVICE_M5STACK_CORES3
             bool "M5Stack CoreS3"
-        config TT_BOARD_M5STACK_STICKC_PLUS
+        config TT_DEVICE_M5STACK_STICKC_PLUS
             bool "M5Stack StickC Plus"
-        config TT_BOARD_M5STACK_STICKC_PLUS2
+        config TT_DEVICE_M5STACK_STICKC_PLUS2
             bool "M5Stack StickC Plus2"
-        config TT_BOARD_UNPHONE
+        config TT_DEVICE_UNPHONE
             bool "unPhone"
-        config TT_BOARD_WAVESHARE_ESP32_S3_GEEK
+        config TT_DEVICE_WAVESHARE_ESP32_S3_GEEK
             bool "Waveshare ESP32 S3 GEEK"
-        config TT_BOARD_WAVESHARE_S3_TOUCH_43
+        config TT_DEVICE_WAVESHARE_S3_TOUCH_43
             bool "Waveshare ESP32 S3 Touch LCD 4.3"
-        config TT_BOARD_WAVESHARE_S3_TOUCH_LCD_147
+        config TT_DEVICE_WAVESHARE_S3_TOUCH_LCD_147
             bool "Waveshare ESP32 S3 Touch LCD 1.47"
-        config TT_BOARD_WAVESHARE_S3_TOUCH_LCD_128
+        config TT_DEVICE_WAVESHARE_S3_TOUCH_LCD_128
             bool "Waveshare ESP32 S3 Touch LCD 1.28"
-        config TT_BOARD_WAVESHARE_S3_LCD_13
+        config TT_DEVICE_WAVESHARE_S3_LCD_13
             bool "Waveshare ESP32 S3 LCD 1.3"
 
         help
-            Select a board/hardware configuration.
-            Use TT_BOARD_CUSTOM if you will manually configure the board in your project.
+            Select a device.
+            Use TT_DEVICE_CUSTOM if you will manually configure the device in your project.
     endchoice
 
     config TT_SPLASH_DURATION
diff --git a/Tactility/Source/Tactility.cpp b/Tactility/Source/Tactility.cpp
index 4dccce5c..9339e455 100644
--- a/Tactility/Source/Tactility.cpp
+++ b/Tactility/Source/Tactility.cpp
@@ -275,7 +275,7 @@ void registerApps() {
 }
 
 void run(const Configuration& config) {
-    TT_LOG_I(TAG, "Tactility v%s on %s (%s)", TT_VERSION, CONFIG_TT_BOARD_NAME, CONFIG_TT_BOARD_ID);
+    TT_LOG_I(TAG, "Tactility v%s on %s (%s)", TT_VERSION, CONFIG_TT_DEVICE_NAME, CONFIG_TT_DEVICE_ID);
 
     assert(config.hardware);
     const hal::Configuration& hardware = *config.hardware;
diff --git a/Tactility/Source/app/crashdiagnostics/QrUrl.cpp b/Tactility/Source/app/crashdiagnostics/QrUrl.cpp
index 06a1ef76..8daefd47 100644
--- a/Tactility/Source/app/crashdiagnostics/QrUrl.cpp
+++ b/Tactility/Source/app/crashdiagnostics/QrUrl.cpp
@@ -29,7 +29,7 @@ std::string getUrlFromCrashData() {
     stream << "https://oops.tactility.one";
     stream << "?v=" << TT_VERSION; // Version
     stream << "&a=" << CONFIG_IDF_TARGET; // Architecture
-    stream << "&b=" << CONFIG_TT_BOARD_ID; // Board identifier
+    stream << "&b=" << CONFIG_TT_DEVICE_ID; // Board identifier
     stream << "&s="; // Stacktrace
 
     for (int i = crash_data.callstackLength - 1; i >= 0; --i) {
diff --git a/device.py b/device.py
index 29581a5a..a80696c3 100644
--- a/device.py
+++ b/device.py
@@ -12,7 +12,7 @@ else:
     SHELL_COLOR_ORANGE = "\033[93m"
     SHELL_COLOR_RESET = "\033[m"
 
-DEVICES_DIRECTORY = "Boards"
+DEVICES_DIRECTORY = "Devices"
 
 def print_warning(message):
     print(f"{SHELL_COLOR_ORANGE}WARNING: {message}{SHELL_COLOR_RESET}")
@@ -93,15 +93,15 @@ def write_partition_table(output_file, device_properties: ConfigParser, is_dev:
 
 def write_tactility_variables(output_file, device_properties: ConfigParser, device_id: str):
     device_selector_name = device_id.upper().replace("-", "_")
-    device_selector = f"CONFIG_TT_BOARD_{device_selector_name}"
+    device_selector = f"CONFIG_TT_DEVICE_{device_selector_name}"
     output_file.write(f"{device_selector}=y\n")
     board_vendor = get_property_or_exit(device_properties, "general", "vendor").replace("\"", "\\\"")
     board_name = get_property_or_exit(device_properties, "general", "name").replace("\"", "\\\"")
     if board_name == board_vendor or board_vendor == "":
-        output_file.write(f"CONFIG_TT_BOARD_NAME=\"{board_name}\"\n")
+        output_file.write(f"CONFIG_TT_DEVICE_NAME=\"{board_name}\"\n")
     else:
-        output_file.write(f"CONFIG_TT_BOARD_NAME=\"{board_vendor} {board_name}\"\n")
-    output_file.write(f"CONFIG_TT_BOARD_ID=\"{device_id}\"\n")
+        output_file.write(f"CONFIG_TT_DEVICE_NAME=\"{board_vendor} {board_name}\"\n")
+    output_file.write(f"CONFIG_TT_DEVICE_ID=\"{device_id}\"\n")
 
 def write_core_variables(output_file, device_properties: ConfigParser):
     idf_target = get_property_or_exit(device_properties, "hardware", "target")