diff --git a/variants/ec_catsniffer/platformio.ini b/variants/rp2040/ec_catsniffer/platformio.ini
similarity index 50%
rename from variants/ec_catsniffer/platformio.ini
rename to variants/rp2040/ec_catsniffer/platformio.ini
index 6db9abe90..acf19d757 100644
--- a/variants/ec_catsniffer/platformio.ini
+++ b/variants/rp2040/ec_catsniffer/platformio.ini
@@ -2,13 +2,13 @@
 extends = rp2040_base
 board = rpipico
 upload_protocol = picotool
-
-build_flags = ${rp2040_base.build_flags} 
-  -DRPI_PICO
-  -Ivariants/ec_catsniffer
-  -DDEBUG_RP2040_PORT=Serial
-  # -DHW_SPI1_DEVICE
+build_flags = 
+  ${rp2040_base.build_flags}
+  -D RPI_PICO
+  -I variants/rp2040/ec_catsniffer
+  -D DEBUG_RP2040_PORT=Serial
+  ; -D HW_SPI1_DEVICE
 lib_deps =
   ${rp2040_base.lib_deps}
 debug_build_flags = ${rp2040_base.build_flags}, -g
-debug_tool = cmsis-dap
\ No newline at end of file
+debug_tool = cmsis-dap
diff --git a/variants/ec_catsniffer/variant.cpp b/variants/rp2040/ec_catsniffer/variant.cpp
similarity index 100%
rename from variants/ec_catsniffer/variant.cpp
rename to variants/rp2040/ec_catsniffer/variant.cpp
diff --git a/variants/ec_catsniffer/variant.h b/variants/rp2040/ec_catsniffer/variant.h
similarity index 100%
rename from variants/ec_catsniffer/variant.h
rename to variants/rp2040/ec_catsniffer/variant.h
diff --git a/variants/feather_rp2040_rfm95/platformio.ini b/variants/rp2040/feather_rp2040_rfm95/platformio.ini
similarity index 53%
rename from variants/feather_rp2040_rfm95/platformio.ini
rename to variants/rp2040/feather_rp2040_rfm95/platformio.ini
index db1eb4f02..ef4118cb0 100644
--- a/variants/feather_rp2040_rfm95/platformio.ini
+++ b/variants/rp2040/feather_rp2040_rfm95/platformio.ini
@@ -2,14 +2,14 @@
 extends = rp2040_base
 board = adafruit_feather
 upload_protocol = picotool
-
 # add our variants files to the include and src paths
-build_flags = ${rp2040_base.build_flags} 
-  -DRP2040_FEATHER_RFM95
-  -Ivariants/feather_rp2040_rfm95
-  -DDEBUG_RP2040_PORT=Serial
-  -DHW_SPI1_DEVICE
+build_flags = 
+  ${rp2040_base.build_flags} 
+  -D RP2040_FEATHER_RFM95
+  -I variants/rp2040/feather_rp2040_rfm95
+  -D DEBUG_RP2040_PORT=Serial
+  -D HW_SPI1_DEVICE
 lib_deps =
   ${rp2040_base.lib_deps}
 debug_build_flags = ${rp2040_base.build_flags}
-debug_tool = cmsis-dap ; for e.g. Picotool
\ No newline at end of file
+debug_tool = cmsis-dap ; for e.g. Picotool
diff --git a/variants/feather_rp2040_rfm95/variant.h b/variants/rp2040/feather_rp2040_rfm95/variant.h
similarity index 100%
rename from variants/feather_rp2040_rfm95/variant.h
rename to variants/rp2040/feather_rp2040_rfm95/variant.h
diff --git a/variants/nibble_rp2040/platformio.ini b/variants/rp2040/nibble_rp2040/platformio.ini
similarity index 56%
rename from variants/nibble_rp2040/platformio.ini
rename to variants/rp2040/nibble_rp2040/platformio.ini
index c3a1923c5..024a72206 100644
--- a/variants/nibble_rp2040/platformio.ini
+++ b/variants/rp2040/nibble_rp2040/platformio.ini
@@ -3,14 +3,14 @@ extends = rp2040_base
 board = rpipico
 board_level = extra
 upload_protocol = picotool
-
 # add our variants files to the include and src paths
-build_flags = ${rp2040_base.build_flags} 
-  -DPRIVATE_HW
-  -Ivariants/nibble_rp2040
-  -DDEBUG_RP2040_PORT=Serial
-  -DHW_SPI1_DEVICE
+build_flags =
+  ${rp2040_base.build_flags}
+  -D PRIVATE_HW
+  -I variants/rp2040/nibble_rp2040
+  -D DEBUG_RP2040_PORT=Serial
+  -D HW_SPI1_DEVICE
 lib_deps =
   ${rp2040_base.lib_deps}
 debug_build_flags = ${rp2040_base.build_flags}, -g
-debug_tool = cmsis-dap ; for e.g. Picotool
\ No newline at end of file
+debug_tool = cmsis-dap ; for e.g. Picotool
diff --git a/variants/nibble_rp2040/variant.h b/variants/rp2040/nibble_rp2040/variant.h
similarity index 100%
rename from variants/nibble_rp2040/variant.h
rename to variants/rp2040/nibble_rp2040/variant.h
diff --git a/variants/rak11310/pins_arduino.h b/variants/rp2040/rak11310/pins_arduino.h
similarity index 100%
rename from variants/rak11310/pins_arduino.h
rename to variants/rp2040/rak11310/pins_arduino.h
diff --git a/variants/rak11310/platformio.ini b/variants/rp2040/rak11310/platformio.ini
similarity index 64%
rename from variants/rak11310/platformio.ini
rename to variants/rp2040/rak11310/platformio.ini
index fd7e842cc..aca24656b 100644
--- a/variants/rak11310/platformio.ini
+++ b/variants/rp2040/rak11310/platformio.ini
@@ -2,18 +2,18 @@
 extends = rp2040_base
 board = rakwireless_rak11300
 upload_protocol = picotool
-
 # add our variants files to the include and src paths
-build_flags = ${rp2040_base.build_flags} 
-  -DRAK11310
-  -Ivariants/rak11310
-  -DDEBUG_RP2040_PORT=Serial
-  -DRV3028_RTC=0x52
-build_src_filter = ${rp2040_base.build_src_filter} +<../variants/rak11310> +<mesh/eth/> +<mesh/api/> +<mqtt/>
+build_flags = 
+  ${rp2040_base.build_flags} 
+  -D RAK11310
+  -I variants/rp2040/rak11310
+  -D DEBUG_RP2040_PORT=Serial
+  -D RV3028_RTC=0x52
+build_src_filter = ${rp2040_base.build_src_filter} +<../variants/rp2040/rak11310> +<mesh/eth/> +<mesh/api/> +<mqtt/>
 lib_deps =
   ${rp2040_base.lib_deps}
   ${networking_base.lib_deps}
   melopero/Melopero RV3028@^1.1.0
   https://github.com/RAKWireless/RAK13800-W5100S/archive/1.0.2.zip
 debug_build_flags = ${rp2040_base.build_flags}, -g
-debug_tool = cmsis-dap ; for e.g. Picotool
\ No newline at end of file
+debug_tool = cmsis-dap ; for e.g. Picotool
diff --git a/variants/rak11310/variant.h b/variants/rp2040/rak11310/variant.h
similarity index 100%
rename from variants/rak11310/variant.h
rename to variants/rp2040/rak11310/variant.h
diff --git a/variants/rp2040-lora/platformio.ini b/variants/rp2040/rp2040-lora/platformio.ini
similarity index 54%
rename from variants/rp2040-lora/platformio.ini
rename to variants/rp2040/rp2040-lora/platformio.ini
index 7ac5b2cac..d59e74f20 100644
--- a/variants/rp2040-lora/platformio.ini
+++ b/variants/rp2040/rp2040-lora/platformio.ini
@@ -2,14 +2,14 @@
 extends = rp2040_base
 board = rpipico
 upload_protocol = picotool
-
 # add our variants files to the include and src paths
-build_flags = ${rp2040_base.build_flags} 
-  -DRP2040_LORA
-  -Ivariants/rp2040-lora
-  -DDEBUG_RP2040_PORT=Serial
-  -DHW_SPI1_DEVICE
+build_flags =
+  ${rp2040_base.build_flags}
+  -D RP2040_LORA
+  -I variants/rp2040/rp2040-lora
+  -D DEBUG_RP2040_PORT=Serial
+  -D HW_SPI1_DEVICE
 lib_deps =
   ${rp2040_base.lib_deps}
 debug_build_flags = ${rp2040_base.build_flags}, -g
-debug_tool = cmsis-dap ; for e.g. Picotool
\ No newline at end of file
+debug_tool = cmsis-dap ; for e.g. Picotool
diff --git a/variants/rp2040-lora/variant.h b/variants/rp2040/rp2040-lora/variant.h
similarity index 100%
rename from variants/rp2040-lora/variant.h
rename to variants/rp2040/rp2040-lora/variant.h
diff --git a/variants/rpipico-slowclock/platformio.ini b/variants/rp2040/rpipico-slowclock/platformio.ini
similarity index 85%
rename from variants/rpipico-slowclock/platformio.ini
rename to variants/rp2040/rpipico-slowclock/platformio.ini
index c56f9e78c..30928aead 100644
--- a/variants/rpipico-slowclock/platformio.ini
+++ b/variants/rp2040/rpipico-slowclock/platformio.ini
@@ -12,11 +12,11 @@ debug_init_cmds =
   $LOAD_CMDS
   monitor init
   monitor reset halt
-
 # add our variants files to the include and src paths
-build_flags = ${rp2040_base.build_flags} 
+build_flags = 
+  ${rp2040_base.build_flags} 
   -DRPI_PICO
-  -Ivariants/rpipico-slowclock
+  -Ivariants/rp2040/rpipico-slowclock
   -DDEBUG_RP2040_PORT=Serial2
   -DHW_SPI1_DEVICE
   -g
@@ -25,4 +25,4 @@ lib_deps =
   ${rp2040_base.lib_deps}
 debug_build_flags = ${rp2040_base.build_flags}
   -g
-  -DNO_USB
\ No newline at end of file
+  -DNO_USB
diff --git a/variants/rpipico-slowclock/variant.h b/variants/rp2040/rpipico-slowclock/variant.h
similarity index 100%
rename from variants/rpipico-slowclock/variant.h
rename to variants/rp2040/rpipico-slowclock/variant.h
diff --git a/variants/rpipico/platformio.ini b/variants/rp2040/rpipico/platformio.ini
similarity index 55%
rename from variants/rpipico/platformio.ini
rename to variants/rp2040/rpipico/platformio.ini
index e34cfa43b..81db2a312 100644
--- a/variants/rpipico/platformio.ini
+++ b/variants/rp2040/rpipico/platformio.ini
@@ -4,12 +4,13 @@ board = rpipico
 upload_protocol = picotool
 
 # add our variants files to the include and src paths
-build_flags = ${rp2040_base.build_flags} 
-  -DRPI_PICO
-  -Ivariants/rpipico
-  -DDEBUG_RP2040_PORT=Serial
-  -DHW_SPI1_DEVICE
+build_flags =
+  ${rp2040_base.build_flags}
+  -D RPI_PICO
+  -I variants/rp2040/rpipico
+  -D DEBUG_RP2040_PORT=Serial
+  -D HW_SPI1_DEVICE
 lib_deps =
   ${rp2040_base.lib_deps}
 debug_build_flags = ${rp2040_base.build_flags}, -g
-debug_tool = cmsis-dap ; for e.g. Picotool
\ No newline at end of file
+debug_tool = cmsis-dap ; for e.g. Picotool
diff --git a/variants/rpipico/variant.h b/variants/rp2040/rpipico/variant.h
similarity index 100%
rename from variants/rpipico/variant.h
rename to variants/rp2040/rpipico/variant.h
diff --git a/variants/rpipicow/platformio.ini b/variants/rp2040/rpipicow/platformio.ini
similarity index 75%
rename from variants/rpipicow/platformio.ini
rename to variants/rp2040/rpipicow/platformio.ini
index e59944b5d..f3fd07f8d 100644
--- a/variants/rpipicow/platformio.ini
+++ b/variants/rp2040/rpipicow/platformio.ini
@@ -2,14 +2,14 @@
 extends = rp2040_base
 board = rpipicow
 upload_protocol = picotool
-
 # add our variants files to the include and src paths
-build_flags = ${rp2040_base.build_flags} 
-  -DRPI_PICO
-  -Ivariants/rpipicow
-  -DHW_SPI1_DEVICE
+build_flags = 
+  ${rp2040_base.build_flags}
+  -D RPI_PICO
+  -I variants/rp2040/rpipicow
+  -D HW_SPI1_DEVICE
+  -D HAS_UDP_MULTICAST=1
   -fexceptions  # for exception handling in MQTT
-  -DHAS_UDP_MULTICAST=1
 build_src_filter = ${rp2040_base.build_src_filter} +<mesh/wifi/>
 lib_deps =
   ${rp2040_base.lib_deps}
diff --git a/variants/rpipicow/variant.h b/variants/rp2040/rpipicow/variant.h
similarity index 100%
rename from variants/rpipicow/variant.h
rename to variants/rp2040/rpipicow/variant.h
diff --git a/variants/senselora_rp2040/pins_arduino.h b/variants/rp2040/senselora_rp2040/pins_arduino.h
similarity index 100%
rename from variants/senselora_rp2040/pins_arduino.h
rename to variants/rp2040/senselora_rp2040/pins_arduino.h
diff --git a/variants/senselora_rp2040/platformio.ini b/variants/rp2040/senselora_rp2040/platformio.ini
similarity index 60%
rename from variants/senselora_rp2040/platformio.ini
rename to variants/rp2040/senselora_rp2040/platformio.ini
index b05fc1f8b..3a574d0f9 100644
--- a/variants/senselora_rp2040/platformio.ini
+++ b/variants/rp2040/senselora_rp2040/platformio.ini
@@ -5,9 +5,9 @@ board = rpipico
 upload_protocol = picotool
 
 # add our variants files to the include and src paths
-build_flags = ${rp2040_base.build_flags} 
-  -DSENSELORA_RP2040
-  -Ivariants/senselora_rp2040
-  -DDEBUG_RP2040_PORT=Serial
+build_flags = ${rp2040_base.build_flags}
+  -D SENSELORA_RP2040
+  -I variants/rp2040/senselora_rp2040
+  -D DEBUG_RP2040_PORT=Serial
 lib_deps =
   ${rp2040_base.lib_deps}
\ No newline at end of file
diff --git a/variants/senselora_rp2040/variant.h b/variants/rp2040/senselora_rp2040/variant.h
similarity index 92%
rename from variants/senselora_rp2040/variant.h
rename to variants/rp2040/senselora_rp2040/variant.h
index 2f68cf034..cc90284b7 100644
--- a/variants/senselora_rp2040/variant.h
+++ b/variants/rp2040/senselora_rp2040/variant.h
@@ -6,6 +6,7 @@
 #define BUTTON_NEED_PULLUP
 
 #define LED_PIN PIN_LED
+#define ledOff(pin) pinMode(pin, INPUT)
 
 #undef BATTERY_PIN
 #define BATTERY_SENSE_RESOLUTION_BITS ADC_RESOLUTION
diff --git a/variants/rpipico2/platformio.ini b/variants/rp2350/rpipico2/platformio.ini
similarity index 54%
rename from variants/rpipico2/platformio.ini
rename to variants/rp2350/rpipico2/platformio.ini
index 066809a91..485523eb0 100644
--- a/variants/rpipico2/platformio.ini
+++ b/variants/rp2350/rpipico2/platformio.ini
@@ -4,12 +4,13 @@ board = rpipico2
 upload_protocol = picotool
 
 # add our variants files to the include and src paths
-build_flags = ${rp2350_base.build_flags} 
-  -DRPI_PICO2
-  -Ivariants/rpipico2
-  -DDEBUG_RP2040_PORT=Serial
-  -DHW_SPI1_DEVICE
+build_flags =
+  ${rp2350_base.build_flags}
+  -D RPI_PICO2
+  -I variants/rp2350/rpipico2
+  -D DEBUG_RP2040_PORT=Serial
+  -D HW_SPI1_DEVICE
 lib_deps =
   ${rp2350_base.lib_deps}
 debug_build_flags = ${rp2350_base.build_flags}, -g
-debug_tool = cmsis-dap ; for e.g. Picotool
\ No newline at end of file
+debug_tool = cmsis-dap ; for e.g. Picotool
diff --git a/variants/rpipico2/variant.h b/variants/rp2350/rpipico2/variant.h
similarity index 100%
rename from variants/rpipico2/variant.h
rename to variants/rp2350/rpipico2/variant.h
diff --git a/variants/rpipico2w/platformio.ini b/variants/rp2350/rpipico2w/platformio.ini
similarity index 91%
rename from variants/rpipico2w/platformio.ini
rename to variants/rp2350/rpipico2w/platformio.ini
index 0fac1e9ce..3e5f2dbdd 100644
--- a/variants/rpipico2w/platformio.ini
+++ b/variants/rp2350/rpipico2w/platformio.ini
@@ -13,9 +13,10 @@ debug_init_cmds =
   monitor reset halt
 
 # add our variants files to the include and src paths
-build_flags = ${rp2350_base.build_flags} 
+build_flags =
+  ${rp2350_base.build_flags}
   -DRPI_PICO2
-  -Ivariants/rpipico2w
+  -Ivariants/rp2350/rpipico2w
 #  -DDEBUG_RP2040_PORT=Serial
   -DHW_SPI1_DEVICE
   -DARDUINO_RASPBERRY_PI_PICO_2W
diff --git a/variants/rpipico2w/variant.h b/variants/rp2350/rpipico2w/variant.h
similarity index 100%
rename from variants/rpipico2w/variant.h
rename to variants/rp2350/rpipico2w/variant.h