diff --git a/src/graphics/niche/InkHUD/PlatformioConfig.ini b/src/graphics/niche/InkHUD/PlatformioConfig.ini
index e5a0e67df..80984f399 100644
--- a/src/graphics/niche/InkHUD/PlatformioConfig.ini
+++ b/src/graphics/niche/InkHUD/PlatformioConfig.ini
@@ -1,7 +1,6 @@
 [inkhud]
 build_src_filter = 
   +<graphics/niche/>; Include the nicheGraphics directory
-  +<../variants/$PIOENV>; Include nicheGraphics.h from our variant folder
 build_flags = 
   -D MESHTASTIC_INCLUDE_NICHE_GRAPHICS ; Use NicheGraphics
   -D MESHTASTIC_INCLUDE_INKHUD ; Use InkHUD (a NicheGraphics UI)
diff --git a/variants/diy/platformio.ini b/variants/diy/platformio.ini
deleted file mode 100644
index 6b3a2ed99..000000000
--- a/variants/diy/platformio.ini
+++ /dev/null
@@ -1,80 +0,0 @@
-; Promicro + E22(0)-xxxMM / RA-01SH modules board variant - DIY - without TCXO
-[env:nrf52_promicro_diy_xtal]
-extends = nrf52840_base
-board = promicro-nrf52840
-board_level = extra
-build_flags = ${nrf52840_base.build_flags}
-  -I variants/diy/nrf52_promicro_diy_xtal
-  -D NRF52_PROMICRO_DIY
-build_src_filter = ${nrf52_base.build_src_filter} +<../variants/diy/nrf52_promicro_diy_xtal>
-lib_deps = 
-  ${nrf52840_base.lib_deps}
-debug_tool = jlink
-
-
-; Promicro + E22(0)-xxxM / HT-RA62 modules board variant - DIY - with TCXO
-[env:nrf52_promicro_diy_tcxo]
-extends = nrf52840_base
-board = promicro-nrf52840
-build_flags = ${nrf52840_base.build_flags}
-  -I variants/diy/nrf52_promicro_diy_tcxo
-  -D NRF52_PROMICRO_DIY
-build_src_filter = ${nrf52_base.build_src_filter} +<../variants/diy/nrf52_promicro_diy_tcxo>
-lib_deps = 
-  ${nrf52840_base.lib_deps}
-debug_tool = jlink
-
-; NRF52 ProMicro w/ E-Ink display
-[env:nrf52_promicro_diy-inkhud]
-board_level = extra
-extends = nrf52840_base, inkhud
-board = promicro-nrf52840
-build_flags =
-  ${nrf52840_base.build_flags}
-  ${inkhud.build_flags}
-  -I variants/diy/nrf52_promicro_diy_tcxo
-  -D NRF52_PROMICRO_DIY
-build_src_filter =
-  ${nrf52_base.build_src_filter}
-  ${inkhud.build_src_filter}
-  +<../variants/diy/nrf52_promicro_diy_tcxo>
-lib_deps =
-  ${inkhud.lib_deps} ; InkHUD libs first, so we get GFXRoot instead of AdafruitGFX
-  ${nrf52840_base.lib_deps}
-extra_scripts =
-  ${env.extra_scripts}
-  variants/diy/nrf52_promicro_diy_tcxo/custom_build_tasks.py ; Add to PIO's Project Tasks pane: preset builds for common displays
-
-; Seeed Xiao BLE: https://www.digikey.com/en/products/detail/seeed-technology-co-ltd/102010448/16652893
-[env:xiao_ble]
-extends = env:seeed_xiao_nrf52840_kit
-board_level = extra
-build_flags = ${env:seeed_xiao_nrf52840_kit.build_flags} -D PRIVATE_HW -DXIAO_BLE_LEGACY_PINOUT -DEBYTE_E22 -DEBYTE_E22_900M30S
-build_unflags = -DGPS_L76K
-
-; Seeed XIAO nRF52840 + EBYTE E22-900M30S - Pinout matching Wio-SX1262 (SKU 113010003)
-[env:seeed_xiao_nrf52840_e22_900m30s]
-extends = env:seeed_xiao_nrf52840_kit
-board_level = extra
-build_flags = ${env:seeed_xiao_nrf52840_kit.build_flags} -D PRIVATE_HW -DEBYTE_E22 -DEBYTE_E22_900M30S
-build_unflags = -DGPS_L76K
-
-; Seeed XIAO nRF52840 + EBYTE E22-900M33S - Pinout matching Wio-SX1262 (SKU 113010003)
-[env:seeed_xiao_nrf52840_e22_900m33s]
-extends = env:seeed_xiao_nrf52840_kit
-board_level = extra
-build_flags = ${env:seeed_xiao_nrf52840_kit.build_flags} -D PRIVATE_HW -DEBYTE_E22 -DEBYTE_E22_900M33S
-build_unflags = -DGPS_L76K
-
-; Seeed XIAO nRF52840 + XIAO Wio SX1262 DIY
-[env:seeed-xiao-nrf52840-wio-sx1262]
-board = xiao_ble_sense
-extends = nrf52840_base
-board_level = extra
-build_flags = ${nrf52840_base.build_flags} -Ivariants/diy/seeed-xiao-nrf52840-wio-sx1262 -D PRIVATE_HW
-  -Isrc/platform/nrf52/softdevice -Isrc/platform/nrf52/softdevice/nrf52
-board_build.ldscript = src/platform/nrf52/nrf52840_s140_v7.ld
-build_src_filter = ${nrf52_base.build_src_filter} +<../variants/diy/seeed-xiao-nrf52840-wio-sx1262>
-lib_deps =
-  ${nrf52840_base.lib_deps}
-debug_tool = jlink
diff --git a/variants/Dongle_nRF52840-pca10059-v1/platformio.ini b/variants/nrf52840/Dongle_nRF52840-pca10059-v1/platformio.ini
similarity index 67%
rename from variants/Dongle_nRF52840-pca10059-v1/platformio.ini
rename to variants/nrf52840/Dongle_nRF52840-pca10059-v1/platformio.ini
index ad944779d..83044c206 100644
--- a/variants/Dongle_nRF52840-pca10059-v1/platformio.ini
+++ b/variants/nrf52840/Dongle_nRF52840-pca10059-v1/platformio.ini
@@ -2,11 +2,13 @@
 board_level = extra
 extends = nrf52840_base
 board = nordic_pca10059
-build_flags = ${nrf52840_base.build_flags} -Ivariants/Dongle_nRF52840-pca10059-v1 -D NORDIC_PCA10059
+build_flags = ${nrf52840_base.build_flags}
+  -Ivariants/nrf52840/Dongle_nRF52840-pca10059-v1
+  -D NORDIC_PCA10059
   -DEINK_DISPLAY_MODEL=GxEPD2_420_M01
   -DEINK_WIDTH=300
   -DEINK_HEIGHT=400
-build_src_filter = ${nrf52_base.build_src_filter} +<../variants/Dongle_nRF52840-pca10059-v1>
+build_src_filter = ${nrf52_base.build_src_filter} +<../variants/nrf52840/Dongle_nRF52840-pca10059-v1>
 lib_deps = 
   ${nrf52840_base.lib_deps}
   zinggjm/GxEPD2@^1.6.2
diff --git a/variants/Dongle_nRF52840-pca10059-v1/variant.cpp b/variants/nrf52840/Dongle_nRF52840-pca10059-v1/variant.cpp
similarity index 100%
rename from variants/Dongle_nRF52840-pca10059-v1/variant.cpp
rename to variants/nrf52840/Dongle_nRF52840-pca10059-v1/variant.cpp
diff --git a/variants/Dongle_nRF52840-pca10059-v1/variant.h b/variants/nrf52840/Dongle_nRF52840-pca10059-v1/variant.h
similarity index 100%
rename from variants/Dongle_nRF52840-pca10059-v1/variant.h
rename to variants/nrf52840/Dongle_nRF52840-pca10059-v1/variant.h
diff --git a/variants/ELECROW-ThinkNode-M1/nicheGraphics.h b/variants/nrf52840/ELECROW-ThinkNode-M1/nicheGraphics.h
similarity index 100%
rename from variants/ELECROW-ThinkNode-M1/nicheGraphics.h
rename to variants/nrf52840/ELECROW-ThinkNode-M1/nicheGraphics.h
diff --git a/variants/ELECROW-ThinkNode-M1/platformio.ini b/variants/nrf52840/ELECROW-ThinkNode-M1/platformio.ini
similarity index 88%
rename from variants/ELECROW-ThinkNode-M1/platformio.ini
rename to variants/nrf52840/ELECROW-ThinkNode-M1/platformio.ini
index 2e9a20dfe..0578bcfe8 100644
--- a/variants/ELECROW-ThinkNode-M1/platformio.ini
+++ b/variants/nrf52840/ELECROW-ThinkNode-M1/platformio.ini
@@ -6,7 +6,8 @@ board_check = true
 debug_tool = jlink
 
 # add -DCFG_SYSVIEW if you want to use the Segger systemview tool for OS profiling.
-build_flags = ${nrf52840_base.build_flags} -Ivariants/ELECROW-ThinkNode-M1
+build_flags = ${nrf52840_base.build_flags}
+  -Ivariants/nrf52840/ELECROW-ThinkNode-M1
   -DELECROW_ThinkNode_M1
   -DGPS_POWER_TOGGLE
   -DUSE_EINK
@@ -20,7 +21,7 @@ build_flags = ${nrf52840_base.build_flags} -Ivariants/ELECROW-ThinkNode-M1
 ;   -DEINK_LIMIT_GHOSTING_PX=2000        ; (Optional) How much image ghosting is tolerated
   -DEINK_BACKGROUND_USES_FAST          ; (Optional) Use FAST refresh for both BACKGROUND and RESPONSIVE, until a limit is reached.
 
-build_src_filter = ${nrf52_base.build_src_filter} +<../variants/ELECROW-ThinkNode-M1>
+build_src_filter = ${nrf52_base.build_src_filter} +<../variants/nrf52840/ELECROW-ThinkNode-M1>
 lib_deps = 
   ${nrf52840_base.lib_deps}
   https://github.com/meshtastic/GxEPD2/archive/33db3fa8ee6fc47d160bdb44f8f127c9a9203a10.zip
@@ -36,11 +37,12 @@ debug_tool = jlink
 build_flags = 
   ${nrf52840_base.build_flags}
   ${inkhud.build_flags}
-  -I variants/ELECROW-ThinkNode-M1
+  -I variants/nrf52840/ELECROW-ThinkNode-M1
   -D ELECROW_ThinkNode_M1
 build_src_filter = 
   ${nrf52_base.build_src_filter} 
   ${inkhud.build_src_filter}
+  +<../variants/nrf52840/ELECROW-ThinkNode-M1>
 lib_deps = 
   ${inkhud.lib_deps} ; InkHUD libs first, so we get GFXRoot instead of AdafruitGFX
   ${nrf52840_base.lib_deps}
diff --git a/variants/ELECROW-ThinkNode-M1/variant.cpp b/variants/nrf52840/ELECROW-ThinkNode-M1/variant.cpp
similarity index 100%
rename from variants/ELECROW-ThinkNode-M1/variant.cpp
rename to variants/nrf52840/ELECROW-ThinkNode-M1/variant.cpp
diff --git a/variants/ELECROW-ThinkNode-M1/variant.h b/variants/nrf52840/ELECROW-ThinkNode-M1/variant.h
similarity index 100%
rename from variants/ELECROW-ThinkNode-M1/variant.h
rename to variants/nrf52840/ELECROW-ThinkNode-M1/variant.h
diff --git a/variants/ME25LS01-4Y10TD/platformio.ini b/variants/nrf52840/ME25LS01-4Y10TD/platformio.ini
similarity index 76%
rename from variants/ME25LS01-4Y10TD/platformio.ini
rename to variants/nrf52840/ME25LS01-4Y10TD/platformio.ini
index b452f0ad8..89a45694c 100644
--- a/variants/ME25LS01-4Y10TD/platformio.ini
+++ b/variants/nrf52840/ME25LS01-4Y10TD/platformio.ini
@@ -3,10 +3,14 @@ extends = nrf52840_base
 board = me25ls01-4y10td
 board_level = extra
 ; platform = https://github.com/maxgerhardt/platform-nordicnrf52#cac6fcf943a41accd2aeb4f3659ae297a73f422e
-build_flags = ${nrf52840_base.build_flags} -Ivariants/ME25LS01-4Y10TD -Isrc/platform/nrf52/softdevice -Isrc/platform/nrf52/softdevice/nrf52 -DME25LS01_4Y10TD
+build_flags = ${nrf52840_base.build_flags}
+  -Ivariants/nrf52840/ME25LS01-4Y10TD
+  -Isrc/platform/nrf52/softdevice
+  -Isrc/platform/nrf52/softdevice/nrf52
+  -DME25LS01_4Y10TD
   -DGPS_POWER_TOGGLE ; comment this line to disable triple press function on the user button to turn off gps entirely.
 board_build.ldscript = src/platform/nrf52/nrf52840_s140_v7.ld
-build_src_filter = ${nrf52_base.build_src_filter} +<../variants/ME25LS01-4Y10TD>
+build_src_filter = ${nrf52_base.build_src_filter} +<../variants/nrf52840/ME25LS01-4Y10TD>
 lib_deps = 
   ${nrf52840_base.lib_deps}
 ; If not set we will default to uploading over serial (first it forces bootloader entry by talking 1200bps to cdcacm)
diff --git a/variants/ME25LS01-4Y10TD/rfswitch.h b/variants/nrf52840/ME25LS01-4Y10TD/rfswitch.h
similarity index 100%
rename from variants/ME25LS01-4Y10TD/rfswitch.h
rename to variants/nrf52840/ME25LS01-4Y10TD/rfswitch.h
diff --git a/variants/ME25LS01-4Y10TD/variant.cpp b/variants/nrf52840/ME25LS01-4Y10TD/variant.cpp
similarity index 100%
rename from variants/ME25LS01-4Y10TD/variant.cpp
rename to variants/nrf52840/ME25LS01-4Y10TD/variant.cpp
diff --git a/variants/ME25LS01-4Y10TD/variant.h b/variants/nrf52840/ME25LS01-4Y10TD/variant.h
similarity index 100%
rename from variants/ME25LS01-4Y10TD/variant.h
rename to variants/nrf52840/ME25LS01-4Y10TD/variant.h
diff --git a/variants/ME25LS01-4Y10TD_e-ink/platformio.ini b/variants/nrf52840/ME25LS01-4Y10TD_e-ink/platformio.ini
similarity index 78%
rename from variants/ME25LS01-4Y10TD_e-ink/platformio.ini
rename to variants/nrf52840/ME25LS01-4Y10TD_e-ink/platformio.ini
index f9788a521..ad5867bd5 100644
--- a/variants/ME25LS01-4Y10TD_e-ink/platformio.ini
+++ b/variants/nrf52840/ME25LS01-4Y10TD_e-ink/platformio.ini
@@ -3,13 +3,17 @@ extends = nrf52840_base
 board = me25ls01-4y10td
 board_level = extra
 ; platform = https://github.com/maxgerhardt/platform-nordicnrf52#cac6fcf943a41accd2aeb4f3659ae297a73f422e
-build_flags = ${nrf52840_base.build_flags} -Ivariants/ME25LS01-4Y10TD_e-ink -Isrc/platform/nrf52/softdevice -Isrc/platform/nrf52/softdevice/nrf52 -DME25LS01_4Y10TD
+build_flags = ${nrf52840_base.build_flags}
+  -Ivariants/nrf52840/ME25LS01-4Y10TD_e-ink
+  -Isrc/platform/nrf52/softdevice
+  -Isrc/platform/nrf52/softdevice/nrf52
+  -DME25LS01_4Y10TD
   -DGPS_POWER_TOGGLE ; comment this line to disable triple press function on the user button to turn off gps entirely.
   -DEINK_DISPLAY_MODEL=GxEPD2_420_GDEY042T81
   -DEINK_WIDTH=400
   -DEINK_HEIGHT=300
 board_build.ldscript = src/platform/nrf52/nrf52840_s140_v7.ld
-build_src_filter = ${nrf52_base.build_src_filter} +<../variants/ME25LS01-4Y10TD_e-ink>
+build_src_filter = ${nrf52_base.build_src_filter} +<../variants/nrf52840/ME25LS01-4Y10TD_e-ink>
 lib_deps = 
   ${nrf52840_base.lib_deps}
   zinggjm/GxEPD2@^1.6.2
diff --git a/variants/ME25LS01-4Y10TD_e-ink/rfswitch.h b/variants/nrf52840/ME25LS01-4Y10TD_e-ink/rfswitch.h
similarity index 100%
rename from variants/ME25LS01-4Y10TD_e-ink/rfswitch.h
rename to variants/nrf52840/ME25LS01-4Y10TD_e-ink/rfswitch.h
diff --git a/variants/ME25LS01-4Y10TD_e-ink/variant.cpp b/variants/nrf52840/ME25LS01-4Y10TD_e-ink/variant.cpp
similarity index 100%
rename from variants/ME25LS01-4Y10TD_e-ink/variant.cpp
rename to variants/nrf52840/ME25LS01-4Y10TD_e-ink/variant.cpp
diff --git a/variants/ME25LS01-4Y10TD_e-ink/variant.h b/variants/nrf52840/ME25LS01-4Y10TD_e-ink/variant.h
similarity index 100%
rename from variants/ME25LS01-4Y10TD_e-ink/variant.h
rename to variants/nrf52840/ME25LS01-4Y10TD_e-ink/variant.h
diff --git a/variants/MS24SF1/platformio.ini b/variants/nrf52840/MS24SF1/platformio.ini
similarity index 79%
rename from variants/MS24SF1/platformio.ini
rename to variants/nrf52840/MS24SF1/platformio.ini
index 10e8d2c95..f162cbd60 100644
--- a/variants/MS24SF1/platformio.ini
+++ b/variants/nrf52840/MS24SF1/platformio.ini
@@ -3,10 +3,13 @@ extends = nrf52840_base
 board = ms24sf1
 board_level = extra
 ; platform = https://github.com/maxgerhardt/platform-nordicnrf52#cac6fcf943a41accd2aeb4f3659ae297a73f422e
-build_flags = ${nrf52840_base.build_flags} -Ivariants/MS24SF1 -Isrc/platform/nrf52/softdevice -Isrc/platform/nrf52/softdevice/nrf52
+build_flags = ${nrf52840_base.build_flags}
+  -Ivariants/nrf52840/MS24SF1
+  -Isrc/platform/nrf52/softdevice
+  -Isrc/platform/nrf52/softdevice/nrf52
   -DGPS_POWER_TOGGLE ; comment this line to disable triple press function on the user button to turn off gps entirely.
 board_build.ldscript = src/platform/nrf52/nrf52840_s140_v7.ld
-build_src_filter = ${nrf52_base.build_src_filter} +<../variants/MS24SF1>
+build_src_filter = ${nrf52_base.build_src_filter} +<../variants/nrf52840/MS24SF1>
 lib_deps =
   ${nrf52840_base.lib_deps}
 ; If not set we will default to uploading over serial (first it forces bootloader entry by talking 1200bps to cdcacm)
diff --git a/variants/MS24SF1/variant.cpp b/variants/nrf52840/MS24SF1/variant.cpp
similarity index 100%
rename from variants/MS24SF1/variant.cpp
rename to variants/nrf52840/MS24SF1/variant.cpp
diff --git a/variants/MS24SF1/variant.h b/variants/nrf52840/MS24SF1/variant.h
similarity index 100%
rename from variants/MS24SF1/variant.h
rename to variants/nrf52840/MS24SF1/variant.h
diff --git a/variants/MakePython_nRF52840_eink/platformio.ini b/variants/nrf52840/MakePython_nRF52840_eink/platformio.ini
similarity index 77%
rename from variants/MakePython_nRF52840_eink/platformio.ini
rename to variants/nrf52840/MakePython_nRF52840_eink/platformio.ini
index ef97172e9..50e5495f0 100644
--- a/variants/MakePython_nRF52840_eink/platformio.ini
+++ b/variants/nrf52840/MakePython_nRF52840_eink/platformio.ini
@@ -2,12 +2,14 @@
 board_level = extra
 extends = nrf52840_base
 board = nordic_pca10059
-build_flags = ${nrf52840_base.build_flags} -Ivariants/MakePython_nRF52840_eink -D PRIVATE_HW
+build_flags = ${nrf52840_base.build_flags}
+  -Ivariants/nrf52840/MakePython_nRF52840_eink
+  -D PRIVATE_HW
   -D PIN_EINK_EN
   -DEINK_DISPLAY_MODEL=GxEPD2_290_T5D
   -DEINK_WIDTH=296
   -DEINK_HEIGHT=128
-build_src_filter = ${nrf52_base.build_src_filter} +<../variants/MakePython_nRF52840_eink>
+build_src_filter = ${nrf52_base.build_src_filter} +<../variants/nrf52840/MakePython_nRF52840_eink>
 lib_deps = 
   ${nrf52840_base.lib_deps}
   https://github.com/meshtastic/ESP32_Codec2/archive/633326c78ac251c059ab3a8c430fcdf25b41672f.zip
diff --git a/variants/MakePython_nRF52840_eink/variant.cpp b/variants/nrf52840/MakePython_nRF52840_eink/variant.cpp
similarity index 100%
rename from variants/MakePython_nRF52840_eink/variant.cpp
rename to variants/nrf52840/MakePython_nRF52840_eink/variant.cpp
diff --git a/variants/MakePython_nRF52840_eink/variant.h b/variants/nrf52840/MakePython_nRF52840_eink/variant.h
similarity index 100%
rename from variants/MakePython_nRF52840_eink/variant.h
rename to variants/nrf52840/MakePython_nRF52840_eink/variant.h
diff --git a/variants/MakePython_nRF52840_oled/platformio.ini b/variants/nrf52840/MakePython_nRF52840_oled/platformio.ini
similarity index 69%
rename from variants/MakePython_nRF52840_oled/platformio.ini
rename to variants/nrf52840/MakePython_nRF52840_oled/platformio.ini
index 57b9ecb79..c7418e53c 100644
--- a/variants/MakePython_nRF52840_oled/platformio.ini
+++ b/variants/nrf52840/MakePython_nRF52840_oled/platformio.ini
@@ -2,8 +2,10 @@
 board_level = extra
 extends = nrf52840_base
 board = nordic_pca10059
-build_flags = ${nrf52840_base.build_flags} -Ivariants/MakePython_nRF52840_oled -D PRIVATE_HW
-build_src_filter = ${nrf52_base.build_src_filter} +<../variants/MakePython_nRF52840_oled>
+build_flags = ${nrf52840_base.build_flags}
+  -I variants/nrf52840/MakePython_nRF52840_oled
+  -D PRIVATE_HW
+build_src_filter = ${nrf52_base.build_src_filter} +<../variants/nrf52840/MakePython_nRF52840_oled>
 lib_deps = 
   ${nrf52840_base.lib_deps}
   https://github.com/meshtastic/ESP32_Codec2/archive/633326c78ac251c059ab3a8c430fcdf25b41672f.zip
diff --git a/variants/MakePython_nRF52840_oled/variant.cpp b/variants/nrf52840/MakePython_nRF52840_oled/variant.cpp
similarity index 100%
rename from variants/MakePython_nRF52840_oled/variant.cpp
rename to variants/nrf52840/MakePython_nRF52840_oled/variant.cpp
diff --git a/variants/MakePython_nRF52840_oled/variant.h b/variants/nrf52840/MakePython_nRF52840_oled/variant.h
similarity index 100%
rename from variants/MakePython_nRF52840_oled/variant.h
rename to variants/nrf52840/MakePython_nRF52840_oled/variant.h
diff --git a/variants/TWC_mesh_v4/platformio.ini b/variants/nrf52840/TWC_mesh_v4/platformio.ini
similarity index 59%
rename from variants/TWC_mesh_v4/platformio.ini
rename to variants/nrf52840/TWC_mesh_v4/platformio.ini
index 2eb58bf9f..77aeee26e 100644
--- a/variants/TWC_mesh_v4/platformio.ini
+++ b/variants/nrf52840/TWC_mesh_v4/platformio.ini
@@ -2,8 +2,10 @@
 extends = nrf52840_base
 board = nordic_pca10059
 board_level = extra
-build_flags = ${nrf52840_base.build_flags} -I variants/TWC_mesh_v4 -D TWC_mesh_v4 -L".pio\libdeps\TWC_mesh_v4\bsec2\src\cortex-m4\fpv4-sp-d16-hard"
-build_src_filter = ${nrf52_base.build_src_filter} +<../variants/TWC_mesh_v4>
+build_flags = ${nrf52840_base.build_flags}
+  -I variants/nrf52840/TWC_mesh_v4
+  -D TWC_mesh_v4
+build_src_filter = ${nrf52_base.build_src_filter} +<../variants/nrf52840/TWC_mesh_v4>
 lib_deps = 
   ${nrf52840_base.lib_deps}
   zinggjm/GxEPD2@^1.6.2
diff --git a/variants/TWC_mesh_v4/variant.cpp b/variants/nrf52840/TWC_mesh_v4/variant.cpp
similarity index 100%
rename from variants/TWC_mesh_v4/variant.cpp
rename to variants/nrf52840/TWC_mesh_v4/variant.cpp
diff --git a/variants/TWC_mesh_v4/variant.h b/variants/nrf52840/TWC_mesh_v4/variant.h
similarity index 100%
rename from variants/TWC_mesh_v4/variant.h
rename to variants/nrf52840/TWC_mesh_v4/variant.h
diff --git a/variants/canaryone/platformio.ini b/variants/nrf52840/canaryone/platformio.ini
similarity index 78%
rename from variants/canaryone/platformio.ini
rename to variants/nrf52840/canaryone/platformio.ini
index ad11305db..251937e9c 100644
--- a/variants/canaryone/platformio.ini
+++ b/variants/nrf52840/canaryone/platformio.ini
@@ -5,8 +5,10 @@ board = canaryone
 debug_tool = jlink
 
 # add -DCFG_SYSVIEW if you want to use the Segger systemview tool for OS profiling.
-build_flags = ${nrf52840_base.build_flags} -Ivariants/canaryone
-build_src_filter = ${nrf52_base.build_src_filter} +<../variants/canaryone>
+build_flags =
+  ${nrf52840_base.build_flags}
+  -I variants/nrf52840/canaryone
+build_src_filter = ${nrf52_base.build_src_filter} +<../variants/nrf52840/canaryone>
 lib_deps = 
   ${nrf52840_base.lib_deps}
   lewisxhe/PCF8563_Library@^1.0.1
diff --git a/variants/canaryone/variant.cpp b/variants/nrf52840/canaryone/variant.cpp
similarity index 100%
rename from variants/canaryone/variant.cpp
rename to variants/nrf52840/canaryone/variant.cpp
diff --git a/variants/canaryone/variant.h b/variants/nrf52840/canaryone/variant.h
similarity index 100%
rename from variants/canaryone/variant.h
rename to variants/nrf52840/canaryone/variant.h
diff --git a/variants/diy/nrf52_promicro_diy_tcxo/E80_RSSI_per_case.webp b/variants/nrf52840/diy/nrf52_promicro_diy_tcxo/E80_RSSI_per_case.webp
similarity index 100%
rename from variants/diy/nrf52_promicro_diy_tcxo/E80_RSSI_per_case.webp
rename to variants/nrf52840/diy/nrf52_promicro_diy_tcxo/E80_RSSI_per_case.webp
diff --git a/variants/diy/nrf52_promicro_diy_tcxo/Schematic_Pro-Micro_Pinouts 2024-12-14.pdf b/variants/nrf52840/diy/nrf52_promicro_diy_tcxo/Schematic_Pro-Micro_Pinouts 2024-12-14.pdf
similarity index 100%
rename from variants/diy/nrf52_promicro_diy_tcxo/Schematic_Pro-Micro_Pinouts 2024-12-14.pdf
rename to variants/nrf52840/diy/nrf52_promicro_diy_tcxo/Schematic_Pro-Micro_Pinouts 2024-12-14.pdf
diff --git a/variants/diy/nrf52_promicro_diy_tcxo/custom_build_tasks.py b/variants/nrf52840/diy/nrf52_promicro_diy_tcxo/custom_build_tasks.py
similarity index 100%
rename from variants/diy/nrf52_promicro_diy_tcxo/custom_build_tasks.py
rename to variants/nrf52840/diy/nrf52_promicro_diy_tcxo/custom_build_tasks.py
diff --git a/variants/diy/nrf52_promicro_diy_tcxo/nicheGraphics.h b/variants/nrf52840/diy/nrf52_promicro_diy_tcxo/nicheGraphics.h
similarity index 100%
rename from variants/diy/nrf52_promicro_diy_tcxo/nicheGraphics.h
rename to variants/nrf52840/diy/nrf52_promicro_diy_tcxo/nicheGraphics.h
diff --git a/variants/nrf52840/diy/nrf52_promicro_diy_tcxo/platformio.ini b/variants/nrf52840/diy/nrf52_promicro_diy_tcxo/platformio.ini
new file mode 100644
index 000000000..61a6eda07
--- /dev/null
+++ b/variants/nrf52840/diy/nrf52_promicro_diy_tcxo/platformio.ini
@@ -0,0 +1,32 @@
+; Promicro + E22(0)-xxxM / HT-RA62 modules board variant - DIY - with TCXO
+[env:nrf52_promicro_diy_tcxo]
+extends = nrf52840_base
+board = promicro-nrf52840
+build_flags = ${nrf52840_base.build_flags}
+  -I variants/nrf52840/diy/nrf52_promicro_diy_tcxo
+  -D NRF52_PROMICRO_DIY
+build_src_filter = ${nrf52_base.build_src_filter} +<../variants/nrf52840/diy/nrf52_promicro_diy_tcxo>
+lib_deps = 
+  ${nrf52840_base.lib_deps}
+debug_tool = jlink
+
+; NRF52 ProMicro w/ E-Ink display
+[env:nrf52_promicro_diy-inkhud]
+board_level = extra
+extends = nrf52840_base, inkhud
+board = promicro-nrf52840
+build_flags =
+  ${nrf52840_base.build_flags}
+  ${inkhud.build_flags}
+  -I variants/nrf52840/diy/nrf52_promicro_diy_tcxo
+  -D NRF52_PROMICRO_DIY
+build_src_filter =
+  ${nrf52_base.build_src_filter}
+  ${inkhud.build_src_filter}
+  +<../variants/nrf52840/diy/nrf52_promicro_diy_tcxo>
+lib_deps =
+  ${inkhud.lib_deps} ; InkHUD libs first, so we get GFXRoot instead of AdafruitGFX
+  ${nrf52840_base.lib_deps}
+extra_scripts =
+  ${env.extra_scripts}
+  variants/nrf52840/diy/nrf52_promicro_diy_tcxo/custom_build_tasks.py ; Add to PIO's Project Tasks pane: preset builds for common displays
diff --git a/variants/diy/nrf52_promicro_diy_tcxo/readme.md b/variants/nrf52840/diy/nrf52_promicro_diy_tcxo/readme.md
similarity index 99%
rename from variants/diy/nrf52_promicro_diy_tcxo/readme.md
rename to variants/nrf52840/diy/nrf52_promicro_diy_tcxo/readme.md
index 585ac36de..5a78103ee 100644
--- a/variants/diy/nrf52_promicro_diy_tcxo/readme.md
+++ b/variants/nrf52840/diy/nrf52_promicro_diy_tcxo/readme.md
@@ -1,3 +1,5 @@
+<!-- trunk-ignore-all(markdownlint/MD059) -->
+
 # Notes
 
 ## General
diff --git a/variants/diy/nrf52_promicro_diy_tcxo/rfswitch.h b/variants/nrf52840/diy/nrf52_promicro_diy_tcxo/rfswitch.h
similarity index 100%
rename from variants/diy/nrf52_promicro_diy_tcxo/rfswitch.h
rename to variants/nrf52840/diy/nrf52_promicro_diy_tcxo/rfswitch.h
diff --git a/variants/diy/nrf52_promicro_diy_tcxo/variant.cpp b/variants/nrf52840/diy/nrf52_promicro_diy_tcxo/variant.cpp
similarity index 100%
rename from variants/diy/nrf52_promicro_diy_tcxo/variant.cpp
rename to variants/nrf52840/diy/nrf52_promicro_diy_tcxo/variant.cpp
diff --git a/variants/diy/nrf52_promicro_diy_tcxo/variant.h b/variants/nrf52840/diy/nrf52_promicro_diy_tcxo/variant.h
similarity index 100%
rename from variants/diy/nrf52_promicro_diy_tcxo/variant.h
rename to variants/nrf52840/diy/nrf52_promicro_diy_tcxo/variant.h
diff --git a/variants/nrf52840/diy/nrf52_promicro_diy_xtal/platformio.ini b/variants/nrf52840/diy/nrf52_promicro_diy_xtal/platformio.ini
new file mode 100644
index 000000000..278f578c5
--- /dev/null
+++ b/variants/nrf52840/diy/nrf52_promicro_diy_xtal/platformio.ini
@@ -0,0 +1,12 @@
+; Promicro + E22(0)-xxxMM / RA-01SH modules board variant - DIY - without TCXO
+[env:nrf52_promicro_diy_xtal]
+extends = nrf52840_base
+board = promicro-nrf52840
+board_level = extra
+build_flags = ${nrf52840_base.build_flags}
+  -I variants/nrf52840/diy/nrf52_promicro_diy_xtal
+  -D NRF52_PROMICRO_DIY
+build_src_filter = ${nrf52_base.build_src_filter} +<../variants/nrf52840/diy/nrf52_promicro_diy_xtal>
+lib_deps = 
+  ${nrf52840_base.lib_deps}
+debug_tool = jlink
diff --git a/variants/diy/nrf52_promicro_diy_xtal/variant.cpp b/variants/nrf52840/diy/nrf52_promicro_diy_xtal/variant.cpp
similarity index 100%
rename from variants/diy/nrf52_promicro_diy_xtal/variant.cpp
rename to variants/nrf52840/diy/nrf52_promicro_diy_xtal/variant.cpp
diff --git a/variants/diy/nrf52_promicro_diy_xtal/variant.h b/variants/nrf52840/diy/nrf52_promicro_diy_xtal/variant.h
similarity index 100%
rename from variants/diy/nrf52_promicro_diy_xtal/variant.h
rename to variants/nrf52840/diy/nrf52_promicro_diy_xtal/variant.h
diff --git a/variants/diy/seeed-xiao-nrf52840-wio-sx1262/README.md b/variants/nrf52840/diy/seeed-xiao-nrf52840-wio-sx1262/README.md
similarity index 100%
rename from variants/diy/seeed-xiao-nrf52840-wio-sx1262/README.md
rename to variants/nrf52840/diy/seeed-xiao-nrf52840-wio-sx1262/README.md
diff --git a/variants/nrf52840/diy/seeed-xiao-nrf52840-wio-sx1262/platformio.ini b/variants/nrf52840/diy/seeed-xiao-nrf52840-wio-sx1262/platformio.ini
new file mode 100644
index 000000000..2df31d23c
--- /dev/null
+++ b/variants/nrf52840/diy/seeed-xiao-nrf52840-wio-sx1262/platformio.ini
@@ -0,0 +1,15 @@
+; Seeed XIAO nRF52840 + XIAO Wio SX1262 DIY
+[env:seeed-xiao-nrf52840-wio-sx1262]
+board = xiao_ble_sense
+extends = nrf52840_base
+board_level = extra
+build_flags = ${nrf52840_base.build_flags}
+  -Ivariants/nrf52840/diy/seeed-xiao-nrf52840-wio-sx1262
+  -D PRIVATE_HW
+  -Isrc/platform/nrf52/softdevice
+  -Isrc/platform/nrf52/softdevice/nrf52
+board_build.ldscript = src/platform/nrf52/nrf52840_s140_v7.ld
+build_src_filter = ${nrf52_base.build_src_filter} +<../variants/nrf52840/diy/seeed-xiao-nrf52840-wio-sx1262>
+lib_deps =
+  ${nrf52840_base.lib_deps}
+debug_tool = jlink
diff --git a/variants/diy/seeed-xiao-nrf52840-wio-sx1262/variant.cpp b/variants/nrf52840/diy/seeed-xiao-nrf52840-wio-sx1262/variant.cpp
similarity index 100%
rename from variants/diy/seeed-xiao-nrf52840-wio-sx1262/variant.cpp
rename to variants/nrf52840/diy/seeed-xiao-nrf52840-wio-sx1262/variant.cpp
diff --git a/variants/diy/seeed-xiao-nrf52840-wio-sx1262/variant.h b/variants/nrf52840/diy/seeed-xiao-nrf52840-wio-sx1262/variant.h
similarity index 100%
rename from variants/diy/seeed-xiao-nrf52840-wio-sx1262/variant.h
rename to variants/nrf52840/diy/seeed-xiao-nrf52840-wio-sx1262/variant.h
diff --git a/variants/nrf52840/diy/seeed_xiao_nrf52840_e22/platformio.ini b/variants/nrf52840/diy/seeed_xiao_nrf52840_e22/platformio.ini
new file mode 100644
index 000000000..a5d0aaf8f
--- /dev/null
+++ b/variants/nrf52840/diy/seeed_xiao_nrf52840_e22/platformio.ini
@@ -0,0 +1,19 @@
+; Seeed XIAO nRF52840 + EBYTE E22-900M30S - Pinout matching Wio-SX1262 (SKU 113010003)
+[env:seeed_xiao_nrf52840_e22_900m30s]
+extends = env:seeed_xiao_nrf52840_kit
+board_level = extra
+build_flags = ${env:seeed_xiao_nrf52840_kit.build_flags}
+  -D PRIVATE_HW
+  -DEBYTE_E22
+  -DEBYTE_E22_900M30S
+build_unflags = -DGPS_L76K
+
+; Seeed XIAO nRF52840 + EBYTE E22-900M33S - Pinout matching Wio-SX1262 (SKU 113010003)
+[env:seeed_xiao_nrf52840_e22_900m33s]
+extends = env:seeed_xiao_nrf52840_kit
+board_level = extra
+build_flags = ${env:seeed_xiao_nrf52840_kit.build_flags}
+  -D PRIVATE_HW
+  -DEBYTE_E22
+  -DEBYTE_E22_900M33S
+build_unflags = -DGPS_L76K
diff --git a/variants/diy/xiao_ble/README.md b/variants/nrf52840/diy/xiao_ble/README.md
similarity index 100%
rename from variants/diy/xiao_ble/README.md
rename to variants/nrf52840/diy/xiao_ble/README.md
diff --git a/variants/nrf52840/diy/xiao_ble/platformio.ini b/variants/nrf52840/diy/xiao_ble/platformio.ini
new file mode 100644
index 000000000..6c764ea78
--- /dev/null
+++ b/variants/nrf52840/diy/xiao_ble/platformio.ini
@@ -0,0 +1,10 @@
+; Seeed Xiao BLE: https://www.digikey.com/en/products/detail/seeed-technology-co-ltd/102010448/16652893
+[env:xiao_ble]
+extends = env:seeed_xiao_nrf52840_kit
+board_level = extra
+build_flags = ${env:seeed_xiao_nrf52840_kit.build_flags}
+  -D PRIVATE_HW
+  -DXIAO_BLE_LEGACY_PINOUT
+  -DEBYTE_E22
+  -DEBYTE_E22_900M30S
+build_unflags = -DGPS_L76K
diff --git a/variants/feather_diy/platformio.ini b/variants/nrf52840/feather_diy/platformio.ini
similarity index 79%
rename from variants/feather_diy/platformio.ini
rename to variants/nrf52840/feather_diy/platformio.ini
index 84c582ab0..a17e418a2 100644
--- a/variants/feather_diy/platformio.ini
+++ b/variants/nrf52840/feather_diy/platformio.ini
@@ -2,8 +2,10 @@
 [env:feather_diy]
 extends = nrf52840_base
 board = adafruit_feather_nrf52840
-build_flags = ${nrf52840_base.build_flags} -Ivariants/feather_diy -Dfeather_diy
-build_src_filter = ${nrf52_base.build_src_filter} +<../variants/feather_diy>
+build_flags = ${nrf52840_base.build_flags}
+  -Ivariants/nrf52840/feather_diy
+  -Dfeather_diy
+build_src_filter = ${nrf52_base.build_src_filter} +<../variants/nrf52840/feather_diy>
 lib_deps = 
   ${nrf52840_base.lib_deps}
 debug_tool = jlink
diff --git a/variants/feather_diy/variant.cpp b/variants/nrf52840/feather_diy/variant.cpp
similarity index 100%
rename from variants/feather_diy/variant.cpp
rename to variants/nrf52840/feather_diy/variant.cpp
diff --git a/variants/feather_diy/variant.h b/variants/nrf52840/feather_diy/variant.h
similarity index 100%
rename from variants/feather_diy/variant.h
rename to variants/nrf52840/feather_diy/variant.h
diff --git a/variants/gat562_mesh_trial_tracker/platformio.ini b/variants/nrf52840/gat562_mesh_trial_tracker/platformio.ini
similarity index 75%
rename from variants/gat562_mesh_trial_tracker/platformio.ini
rename to variants/nrf52840/gat562_mesh_trial_tracker/platformio.ini
index e67f3ec8d..72ac6320d 100644
--- a/variants/gat562_mesh_trial_tracker/platformio.ini
+++ b/variants/nrf52840/gat562_mesh_trial_tracker/platformio.ini
@@ -3,11 +3,13 @@
 extends = nrf52840_base
 board = gat562_mesh_trial_tracker
 board_check = true
-build_flags = ${nrf52840_base.build_flags} -Ivariants/gat562_mesh_trial_tracker -D GAT562_MESH_TRIAL_TRACKER
+build_flags = ${nrf52840_base.build_flags}
+  -I variants/nrf52840/gat562_mesh_trial_tracker
+  -D GAT562_MESH_TRIAL_TRACKER
   -DGPS_POWER_TOGGLE ; comment this line to disable triple press function on the user button to turn off gps entirely.
   -DRADIOLIB_EXCLUDE_SX128X=1
   -DRADIOLIB_EXCLUDE_SX127X=1
   -DRADIOLIB_EXCLUDE_LR11X0=1
-build_src_filter = ${nrf52_base.build_src_filter} +<../variants/gat562_mesh_trial_tracker>
-lib_deps = 
+build_src_filter = ${nrf52_base.build_src_filter} +<../variants/nrf52840/gat562_mesh_trial_tracker>
+lib_deps =
   ${nrf52840_base.lib_deps}
diff --git a/variants/gat562_mesh_trial_tracker/variant.cpp b/variants/nrf52840/gat562_mesh_trial_tracker/variant.cpp
similarity index 100%
rename from variants/gat562_mesh_trial_tracker/variant.cpp
rename to variants/nrf52840/gat562_mesh_trial_tracker/variant.cpp
diff --git a/variants/gat562_mesh_trial_tracker/variant.h b/variants/nrf52840/gat562_mesh_trial_tracker/variant.h
similarity index 100%
rename from variants/gat562_mesh_trial_tracker/variant.h
rename to variants/nrf52840/gat562_mesh_trial_tracker/variant.h
diff --git a/variants/heltec_mesh_node_t114-inkhud/custom_build_tasks.py b/variants/nrf52840/heltec_mesh_node_t114-inkhud/custom_build_tasks.py
similarity index 100%
rename from variants/heltec_mesh_node_t114-inkhud/custom_build_tasks.py
rename to variants/nrf52840/heltec_mesh_node_t114-inkhud/custom_build_tasks.py
diff --git a/variants/heltec_mesh_node_t114-inkhud/nicheGraphics.h b/variants/nrf52840/heltec_mesh_node_t114-inkhud/nicheGraphics.h
similarity index 100%
rename from variants/heltec_mesh_node_t114-inkhud/nicheGraphics.h
rename to variants/nrf52840/heltec_mesh_node_t114-inkhud/nicheGraphics.h
diff --git a/variants/heltec_mesh_node_t114-inkhud/platformio.ini b/variants/nrf52840/heltec_mesh_node_t114-inkhud/platformio.ini
similarity index 66%
rename from variants/heltec_mesh_node_t114-inkhud/platformio.ini
rename to variants/nrf52840/heltec_mesh_node_t114-inkhud/platformio.ini
index 9a5673040..2641a507d 100644
--- a/variants/heltec_mesh_node_t114-inkhud/platformio.ini
+++ b/variants/nrf52840/heltec_mesh_node_t114-inkhud/platformio.ini
@@ -6,14 +6,15 @@ board_check = true
 build_flags = 
   ${nrf52840_base.build_flags}
   ${inkhud.build_flags}
-  -I variants/heltec_mesh_node_t114-inkhud
+  -I variants/nrf52840/heltec_mesh_node_t114-inkhud
 build_src_filter = 
   ${nrf52_base.build_src_filter} 
   ${inkhud.build_src_filter}
+  +<../variants/nrf52840/heltec_mesh_node_t114-inkhud>
 lib_deps = 
   ${inkhud.lib_deps} ; InkHUD libs first, so we get GFXRoot instead of AdafruitGFX
   ${nrf52840_base.lib_deps}
   lewisxhe/PCF8563_Library@^1.0.1
 extra_scripts =
   ${env.extra_scripts}
-  variants/diy/nrf52_promicro_diy_tcxo/custom_build_tasks.py ; Add to PIO's Project Tasks pane: preset builds for common displays
\ No newline at end of file
+  variants/nrf52840/diy/nrf52_promicro_diy_tcxo/custom_build_tasks.py ; Add to PIO's Project Tasks pane: preset builds for common displays
diff --git a/variants/heltec_mesh_node_t114-inkhud/variant.cpp b/variants/nrf52840/heltec_mesh_node_t114-inkhud/variant.cpp
similarity index 100%
rename from variants/heltec_mesh_node_t114-inkhud/variant.cpp
rename to variants/nrf52840/heltec_mesh_node_t114-inkhud/variant.cpp
diff --git a/variants/heltec_mesh_node_t114-inkhud/variant.h b/variants/nrf52840/heltec_mesh_node_t114-inkhud/variant.h
similarity index 100%
rename from variants/heltec_mesh_node_t114-inkhud/variant.h
rename to variants/nrf52840/heltec_mesh_node_t114-inkhud/variant.h
diff --git a/variants/heltec_mesh_node_t114/platformio.ini b/variants/nrf52840/heltec_mesh_node_t114/platformio.ini
similarity index 74%
rename from variants/heltec_mesh_node_t114/platformio.ini
rename to variants/nrf52840/heltec_mesh_node_t114/platformio.ini
index 3ba97bd04..ead787bb1 100644
--- a/variants/heltec_mesh_node_t114/platformio.ini
+++ b/variants/nrf52840/heltec_mesh_node_t114/platformio.ini
@@ -5,11 +5,12 @@ board = heltec_mesh_node_t114
 debug_tool = jlink
 
 # add -DCFG_SYSVIEW if you want to use the Segger systemview tool for OS profiling.
-build_flags = ${nrf52840_base.build_flags} -Ivariants/heltec_mesh_node_t114
-        -DGPS_POWER_TOGGLE
-        -DHELTEC_T114
+build_flags = ${nrf52840_base.build_flags}
+  -Ivariants/nrf52840/heltec_mesh_node_t114
+  -DGPS_POWER_TOGGLE
+  -DHELTEC_T114
 
-build_src_filter = ${nrf52_base.build_src_filter} +<../variants/heltec_mesh_node_t114> 
+build_src_filter = ${nrf52_base.build_src_filter} +<../variants/nrf52840/heltec_mesh_node_t114>
 lib_deps = 
   ${nrf52840_base.lib_deps}
   lewisxhe/PCF8563_Library@^1.0.1
diff --git a/variants/heltec_mesh_node_t114/variant.cpp b/variants/nrf52840/heltec_mesh_node_t114/variant.cpp
similarity index 100%
rename from variants/heltec_mesh_node_t114/variant.cpp
rename to variants/nrf52840/heltec_mesh_node_t114/variant.cpp
diff --git a/variants/heltec_mesh_node_t114/variant.h b/variants/nrf52840/heltec_mesh_node_t114/variant.h
similarity index 100%
rename from variants/heltec_mesh_node_t114/variant.h
rename to variants/nrf52840/heltec_mesh_node_t114/variant.h
diff --git a/variants/heltec_mesh_pocket/nicheGraphics.h b/variants/nrf52840/heltec_mesh_pocket/nicheGraphics.h
similarity index 100%
rename from variants/heltec_mesh_pocket/nicheGraphics.h
rename to variants/nrf52840/heltec_mesh_pocket/nicheGraphics.h
diff --git a/variants/heltec_mesh_pocket/platformio.ini b/variants/nrf52840/heltec_mesh_pocket/platformio.ini
similarity index 89%
rename from variants/heltec_mesh_pocket/platformio.ini
rename to variants/nrf52840/heltec_mesh_pocket/platformio.ini
index 2f3886887..2fb852226 100644
--- a/variants/heltec_mesh_pocket/platformio.ini
+++ b/variants/nrf52840/heltec_mesh_pocket/platformio.ini
@@ -5,7 +5,8 @@ board = heltec_mesh_pocket
 debug_tool = jlink
 
 # add -DCFG_SYSVIEW if you want to use the Segger systemview tool for OS profiling.
-build_flags = ${nrf52840_base.build_flags} -Ivariants/heltec_mesh_pocket
+build_flags = ${nrf52840_base.build_flags}
+  -Ivariants/nrf52840/heltec_mesh_pocket
   -DHELTEC_MESH_POCKET
   -DHELTEC_MESH_POCKET_BATTERY_5000
   -DUSE_EINK
@@ -21,7 +22,7 @@ build_flags = ${nrf52840_base.build_flags} -Ivariants/heltec_mesh_pocket
   -DEINK_HASQUIRK_GHOSTING             ; Display model is identified as "prone to ghosting"
   -DEINK_HASQUIRK_WEAKFASTREFRESH      ; Pixels set with fast-refresh are easy to clear, disrupted by sunlight
 
-build_src_filter = ${nrf52_base.build_src_filter} +<../variants/heltec_mesh_pocket> 
+build_src_filter = ${nrf52_base.build_src_filter} +<../variants/nrf52840/heltec_mesh_pocket> 
 lib_deps = 
   ${nrf52840_base.lib_deps}
   lewisxhe/PCF8563_Library@^1.0.1
@@ -31,11 +32,11 @@ lib_deps =
 [env:heltec-mesh-pocket-5000-inkhud]
 extends = nrf52840_base, inkhud
 board = heltec_mesh_pocket
-build_src_filter = ${nrf52_base.build_src_filter} +<../variants/heltec_mesh_pocket> ${inkhud.build_src_filter}
+build_src_filter = ${nrf52_base.build_src_filter} +<../variants/nrf52840/heltec_mesh_pocket> ${inkhud.build_src_filter}
 build_flags = 
   ${inkhud.build_flags}
   ${nrf52840_base.build_flags} 
-  -I variants/heltec_mesh_pocket
+  -I variants/nrf52840/heltec_mesh_pocket
   -D HELTEC_MESH_POCKET
   -D HELTEC_MESH_POCKET_BATTERY_5000
 lib_deps =
@@ -50,7 +51,8 @@ board = heltec_mesh_pocket
 debug_tool = jlink
 
 # add -DCFG_SYSVIEW if you want to use the Segger systemview tool for OS profiling.
-build_flags = ${nrf52840_base.build_flags} -Ivariants/heltec_mesh_pocket
+build_flags = ${nrf52840_base.build_flags}
+  -Ivariants/nrf52840/heltec_mesh_pocket
   -DHELTEC_MESH_POCKET
   -DHELTEC_MESH_POCKET_BATTERY_10000
   -DUSE_EINK
@@ -66,7 +68,7 @@ build_flags = ${nrf52840_base.build_flags} -Ivariants/heltec_mesh_pocket
   -DEINK_HASQUIRK_GHOSTING             ; Display model is identified as "prone to ghosting"
   -DEINK_HASQUIRK_WEAKFASTREFRESH      ; Pixels set with fast-refresh are easy to clear, disrupted by sunlight
 
-build_src_filter = ${nrf52_base.build_src_filter} +<../variants/heltec_mesh_pocket> 
+build_src_filter = ${nrf52_base.build_src_filter} +<../variants/nrf52840/heltec_mesh_pocket> 
 lib_deps = 
   ${nrf52840_base.lib_deps}
   lewisxhe/PCF8563_Library@^1.0.1
@@ -76,11 +78,11 @@ lib_deps =
 [env:heltec-mesh-pocket-10000-inkhud]
 extends = nrf52840_base, inkhud
 board = heltec_mesh_pocket
-build_src_filter = ${nrf52_base.build_src_filter} +<../variants/heltec_mesh_pocket> ${inkhud.build_src_filter}
+build_src_filter = ${nrf52_base.build_src_filter} +<../variants/nrf52840/heltec_mesh_pocket> ${inkhud.build_src_filter}
 build_flags = 
   ${inkhud.build_flags}
   ${nrf52840_base.build_flags} 
-  -I variants/heltec_mesh_pocket
+  -I variants/nrf52840/heltec_mesh_pocket
   -D HELTEC_MESH_POCKET
   -D HELTEC_MESH_POCKET_BATTERY_10000
 lib_deps =
diff --git a/variants/heltec_mesh_pocket/variant.cpp b/variants/nrf52840/heltec_mesh_pocket/variant.cpp
similarity index 100%
rename from variants/heltec_mesh_pocket/variant.cpp
rename to variants/nrf52840/heltec_mesh_pocket/variant.cpp
diff --git a/variants/heltec_mesh_pocket/variant.h b/variants/nrf52840/heltec_mesh_pocket/variant.h
similarity index 100%
rename from variants/heltec_mesh_pocket/variant.h
rename to variants/nrf52840/heltec_mesh_pocket/variant.h
diff --git a/variants/meshlink/platformio.ini b/variants/nrf52840/meshlink/platformio.ini
similarity index 94%
rename from variants/meshlink/platformio.ini
rename to variants/nrf52840/meshlink/platformio.ini
index 384858576..8216a704a 100644
--- a/variants/meshlink/platformio.ini
+++ b/variants/nrf52840/meshlink/platformio.ini
@@ -5,7 +5,9 @@
 extends = nrf52840_base
 board = meshlink
 ;board_check = true
-build_flags = ${nrf52840_base.build_flags} -I variants/meshlink -D MESHLINK
+build_flags = ${nrf52840_base.build_flags}
+  -I variants/nrf52840/meshlink
+  -D MESHLINK
   -D GPS_POWER_TOGGLE ; comment this line to disable triple press function on the user button to turn off gps entirely.
   -D EINK_DISPLAY_MODEL=GxEPD2_213_B74
   -D EINK_WIDTH=250
@@ -19,7 +21,7 @@ build_flags = ${nrf52840_base.build_flags} -I variants/meshlink -D MESHLINK
   -D EINK_HASQUIRK_VICIOUSFASTREFRESH   ; Identify that pixels drawn by fast-refresh are harder to clear
 
 
-build_src_filter = ${nrf52_base.build_src_filter} +<../variants/meshlink>
+build_src_filter = ${nrf52_base.build_src_filter} +<../variants/nrf52840/meshlink>
 lib_deps = 
   ${nrf52840_base.lib_deps}
   https://github.com/meshtastic/GxEPD2/archive/55f618961db45a23eff0233546430f1e5a80f63a.zip
diff --git a/variants/meshlink/variant.cpp b/variants/nrf52840/meshlink/variant.cpp
similarity index 100%
rename from variants/meshlink/variant.cpp
rename to variants/nrf52840/meshlink/variant.cpp
diff --git a/variants/meshlink/variant.h b/variants/nrf52840/meshlink/variant.h
similarity index 100%
rename from variants/meshlink/variant.h
rename to variants/nrf52840/meshlink/variant.h
diff --git a/variants/meshlink_eink/platformio.ini b/variants/nrf52840/meshlink_eink/platformio.ini
similarity index 93%
rename from variants/meshlink_eink/platformio.ini
rename to variants/nrf52840/meshlink_eink/platformio.ini
index 550b1e2fc..a48a9e695 100644
--- a/variants/meshlink_eink/platformio.ini
+++ b/variants/nrf52840/meshlink_eink/platformio.ini
@@ -5,7 +5,9 @@
 extends = nrf52840_base
 board = meshlink
 ;board_check = true
-build_flags = ${nrf52840_base.build_flags} -I variants/meshlink_eink -D MESHLINK
+build_flags = ${nrf52840_base.build_flags}
+  -I variants/nrf52840/meshlink_eink
+  -D MESHLINK
   -D GPS_POWER_TOGGLE ; comment this line to disable triple press function on the user button to turn off gps entirely.
   -D EINK_DISPLAY_MODEL=GxEPD2_213_B74
   -D EINK_WIDTH=250
@@ -19,7 +21,7 @@ build_flags = ${nrf52840_base.build_flags} -I variants/meshlink_eink -D MESHLINK
   -D EINK_HASQUIRK_VICIOUSFASTREFRESH   ; Identify that pixels drawn by fast-refresh are harder to clear
 
 
-build_src_filter = ${nrf52_base.build_src_filter} +<../variants/meshlink_eink>
+build_src_filter = ${nrf52_base.build_src_filter} +<../variants/nrf52840/meshlink_eink>
 lib_deps = 
   ${nrf52840_base.lib_deps}
   https://github.com/meshtastic/GxEPD2/archive/55f618961db45a23eff0233546430f1e5a80f63a.zip
diff --git a/variants/meshlink_eink/variant.cpp b/variants/nrf52840/meshlink_eink/variant.cpp
similarity index 100%
rename from variants/meshlink_eink/variant.cpp
rename to variants/nrf52840/meshlink_eink/variant.cpp
diff --git a/variants/meshlink_eink/variant.h b/variants/nrf52840/meshlink_eink/variant.h
similarity index 100%
rename from variants/meshlink_eink/variant.h
rename to variants/nrf52840/meshlink_eink/variant.h
diff --git a/variants/monteops_hw1/platformio.ini b/variants/nrf52840/monteops_hw1/platformio.ini
similarity index 77%
rename from variants/monteops_hw1/platformio.ini
rename to variants/nrf52840/monteops_hw1/platformio.ini
index 82567f614..5426aee7f 100644
--- a/variants/monteops_hw1/platformio.ini
+++ b/variants/nrf52840/monteops_hw1/platformio.ini
@@ -3,8 +3,10 @@
 board_level = extra
 extends = nrf52840_base
 board = wiscore_rak4631
-build_flags = ${nrf52840_base.build_flags} -Ivariants/monteops_hw1 -D MONTEOPS_HW1
-build_src_filter = ${nrf52_base.build_src_filter} +<../variants/monteops_hw1> +<mesh/eth/> +<mesh/api/> +<mqtt/>
+build_flags = ${nrf52840_base.build_flags}
+  -I variants/nrf52840/monteops_hw1
+  -D MONTEOPS_HW1
+build_src_filter = ${nrf52_base.build_src_filter} +<../variants/nrf52840/monteops_hw1> +<mesh/eth/> +<mesh/api/> +<mqtt/>
 lib_deps = 
   ${nrf52840_base.lib_deps}
   ${networking_base.lib_deps}
diff --git a/variants/monteops_hw1/variant.cpp b/variants/nrf52840/monteops_hw1/variant.cpp
similarity index 100%
rename from variants/monteops_hw1/variant.cpp
rename to variants/nrf52840/monteops_hw1/variant.cpp
diff --git a/variants/monteops_hw1/variant.h b/variants/nrf52840/monteops_hw1/variant.h
similarity index 100%
rename from variants/monteops_hw1/variant.h
rename to variants/nrf52840/monteops_hw1/variant.h
diff --git a/variants/nano-g2-ultra/platformio.ini b/variants/nrf52840/nano-g2-ultra/platformio.ini
similarity index 70%
rename from variants/nano-g2-ultra/platformio.ini
rename to variants/nrf52840/nano-g2-ultra/platformio.ini
index 7da168b47..f697a90dd 100644
--- a/variants/nano-g2-ultra/platformio.ini
+++ b/variants/nrf52840/nano-g2-ultra/platformio.ini
@@ -4,8 +4,10 @@ extends = nrf52840_base
 board = nano-g2-ultra
 debug_tool = jlink
 
-build_flags = ${nrf52840_base.build_flags} -Ivariants/nano-g2-ultra -D NANO_G2_ULTRA
-build_src_filter = ${nrf52_base.build_src_filter} +<../variants/nano-g2-ultra>
+build_flags = ${nrf52840_base.build_flags}
+  -I variants/nrf52840/nano-g2-ultra
+  -D NANO_G2_ULTRA
+build_src_filter = ${nrf52_base.build_src_filter} +<../variants/nrf52840/nano-g2-ultra>
 lib_deps = 
   ${nrf52840_base.lib_deps}
   lewisxhe/PCF8563_Library@^1.0.1
diff --git a/variants/nano-g2-ultra/variant.cpp b/variants/nrf52840/nano-g2-ultra/variant.cpp
similarity index 100%
rename from variants/nano-g2-ultra/variant.cpp
rename to variants/nrf52840/nano-g2-ultra/variant.cpp
diff --git a/variants/nano-g2-ultra/variant.h b/variants/nrf52840/nano-g2-ultra/variant.h
similarity index 100%
rename from variants/nano-g2-ultra/variant.h
rename to variants/nrf52840/nano-g2-ultra/variant.h
diff --git a/variants/rak2560/platformio.ini b/variants/nrf52840/rak2560/platformio.ini
similarity index 87%
rename from variants/rak2560/platformio.ini
rename to variants/nrf52840/rak2560/platformio.ini
index 8a720ce5a..2b73aca03 100644
--- a/variants/rak2560/platformio.ini
+++ b/variants/nrf52840/rak2560/platformio.ini
@@ -3,13 +3,15 @@
 extends = nrf52840_base
 board = wiscore_rak4631
 board_check = true
-build_flags = ${nrf52840_base.build_flags} -Ivariants/rak2560 -D RAK_4631
+build_flags = ${nrf52840_base.build_flags}
+  -I variants/nrf52840/rak2560
+  -D RAK_4631
   -DGPS_POWER_TOGGLE ; comment this line to disable triple press function on the user button to turn off gps entirely.
   -DRADIOLIB_EXCLUDE_SX128X=1
   -DRADIOLIB_EXCLUDE_SX127X=1
   -DRADIOLIB_EXCLUDE_LR11X0=1
   -DHAS_RAKPROT=1 ; Define if RAk OneWireSerial is used (disables GPS)
-build_src_filter = ${nrf52_base.build_src_filter} +<../variants/rak2560> +<mesh/api/> +<mqtt/>
+build_src_filter = ${nrf52_base.build_src_filter} +<../variants/nrf52840/rak2560> +<mesh/api/> +<mqtt/>
 lib_deps = 
   ${nrf52840_base.lib_deps}
   ${networking_base.lib_deps}
diff --git a/variants/rak2560/variant.cpp b/variants/nrf52840/rak2560/variant.cpp
similarity index 100%
rename from variants/rak2560/variant.cpp
rename to variants/nrf52840/rak2560/variant.cpp
diff --git a/variants/rak2560/variant.h b/variants/nrf52840/rak2560/variant.h
similarity index 100%
rename from variants/rak2560/variant.h
rename to variants/nrf52840/rak2560/variant.h
diff --git a/variants/rak4631/platformio.ini b/variants/nrf52840/rak4631/platformio.ini
similarity index 94%
rename from variants/rak4631/platformio.ini
rename to variants/nrf52840/rak4631/platformio.ini
index ee134e87a..7b695779c 100644
--- a/variants/rak4631/platformio.ini
+++ b/variants/nrf52840/rak4631/platformio.ini
@@ -3,7 +3,9 @@
 extends = nrf52840_base
 board = wiscore_rak4631
 board_check = true
-build_flags = ${nrf52840_base.build_flags} -Ivariants/rak4631 -D RAK_4631
+build_flags = ${nrf52840_base.build_flags}
+  -I variants/nrf52840/rak4631
+  -D RAK_4631
   -DGPS_POWER_TOGGLE ; comment this line to disable triple press function on the user button to turn off gps entirely.
   -DEINK_DISPLAY_MODEL=GxEPD2_213_BN
   -DEINK_WIDTH=250
@@ -11,7 +13,7 @@ build_flags = ${nrf52840_base.build_flags} -Ivariants/rak4631 -D RAK_4631
   -DRADIOLIB_EXCLUDE_SX128X=1
   -DRADIOLIB_EXCLUDE_SX127X=1
   -DRADIOLIB_EXCLUDE_LR11X0=1
-build_src_filter = ${nrf52_base.build_src_filter} +<../variants/rak4631> +<mesh/eth/> +<mesh/api/> +<mqtt/>
+build_src_filter = ${nrf52_base.build_src_filter} +<../variants/nrf52840/rak4631> +<mesh/eth/> +<mesh/api/> +<mqtt/>
 lib_deps = 
   ${nrf52840_base.lib_deps}
   ${networking_base.lib_deps}
diff --git a/variants/rak4631/variant.cpp b/variants/nrf52840/rak4631/variant.cpp
similarity index 100%
rename from variants/rak4631/variant.cpp
rename to variants/nrf52840/rak4631/variant.cpp
diff --git a/variants/rak4631/variant.h b/variants/nrf52840/rak4631/variant.h
similarity index 100%
rename from variants/rak4631/variant.h
rename to variants/nrf52840/rak4631/variant.h
diff --git a/variants/rak4631_epaper/platformio.ini b/variants/nrf52840/rak4631_epaper/platformio.ini
similarity index 86%
rename from variants/rak4631_epaper/platformio.ini
rename to variants/nrf52840/rak4631_epaper/platformio.ini
index 47e4451c7..704520f8d 100644
--- a/variants/rak4631_epaper/platformio.ini
+++ b/variants/nrf52840/rak4631_epaper/platformio.ini
@@ -2,14 +2,16 @@
 [env:rak4631_eink]
 extends = nrf52840_base
 board = wiscore_rak4631
-build_flags = ${nrf52840_base.build_flags} -Ivariants/rak4631_epaper -D RAK_4631
+build_flags = ${nrf52840_base.build_flags}
+  -I variants/nrf52840/rak4631_epaper
+  -D RAK_4631
   -DEINK_DISPLAY_MODEL=GxEPD2_213_BN
   -DEINK_WIDTH=250
   -DEINK_HEIGHT=122
   -DRADIOLIB_EXCLUDE_SX128X=1
   -DRADIOLIB_EXCLUDE_SX127X=1
   -DRADIOLIB_EXCLUDE_LR11X0=1
-build_src_filter = ${nrf52_base.build_src_filter} +<../variants/rak4631_epaper>
+build_src_filter = ${nrf52_base.build_src_filter} +<../variants/nrf52840/rak4631_epaper>
 lib_deps = 
   ${nrf52840_base.lib_deps}
   zinggjm/GxEPD2@^1.6.2
diff --git a/variants/rak4631_epaper/variant.cpp b/variants/nrf52840/rak4631_epaper/variant.cpp
similarity index 100%
rename from variants/rak4631_epaper/variant.cpp
rename to variants/nrf52840/rak4631_epaper/variant.cpp
diff --git a/variants/rak4631_epaper/variant.h b/variants/nrf52840/rak4631_epaper/variant.h
similarity index 100%
rename from variants/rak4631_epaper/variant.h
rename to variants/nrf52840/rak4631_epaper/variant.h
diff --git a/variants/rak4631_epaper_onrxtx/platformio.ini b/variants/nrf52840/rak4631_epaper_onrxtx/platformio.ini
similarity index 87%
rename from variants/rak4631_epaper_onrxtx/platformio.ini
rename to variants/nrf52840/rak4631_epaper_onrxtx/platformio.ini
index 52a13f2a7..e0156668b 100644
--- a/variants/rak4631_epaper_onrxtx/platformio.ini
+++ b/variants/nrf52840/rak4631_epaper_onrxtx/platformio.ini
@@ -3,7 +3,9 @@
 board_level = extra
 extends = nrf52840_base
 board = wiscore_rak4631
-build_flags = ${nrf52840_base.build_flags} -Ivariants/rak4631_epaper -D RAK_4631
+build_flags = ${nrf52840_base.build_flags}
+  -I variants/nrf52840/rak4631_epaper
+  -D RAK_4631
   -D PIN_EINK_EN=34
   -D EINK_DISPLAY_MODEL=GxEPD2_213_BN
   -D EINK_WIDTH=250
@@ -11,7 +13,7 @@ build_flags = ${nrf52840_base.build_flags} -Ivariants/rak4631_epaper -D RAK_4631
   -D RADIOLIB_EXCLUDE_SX128X=1
   -D RADIOLIB_EXCLUDE_SX127X=1
   -D RADIOLIB_EXCLUDE_LR11X0=1
-build_src_filter = ${nrf52_base.build_src_filter} +<../variants/rak4631_epaper_onrxtx>
+build_src_filter = ${nrf52_base.build_src_filter} +<../variants/nrf52840/rak4631_epaper_onrxtx>
 lib_deps = 
   ${nrf52840_base.lib_deps}
   zinggjm/GxEPD2@^1.6.2
diff --git a/variants/rak4631_epaper_onrxtx/variant.cpp b/variants/nrf52840/rak4631_epaper_onrxtx/variant.cpp
similarity index 100%
rename from variants/rak4631_epaper_onrxtx/variant.cpp
rename to variants/nrf52840/rak4631_epaper_onrxtx/variant.cpp
diff --git a/variants/rak4631_epaper_onrxtx/variant.h b/variants/nrf52840/rak4631_epaper_onrxtx/variant.h
similarity index 100%
rename from variants/rak4631_epaper_onrxtx/variant.h
rename to variants/nrf52840/rak4631_epaper_onrxtx/variant.h
diff --git a/variants/rak4631_eth_gw/platformio.ini b/variants/nrf52840/rak4631_eth_gw/platformio.ini
similarity index 95%
rename from variants/rak4631_eth_gw/platformio.ini
rename to variants/nrf52840/rak4631_eth_gw/platformio.ini
index 7e7b0e019..a1c1b4610 100644
--- a/variants/rak4631_eth_gw/platformio.ini
+++ b/variants/nrf52840/rak4631_eth_gw/platformio.ini
@@ -3,7 +3,9 @@
 extends = nrf52840_base
 board = wiscore_rak4631
 board_check = true
-build_flags = ${nrf52840_base.build_flags} -Ivariants/rak4631_eth_gw -D RAK_4631
+build_flags = ${nrf52840_base.build_flags}
+  -I variants/nrf52840/rak4631_eth_gw
+  -D RAK_4631
   -DGPS_POWER_TOGGLE ; comment this line to disable triple press function on the user button to turn off gps entirely.
   -DHAS_UDP_MULTICAST=1
   -DEINK_DISPLAY_MODEL=GxEPD2_213_BN
@@ -22,7 +24,7 @@ build_flags = ${nrf52840_base.build_flags} -Ivariants/rak4631_eth_gw -D RAK_4631
   -DMESHTASTIC_EXCLUDE_STOREFORWARD=1
   -DMESHTASTIC_EXCLUDE_CANNEDMESSAGES=1
   -DMESHTASTIC_EXCLUDE_WAYPOINT=1
-build_src_filter = ${nrf52_base.build_src_filter} +<../variants/rak4631_eth_gw> +<mesh/eth/> +<mesh/api/> +<mqtt/>
+build_src_filter = ${nrf52_base.build_src_filter} +<../variants/nrf52840/rak4631_eth_gw> +<mesh/eth/> +<mesh/api/> +<mqtt/>
 lib_deps = 
   ${nrf52840_base.lib_deps}
   ${networking_base.lib_deps}
diff --git a/variants/rak4631_eth_gw/variant.cpp b/variants/nrf52840/rak4631_eth_gw/variant.cpp
similarity index 100%
rename from variants/rak4631_eth_gw/variant.cpp
rename to variants/nrf52840/rak4631_eth_gw/variant.cpp
diff --git a/variants/rak4631_eth_gw/variant.h b/variants/nrf52840/rak4631_eth_gw/variant.h
similarity index 100%
rename from variants/rak4631_eth_gw/variant.h
rename to variants/nrf52840/rak4631_eth_gw/variant.h
diff --git a/variants/rak4631_nomadstar_meteor_pro/platformio.ini b/variants/nrf52840/rak4631_nomadstar_meteor_pro/platformio.ini
similarity index 89%
rename from variants/rak4631_nomadstar_meteor_pro/platformio.ini
rename to variants/nrf52840/rak4631_nomadstar_meteor_pro/platformio.ini
index d5fbe6a16..e94eef1ee 100644
--- a/variants/rak4631_nomadstar_meteor_pro/platformio.ini
+++ b/variants/nrf52840/rak4631_nomadstar_meteor_pro/platformio.ini
@@ -3,8 +3,9 @@
 extends = nrf52840_base
 board = wiscore_rak4631
 board_check = true
-build_flags = ${nrf52840_base.build_flags} -Ivariants/rak4631_nomadstar_meteor_pro -D NOMADSTAR_METEOR_PRO
-  -L "${platformio.libdeps_dir}/${this.__env__}/bsec2/src/cortex-m4/fpv4-sp-d16-hard"
+build_flags = ${nrf52840_base.build_flags}
+  -I variants/nrf52840/rak4631_nomadstar_meteor_pro
+  -D NOMADSTAR_METEOR_PRO
   ;-DGPS_POWER_TOGGLE ; comment this line to disable triple press function on the user button to turn off gps entirely.
   -DEINK_DISPLAY_MODEL=GxEPD2_213_BN
   -DEINK_WIDTH=250
@@ -12,8 +13,8 @@ build_flags = ${nrf52840_base.build_flags} -Ivariants/rak4631_nomadstar_meteor_p
   -DRADIOLIB_EXCLUDE_SX128X=1
   -DRADIOLIB_EXCLUDE_SX127X=1
   -DRADIOLIB_EXCLUDE_LR11X0=1
-build_src_filter = ${nrf52_base.build_src_filter} +<../variants/rak4631_nomadstar_meteor_pro> +<mesh/api/> +<mqtt/>
-lib_deps = 
+build_src_filter = ${nrf52_base.build_src_filter} +<../variants/nrf52840/rak4631_nomadstar_meteor_pro> +<mesh/api/> +<mqtt/>
+lib_deps =
   ${nrf52840_base.lib_deps}
   https://github.com/NomadStar-outdoor/IOBoard-RGB-LP5562-Library.git#9c366c8
 
diff --git a/variants/rak4631_nomadstar_meteor_pro/variant.cpp b/variants/nrf52840/rak4631_nomadstar_meteor_pro/variant.cpp
similarity index 100%
rename from variants/rak4631_nomadstar_meteor_pro/variant.cpp
rename to variants/nrf52840/rak4631_nomadstar_meteor_pro/variant.cpp
diff --git a/variants/rak4631_nomadstar_meteor_pro/variant.h b/variants/nrf52840/rak4631_nomadstar_meteor_pro/variant.h
similarity index 100%
rename from variants/rak4631_nomadstar_meteor_pro/variant.h
rename to variants/nrf52840/rak4631_nomadstar_meteor_pro/variant.h
diff --git a/variants/rak_wismeshtag/platformio.ini b/variants/nrf52840/rak_wismeshtag/platformio.ini
similarity index 71%
rename from variants/rak_wismeshtag/platformio.ini
rename to variants/nrf52840/rak_wismeshtag/platformio.ini
index a066e5282..08e723302 100644
--- a/variants/rak_wismeshtag/platformio.ini
+++ b/variants/nrf52840/rak_wismeshtag/platformio.ini
@@ -3,13 +3,15 @@
 extends = nrf52840_base
 board = wiscore_rak4631
 board_check = true
-build_flags = ${nrf52840_base.build_flags} -Ivariants/rak_wismeshtag -D WISMESH_TAG -D RAK_4631
-  -L "${platformio.libdeps_dir}/${this.__env__}/bsec2/src/cortex-m4/fpv4-sp-d16-hard"
+build_flags = ${nrf52840_base.build_flags}
+  -I variants/nrf52840/rak_wismeshtag
+  -D WISMESH_TAG
+  -D RAK_4631
   -DGPS_POWER_TOGGLE ; comment this line to disable triple press function on the user button to turn off gps entirely.
   -DRADIOLIB_EXCLUDE_SX128X=1
   -DRADIOLIB_EXCLUDE_SX127X=1
   -DRADIOLIB_EXCLUDE_LR11X0=1
   -DMESHTASTIC_EXCLUDE_WIFI=1
-build_src_filter = ${nrf52_base.build_src_filter} +<../variants/rak_wismeshtag>
-lib_deps = 
+build_src_filter = ${nrf52_base.build_src_filter} +<../variants/nrf52840/rak_wismeshtag>
+lib_deps =
   ${nrf52840_base.lib_deps}
\ No newline at end of file
diff --git a/variants/rak_wismeshtag/variant.cpp b/variants/nrf52840/rak_wismeshtag/variant.cpp
similarity index 100%
rename from variants/rak_wismeshtag/variant.cpp
rename to variants/nrf52840/rak_wismeshtag/variant.cpp
diff --git a/variants/rak_wismeshtag/variant.h b/variants/nrf52840/rak_wismeshtag/variant.h
similarity index 99%
rename from variants/rak_wismeshtag/variant.h
rename to variants/nrf52840/rak_wismeshtag/variant.h
index dd82b76a1..eba910dc1 100644
--- a/variants/rak_wismeshtag/variant.h
+++ b/variants/nrf52840/rak_wismeshtag/variant.h
@@ -150,7 +150,6 @@ static const uint8_t SCK = PIN_SPI_SCK;
 #define PIN_QSPI_IO2 28
 #define PIN_QSPI_IO3 2
 
-
 /* @note RAK5005-O GPIO mapping to RAK4631 GPIO ports
    RAK5005-O <->  nRF52840
    IO1       <->  P0.17 (Arduino GPIO number 17)
@@ -219,7 +218,7 @@ SO GPIO 39/TXEN MAY NOT BE DEFINED FOR SUCCESSFUL OPERATION OF THE SX1262 - TG
 #define GPS_TX_PIN PIN_SERIAL1_TX
 
 // RAK WISMESHTAG
-#define PIN_BUZZER 21 
+#define PIN_BUZZER 21
 
 // Battery
 // The battery sense is hooked to pin A0 (5)
diff --git a/variants/rak_wismeshtap/platformio.ini b/variants/nrf52840/rak_wismeshtap/platformio.ini
similarity index 87%
rename from variants/rak_wismeshtap/platformio.ini
rename to variants/nrf52840/rak_wismeshtap/platformio.ini
index bfb3ea927..f6ee8fd23 100644
--- a/variants/rak_wismeshtap/platformio.ini
+++ b/variants/nrf52840/rak_wismeshtap/platformio.ini
@@ -2,7 +2,10 @@
 [env:rak_wismeshtap]
 extends = nrf52840_base
 board = wiscore_rak4631
-build_flags = ${nrf52840_base.build_flags} -Ivariants/rak_wismeshtap -DWISMESH_TAP -DRAK_4631
+build_flags = ${nrf52840_base.build_flags}
+  -Ivariants/nrf52840/rak_wismeshtap
+  -DWISMESH_TAP
+  -DRAK_4631
   -DGPS_POWER_TOGGLE ; comment this line to disable triple press function on the user button to turn off gps entirely.
   -DEINK_DISPLAY_MODEL=GxEPD2_213_BN
   -DEINK_WIDTH=250
@@ -12,7 +15,7 @@ build_flags = ${nrf52840_base.build_flags} -Ivariants/rak_wismeshtap -DWISMESH_T
   -DMESHTASTIC_EXCLUDE_STOREFORWARD=1
   -DMESHTASTIC_EXCLUDE_POWER_TELEMETRY=1
   -DMESHTASTIC_EXCLUDE_ATAK=1
-build_src_filter = ${nrf52_base.build_src_filter} +<../variants/rak_wismeshtap> +<mesh/eth/> +<mesh/api/> +<mqtt/>
+build_src_filter = ${nrf52_base.build_src_filter} +<../variants/nrf52840/rak_wismeshtap> +<mesh/eth/> +<mesh/api/> +<mqtt/>
 lib_deps = 
   ${nrf52840_base.lib_deps}
   ${networking_base.lib_deps}
diff --git a/variants/rak_wismeshtap/variant.cpp b/variants/nrf52840/rak_wismeshtap/variant.cpp
similarity index 100%
rename from variants/rak_wismeshtap/variant.cpp
rename to variants/nrf52840/rak_wismeshtap/variant.cpp
diff --git a/variants/rak_wismeshtap/variant.h b/variants/nrf52840/rak_wismeshtap/variant.h
similarity index 100%
rename from variants/rak_wismeshtap/variant.h
rename to variants/nrf52840/rak_wismeshtap/variant.h
diff --git a/variants/seeed_solar_node/platformio.ini b/variants/nrf52840/seeed_solar_node/platformio.ini
similarity index 70%
rename from variants/seeed_solar_node/platformio.ini
rename to variants/nrf52840/seeed_solar_node/platformio.ini
index eb91a435f..b2a128c57 100644
--- a/variants/seeed_solar_node/platformio.ini
+++ b/variants/nrf52840/seeed_solar_node/platformio.ini
@@ -3,11 +3,12 @@ board = seeed_solar_node
 extends = nrf52840_base
 ;board_level = extra
 build_flags = ${nrf52840_base.build_flags} 
-  -I $PROJECT_DIR/variants/seeed_solar_node 
+  -I variants/nrf52840/seeed_solar_node 
   -D SEEED_SOLAR_NODE 
-  -Isrc/platform/nrf52/softdevice -Isrc/platform/nrf52/softdevice/nrf52
+  -I src/platform/nrf52/softdevice
+  -I src/platform/nrf52/softdevice/nrf52
 board_build.ldscript = src/platform/nrf52/nrf52840_s140_v7.ld
-build_src_filter = ${nrf52_base.build_src_filter} +<../variants/seeed_solar_node>
+build_src_filter = ${nrf52_base.build_src_filter} +<../variants/nrf52840/seeed_solar_node>
 lib_deps =
   ${nrf52840_base.lib_deps}
 debug_tool = jlink
diff --git a/variants/seeed_solar_node/variant.cpp b/variants/nrf52840/seeed_solar_node/variant.cpp
similarity index 100%
rename from variants/seeed_solar_node/variant.cpp
rename to variants/nrf52840/seeed_solar_node/variant.cpp
diff --git a/variants/seeed_solar_node/variant.h b/variants/nrf52840/seeed_solar_node/variant.h
similarity index 100%
rename from variants/seeed_solar_node/variant.h
rename to variants/nrf52840/seeed_solar_node/variant.h
diff --git a/variants/seeed_wio_tracker_L1/platformio.ini b/variants/nrf52840/seeed_wio_tracker_L1/platformio.ini
similarity index 61%
rename from variants/seeed_wio_tracker_L1/platformio.ini
rename to variants/nrf52840/seeed_wio_tracker_L1/platformio.ini
index 3c4653d7e..6c137384d 100644
--- a/variants/seeed_wio_tracker_L1/platformio.ini
+++ b/variants/nrf52840/seeed_wio_tracker_L1/platformio.ini
@@ -1,13 +1,13 @@
 [env:seeed_wio_tracker_L1]
 board = seeed_wio_tracker_L1
 extends = nrf52840_base
-;board_level = extra
 build_flags = ${nrf52840_base.build_flags} 
-  -I $PROJECT_DIR/variants/seeed_wio_tracker_L1
-  -D  SEEED_WIO_TRACKER_L1
-  -Isrc/platform/nrf52/softdevice -Isrc/platform/nrf52/softdevice/nrf52
+  -I variants/nrf52840/seeed_wio_tracker_L1
+  -D SEEED_WIO_TRACKER_L1
+  -I src/platform/nrf52/softdevice
+  -I src/platform/nrf52/softdevice/nrf52
 board_build.ldscript = src/platform/nrf52/nrf52840_s140_v7.ld
-build_src_filter = ${nrf52_base.build_src_filter} +<../variants/seeed_wio_tracker_L1>
+build_src_filter = ${nrf52_base.build_src_filter} +<../variants/nrf52840/seeed_wio_tracker_L1>
 lib_deps =
   ${nrf52840_base.lib_deps}
 debug_tool = jlink
diff --git a/variants/seeed_wio_tracker_L1/variant.cpp b/variants/nrf52840/seeed_wio_tracker_L1/variant.cpp
similarity index 100%
rename from variants/seeed_wio_tracker_L1/variant.cpp
rename to variants/nrf52840/seeed_wio_tracker_L1/variant.cpp
diff --git a/variants/seeed_wio_tracker_L1/variant.h b/variants/nrf52840/seeed_wio_tracker_L1/variant.h
similarity index 100%
rename from variants/seeed_wio_tracker_L1/variant.h
rename to variants/nrf52840/seeed_wio_tracker_L1/variant.h
diff --git a/variants/seeed_wio_tracker_L1_eink/nicheGraphics.h b/variants/nrf52840/seeed_wio_tracker_L1_eink/nicheGraphics.h
similarity index 100%
rename from variants/seeed_wio_tracker_L1_eink/nicheGraphics.h
rename to variants/nrf52840/seeed_wio_tracker_L1_eink/nicheGraphics.h
diff --git a/variants/seeed_wio_tracker_L1_eink/platformio.ini b/variants/nrf52840/seeed_wio_tracker_L1_eink/platformio.ini
similarity index 59%
rename from variants/seeed_wio_tracker_L1_eink/platformio.ini
rename to variants/nrf52840/seeed_wio_tracker_L1_eink/platformio.ini
index b310cce83..52ff39d49 100644
--- a/variants/seeed_wio_tracker_L1_eink/platformio.ini
+++ b/variants/nrf52840/seeed_wio_tracker_L1_eink/platformio.ini
@@ -2,13 +2,15 @@
 board = seeed_wio_tracker_L1
 extends = nrf52840_base, inkhud
 ;board_level = extra
-build_flags = ${nrf52840_base.build_flags}  ${inkhud.build_flags}
-  -I $PROJECT_DIR/variants/seeed_wio_tracker_L1_eink
+build_flags = ${nrf52840_base.build_flags}
+  ${inkhud.build_flags}
+  -I variants/nrf52840/seeed_wio_tracker_L1_eink
   -D SEEED_WIO_TRACKER_L1_EINK
   -D SEEED_WIO_TRACKER_L1
-  -Isrc/platform/nrf52/softdevice -Isrc/platform/nrf52/softdevice/nrf52
+  -I src/platform/nrf52/softdevice
+  -I src/platform/nrf52/softdevice/nrf52
 board_build.ldscript = src/platform/nrf52/nrf52840_s140_v7.ld
-build_src_filter = ${nrf52_base.build_src_filter} +<../variants/seeed_wio_tracker_L1_eink> ${inkhud.build_src_filter}
+build_src_filter = ${nrf52_base.build_src_filter} +<../variants/nrf52840/seeed_wio_tracker_L1_eink> ${inkhud.build_src_filter}
 lib_deps =
   ${inkhud.lib_deps}
   ${nrf52840_base.lib_deps}
diff --git a/variants/seeed_wio_tracker_L1_eink/variant.cpp b/variants/nrf52840/seeed_wio_tracker_L1_eink/variant.cpp
similarity index 100%
rename from variants/seeed_wio_tracker_L1_eink/variant.cpp
rename to variants/nrf52840/seeed_wio_tracker_L1_eink/variant.cpp
diff --git a/variants/seeed_wio_tracker_L1_eink/variant.h b/variants/nrf52840/seeed_wio_tracker_L1_eink/variant.h
similarity index 100%
rename from variants/seeed_wio_tracker_L1_eink/variant.h
rename to variants/nrf52840/seeed_wio_tracker_L1_eink/variant.h
diff --git a/variants/seeed_xiao_nrf52840_kit/platformio.ini b/variants/nrf52840/seeed_xiao_nrf52840_kit/platformio.ini
similarity index 66%
rename from variants/seeed_xiao_nrf52840_kit/platformio.ini
rename to variants/nrf52840/seeed_xiao_nrf52840_kit/platformio.ini
index 0e1e94cd5..27352875d 100644
--- a/variants/seeed_xiao_nrf52840_kit/platformio.ini
+++ b/variants/nrf52840/seeed_xiao_nrf52840_kit/platformio.ini
@@ -2,9 +2,14 @@
 [env:seeed_xiao_nrf52840_kit]
 extends = nrf52840_base
 board = xiao_ble_sense
-build_flags = ${nrf52840_base.build_flags} -Ivariants/seeed_xiao_nrf52840_kit -Isrc/platform/nrf52/softdevice -Isrc/platform/nrf52/softdevice/nrf52  -DSEEED_XIAO_NRF52840_KIT -DGPS_L76K
+build_flags = ${nrf52840_base.build_flags}
+  -Ivariants/nrf52840/seeed_xiao_nrf52840_kit
+  -Isrc/platform/nrf52/softdevice
+  -Isrc/platform/nrf52/softdevice/nrf52
+  -DSEEED_XIAO_NRF52840_KIT
+  -DGPS_L76K
 board_build.ldscript = src/platform/nrf52/nrf52840_s140_v7.ld
-build_src_filter = ${nrf52_base.build_src_filter} +<../variants/seeed_xiao_nrf52840_kit>
+build_src_filter = ${nrf52_base.build_src_filter} +<../variants/nrf52840/seeed_xiao_nrf52840_kit>
 lib_deps = 
   ${nrf52840_base.lib_deps}
 debug_tool = jlink
diff --git a/variants/seeed_xiao_nrf52840_kit/variant.cpp b/variants/nrf52840/seeed_xiao_nrf52840_kit/variant.cpp
similarity index 100%
rename from variants/seeed_xiao_nrf52840_kit/variant.cpp
rename to variants/nrf52840/seeed_xiao_nrf52840_kit/variant.cpp
diff --git a/variants/seeed_xiao_nrf52840_kit/variant.h b/variants/nrf52840/seeed_xiao_nrf52840_kit/variant.h
similarity index 100%
rename from variants/seeed_xiao_nrf52840_kit/variant.h
rename to variants/nrf52840/seeed_xiao_nrf52840_kit/variant.h
diff --git a/variants/t-echo/nicheGraphics.h b/variants/nrf52840/t-echo/nicheGraphics.h
similarity index 100%
rename from variants/t-echo/nicheGraphics.h
rename to variants/nrf52840/t-echo/nicheGraphics.h
diff --git a/variants/t-echo/platformio.ini b/variants/nrf52840/t-echo/platformio.ini
similarity index 89%
rename from variants/t-echo/platformio.ini
rename to variants/nrf52840/t-echo/platformio.ini
index 85c3b5799..b80958d5d 100644
--- a/variants/t-echo/platformio.ini
+++ b/variants/nrf52840/t-echo/platformio.ini
@@ -6,7 +6,8 @@ board_check = true
 debug_tool = jlink
 
 # add -DCFG_SYSVIEW if you want to use the Segger systemview tool for OS profiling.
-build_flags = ${nrf52840_base.build_flags} -Ivariants/t-echo
+build_flags = ${nrf52840_base.build_flags}
+  -Ivariants/nrf52840/t-echo
   -DGPS_POWER_TOGGLE
   -DEINK_DISPLAY_MODEL=GxEPD2_154_D67
   -DEINK_WIDTH=200
@@ -16,7 +17,7 @@ build_flags = ${nrf52840_base.build_flags} -Ivariants/t-echo
   -DEINK_LIMIT_FASTREFRESH=20          ; How many consecutive fast-refreshes are permitted
   -DEINK_BACKGROUND_USES_FAST          ; (Optional) Use FAST refresh for both BACKGROUND and RESPONSIVE, until a limit is reached.
 
-build_src_filter = ${nrf52_base.build_src_filter} +<../variants/t-echo>
+build_src_filter = ${nrf52_base.build_src_filter} +<../variants/nrf52840/t-echo>
 lib_deps = 
   ${nrf52840_base.lib_deps}
   https://github.com/meshtastic/GxEPD2/archive/55f618961db45a23eff0233546430f1e5a80f63a.zip
@@ -31,11 +32,11 @@ debug_tool = jlink
 build_flags = 
   ${nrf52840_base.build_flags}
   ${inkhud.build_flags}
-  -I variants/t-echo
+  -I variants/nrf52840/t-echo
 build_src_filter = 
   ${nrf52_base.build_src_filter} 
   ${inkhud.build_src_filter}
-  +<../variants/t-echo>
+  +<../variants/nrf52840/t-echo>
 lib_deps = 
   ${inkhud.lib_deps} ; InkHUD libs first, so we get GFXRoot instead of AdafruitGFX
   ${nrf52840_base.lib_deps}
diff --git a/variants/t-echo/variant.cpp b/variants/nrf52840/t-echo/variant.cpp
similarity index 100%
rename from variants/t-echo/variant.cpp
rename to variants/nrf52840/t-echo/variant.cpp
diff --git a/variants/t-echo/variant.h b/variants/nrf52840/t-echo/variant.h
similarity index 100%
rename from variants/t-echo/variant.h
rename to variants/nrf52840/t-echo/variant.h
diff --git a/variants/tracker-t1000-e/platformio.ini b/variants/nrf52840/tracker-t1000-e/platformio.ini
similarity index 78%
rename from variants/tracker-t1000-e/platformio.ini
rename to variants/nrf52840/tracker-t1000-e/platformio.ini
index b1f11d524..45c8c5d00 100644
--- a/variants/tracker-t1000-e/platformio.ini
+++ b/variants/nrf52840/tracker-t1000-e/platformio.ini
@@ -1,7 +1,11 @@
 [env:tracker-t1000-e]
 extends = nrf52840_base
 board = tracker-t1000-e
-build_flags = ${nrf52840_base.build_flags} -Ivariants/tracker-t1000-e -Isrc/platform/nrf52/softdevice -Isrc/platform/nrf52/softdevice/nrf52 -DTRACKER_T1000_E
+build_flags = ${nrf52840_base.build_flags}
+  -Ivariants/nrf52840/tracker-t1000-e
+  -Isrc/platform/nrf52/softdevice
+  -Isrc/platform/nrf52/softdevice/nrf52
+  -DTRACKER_T1000_E
   -DGPS_POWER_TOGGLE
   -DMESHTASTIC_EXCLUDE_ENVIRONMENTAL_SENSOR_EXTERNAL=1
   -DMESHTASTIC_EXCLUDE_CANNEDMESSAGES=1
@@ -9,7 +13,7 @@ build_flags = ${nrf52840_base.build_flags} -Ivariants/tracker-t1000-e -Isrc/plat
   -DMESHTASTIC_EXCLUDE_DETECTIONSENSOR=1
   -DMESHTASTIC_EXCLUDE_WIFI=1
 board_build.ldscript = src/platform/nrf52/nrf52840_s140_v7.ld
-build_src_filter = ${nrf52_base.build_src_filter} +<../variants/tracker-t1000-e>
+build_src_filter = ${nrf52_base.build_src_filter} +<../variants/nrf52840/tracker-t1000-e>
 lib_deps = 
   ${nrf52840_base.lib_deps}
   https://github.com/meshtastic/QMA6100P_Arduino_Library/archive/14c900b8b2e4feaac5007a7e41e0c1b7f0841136.zip
diff --git a/variants/tracker-t1000-e/rfswitch.h b/variants/nrf52840/tracker-t1000-e/rfswitch.h
similarity index 100%
rename from variants/tracker-t1000-e/rfswitch.h
rename to variants/nrf52840/tracker-t1000-e/rfswitch.h
diff --git a/variants/tracker-t1000-e/variant.cpp b/variants/nrf52840/tracker-t1000-e/variant.cpp
similarity index 100%
rename from variants/tracker-t1000-e/variant.cpp
rename to variants/nrf52840/tracker-t1000-e/variant.cpp
diff --git a/variants/tracker-t1000-e/variant.h b/variants/nrf52840/tracker-t1000-e/variant.h
similarity index 100%
rename from variants/tracker-t1000-e/variant.h
rename to variants/nrf52840/tracker-t1000-e/variant.h
diff --git a/variants/wio-sdk-wm1110/platformio.ini b/variants/nrf52840/wio-sdk-wm1110/platformio.ini
similarity index 80%
rename from variants/wio-sdk-wm1110/platformio.ini
rename to variants/nrf52840/wio-sdk-wm1110/platformio.ini
index 4e1415678..2c65246b8 100644
--- a/variants/wio-sdk-wm1110/platformio.ini
+++ b/variants/nrf52840/wio-sdk-wm1110/platformio.ini
@@ -4,16 +4,20 @@ extends = nrf52840_base
 board = wio-sdk-wm1110
 
 extra_scripts =
-  bin/platformio-custom.py
+  ${env.extra_scripts}
   extra_scripts/disable_adafruit_usb.py
 
 # Remove adafruit USB serial from the build (it is incompatible with using the ch340 serial chip on this board)
 build_unflags = ${nrf52840_base:build_unflags} -DUSBCON -DUSE_TINYUSB
-build_flags = ${nrf52840_base.build_flags} -Ivariants/wio-sdk-wm1110 -Isrc/platform/nrf52/softdevice -Isrc/platform/nrf52/softdevice/nrf52 -DWIO_WM1110
+build_flags = ${nrf52840_base.build_flags}
+  -Ivariants/nrf52840/wio-sdk-wm1110
+  -Isrc/platform/nrf52/softdevice
+  -Isrc/platform/nrf52/softdevice/nrf52
+  -DWIO_WM1110
   -DGPS_POWER_TOGGLE ; comment this line to disable triple press function on the user button to turn off gps entirely.
   -DCFG_TUD_CDC=0
 board_build.ldscript = src/platform/nrf52/nrf52840_s140_v7.ld
-build_src_filter = ${nrf52_base.build_src_filter} +<../variants/wio-sdk-wm1110>
+build_src_filter = ${nrf52_base.build_src_filter} +<../variants/nrf52840/wio-sdk-wm1110>
 
 ;debug_tool = jlink
 debug_tool = stlink
diff --git a/variants/wio-sdk-wm1110/rfswitch.h b/variants/nrf52840/wio-sdk-wm1110/rfswitch.h
similarity index 100%
rename from variants/wio-sdk-wm1110/rfswitch.h
rename to variants/nrf52840/wio-sdk-wm1110/rfswitch.h
diff --git a/variants/wio-sdk-wm1110/variant.cpp b/variants/nrf52840/wio-sdk-wm1110/variant.cpp
similarity index 100%
rename from variants/wio-sdk-wm1110/variant.cpp
rename to variants/nrf52840/wio-sdk-wm1110/variant.cpp
diff --git a/variants/wio-sdk-wm1110/variant.h b/variants/nrf52840/wio-sdk-wm1110/variant.h
similarity index 100%
rename from variants/wio-sdk-wm1110/variant.h
rename to variants/nrf52840/wio-sdk-wm1110/variant.h
diff --git a/variants/wio-t1000-s/platformio.ini b/variants/nrf52840/wio-t1000-s/platformio.ini
similarity index 77%
rename from variants/wio-t1000-s/platformio.ini
rename to variants/nrf52840/wio-t1000-s/platformio.ini
index 2eab1e1c5..3594bcf07 100644
--- a/variants/wio-t1000-s/platformio.ini
+++ b/variants/nrf52840/wio-t1000-s/platformio.ini
@@ -3,10 +3,14 @@
 extends = nrf52840_base
 board = wio-t1000-s
 board_level = extra
-build_flags = ${nrf52840_base.build_flags} -Ivariants/wio-t1000-s -Isrc/platform/nrf52/softdevice -Isrc/platform/nrf52/softdevice/nrf52 -DWIO_WM1110
+build_flags = ${nrf52840_base.build_flags}
+  -Ivariants/nrf52840/wio-t1000-s
+  -Isrc/platform/nrf52/softdevice
+  -Isrc/platform/nrf52/softdevice/nrf52
+  -DWIO_WM1110
   -DGPS_POWER_TOGGLE ; comment this line to disable triple press function on the user button to turn off gps entirely.
 board_build.ldscript = src/platform/nrf52/nrf52840_s140_v7.ld
-build_src_filter = ${nrf52_base.build_src_filter} +<../variants/wio-t1000-s>
+build_src_filter = ${nrf52_base.build_src_filter} +<../variants/nrf52840/wio-t1000-s>
 lib_deps = 
   ${nrf52840_base.lib_deps}
 debug_tool = jlink
diff --git a/variants/wio-t1000-s/rfswitch.h b/variants/nrf52840/wio-t1000-s/rfswitch.h
similarity index 100%
rename from variants/wio-t1000-s/rfswitch.h
rename to variants/nrf52840/wio-t1000-s/rfswitch.h
diff --git a/variants/wio-t1000-s/variant.cpp b/variants/nrf52840/wio-t1000-s/variant.cpp
similarity index 100%
rename from variants/wio-t1000-s/variant.cpp
rename to variants/nrf52840/wio-t1000-s/variant.cpp
diff --git a/variants/wio-t1000-s/variant.h b/variants/nrf52840/wio-t1000-s/variant.h
similarity index 100%
rename from variants/wio-t1000-s/variant.h
rename to variants/nrf52840/wio-t1000-s/variant.h
diff --git a/variants/wio-tracker-wm1110/platformio.ini b/variants/nrf52840/wio-tracker-wm1110/platformio.ini
similarity index 73%
rename from variants/wio-tracker-wm1110/platformio.ini
rename to variants/nrf52840/wio-tracker-wm1110/platformio.ini
index a6960b435..b383043bb 100644
--- a/variants/wio-tracker-wm1110/platformio.ini
+++ b/variants/nrf52840/wio-tracker-wm1110/platformio.ini
@@ -2,10 +2,14 @@
 [env:wio-tracker-wm1110]
 extends = nrf52840_base
 board = wio-tracker-wm1110
-build_flags = ${nrf52840_base.build_flags} -Ivariants/wio-tracker-wm1110 -Isrc/platform/nrf52/softdevice -Isrc/platform/nrf52/softdevice/nrf52 -DWIO_WM1110
+build_flags = ${nrf52840_base.build_flags}
+  -Ivariants/nrf52840/wio-tracker-wm1110
+  -Isrc/platform/nrf52/softdevice
+  -Isrc/platform/nrf52/softdevice/nrf52
+  -DWIO_WM1110
   -DGPS_POWER_TOGGLE ; comment this line to disable triple press function on the user button to turn off gps entirely.
 board_build.ldscript = src/platform/nrf52/nrf52840_s140_v7.ld
-build_src_filter = ${nrf52_base.build_src_filter} +<../variants/wio-tracker-wm1110>
+build_src_filter = ${nrf52_base.build_src_filter} +<../variants/nrf52840/wio-tracker-wm1110>
 lib_deps = 
   ${nrf52840_base.lib_deps}
 ; If not set we will default to uploading over serial (first it forces bootloader entry by talking 1200bps to cdcacm)
diff --git a/variants/wio-tracker-wm1110/rfswitch.h b/variants/nrf52840/wio-tracker-wm1110/rfswitch.h
similarity index 100%
rename from variants/wio-tracker-wm1110/rfswitch.h
rename to variants/nrf52840/wio-tracker-wm1110/rfswitch.h
diff --git a/variants/wio-tracker-wm1110/variant.cpp b/variants/nrf52840/wio-tracker-wm1110/variant.cpp
similarity index 100%
rename from variants/wio-tracker-wm1110/variant.cpp
rename to variants/nrf52840/wio-tracker-wm1110/variant.cpp
diff --git a/variants/wio-tracker-wm1110/variant.h b/variants/nrf52840/wio-tracker-wm1110/variant.h
similarity index 100%
rename from variants/wio-tracker-wm1110/variant.h
rename to variants/nrf52840/wio-tracker-wm1110/variant.h