diff --git a/data/mappings/keyboard_aliases.hjson b/data/mappings/keyboard_aliases.hjson
index 760e54b889..d03ff33f2c 100644
--- a/data/mappings/keyboard_aliases.hjson
+++ b/data/mappings/keyboard_aliases.hjson
@@ -197,6 +197,9 @@
     "ergodone": {
         "target": "ktec/ergodone"
     },
+    "ergodox_stm32": {
+        "target": "handwired/ergodox_stm32"
+    },
     "ergoinu": {
         "target": "dm9records/ergoinu"
     },
diff --git a/keyboards/ergodox_stm32/board.h b/keyboards/handwired/ergodox_stm32/board.h
similarity index 100%
rename from keyboards/ergodox_stm32/board.h
rename to keyboards/handwired/ergodox_stm32/board.h
diff --git a/keyboards/ergodox_stm32/chconf.h b/keyboards/handwired/ergodox_stm32/chconf.h
similarity index 100%
rename from keyboards/ergodox_stm32/chconf.h
rename to keyboards/handwired/ergodox_stm32/chconf.h
diff --git a/keyboards/ergodox_stm32/config.h b/keyboards/handwired/ergodox_stm32/config.h
similarity index 100%
rename from keyboards/ergodox_stm32/config.h
rename to keyboards/handwired/ergodox_stm32/config.h
diff --git a/keyboards/ergodox_stm32/ergodox_stm32.c b/keyboards/handwired/ergodox_stm32/ergodox_stm32.c
similarity index 100%
rename from keyboards/ergodox_stm32/ergodox_stm32.c
rename to keyboards/handwired/ergodox_stm32/ergodox_stm32.c
diff --git a/keyboards/ergodox_stm32/ergodox_stm32.h b/keyboards/handwired/ergodox_stm32/ergodox_stm32.h
similarity index 100%
rename from keyboards/ergodox_stm32/ergodox_stm32.h
rename to keyboards/handwired/ergodox_stm32/ergodox_stm32.h
diff --git a/keyboards/ergodox_stm32/halconf.h b/keyboards/handwired/ergodox_stm32/halconf.h
similarity index 100%
rename from keyboards/ergodox_stm32/halconf.h
rename to keyboards/handwired/ergodox_stm32/halconf.h
diff --git a/keyboards/ergodox_stm32/keyboard.json b/keyboards/handwired/ergodox_stm32/keyboard.json
similarity index 100%
rename from keyboards/ergodox_stm32/keyboard.json
rename to keyboards/handwired/ergodox_stm32/keyboard.json
diff --git a/keyboards/ergodox_stm32/keymaps/default/keymap.c b/keyboards/handwired/ergodox_stm32/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/ergodox_stm32/keymaps/default/keymap.c
rename to keyboards/handwired/ergodox_stm32/keymaps/default/keymap.c
diff --git a/keyboards/ergodox_stm32/ld/stm32f103_bootloader.ld b/keyboards/handwired/ergodox_stm32/ld/stm32f103_bootloader.ld
similarity index 100%
rename from keyboards/ergodox_stm32/ld/stm32f103_bootloader.ld
rename to keyboards/handwired/ergodox_stm32/ld/stm32f103_bootloader.ld
diff --git a/keyboards/ergodox_stm32/matrix.c b/keyboards/handwired/ergodox_stm32/matrix.c
similarity index 100%
rename from keyboards/ergodox_stm32/matrix.c
rename to keyboards/handwired/ergodox_stm32/matrix.c
diff --git a/keyboards/ergodox_stm32/mcuconf.h b/keyboards/handwired/ergodox_stm32/mcuconf.h
similarity index 100%
rename from keyboards/ergodox_stm32/mcuconf.h
rename to keyboards/handwired/ergodox_stm32/mcuconf.h
diff --git a/keyboards/ergodox_stm32/readme.md b/keyboards/handwired/ergodox_stm32/readme.md
similarity index 91%
rename from keyboards/ergodox_stm32/readme.md
rename to keyboards/handwired/ergodox_stm32/readme.md
index f8b9c4c553..84accbb5fe 100644
--- a/keyboards/ergodox_stm32/readme.md
+++ b/keyboards/handwired/ergodox_stm32/readme.md
@@ -4,6 +4,6 @@
 
 Make example for this keyboard (after setting up your build environment):
 
-    make ergodox_stm32:default
+    make handwired/ergodox_stm32:default
 
 See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
diff --git a/keyboards/ergodox_stm32/rules.mk b/keyboards/handwired/ergodox_stm32/rules.mk
similarity index 100%
rename from keyboards/ergodox_stm32/rules.mk
rename to keyboards/handwired/ergodox_stm32/rules.mk