diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 2629bdc..d74fb89 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -3,6 +3,3 @@ on: [push, pull_request, workflow_dispatch]
 jobs:
   build:
     uses: zmkfirmware/zmk/.github/workflows/build-user-config.yml@main
-    with:
-      build_matrix_path: zmk-config/build.yaml
-      config_path: zmk-config/config
diff --git a/zmk-config/boards/shields/abyss/Kconfig.defconfig b/boards/shields/abyss/Kconfig.defconfig
similarity index 100%
rename from zmk-config/boards/shields/abyss/Kconfig.defconfig
rename to boards/shields/abyss/Kconfig.defconfig
diff --git a/zmk-config/boards/shields/abyss/Kconfig.shield b/boards/shields/abyss/Kconfig.shield
similarity index 100%
rename from zmk-config/boards/shields/abyss/Kconfig.shield
rename to boards/shields/abyss/Kconfig.shield
diff --git a/zmk-config/boards/shields/abyss/abyss.dtsi b/boards/shields/abyss/abyss.dtsi
similarity index 100%
rename from zmk-config/boards/shields/abyss/abyss.dtsi
rename to boards/shields/abyss/abyss.dtsi
diff --git a/zmk-config/boards/shields/abyss/abyss_left.dtsi b/boards/shields/abyss/abyss_left.dtsi
similarity index 100%
rename from zmk-config/boards/shields/abyss/abyss_left.dtsi
rename to boards/shields/abyss/abyss_left.dtsi
diff --git a/zmk-config/boards/shields/abyss/abyss_right.dtsi b/boards/shields/abyss/abyss_right.dtsi
similarity index 100%
rename from zmk-config/boards/shields/abyss/abyss_right.dtsi
rename to boards/shields/abyss/abyss_right.dtsi
diff --git a/zmk-config/build.yaml b/build.yaml
similarity index 100%
rename from zmk-config/build.yaml
rename to build.yaml
diff --git a/zmk-config/config/abyss.conf b/config/abyss.conf
similarity index 100%
rename from zmk-config/config/abyss.conf
rename to config/abyss.conf
diff --git a/zmk-config/config/abyss.keymap b/config/abyss.keymap
similarity index 100%
rename from zmk-config/config/abyss.keymap
rename to config/abyss.keymap
diff --git a/zmk-config/config/west.yml b/config/west.yml
similarity index 100%
rename from zmk-config/config/west.yml
rename to config/west.yml
diff --git a/zmk-config/zephyr/module.yml b/zephyr/module.yml
similarity index 100%
rename from zmk-config/zephyr/module.yml
rename to zephyr/module.yml