diff --git a/data/mappings/keyboard_aliases.hjson b/data/mappings/keyboard_aliases.hjson
index 9b514045bae..8c941f11c84 100644
--- a/data/mappings/keyboard_aliases.hjson
+++ b/data/mappings/keyboard_aliases.hjson
@@ -975,6 +975,12 @@
     "keychron/q4": {
         "target": "keychron/q4/ansi/v1"
     }
+    "kmac": {
+        "target": "kbdmania/kmac"
+    }
+    "kmac_pad": {
+        "target": "kbdmania/kmac_pad"
+    }
     "kprepublic/bm40hsrgb": {
         "target": "kprepublic/bm40hsrgb/rev1"
     },
diff --git a/keyboards/kmac/config.h b/keyboards/kbdmania/kmac/config.h
similarity index 100%
rename from keyboards/kmac/config.h
rename to keyboards/kbdmania/kmac/config.h
diff --git a/keyboards/kmac/info.json b/keyboards/kbdmania/kmac/info.json
similarity index 100%
rename from keyboards/kmac/info.json
rename to keyboards/kbdmania/kmac/info.json
diff --git a/keyboards/kmac/keymaps/default/keymap.c b/keyboards/kbdmania/kmac/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/kmac/keymaps/default/keymap.c
rename to keyboards/kbdmania/kmac/keymaps/default/keymap.c
diff --git a/keyboards/kmac/keymaps/default/readme.md b/keyboards/kbdmania/kmac/keymaps/default/readme.md
similarity index 100%
rename from keyboards/kmac/keymaps/default/readme.md
rename to keyboards/kbdmania/kmac/keymaps/default/readme.md
diff --git a/keyboards/kmac/keymaps/default_tkl_ansi/keymap.c b/keyboards/kbdmania/kmac/keymaps/default_tkl_ansi/keymap.c
similarity index 100%
rename from keyboards/kmac/keymaps/default_tkl_ansi/keymap.c
rename to keyboards/kbdmania/kmac/keymaps/default_tkl_ansi/keymap.c
diff --git a/keyboards/kmac/keymaps/default_tkl_ansi/readme.md b/keyboards/kbdmania/kmac/keymaps/default_tkl_ansi/readme.md
similarity index 100%
rename from keyboards/kmac/keymaps/default_tkl_ansi/readme.md
rename to keyboards/kbdmania/kmac/keymaps/default_tkl_ansi/readme.md
diff --git a/keyboards/kmac/keymaps/default_tkl_ansi_wkl/keymap.c b/keyboards/kbdmania/kmac/keymaps/default_tkl_ansi_wkl/keymap.c
similarity index 100%
rename from keyboards/kmac/keymaps/default_tkl_ansi_wkl/keymap.c
rename to keyboards/kbdmania/kmac/keymaps/default_tkl_ansi_wkl/keymap.c
diff --git a/keyboards/kmac/keymaps/default_tkl_ansi_wkl/readme.md b/keyboards/kbdmania/kmac/keymaps/default_tkl_ansi_wkl/readme.md
similarity index 100%
rename from keyboards/kmac/keymaps/default_tkl_ansi_wkl/readme.md
rename to keyboards/kbdmania/kmac/keymaps/default_tkl_ansi_wkl/readme.md
diff --git a/keyboards/kmac/keymaps/via/keymap.c b/keyboards/kbdmania/kmac/keymaps/via/keymap.c
similarity index 100%
rename from keyboards/kmac/keymaps/via/keymap.c
rename to keyboards/kbdmania/kmac/keymaps/via/keymap.c
diff --git a/keyboards/kmac/keymaps/via/rules.mk b/keyboards/kbdmania/kmac/keymaps/via/rules.mk
similarity index 100%
rename from keyboards/kmac/keymaps/via/rules.mk
rename to keyboards/kbdmania/kmac/keymaps/via/rules.mk
diff --git a/keyboards/kmac/kmac.c b/keyboards/kbdmania/kmac/kmac.c
similarity index 100%
rename from keyboards/kmac/kmac.c
rename to keyboards/kbdmania/kmac/kmac.c
diff --git a/keyboards/kmac/matrix.c b/keyboards/kbdmania/kmac/matrix.c
similarity index 100%
rename from keyboards/kmac/matrix.c
rename to keyboards/kbdmania/kmac/matrix.c
diff --git a/keyboards/kmac/readme.md b/keyboards/kbdmania/kmac/readme.md
similarity index 88%
rename from keyboards/kmac/readme.md
rename to keyboards/kbdmania/kmac/readme.md
index 47dbaa847f6..c9f77462928 100644
--- a/keyboards/kmac/readme.md
+++ b/keyboards/kbdmania/kmac/readme.md
@@ -4,11 +4,11 @@ A Korean custom keyboard designed by Byungho Kim and the KBDMania community.
 
 Keyboard Maintainer: [Mathias Andersson](https://github.com/wraul)  
 Hardware Supported: KMAC & KMAC 2  
-Hardware Availability: http://www.kbdmania.net/xe/news/5232321
+Hardware Availability: [KBDMania](http://www.kbdmania.net/xe/news/5232321)
 
 Make example for this keyboard (after setting up your build environment):
 
-    make kmac:default
+    make kbdmania/kmac: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/kmac/rules.mk b/keyboards/kbdmania/kmac/rules.mk
similarity index 100%
rename from keyboards/kmac/rules.mk
rename to keyboards/kbdmania/kmac/rules.mk
diff --git a/keyboards/kmac_pad/config.h b/keyboards/kbdmania/kmac_pad/config.h
similarity index 100%
rename from keyboards/kmac_pad/config.h
rename to keyboards/kbdmania/kmac_pad/config.h
diff --git a/keyboards/kmac_pad/info.json b/keyboards/kbdmania/kmac_pad/info.json
similarity index 100%
rename from keyboards/kmac_pad/info.json
rename to keyboards/kbdmania/kmac_pad/info.json
diff --git a/keyboards/kmac_pad/keymaps/default/keymap.c b/keyboards/kbdmania/kmac_pad/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/kmac_pad/keymaps/default/keymap.c
rename to keyboards/kbdmania/kmac_pad/keymaps/default/keymap.c
diff --git a/keyboards/kmac_pad/keymaps/default/readme.md b/keyboards/kbdmania/kmac_pad/keymaps/default/readme.md
similarity index 100%
rename from keyboards/kmac_pad/keymaps/default/readme.md
rename to keyboards/kbdmania/kmac_pad/keymaps/default/readme.md
diff --git a/keyboards/kmac_pad/kmac_pad.c b/keyboards/kbdmania/kmac_pad/kmac_pad.c
similarity index 100%
rename from keyboards/kmac_pad/kmac_pad.c
rename to keyboards/kbdmania/kmac_pad/kmac_pad.c
diff --git a/keyboards/kmac_pad/matrix.c b/keyboards/kbdmania/kmac_pad/matrix.c
similarity index 100%
rename from keyboards/kmac_pad/matrix.c
rename to keyboards/kbdmania/kmac_pad/matrix.c
diff --git a/keyboards/kmac_pad/readme.md b/keyboards/kbdmania/kmac_pad/readme.md
similarity index 91%
rename from keyboards/kmac_pad/readme.md
rename to keyboards/kbdmania/kmac_pad/readme.md
index 7605501f3a5..59cc307073d 100644
--- a/keyboards/kmac_pad/readme.md
+++ b/keyboards/kbdmania/kmac_pad/readme.md
@@ -7,15 +7,15 @@ It can be used independently, but can also be used by connecting with KMAC keybo
 
 * Keyboard Maintainer: [talsu](https://github.com/talsu)
 * Hardware Supported: KMAC PAD
-* Hardware Availability: http://www.kbdmania.net/xe/news/5232321
+* Hardware Availability: [KBDMania](http://www.kbdmania.net/xe/news/5232321)
 
 Make example for this keyboard (after setting up your build environment):
 
-    make kmac_pad:default
+    make kbdmania/kmac_pad:default
     
 Flashing example for this keyboard:
 
-    make kmac_pad:default:flash
+    make kbdmania/kmac_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/kmac_pad/rules.mk b/keyboards/kbdmania/kmac_pad/rules.mk
similarity index 100%
rename from keyboards/kmac_pad/rules.mk
rename to keyboards/kbdmania/kmac_pad/rules.mk