diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 90a76bbe..55b0fac7 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -9,39 +9,31 @@ jobs:
       # you must check out the repository
       - name: Checkout
         uses: actions/checkout@v2
-      - name: Move files into workspace subdirectory
-        run: |
-          mkdir -p workspace/zmk
-          mv * workspace/zmk || true
       - name: West Init
         uses: ./.github/actions/zephyr-west # Uses an action in the root directory
         id: west-init
         with:
           command: 'init'
-          command-args: '-l workspace/zmk'
+          command-args: '-l app'
       - name: West Update
         uses: ./.github/actions/zephyr-west # Uses an action in the root directory
         id: west-update
-        working-directory: 'workspace/zmk'
         with:
           command: 'update'
       - name: West Config Zephyr Base
         uses: ./.github/actions/zephyr-west # Uses an action in the root directory
         id: west-config
-        working-directory: 'workspace/zmk'
         with:
           command: 'config'
           command-args: '--global zephyr.base-prefer configfile'
       - name: West Zephyr Export
         uses: ./.github/actions/zephyr-west # Uses an action in the root directory
         id: west-zephyr-export
-        working-directory: 'workspace/zmk'
         with:
           command: 'zephyr-export'
       - name: West Build
         uses: ./.github/actions/zephyr-west # Uses an action in the root directory
         id: west-build
-        working-directory: 'workspace/zmk'
         with:
           command: 'build'
           command-args: '-b nucleo_wb55rg -- -DSHIELD=petejohanson_handwire'
diff --git a/.gitignore b/app/.gitignore
similarity index 100%
rename from .gitignore
rename to app/.gitignore
diff --git a/CMakeLists.txt b/app/CMakeLists.txt
similarity index 100%
rename from CMakeLists.txt
rename to app/CMakeLists.txt
diff --git a/Kconfig b/app/Kconfig
similarity index 100%
rename from Kconfig
rename to app/Kconfig
diff --git a/boards/Kconfig b/app/boards/Kconfig
similarity index 100%
rename from boards/Kconfig
rename to app/boards/Kconfig
diff --git a/boards/arm/planck/CMakeLists.txt b/app/boards/arm/planck/CMakeLists.txt
similarity index 100%
rename from boards/arm/planck/CMakeLists.txt
rename to app/boards/arm/planck/CMakeLists.txt
diff --git a/boards/arm/planck/Kconfig.board b/app/boards/arm/planck/Kconfig.board
similarity index 100%
rename from boards/arm/planck/Kconfig.board
rename to app/boards/arm/planck/Kconfig.board
diff --git a/boards/arm/planck/Kconfig.defconfig b/app/boards/arm/planck/Kconfig.defconfig
similarity index 100%
rename from boards/arm/planck/Kconfig.defconfig
rename to app/boards/arm/planck/Kconfig.defconfig
diff --git a/boards/arm/planck/board.cmake b/app/boards/arm/planck/board.cmake
similarity index 100%
rename from boards/arm/planck/board.cmake
rename to app/boards/arm/planck/board.cmake
diff --git a/boards/arm/planck/pinmux.c b/app/boards/arm/planck/pinmux.c
similarity index 100%
rename from boards/arm/planck/pinmux.c
rename to app/boards/arm/planck/pinmux.c
diff --git a/boards/arm/planck/planck_rev6.dts b/app/boards/arm/planck/planck_rev6.dts
similarity index 100%
rename from boards/arm/planck/planck_rev6.dts
rename to app/boards/arm/planck/planck_rev6.dts
diff --git a/boards/arm/planck/planck_rev6.yaml b/app/boards/arm/planck/planck_rev6.yaml
similarity index 100%
rename from boards/arm/planck/planck_rev6.yaml
rename to app/boards/arm/planck/planck_rev6.yaml
diff --git a/boards/arm/planck/planck_rev6_defconfig b/app/boards/arm/planck/planck_rev6_defconfig
similarity index 100%
rename from boards/arm/planck/planck_rev6_defconfig
rename to app/boards/arm/planck/planck_rev6_defconfig
diff --git a/boards/native_posix.conf b/app/boards/native_posix.conf
similarity index 100%
rename from boards/native_posix.conf
rename to app/boards/native_posix.conf
diff --git a/boards/native_posix.overlay b/app/boards/native_posix.overlay
similarity index 100%
rename from boards/native_posix.overlay
rename to app/boards/native_posix.overlay
diff --git a/boards/shields/petejohanson_handwire/Kconfig.defconfig b/app/boards/shields/petejohanson_handwire/Kconfig.defconfig
similarity index 100%
rename from boards/shields/petejohanson_handwire/Kconfig.defconfig
rename to app/boards/shields/petejohanson_handwire/Kconfig.defconfig
diff --git a/boards/shields/petejohanson_handwire/Kconfig.shield b/app/boards/shields/petejohanson_handwire/Kconfig.shield
similarity index 100%
rename from boards/shields/petejohanson_handwire/Kconfig.shield
rename to app/boards/shields/petejohanson_handwire/Kconfig.shield
diff --git a/boards/shields/petejohanson_handwire/keymaps/default/include/keymap.h b/app/boards/shields/petejohanson_handwire/keymaps/default/include/keymap.h
similarity index 100%
rename from boards/shields/petejohanson_handwire/keymaps/default/include/keymap.h
rename to app/boards/shields/petejohanson_handwire/keymaps/default/include/keymap.h
diff --git a/boards/shields/petejohanson_handwire/keymaps/default/keymap.c b/app/boards/shields/petejohanson_handwire/keymaps/default/keymap.c
similarity index 100%
rename from boards/shields/petejohanson_handwire/keymaps/default/keymap.c
rename to app/boards/shields/petejohanson_handwire/keymaps/default/keymap.c
diff --git a/boards/shields/petejohanson_handwire/keymaps/default/keymap.overlay b/app/boards/shields/petejohanson_handwire/keymaps/default/keymap.overlay
similarity index 100%
rename from boards/shields/petejohanson_handwire/keymaps/default/keymap.overlay
rename to app/boards/shields/petejohanson_handwire/keymaps/default/keymap.overlay
diff --git a/boards/shields/petejohanson_handwire/petejohanson_handwire.conf b/app/boards/shields/petejohanson_handwire/petejohanson_handwire.conf
similarity index 100%
rename from boards/shields/petejohanson_handwire/petejohanson_handwire.conf
rename to app/boards/shields/petejohanson_handwire/petejohanson_handwire.conf
diff --git a/boards/shields/petejohanson_handwire/petejohanson_handwire.overlay b/app/boards/shields/petejohanson_handwire/petejohanson_handwire.overlay
similarity index 100%
rename from boards/shields/petejohanson_handwire/petejohanson_handwire.overlay
rename to app/boards/shields/petejohanson_handwire/petejohanson_handwire.overlay
diff --git a/cmake/keymap.cmake b/app/cmake/keymap.cmake
similarity index 100%
rename from cmake/keymap.cmake
rename to app/cmake/keymap.cmake
diff --git a/drivers/zephyr/CMakeLists.txt b/app/drivers/zephyr/CMakeLists.txt
similarity index 100%
rename from drivers/zephyr/CMakeLists.txt
rename to app/drivers/zephyr/CMakeLists.txt
diff --git a/drivers/zephyr/Kconfig b/app/drivers/zephyr/Kconfig
similarity index 100%
rename from drivers/zephyr/Kconfig
rename to app/drivers/zephyr/Kconfig
diff --git a/drivers/zephyr/dts/bindings/gpio-kscan.yaml b/app/drivers/zephyr/dts/bindings/gpio-kscan.yaml
similarity index 100%
rename from drivers/zephyr/dts/bindings/gpio-kscan.yaml
rename to app/drivers/zephyr/dts/bindings/gpio-kscan.yaml
diff --git a/drivers/zephyr/kscan_gpio.c b/app/drivers/zephyr/kscan_gpio.c
similarity index 100%
rename from drivers/zephyr/kscan_gpio.c
rename to app/drivers/zephyr/kscan_gpio.c
diff --git a/drivers/zephyr/module.yaml b/app/drivers/zephyr/module.yaml
similarity index 100%
rename from drivers/zephyr/module.yaml
rename to app/drivers/zephyr/module.yaml
diff --git a/dts/bindings/zmk,keymap.yaml b/app/dts/bindings/zmk,keymap.yaml
similarity index 100%
rename from dts/bindings/zmk,keymap.yaml
rename to app/dts/bindings/zmk,keymap.yaml
diff --git a/dts/bindings/zmk,kscan-composite.yaml b/app/dts/bindings/zmk,kscan-composite.yaml
similarity index 100%
rename from dts/bindings/zmk,kscan-composite.yaml
rename to app/dts/bindings/zmk,kscan-composite.yaml
diff --git a/dts/bindings/zmk,kscan-mock.yaml b/app/dts/bindings/zmk,kscan-mock.yaml
similarity index 100%
rename from dts/bindings/zmk,kscan-mock.yaml
rename to app/dts/bindings/zmk,kscan-mock.yaml
diff --git a/dts/bindings/zmk,layers.yaml b/app/dts/bindings/zmk,layers.yaml
similarity index 100%
rename from dts/bindings/zmk,layers.yaml
rename to app/dts/bindings/zmk,layers.yaml
diff --git a/include/dt-bindings/zmk/keys.h b/app/include/dt-bindings/zmk/keys.h
similarity index 100%
rename from include/dt-bindings/zmk/keys.h
rename to app/include/dt-bindings/zmk/keys.h
diff --git a/include/zmk/ble.h b/app/include/zmk/ble.h
similarity index 100%
rename from include/zmk/ble.h
rename to app/include/zmk/ble.h
diff --git a/include/zmk/endpoints.h b/app/include/zmk/endpoints.h
similarity index 100%
rename from include/zmk/endpoints.h
rename to app/include/zmk/endpoints.h
diff --git a/include/zmk/handlers.h b/app/include/zmk/handlers.h
similarity index 100%
rename from include/zmk/handlers.h
rename to app/include/zmk/handlers.h
diff --git a/include/zmk/hid.h b/app/include/zmk/hid.h
similarity index 100%
rename from include/zmk/hid.h
rename to app/include/zmk/hid.h
diff --git a/include/zmk/hog.h b/app/include/zmk/hog.h
similarity index 100%
rename from include/zmk/hog.h
rename to app/include/zmk/hog.h
diff --git a/include/zmk/keymap.h b/app/include/zmk/keymap.h
similarity index 100%
rename from include/zmk/keymap.h
rename to app/include/zmk/keymap.h
diff --git a/include/zmk/keys.h b/app/include/zmk/keys.h
similarity index 100%
rename from include/zmk/keys.h
rename to app/include/zmk/keys.h
diff --git a/include/zmk/kscan-mock.h b/app/include/zmk/kscan-mock.h
similarity index 100%
rename from include/zmk/kscan-mock.h
rename to app/include/zmk/kscan-mock.h
diff --git a/include/zmk/kscan.h b/app/include/zmk/kscan.h
similarity index 100%
rename from include/zmk/kscan.h
rename to app/include/zmk/kscan.h
diff --git a/include/zmk/matrix.h b/app/include/zmk/matrix.h
similarity index 100%
rename from include/zmk/matrix.h
rename to app/include/zmk/matrix.h
diff --git a/include/zmk/usb_hid.h b/app/include/zmk/usb_hid.h
similarity index 100%
rename from include/zmk/usb_hid.h
rename to app/include/zmk/usb_hid.h
diff --git a/prj.conf b/app/prj.conf
similarity index 100%
rename from prj.conf
rename to app/prj.conf
diff --git a/src/ble.c b/app/src/ble.c
similarity index 100%
rename from src/ble.c
rename to app/src/ble.c
diff --git a/src/endpoints.c b/app/src/endpoints.c
similarity index 100%
rename from src/endpoints.c
rename to app/src/endpoints.c
diff --git a/src/handlers.c b/app/src/handlers.c
similarity index 100%
rename from src/handlers.c
rename to app/src/handlers.c
diff --git a/src/hid.c b/app/src/hid.c
similarity index 100%
rename from src/hid.c
rename to app/src/hid.c
diff --git a/src/hog.c b/app/src/hog.c
similarity index 100%
rename from src/hog.c
rename to app/src/hog.c
diff --git a/src/keymap.c b/app/src/keymap.c
similarity index 100%
rename from src/keymap.c
rename to app/src/keymap.c
diff --git a/src/kscan.c b/app/src/kscan.c
similarity index 100%
rename from src/kscan.c
rename to app/src/kscan.c
diff --git a/src/kscan_composite.c b/app/src/kscan_composite.c
similarity index 100%
rename from src/kscan_composite.c
rename to app/src/kscan_composite.c
diff --git a/src/kscan_mock.c b/app/src/kscan_mock.c
similarity index 100%
rename from src/kscan_mock.c
rename to app/src/kscan_mock.c
diff --git a/src/main.c b/app/src/main.c
similarity index 100%
rename from src/main.c
rename to app/src/main.c
diff --git a/src/usb_hid.c b/app/src/usb_hid.c
similarity index 100%
rename from src/usb_hid.c
rename to app/src/usb_hid.c
diff --git a/west.yml b/app/west.yml
similarity index 100%
rename from west.yml
rename to app/west.yml