diff --git a/config/boards/shields/urchin/Kconfig.defconfig b/config/boards/shields/urchin/Kconfig.defconfig
deleted file mode 100644
index c07f57a0..00000000
--- a/config/boards/shields/urchin/Kconfig.defconfig
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright (c) 2022 Duccio Breschi
-# SPDX-License-Identifier: MIT
-
-if SHIELD_URCHIN_LEFT
-
-config ZMK_KEYBOARD_NAME
-    default "urchin"
-
-config ZMK_SPLIT_ROLE_CENTRAL
-    default y
-
-endif
-
-if SHIELD_URCHIN_LEFT || SHIELD_URCHIN_RIGHT
-config ZMK_SPLIT
-    default y
-endif
diff --git a/config/boards/shields/urchin/Kconfig.shield b/config/boards/shields/urchin/Kconfig.shield
deleted file mode 100644
index fe0a07c5..00000000
--- a/config/boards/shields/urchin/Kconfig.shield
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright (c) 2022 Duccio Breschi
-# SPDX-License-Identifier: MIT
-
-config SHIELD_URCHIN_LEFT
-    def_bool $(shields_list_contains,urchin_left)
-
-config SHIELD_URCHIN_RIGHT
-    def_bool $(shields_list_contains,urchin_right)
diff --git a/config/boards/shields/urchin/urchin.dtsi b/config/boards/shields/urchin/urchin.dtsi
deleted file mode 100644
index 163945e3..00000000
--- a/config/boards/shields/urchin/urchin.dtsi
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Copyright (c) 2022 Duccio Breschi
- *
- * 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 = <10>;
-        rows = <4>;
-
-        map = <
-            RC(0,0)     RC(0,1)     RC(0,2)     RC(0,3)     RC(0,4)         RC(0,5)     RC(0,6)     RC(0,7)     RC(0,8 )    RC(0,9)
-            RC(1,0)     RC(1,1)     RC(1,2)     RC(1,3)     RC(1,4)         RC(1,5)     RC(1,6)     RC(1,7)     RC(1,8)     RC(1,9)
-            RC(2,0)     RC(2,1)     RC(2,2)     RC(2,3)     RC(2,4)         RC(2,5)     RC(2,6)     RC(2,7)     RC(2,8)     RC(2,9)
-                                                RC(3,3)     RC(3,4)         RC(3,5)     RC(3,6)
-        >;
-    };
-
-    kscan0: kscan {        
-        compatible = "zmk,kscan-gpio-matrix";
-        label = "KSCAN0";
-    };
-};
diff --git a/config/boards/shields/urchin/urchin.keymap b/config/boards/shields/urchin/urchin.keymap
deleted file mode 100644
index 58103ecb..00000000
--- a/config/boards/shields/urchin/urchin.keymap
+++ /dev/null
@@ -1,7 +0,0 @@
-/*
- * Copyright (c) 2020 Duccio Breschi
- *
- * SPDX-License-Identifier: MIT
- */
-
-#include "../../../urchin.keymap"
diff --git a/config/boards/shields/urchin/urchin.zmk.yml b/config/boards/shields/urchin/urchin.zmk.yml
deleted file mode 100644
index a1cc0925..00000000
--- a/config/boards/shields/urchin/urchin.zmk.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-file_format: "1"
-id: urchin
-name: urchin
-type: shield
-url: https://github.com/duckyb/urchin
-requires: [pro_micro]
-features:
-  - keys
-siblings:
-  - urchin_left
-  - urchin_right
diff --git a/config/boards/shields/urchin/urchin_left.overlay b/config/boards/shields/urchin/urchin_left.overlay
deleted file mode 100644
index 43906e9b..00000000
--- a/config/boards/shields/urchin/urchin_left.overlay
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (c) 2022 Duccio Breschi
- *
- * SPDX-License-Identifier: MIT
- */
-
-#include "urchin.dtsi"
-
-&kscan0 {
-    diode-direction = "col2row";
-    col-gpios
-        = <&pro_micro 18 (GPIO_ACTIVE_HIGH)> // COL0
-        , <&pro_micro 15 (GPIO_ACTIVE_HIGH)> // COL1
-        , <&pro_micro 14 (GPIO_ACTIVE_HIGH)> // COL2
-        , <&pro_micro 16 (GPIO_ACTIVE_HIGH)> // COL3
-        , <&pro_micro 10 (GPIO_ACTIVE_HIGH)> // COL4
-    ;
-    row-gpios
-        = <&pro_micro 6 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> // ROW0
-        , <&pro_micro 7 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> // ROW1
-        , <&pro_micro 8 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> // ROW2
-        , <&pro_micro 9 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> // ROW3
-    ;
-};
diff --git a/config/boards/shields/urchin/urchin_right.overlay b/config/boards/shields/urchin/urchin_right.overlay
deleted file mode 100644
index 11054463..00000000
--- a/config/boards/shields/urchin/urchin_right.overlay
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Copyright (c) 2022 Duccio Breschi
- *
- * SPDX-License-Identifier: MIT
- */
-
-#include "urchin.dtsi"
-
-&default_transform {
-    col-offset = <5>;
-};
-
-&kscan0 {
-    diode-direction = "col2row";
-    col-gpios
-        = <&pro_micro 5 (GPIO_ACTIVE_HIGH)> // COL0
-        , <&pro_micro 6 (GPIO_ACTIVE_HIGH)> // COL1
-        , <&pro_micro 7 (GPIO_ACTIVE_HIGH)> // COL2
-        , <&pro_micro 8 (GPIO_ACTIVE_HIGH)> // COL3
-        , <&pro_micro 9 (GPIO_ACTIVE_HIGH)> // COL4
-    ;
-    row-gpios
-        = <&pro_micro 15 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> // ROW0
-        , <&pro_micro 14 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> // ROW1
-        , <&pro_micro 16 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> // ROW2
-        , <&pro_micro 10 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> // ROW3
-    ;
-};
diff --git a/config/west.yml b/config/west.yml
index 33b8bd81..eea9b652 100644
--- a/config/west.yml
+++ b/config/west.yml
@@ -1,15 +1,21 @@
 manifest:
   remotes:
-      # zmk official
+    # zmk official
     - name: zmkfirmware
       url-base: https://github.com/zmkfirmware
       # bravekarma
     - name: caksoylar
       url-base: https://github.com/caksoylar
+      # kyek / duckyb
+    - name: duckyb
+      url-base: https://github.com/duckyb
   projects:
     - name: zmk
       remote: zmkfirmware
       revision: main
       import: app/west.yml
+    - name: urchin-zmk-module
+      remote: duckyb
+      revision: main
   self:
     path: config