diff --git a/.DS_Store b/.DS_Store
new file mode 100644
index 00000000..6b508f3d
Binary files /dev/null and b/.DS_Store differ
diff --git a/app/.DS_Store b/app/.DS_Store
new file mode 100644
index 00000000..7b9df978
Binary files /dev/null and b/app/.DS_Store differ
diff --git a/app/boards/.DS_Store b/app/boards/.DS_Store
new file mode 100644
index 00000000..f1a7fabe
Binary files /dev/null and b/app/boards/.DS_Store differ
diff --git a/app/boards/shields/.DS_Store b/app/boards/shields/.DS_Store
new file mode 100644
index 00000000..242a19d4
Binary files /dev/null and b/app/boards/shields/.DS_Store differ
diff --git a/app/boards/shields/cradios/Kconfig.defconfig b/app/boards/shields/cradio/Kconfig.defconfig
similarity index 92%
rename from app/boards/shields/cradios/Kconfig.defconfig
rename to app/boards/shields/cradio/Kconfig.defconfig
index 5b9ca9a1..ab38e258 100644
--- a/app/boards/shields/cradios/Kconfig.defconfig
+++ b/app/boards/shields/cradio/Kconfig.defconfig
@@ -1,8 +1,5 @@
-
-
-
 config ZMK_KEYBOARD_NAME
-	default "cradios"
+	default "cradio"
 
 # Unable to use interrupts as the same pin number is used
 # across A & B controllers, and STM32F303CCT6 can't enable
diff --git a/app/boards/shields/cradios/Kconfig.shield b/app/boards/shields/cradio/Kconfig.shield
similarity index 50%
rename from app/boards/shields/cradios/Kconfig.shield
rename to app/boards/shields/cradio/Kconfig.shield
index 844d4332..0385d23e 100644
--- a/app/boards/shields/cradios/Kconfig.shield
+++ b/app/boards/shields/cradio/Kconfig.shield
@@ -1,5 +1,5 @@
 # Copyright (c) 2020 Pete Johanson
 # SPDX-License-Identifier: MIT
 
-config SHIELD_CRADIOS
-	def_bool $(shields_list_contains,cradios)
+config SHIELD_CRADIO
+	def_bool $(shields_list_contains,cradio)
diff --git a/app/boards/shields/cradios.dtsi b/app/boards/shields/cradio/cradio.dtsi
similarity index 99%
rename from app/boards/shields/cradios.dtsi
rename to app/boards/shields/cradio/cradio.dtsi
index 68d1fc57..19225f90 100644
--- a/app/boards/shields/cradios.dtsi
+++ b/app/boards/shields/cradio/cradio.dtsi
@@ -22,7 +22,6 @@ RC(0,10)RC(0,11) RC(0,12) RC(0,13) RC(0,14) 		RC(0,31) RC(0,30) RC(0,29) RC(0,28
 RC(0,15)  RC(0,16) 					RC(0,33) RC(0,32)  
 >;
 
-
 	};	
 	
 	kscan0: kscan {
@@ -37,11 +36,8 @@ RC(0,15)  RC(0,16) 					RC(0,33) RC(0,32)
 		compatible = "zmk,bt-unpair-combo";
 	};
 	
-	
-	
 		};
 		
-		
 		&kscan0 {
 		input-gpios
 		= <&pro_micro_d 7 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>
diff --git a/app/boards/shields/cradios.keymap b/app/boards/shields/cradio/cradio.keymap
similarity index 100%
rename from app/boards/shields/cradios.keymap
rename to app/boards/shields/cradio/cradio.keymap
diff --git a/app/boards/shields/cradios/cradios_left.conf b/app/boards/shields/cradio/cradio_left.conf
similarity index 100%
rename from app/boards/shields/cradios/cradios_left.conf
rename to app/boards/shields/cradio/cradio_left.conf
diff --git a/app/boards/shields/cradios/cradios_left.overlay b/app/boards/shields/cradio/cradio_left.overlay
similarity index 81%
rename from app/boards/shields/cradios/cradios_left.overlay
rename to app/boards/shields/cradio/cradio_left.overlay
index b0bdc6fe..c6600724 100644
--- a/app/boards/shields/cradios/cradios_left.overlay
+++ b/app/boards/shields/cradio/cradio_left.overlay
@@ -3,13 +3,9 @@
  *
  * SPDX-License-Identifier: MIT
  */
-#include "cradios.dtsi"
-
-
-
-
-
+#include "cradio.dtsi"
 
 &bt_unpair_combo {
+
 	key-positions = <0 16>;
 };
diff --git a/app/boards/shields/cradios/cradios_right.conf b/app/boards/shields/cradio/cradio_right.conf
similarity index 100%
rename from app/boards/shields/cradios/cradios_right.conf
rename to app/boards/shields/cradio/cradio_right.conf
diff --git a/app/boards/shields/cradios/cradios_right.overlay b/app/boards/shields/cradio/cradio_right.overlay
similarity index 86%
rename from app/boards/shields/cradios/cradios_right.overlay
rename to app/boards/shields/cradio/cradio_right.overlay
index ef920ac3..3469199b 100644
--- a/app/boards/shields/cradios/cradios_right.overlay
+++ b/app/boards/shields/cradio/cradio_right.overlay
@@ -3,15 +3,12 @@
  *
  * SPDX-License-Identifier: MIT
  */
-#include "cradios.dtsi"
+#include "cradio.dtsi"
 
 &default_transform {
 	col-offset = <17>;
 };
 
-
-
-
 &bt_unpair_combo {
 	key-positions = <21 32>;
 };
diff --git a/app/boards/shields/cradios/default.keymap b/app/boards/shields/cradio/default.keymap
similarity index 100%
rename from app/boards/shields/cradios/default.keymap
rename to app/boards/shields/cradio/default.keymap
diff --git a/app/boards/shields/cradios/cradios.dtsi b/app/boards/shields/cradios/cradios.dtsi
deleted file mode 100644
index 68d1fc57..00000000
--- a/app/boards/shields/cradios/cradios.dtsi
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * Copyright (c) 2020 Pete Johanson
- *
- * SPDX-License-Identifier: MIT
- */
- #include <dt-bindings/zmk/matrix-transform.h>
- 
-/ {
-	chosen {
-		zmk,kscan = &kscan0;
-		zmk,matrix_transform = &default_transform;
-	};
-		
-	default_transform: keymap_transform_0 {
-	compatible = "zmk,matrix-transform";
-        columns = <34>;
-        rows = <1>;
-		map = <
-RC(0,0) RC(0,1) RC(0,2) RC(0,3) RC(0,4) 		RC(0,21) RC(0,20) RC(0,19) RC(0,18) RC(0,17) 
-RC(0,5) RC(0,6) RC(0,7) RC(0,8) RC(0,9) 		RC(0,26) RC(0,25) RC(0,24) RC(0,23) RC(0,22)   
-RC(0,10)RC(0,11) RC(0,12) RC(0,13) RC(0,14) 		RC(0,31) RC(0,30) RC(0,29) RC(0,28) RC(0,27) 
-RC(0,15)  RC(0,16) 					RC(0,33) RC(0,32)  
->;
-
-
-	};	
-	
-	kscan0: kscan {
-		compatible = "zmk,kscan-gpio-direct";
-		label = "KSCAN";
-	};
-	
-	
-	
-	
-	bt_unpair_combo: bt_unpair_combo {
-		compatible = "zmk,bt-unpair-combo";
-	};
-	
-	
-	
-		};
-		
-		
-		&kscan0 {
-		input-gpios
-		= <&pro_micro_d 7 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>
-			, <&pro_micro_a 0 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>
-			, <&pro_micro_a 1 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>
-			, <&pro_micro_a 2 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>
-			, <&pro_micro_a 3 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>
-			, <&pro_micro_d 15 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>
-			, <&pro_micro_d 14 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>
-			, <&pro_micro_d 16 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>
-			, <&pro_micro_d 10 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>
-			, <&pro_micro_d 1 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>
-			, <&pro_micro_d 2 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>
-			, <&pro_micro_d 3 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>
-			, <&pro_micro_a 6 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>
-			, <&pro_micro_d 5 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>
-			, <&pro_micro_d 6 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>
-			, <&pro_micro_d 8 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>
-			, <&pro_micro_d 9 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>
-			;
-};
-	
-	
diff --git a/app/boards/shields/cradios/cradios.keymap b/app/boards/shields/cradios/cradios.keymap
deleted file mode 100644
index c46468dd..00000000
--- a/app/boards/shields/cradios/cradios.keymap
+++ /dev/null
@@ -1,18 +0,0 @@
-#include <behaviors.dtsi>
-#include <dt-bindings/zmk/keys.h>
-
-
-/ {
-        keymap {
-                compatible = "zmk,keymap";
-
-                default_layer {
-		bindings = <
-		&kp Q &kp W &kp E &kp R &kp T 		&kp Y &kp U  &kp I    &kp O   &kp P 
-		&kp A &kp S &kp D &kp F &kp G 		&kp H &kp J  &kp K    &kp L   &kp SCLN 
-		&kp Z &kp X &kp C &kp V &kp B		&kp N &kp M  &kp CMMA &kp DOT &kp FSLH
-			      &kp NUM_1 &kp NUM_2 		&kp NUM_3 &kp NUM_4 
-			      >;
-		};
-	};
-};
diff --git a/app/boards/shields/cradios_left.conf b/app/boards/shields/cradios_left.conf
deleted file mode 100644
index 1e028a78..00000000
--- a/app/boards/shields/cradios_left.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-CONFIG_ZMK_SPLIT=y
-CONFIG_ZMK_SPLIT_BLE_ROLE_CENTRAL=y
diff --git a/app/boards/shields/cradios_left.overlay b/app/boards/shields/cradios_left.overlay
deleted file mode 100644
index b0bdc6fe..00000000
--- a/app/boards/shields/cradios_left.overlay
+++ /dev/null
@@ -1,15 +0,0 @@
-/*
- * Copyright (c) 2020 Pete Johanson
- *
- * SPDX-License-Identifier: MIT
- */
-#include "cradios.dtsi"
-
-
-
-
-
-
-&bt_unpair_combo {
-	key-positions = <0 16>;
-};
diff --git a/app/boards/shields/cradios_right.conf b/app/boards/shields/cradios_right.conf
deleted file mode 100644
index 990cf7c0..00000000
--- a/app/boards/shields/cradios_right.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-CONFIG_ZMK_SPLIT=y
-CONFIG_ZMK_SPLIT_BLE_ROLE_PERIPHERAL=y
diff --git a/app/boards/shields/cradios_right.overlay b/app/boards/shields/cradios_right.overlay
deleted file mode 100644
index ef920ac3..00000000
--- a/app/boards/shields/cradios_right.overlay
+++ /dev/null
@@ -1,17 +0,0 @@
-/*
- * Copyright (c) 2020 Pete Johanson
- *
- * SPDX-License-Identifier: MIT
- */
-#include "cradios.dtsi"
-
-&default_transform {
-	col-offset = <17>;
-};
-
-
-
-
-&bt_unpair_combo {
-	key-positions = <21 32>;
-};