diff --git a/keyboards/macro3/info.json b/keyboards/handwired/macro3/info.json
similarity index 100%
rename from keyboards/macro3/info.json
rename to keyboards/handwired/macro3/info.json
diff --git a/keyboards/macro3/keymaps/default/keymap.c b/keyboards/handwired/macro3/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/macro3/keymaps/default/keymap.c
rename to keyboards/handwired/macro3/keymaps/default/keymap.c
diff --git a/keyboards/macro3/keymaps/default/rules.mk b/keyboards/handwired/macro3/keymaps/default/rules.mk
similarity index 100%
rename from keyboards/macro3/keymaps/default/rules.mk
rename to keyboards/handwired/macro3/keymaps/default/rules.mk
diff --git a/keyboards/macro3/macro3.c b/keyboards/handwired/macro3/macro3.c
similarity index 100%
rename from keyboards/macro3/macro3.c
rename to keyboards/handwired/macro3/macro3.c
diff --git a/keyboards/macro3/readme.md b/keyboards/handwired/macro3/readme.md
similarity index 80%
rename from keyboards/macro3/readme.md
rename to keyboards/handwired/macro3/readme.md
index 40cf9273924..185496ac8bd 100644
--- a/keyboards/macro3/readme.md
+++ b/keyboards/handwired/macro3/readme.md
@@ -6,13 +6,13 @@ Macro3 is a low-profile macro pad with dual encoder support designed by [@davidp
 
 ## Keyboard Info
 
-* Keyboard Maintainer: [filterpaper](https://github.com/filterpaper), [davidphilipbarr](https://github.com/davidphilipbarr)
-* Hardware Supported: [Macro3](https://github.com/davidphilipbarr/Macropads/tree/main/macro3)
-* Hardware Availability: order PCBs with gerber file from the repository
+* Keyboard Maintainer: [filterpaper](https://github.com/filterpaper)
+* Hardware Supported: Macro3
+* Hardware Availability: [Open-source](https://github.com/davidphilipbarr/Macropads/tree/main/macro3)
 
 Make example for this keyboard (after setting up your build environment):
 
-    make macro3:default
+    make handwired/macro3: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/macro3/rules.mk b/keyboards/handwired/macro3/rules.mk
similarity index 100%
rename from keyboards/macro3/rules.mk
rename to keyboards/handwired/macro3/rules.mk