45 files changed, 25 insertions, 10 deletions
diff --git a/data/mappings/keyboard_aliases.hjson b/data/mappings/keyboard_aliases.hjson
index 12c8d0b190..f70ff14afc 100644
--- a/data/mappings/keyboard_aliases.hjson
+++ b/data/mappings/keyboard_aliases.hjson
@@ -882,6 +882,9 @@
     "felix": {
         "target": "unikeyboard/felix"
     },
+    "flygone60/rev3": {
+        "target": "shandoncodes/flygone60/rev3"
+    },
     "four_banger": {
         "target": "bpiphany/four_banger"
     },
@@ -1080,6 +1083,15 @@
     "minidox/rev1": {
         "target": "maple_computing/minidox/rev1"
     },
+    "mino/hotswap": {
+        "target": "shandoncodes/mino/hotswap"
+    },
+    "mino_plus/hotswap": {
+        "target": "shandoncodes/mino_plus/hotswap"
+    },
+    "mino_plus/soldered": {
+        "target": "shandoncodes/mino_plus/soldered"
+    },
     "mio": {
         "target": "recompile_keys/mio"
     },
@@ -1269,6 +1281,9 @@
     "reviung61": {
         "target": "reviung/reviung61"
     },
+    "riot_pad": {
+        "target": "shandoncodes/riot_pad"
+    },
     "runner3680/3x6": {
         "target": "omkbd/runner3680/3x6"
     },
diff --git a/keyboards/flygone60/rev3/config.h b/keyboards/shandoncodes/flygone60/rev3/config.h
index 339cf3c782..339cf3c782 100644
--- a/keyboards/flygone60/rev3/config.h
+++ b/keyboards/shandoncodes/flygone60/rev3/config.h
diff --git a/keyboards/flygone60/rev3/info.json b/keyboards/shandoncodes/flygone60/rev3/info.json
index 254f093aee..254f093aee 100644
--- a/keyboards/flygone60/rev3/info.json
+++ b/keyboards/shandoncodes/flygone60/rev3/info.json
diff --git a/keyboards/flygone60/rev3/keymaps/default/keymap.c b/keyboards/shandoncodes/flygone60/rev3/keymaps/default/keymap.c
index 20bcc64f80..20bcc64f80 100644
--- a/keyboards/flygone60/rev3/keymaps/default/keymap.c
+++ b/keyboards/shandoncodes/flygone60/rev3/keymaps/default/keymap.c
diff --git a/keyboards/flygone60/rev3/keymaps/default/readme.md b/keyboards/shandoncodes/flygone60/rev3/keymaps/default/readme.md
index 91ea23c734..91ea23c734 100644
--- a/keyboards/flygone60/rev3/keymaps/default/readme.md
+++ b/keyboards/shandoncodes/flygone60/rev3/keymaps/default/readme.md
diff --git a/keyboards/flygone60/rev3/keymaps/via/keymap.c b/keyboards/shandoncodes/flygone60/rev3/keymaps/via/keymap.c
index 54b0e4f673..54b0e4f673 100644
--- a/keyboards/flygone60/rev3/keymaps/via/keymap.c
+++ b/keyboards/shandoncodes/flygone60/rev3/keymaps/via/keymap.c
diff --git a/keyboards/flygone60/rev3/keymaps/via/rules.mk b/keyboards/shandoncodes/flygone60/rev3/keymaps/via/rules.mk
index 43061db1dd..43061db1dd 100644
--- a/keyboards/flygone60/rev3/keymaps/via/rules.mk
+++ b/keyboards/shandoncodes/flygone60/rev3/keymaps/via/rules.mk
diff --git a/keyboards/flygone60/rev3/readme.md b/keyboards/shandoncodes/flygone60/rev3/readme.md
index d5e8cbcc25..4bb2438602 100644
--- a/keyboards/flygone60/rev3/readme.md
+++ b/keyboards/shandoncodes/flygone60/rev3/readme.md
@@ -10,10 +10,10 @@ A 60% that takes arrow keys seriously!
 
 Make example for this keyboard (after setting up your build environment):
 
-    make flygone60/rev3:default
+    make shandoncodes/flygone60/rev3:default
 
 Flashing example for this keyboard:
 
-    make flygone60/rev3:default:flash
+    make shandoncodes/flygone60/rev3: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/flygone60/rev3/rules.mk b/keyboards/shandoncodes/flygone60/rev3/rules.mk
index ab2c49da70..ab2c49da70 100644
--- a/keyboards/flygone60/rev3/rules.mk
+++ b/keyboards/shandoncodes/flygone60/rev3/rules.mk
diff --git a/keyboards/mino/hotswap/config.h b/keyboards/shandoncodes/mino/hotswap/config.h
index 45fec5af48..45fec5af48 100644
--- a/keyboards/mino/hotswap/config.h
+++ b/keyboards/shandoncodes/mino/hotswap/config.h
diff --git a/keyboards/mino/hotswap/info.json b/keyboards/shandoncodes/mino/hotswap/info.json
index 9ba7617920..9ba7617920 100644
--- a/keyboards/mino/hotswap/info.json
+++ b/keyboards/shandoncodes/mino/hotswap/info.json
diff --git a/keyboards/mino/hotswap/rules.mk b/keyboards/shandoncodes/mino/hotswap/rules.mk
index f8a709213c..f8a709213c 100644
--- a/keyboards/mino/hotswap/rules.mk
+++ b/keyboards/shandoncodes/mino/hotswap/rules.mk
diff --git a/keyboards/mino/keymaps/default/keymap.c b/keyboards/shandoncodes/mino/keymaps/default/keymap.c
index 94ef51e0e3..94ef51e0e3 100644
--- a/keyboards/mino/keymaps/default/keymap.c
+++ b/keyboards/shandoncodes/mino/keymaps/default/keymap.c
diff --git a/keyboards/mino/keymaps/via/keymap.c b/keyboards/shandoncodes/mino/keymaps/via/keymap.c
index f481b07d34..f481b07d34 100644
--- a/keyboards/mino/keymaps/via/keymap.c
+++ b/keyboards/shandoncodes/mino/keymaps/via/keymap.c
diff --git a/keyboards/mino/keymaps/via/rules.mk b/keyboards/shandoncodes/mino/keymaps/via/rules.mk
index a4ac614775..a4ac614775 100644
--- a/keyboards/mino/keymaps/via/rules.mk
+++ b/keyboards/shandoncodes/mino/keymaps/via/rules.mk
diff --git a/keyboards/mino/readme.md b/keyboards/shandoncodes/mino/readme.md
index e13718b86c..7ccb70662b 100644
--- a/keyboards/mino/readme.md
+++ b/keyboards/shandoncodes/mino/readme.md
@@ -18,10 +18,10 @@ Enter the bootloader in 3 ways:
 
 Make example for this keyboard (after setting up your build environment):
 
-    make mino/hotswap:default
+    make shandoncodes/mino/hotswap:default
 
 Flashing example for this keyboard:
 
-    make mino/hotswap:default:flash
+    make shandoncodes/mino/hotswap: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/mino_plus/hotswap/config.h b/keyboards/shandoncodes/mino_plus/hotswap/config.h
index b8c0007938..b8c0007938 100644
--- a/keyboards/mino_plus/hotswap/config.h
+++ b/keyboards/shandoncodes/mino_plus/hotswap/config.h
diff --git a/keyboards/mino_plus/hotswap/halconf.h b/keyboards/shandoncodes/mino_plus/hotswap/halconf.h
index fb8ce45220..fb8ce45220 100644
--- a/keyboards/mino_plus/hotswap/halconf.h
+++ b/keyboards/shandoncodes/mino_plus/hotswap/halconf.h
diff --git a/keyboards/mino_plus/hotswap/hotswap.c b/keyboards/shandoncodes/mino_plus/hotswap/hotswap.c
index a5920b2617..a5920b2617 100644
--- a/keyboards/mino_plus/hotswap/hotswap.c
+++ b/keyboards/shandoncodes/mino_plus/hotswap/hotswap.c
diff --git a/keyboards/mino_plus/hotswap/info.json b/keyboards/shandoncodes/mino_plus/hotswap/info.json
index b7cda6d71f..b7cda6d71f 100644
--- a/keyboards/mino_plus/hotswap/info.json
+++ b/keyboards/shandoncodes/mino_plus/hotswap/info.json
diff --git a/keyboards/mino_plus/hotswap/keymaps/default/keymap.c b/keyboards/shandoncodes/mino_plus/hotswap/keymaps/default/keymap.c
index f068c66215..f068c66215 100644
--- a/keyboards/mino_plus/hotswap/keymaps/default/keymap.c
+++ b/keyboards/shandoncodes/mino_plus/hotswap/keymaps/default/keymap.c
diff --git a/keyboards/mino_plus/hotswap/keymaps/via/keymap.c b/keyboards/shandoncodes/mino_plus/hotswap/keymaps/via/keymap.c
index 901adcb3d2..901adcb3d2 100644
--- a/keyboards/mino_plus/hotswap/keymaps/via/keymap.c
+++ b/keyboards/shandoncodes/mino_plus/hotswap/keymaps/via/keymap.c
diff --git a/keyboards/mino_plus/hotswap/keymaps/via/rules.mk b/keyboards/shandoncodes/mino_plus/hotswap/keymaps/via/rules.mk
index 036bd6d1c3..036bd6d1c3 100644
--- a/keyboards/mino_plus/hotswap/keymaps/via/rules.mk
+++ b/keyboards/shandoncodes/mino_plus/hotswap/keymaps/via/rules.mk
diff --git a/keyboards/mino_plus/hotswap/mcuconf.h b/keyboards/shandoncodes/mino_plus/hotswap/mcuconf.h
index 7b8a66123e..7b8a66123e 100644
--- a/keyboards/mino_plus/hotswap/mcuconf.h
+++ b/keyboards/shandoncodes/mino_plus/hotswap/mcuconf.h
diff --git a/keyboards/mino_plus/hotswap/rules.mk b/keyboards/shandoncodes/mino_plus/hotswap/rules.mk
index 76e55c05f4..76e55c05f4 100644
--- a/keyboards/mino_plus/hotswap/rules.mk
+++ b/keyboards/shandoncodes/mino_plus/hotswap/rules.mk
diff --git a/keyboards/mino_plus/mino_plus.c b/keyboards/shandoncodes/mino_plus/mino_plus.c
index 0763a5292b..0763a5292b 100644
--- a/keyboards/mino_plus/mino_plus.c
+++ b/keyboards/shandoncodes/mino_plus/mino_plus.c
diff --git a/keyboards/mino_plus/readme.md b/keyboards/shandoncodes/mino_plus/readme.md
index 0a85b6dc58..8f2b06fa3c 100644
--- a/keyboards/mino_plus/readme.md
+++ b/keyboards/shandoncodes/mino_plus/readme.md
@@ -10,13 +10,13 @@ A 65% keyboard, inspried by tetrominos.
 
 Make example for this keyboard (after setting up your build environment):
 
-    make mino_plus/soldered:default
-    make mino_plus/hotswap:default
+    make shandoncodes/mino_plus/soldered:default
+    make shandoncodes/mino_plus/hotswap:default
 
 Flashing example for this keyboard:
 
-    make mino_plus/soldered:default:flash
-    make mino_plus/hotswap:default:flash
+    make shandoncodes/mino_plus/soldered:default:flash
+    make shandoncodes/mino_plus/hotswap: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/mino_plus/soldered/config.h b/keyboards/shandoncodes/mino_plus/soldered/config.h
index bbdb3c9452..bbdb3c9452 100644
--- a/keyboards/mino_plus/soldered/config.h
+++ b/keyboards/shandoncodes/mino_plus/soldered/config.h
diff --git a/keyboards/mino_plus/soldered/halconf.h b/keyboards/shandoncodes/mino_plus/soldered/halconf.h
index 65321fb1c8..65321fb1c8 100644
--- a/keyboards/mino_plus/soldered/halconf.h
+++ b/keyboards/shandoncodes/mino_plus/soldered/halconf.h
diff --git a/keyboards/mino_plus/soldered/info.json b/keyboards/shandoncodes/mino_plus/soldered/info.json
index 52b612e01b..52b612e01b 100644
--- a/keyboards/mino_plus/soldered/info.json
+++ b/keyboards/shandoncodes/mino_plus/soldered/info.json
diff --git a/keyboards/mino_plus/soldered/keymaps/default/keymap.c b/keyboards/shandoncodes/mino_plus/soldered/keymaps/default/keymap.c
index 365f31440a..365f31440a 100644
--- a/keyboards/mino_plus/soldered/keymaps/default/keymap.c
+++ b/keyboards/shandoncodes/mino_plus/soldered/keymaps/default/keymap.c
diff --git a/keyboards/mino_plus/soldered/keymaps/via/keymap.c b/keyboards/shandoncodes/mino_plus/soldered/keymaps/via/keymap.c
index 2a7e816e36..2a7e816e36 100644
--- a/keyboards/mino_plus/soldered/keymaps/via/keymap.c
+++ b/keyboards/shandoncodes/mino_plus/soldered/keymaps/via/keymap.c
diff --git a/keyboards/mino_plus/soldered/keymaps/via/rules.mk b/keyboards/shandoncodes/mino_plus/soldered/keymaps/via/rules.mk
index 036bd6d1c3..036bd6d1c3 100644
--- a/keyboards/mino_plus/soldered/keymaps/via/rules.mk
+++ b/keyboards/shandoncodes/mino_plus/soldered/keymaps/via/rules.mk
diff --git a/keyboards/mino_plus/soldered/mcuconf.h b/keyboards/shandoncodes/mino_plus/soldered/mcuconf.h
index 7968bd26da..7968bd26da 100644
--- a/keyboards/mino_plus/soldered/mcuconf.h
+++ b/keyboards/shandoncodes/mino_plus/soldered/mcuconf.h
diff --git a/keyboards/mino_plus/soldered/rules.mk b/keyboards/shandoncodes/mino_plus/soldered/rules.mk
index 76e55c05f4..76e55c05f4 100644
--- a/keyboards/mino_plus/soldered/rules.mk
+++ b/keyboards/shandoncodes/mino_plus/soldered/rules.mk
diff --git a/keyboards/mino_plus/soldered/soldered.c b/keyboards/shandoncodes/mino_plus/soldered/soldered.c
index 6dd113ebfa..6dd113ebfa 100644
--- a/keyboards/mino_plus/soldered/soldered.c
+++ b/keyboards/shandoncodes/mino_plus/soldered/soldered.c
diff --git a/keyboards/riot_pad/config.h b/keyboards/shandoncodes/riot_pad/config.h
index 4c5de878dc..4c5de878dc 100644
--- a/keyboards/riot_pad/config.h
+++ b/keyboards/shandoncodes/riot_pad/config.h
diff --git a/keyboards/riot_pad/halconf.h b/keyboards/shandoncodes/riot_pad/halconf.h
index 555a609029..555a609029 100644
--- a/keyboards/riot_pad/halconf.h
+++ b/keyboards/shandoncodes/riot_pad/halconf.h
diff --git a/keyboards/riot_pad/info.json b/keyboards/shandoncodes/riot_pad/info.json
index ab732ef0b0..ab732ef0b0 100644
--- a/keyboards/riot_pad/info.json
+++ b/keyboards/shandoncodes/riot_pad/info.json
diff --git a/keyboards/riot_pad/keymaps/default/keymap.c b/keyboards/shandoncodes/riot_pad/keymaps/default/keymap.c
index 0e6eda839e..0e6eda839e 100644
--- a/keyboards/riot_pad/keymaps/default/keymap.c
+++ b/keyboards/shandoncodes/riot_pad/keymaps/default/keymap.c
diff --git a/keyboards/riot_pad/keymaps/via/keymap.c b/keyboards/shandoncodes/riot_pad/keymaps/via/keymap.c
index 0e6eda839e..0e6eda839e 100644
--- a/keyboards/riot_pad/keymaps/via/keymap.c
+++ b/keyboards/shandoncodes/riot_pad/keymaps/via/keymap.c
diff --git a/keyboards/riot_pad/keymaps/via/rules.mk b/keyboards/shandoncodes/riot_pad/keymaps/via/rules.mk
index 036bd6d1c3..036bd6d1c3 100644
--- a/keyboards/riot_pad/keymaps/via/rules.mk
+++ b/keyboards/shandoncodes/riot_pad/keymaps/via/rules.mk
diff --git a/keyboards/riot_pad/mcuconf.h b/keyboards/shandoncodes/riot_pad/mcuconf.h
index 7c3eec4802..7c3eec4802 100644
--- a/keyboards/riot_pad/mcuconf.h
+++ b/keyboards/shandoncodes/riot_pad/mcuconf.h
diff --git a/keyboards/riot_pad/readme.md b/keyboards/shandoncodes/riot_pad/readme.md
index c2c3ffd4be..ce5f874213 100644
--- a/keyboards/riot_pad/readme.md
+++ b/keyboards/shandoncodes/riot_pad/readme.md
@@ -10,11 +10,11 @@ A RGB lovin', 6 key macropad.
 
 Make example for this keyboard (after setting up your build environment):
 
-    make riot_pad:default
+    make shandoncodes/riot_pad:default
 
 Flashing example for this keyboard:
 
-    make riot_pad:default:flash
+    make shandoncodes/riot_pad: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/riot_pad/rules.mk b/keyboards/shandoncodes/riot_pad/rules.mk
index 7ff128fa69..7ff128fa69 100644
--- a/keyboards/riot_pad/rules.mk
+++ b/keyboards/shandoncodes/riot_pad/rules.mk