47 files changed, 26 insertions, 12 deletions

diff --git a/data/mappings/keyboard_aliases.hjson b/data/mappings/keyboard_aliases.hjson
index 8f931f4cd0..af97c39f0c 100644
--- a/data/mappings/keyboard_aliases.hjson
+++ b/data/mappings/keyboard_aliases.hjson
@@ -894,6 +894,9 @@
     "espectro": {
         "target": "mechkeys/espectro"
     },
+    "eu_isolation": {
+        "target": "p3d/eu_isolation"
+    },
     "felix": {
         "target": "unikeyboard/felix"
     },
@@ -1224,6 +1227,9 @@
     "pw88": {
         "target": "smoll/pw88"
     },
+    "q4z": {
+        "target": "p3d/q4z"
+    },
     "qaz": {
         "target": "tominabox1/qaz"
     },
@@ -1359,6 +1365,9 @@
     "space_space/rev2": {
         "target": "qpockets/space_space/rev2"
     },
+    "spacey": {
+        "target": "p3d/spacey"
+    },
     "spiderisland/winry25tc": {
         "target": "winry/winry25tc"
     },
@@ -1389,6 +1398,9 @@
     "suihankey/split": {
         "target": "kakunpc/suihankey/split"
     },
+    "synapse": {
+        "target": "p3d/synapse"
+    },
     "the_ruler": {
         "target": "maple_computing/the_ruler"
     },
@@ -1410,6 +1422,9 @@
     "tronguylabs/m122_3270": {
         "target": "ibm/model_m_122/m122_3270/teensy"
     },
+    "tw40": {
+        "target": "p3d/tw40"
+    },
     "ua62": {
         "target": "nacly/ua62"
     },
diff --git a/keyboards/eu_isolation/config.h b/keyboards/p3d/eu_isolation/config.h
index de7206efe2..de7206efe2 100644
--- a/keyboards/eu_isolation/config.h
+++ b/keyboards/p3d/eu_isolation/config.h
diff --git a/keyboards/eu_isolation/info.json b/keyboards/p3d/eu_isolation/info.json
index f181418cf0..f181418cf0 100644
--- a/keyboards/eu_isolation/info.json
+++ b/keyboards/p3d/eu_isolation/info.json
diff --git a/keyboards/eu_isolation/keymaps/default/config.h b/keyboards/p3d/eu_isolation/keymaps/default/config.h
index ad4389af3e..ad4389af3e 100644
--- a/keyboards/eu_isolation/keymaps/default/config.h
+++ b/keyboards/p3d/eu_isolation/keymaps/default/config.h
diff --git a/keyboards/eu_isolation/keymaps/default/keymap.c b/keyboards/p3d/eu_isolation/keymaps/default/keymap.c
index 65dc381974..65dc381974 100644
--- a/keyboards/eu_isolation/keymaps/default/keymap.c
+++ b/keyboards/p3d/eu_isolation/keymaps/default/keymap.c
diff --git a/keyboards/eu_isolation/keymaps/default/readme.md b/keyboards/p3d/eu_isolation/keymaps/default/readme.md
index b1f90f9ef4..b1f90f9ef4 100644
--- a/keyboards/eu_isolation/keymaps/default/readme.md
+++ b/keyboards/p3d/eu_isolation/keymaps/default/readme.md
diff --git a/keyboards/eu_isolation/keymaps/default/rules.mk b/keyboards/p3d/eu_isolation/keymaps/default/rules.mk
index ab1e438182..ab1e438182 100644
--- a/keyboards/eu_isolation/keymaps/default/rules.mk
+++ b/keyboards/p3d/eu_isolation/keymaps/default/rules.mk
diff --git a/keyboards/eu_isolation/readme.md b/keyboards/p3d/eu_isolation/readme.md
index c1272ea6a9..44cb4277e4 100644
--- a/keyboards/eu_isolation/readme.md
+++ b/keyboards/p3d/eu_isolation/readme.md
@@ -22,10 +22,10 @@ Enter the bootloader in 3 ways:
 
 Make example for this keyboard (after setting up your build environment):
 
-    make eu_isolation:default
+    make p3d/eu_isolation:default
 
 Flashing example for this keyboard:
 
-    make eu_isolation:default:flash
+    make p3d/eu_isolation:default:flash
 
 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/eu_isolation/rules.mk b/keyboards/p3d/eu_isolation/rules.mk
index 20825c8cfa..20825c8cfa 100644
--- a/keyboards/eu_isolation/rules.mk
+++ b/keyboards/p3d/eu_isolation/rules.mk
diff --git a/keyboards/q4z/config.h b/keyboards/p3d/q4z/config.h
index 67553a4432..67553a4432 100644
--- a/keyboards/q4z/config.h
+++ b/keyboards/p3d/q4z/config.h
diff --git a/keyboards/q4z/info.json b/keyboards/p3d/q4z/info.json
index dc02296131..dc02296131 100644
--- a/keyboards/q4z/info.json
+++ b/keyboards/p3d/q4z/info.json
diff --git a/keyboards/q4z/keymaps/default/config.h b/keyboards/p3d/q4z/keymaps/default/config.h
index 88392557de..88392557de 100644
--- a/keyboards/q4z/keymaps/default/config.h
+++ b/keyboards/p3d/q4z/keymaps/default/config.h
diff --git a/keyboards/q4z/keymaps/default/keymap.c b/keyboards/p3d/q4z/keymaps/default/keymap.c
index 4a7c28acb1..4a7c28acb1 100644
--- a/keyboards/q4z/keymaps/default/keymap.c
+++ b/keyboards/p3d/q4z/keymaps/default/keymap.c
diff --git a/keyboards/q4z/keymaps/default/readme.md b/keyboards/p3d/q4z/keymaps/default/readme.md
index 28186f64d8..28186f64d8 100644
--- a/keyboards/q4z/keymaps/default/readme.md
+++ b/keyboards/p3d/q4z/keymaps/default/readme.md
diff --git a/keyboards/q4z/keymaps/default/rules.mk b/keyboards/p3d/q4z/keymaps/default/rules.mk
index ab1e438182..ab1e438182 100644
--- a/keyboards/q4z/keymaps/default/rules.mk
+++ b/keyboards/p3d/q4z/keymaps/default/rules.mk
diff --git a/keyboards/q4z/keymaps/rjboone/config.h b/keyboards/p3d/q4z/keymaps/rjboone/config.h
index 9264f33bae..9264f33bae 100644
--- a/keyboards/q4z/keymaps/rjboone/config.h
+++ b/keyboards/p3d/q4z/keymaps/rjboone/config.h
diff --git a/keyboards/q4z/keymaps/rjboone/keymap.c b/keyboards/p3d/q4z/keymaps/rjboone/keymap.c
index c54ec014ec..c54ec014ec 100644
--- a/keyboards/q4z/keymaps/rjboone/keymap.c
+++ b/keyboards/p3d/q4z/keymaps/rjboone/keymap.c
diff --git a/keyboards/q4z/keymaps/rjboone/readme.md b/keyboards/p3d/q4z/keymaps/rjboone/readme.md
index 29f2d31f6f..29f2d31f6f 100644
--- a/keyboards/q4z/keymaps/rjboone/readme.md
+++ b/keyboards/p3d/q4z/keymaps/rjboone/readme.md
diff --git a/keyboards/q4z/keymaps/rjboone/rules.mk b/keyboards/p3d/q4z/keymaps/rjboone/rules.mk
index ab1e438182..ab1e438182 100644
--- a/keyboards/q4z/keymaps/rjboone/rules.mk
+++ b/keyboards/p3d/q4z/keymaps/rjboone/rules.mk
diff --git a/keyboards/q4z/readme.md b/keyboards/p3d/q4z/readme.md
index 6b3839a2cb..f6f4afecc8 100644
--- a/keyboards/q4z/readme.md
+++ b/keyboards/p3d/q4z/readme.md
@@ -11,10 +11,10 @@ this little board is ready for whatever a raging gamer can throw it at.
 
 Make example for this keyboard (after setting up your build environment):
 
-    make q4z:default
+    make p3d/q4z:default
 
 Flashing example for this keyboard:
 
-    make q4z:default:flash
+    make p3d/q4z:default:flash
 
 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/q4z/rules.mk b/keyboards/p3d/q4z/rules.mk
index 6d3709762d..6d3709762d 100644
--- a/keyboards/q4z/rules.mk
+++ b/keyboards/p3d/q4z/rules.mk
diff --git a/keyboards/spacey/info.json b/keyboards/p3d/spacey/info.json
index 289eff730f..289eff730f 100644
--- a/keyboards/spacey/info.json
+++ b/keyboards/p3d/spacey/info.json
diff --git a/keyboards/spacey/keymaps/default/keymap.c b/keyboards/p3d/spacey/keymaps/default/keymap.c
index 8d0b138390..8d0b138390 100644
--- a/keyboards/spacey/keymaps/default/keymap.c
+++ b/keyboards/p3d/spacey/keymaps/default/keymap.c
diff --git a/keyboards/spacey/keymaps/default/readme.md b/keyboards/p3d/spacey/keymaps/default/readme.md
index 808ab68264..808ab68264 100644
--- a/keyboards/spacey/keymaps/default/readme.md
+++ b/keyboards/p3d/spacey/keymaps/default/readme.md
diff --git a/keyboards/spacey/keymaps/via/keymap.c b/keyboards/p3d/spacey/keymaps/via/keymap.c
index 17dec84fc7..17dec84fc7 100644
--- a/keyboards/spacey/keymaps/via/keymap.c
+++ b/keyboards/p3d/spacey/keymaps/via/keymap.c
diff --git a/keyboards/spacey/keymaps/via/rules.mk b/keyboards/p3d/spacey/keymaps/via/rules.mk
index 43061db1dd..43061db1dd 100644
--- a/keyboards/spacey/keymaps/via/rules.mk
+++ b/keyboards/p3d/spacey/keymaps/via/rules.mk
diff --git a/keyboards/spacey/readme.md b/keyboards/p3d/spacey/readme.md
index e615852693..252cc39f86 100644
--- a/keyboards/spacey/readme.md
+++ b/keyboards/p3d/spacey/readme.md
@@ -6,14 +6,14 @@ Spacey, designed by Vanilla Keyboards is a 45/65% keyboard with a little persona
 
 * Keyboard Maintainer: [vanilla](https://github.com/vanillakeyboards)
 * Hardware Supported: Elite C, Spacey PCB plates and acrylic drop_in case
-* Hardware Availability: https://p3dstore.com/collections/ended-group-buys/products/spacey?variant=37742593147064 and https://keeb.io/products/elite-c-low-profile-version-usb-c-pro-micro-replacement-atmega32u4
+* Hardware Availability: [P3D Store](https://p3dstore.com/collections/ended-group-buys/products/spacey?variant=37742593147064)
 
 Make example for this keyboard (after setting up your build environment):
 
-    make spacey:default
+    make p3d/spacey:default
 
 Flashing example for this keyboard:
 
-    make spacey:default:flash
+    make p3d/spacey:default:flash
 
 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/spacey/rules.mk b/keyboards/p3d/spacey/rules.mk
index b03b6fa905..b03b6fa905 100644
--- a/keyboards/spacey/rules.mk
+++ b/keyboards/p3d/spacey/rules.mk
diff --git a/keyboards/synapse/config.h b/keyboards/p3d/synapse/config.h
index 9f86bdabd7..9f86bdabd7 100644
--- a/keyboards/synapse/config.h
+++ b/keyboards/p3d/synapse/config.h
diff --git a/keyboards/synapse/info.json b/keyboards/p3d/synapse/info.json
index 85659dc8a5..85659dc8a5 100644
--- a/keyboards/synapse/info.json
+++ b/keyboards/p3d/synapse/info.json
diff --git a/keyboards/synapse/keymaps/7u_space/config.h b/keyboards/p3d/synapse/keymaps/7u_space/config.h
index e398cb5b2d..e398cb5b2d 100644
--- a/keyboards/synapse/keymaps/7u_space/config.h
+++ b/keyboards/p3d/synapse/keymaps/7u_space/config.h
diff --git a/keyboards/synapse/keymaps/7u_space/keymap.c b/keyboards/p3d/synapse/keymaps/7u_space/keymap.c
index b530e91c78..b530e91c78 100644
--- a/keyboards/synapse/keymaps/7u_space/keymap.c
+++ b/keyboards/p3d/synapse/keymaps/7u_space/keymap.c
diff --git a/keyboards/synapse/keymaps/7u_space/rules.mk b/keyboards/p3d/synapse/keymaps/7u_space/rules.mk
index ab1e438182..ab1e438182 100644
--- a/keyboards/synapse/keymaps/7u_space/rules.mk
+++ b/keyboards/p3d/synapse/keymaps/7u_space/rules.mk
diff --git a/keyboards/synapse/keymaps/default/config.h b/keyboards/p3d/synapse/keymaps/default/config.h
index e398cb5b2d..e398cb5b2d 100644
--- a/keyboards/synapse/keymaps/default/config.h
+++ b/keyboards/p3d/synapse/keymaps/default/config.h
diff --git a/keyboards/synapse/keymaps/default/keymap.c b/keyboards/p3d/synapse/keymaps/default/keymap.c
index 3428272ee9..3428272ee9 100644
--- a/keyboards/synapse/keymaps/default/keymap.c
+++ b/keyboards/p3d/synapse/keymaps/default/keymap.c
diff --git a/keyboards/synapse/keymaps/default/rules.mk b/keyboards/p3d/synapse/keymaps/default/rules.mk
index ab1e438182..ab1e438182 100644
--- a/keyboards/synapse/keymaps/default/rules.mk
+++ b/keyboards/p3d/synapse/keymaps/default/rules.mk
diff --git a/keyboards/synapse/readme.md b/keyboards/p3d/synapse/readme.md
index f98fee8e42..8de1e779d5 100644
--- a/keyboards/synapse/readme.md
+++ b/keyboards/p3d/synapse/readme.md
@@ -9,11 +9,11 @@ Stagger PCB for Cervello!
 
 Make example for this keyboard (after setting up your build environment):
 
-    make synapse:default
+    make p3d/synapse:default
 
 Flashing example for this keyboard:
 
-    make synapse:default:flash
+    make p3d/synapse:default:flash
 
 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/synapse/rules.mk b/keyboards/p3d/synapse/rules.mk
index ebe0d0e0e3..ebe0d0e0e3 100644
--- a/keyboards/synapse/rules.mk
+++ b/keyboards/p3d/synapse/rules.mk
diff --git a/keyboards/synapse/synapse.c b/keyboards/p3d/synapse/synapse.c
index 0b532eaab6..0b532eaab6 100644
--- a/keyboards/synapse/synapse.c
+++ b/keyboards/p3d/synapse/synapse.c
diff --git a/keyboards/tw40/config.h b/keyboards/p3d/tw40/config.h
index 99549d9efa..99549d9efa 100644
--- a/keyboards/tw40/config.h
+++ b/keyboards/p3d/tw40/config.h
diff --git a/keyboards/tw40/info.json b/keyboards/p3d/tw40/info.json
index 79f3d7fbaa..79f3d7fbaa 100644
--- a/keyboards/tw40/info.json
+++ b/keyboards/p3d/tw40/info.json
diff --git a/keyboards/tw40/keymaps/default/keymap.c b/keyboards/p3d/tw40/keymaps/default/keymap.c
index 11b3d0d6e9..11b3d0d6e9 100644
--- a/keyboards/tw40/keymaps/default/keymap.c
+++ b/keyboards/p3d/tw40/keymaps/default/keymap.c
diff --git a/keyboards/tw40/keymaps/default/readme.md b/keyboards/p3d/tw40/keymaps/default/readme.md
index 4dfa184e29..4dfa184e29 100644
--- a/keyboards/tw40/keymaps/default/readme.md
+++ b/keyboards/p3d/tw40/keymaps/default/readme.md
diff --git a/keyboards/tw40/keymaps/via/keymap.c b/keyboards/p3d/tw40/keymaps/via/keymap.c
index ffa7470bc1..ffa7470bc1 100644
--- a/keyboards/tw40/keymaps/via/keymap.c
+++ b/keyboards/p3d/tw40/keymaps/via/keymap.c
diff --git a/keyboards/tw40/keymaps/via/rules.mk b/keyboards/p3d/tw40/keymaps/via/rules.mk
index 36b7ba9cbc..36b7ba9cbc 100644
--- a/keyboards/tw40/keymaps/via/rules.mk
+++ b/keyboards/p3d/tw40/keymaps/via/rules.mk
diff --git a/keyboards/tw40/readme.md b/keyboards/p3d/tw40/readme.md
index 7db7378590..1019ca4914 100644
--- a/keyboards/tw40/readme.md
+++ b/keyboards/p3d/tw40/readme.md
@@ -8,13 +8,12 @@
 
 Make example for this keyboard (after setting up your build environment):
 
-    make tw40:default
-
+    make p3d/tw40:default
 
 To flash a new firmware plug in the keyboard while holding Esc (top left key) and then run the commands below.
 
 Flashing example for this keyboard:
 
-    make tw40:default:flash
+    make p3d/tw40:default:flash
 
 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/tw40/rules.mk b/keyboards/p3d/tw40/rules.mk
index 2eba275490..2eba275490 100644
--- a/keyboards/tw40/rules.mk
+++ b/keyboards/p3d/tw40/rules.mk