diff --git a/data/mappings/keyboard_aliases.json b/data/mappings/keyboard_aliases.json
index 5d9bf9f439c..430229ecffd 100644
--- a/data/mappings/keyboard_aliases.json
+++ b/data/mappings/keyboard_aliases.json
@@ -41,8 +41,14 @@
     'atom47/rev3': {
           target: 'maartenwut/atom47/rev3'
     },
+    bakeneko60: {
+          target: 'kkatano/bakeneko60'
+    },
     bakeneko65: {
-          target: 'bakeneko65/rev2'
+          target: 'kkatano/bakeneko65/rev2'
+    },
+    bakeneko80: {
+          target: 'kkatano/bakeneko80'
     },
     bear_face: {
           target: 'bear_face/v1'
diff --git a/keyboards/bakeneko60/bakeneko60.c b/keyboards/kkatano/bakeneko60/bakeneko60.c
similarity index 100%
rename from keyboards/bakeneko60/bakeneko60.c
rename to keyboards/kkatano/bakeneko60/bakeneko60.c
diff --git a/keyboards/bakeneko60/bakeneko60.h b/keyboards/kkatano/bakeneko60/bakeneko60.h
similarity index 100%
rename from keyboards/bakeneko60/bakeneko60.h
rename to keyboards/kkatano/bakeneko60/bakeneko60.h
diff --git a/keyboards/bakeneko60/config.h b/keyboards/kkatano/bakeneko60/config.h
similarity index 100%
rename from keyboards/bakeneko60/config.h
rename to keyboards/kkatano/bakeneko60/config.h
diff --git a/keyboards/bakeneko60/info.json b/keyboards/kkatano/bakeneko60/info.json
similarity index 100%
rename from keyboards/bakeneko60/info.json
rename to keyboards/kkatano/bakeneko60/info.json
diff --git a/keyboards/bakeneko60/keymaps/default/keymap.c b/keyboards/kkatano/bakeneko60/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/bakeneko60/keymaps/default/keymap.c
rename to keyboards/kkatano/bakeneko60/keymaps/default/keymap.c
diff --git a/keyboards/bakeneko60/keymaps/default/readme.md b/keyboards/kkatano/bakeneko60/keymaps/default/readme.md
similarity index 100%
rename from keyboards/bakeneko60/keymaps/default/readme.md
rename to keyboards/kkatano/bakeneko60/keymaps/default/readme.md
diff --git a/keyboards/bakeneko60/keymaps/via/keymap.c b/keyboards/kkatano/bakeneko60/keymaps/via/keymap.c
similarity index 100%
rename from keyboards/bakeneko60/keymaps/via/keymap.c
rename to keyboards/kkatano/bakeneko60/keymaps/via/keymap.c
diff --git a/keyboards/bakeneko60/keymaps/via/rules.mk b/keyboards/kkatano/bakeneko60/keymaps/via/rules.mk
similarity index 100%
rename from keyboards/bakeneko60/keymaps/via/rules.mk
rename to keyboards/kkatano/bakeneko60/keymaps/via/rules.mk
diff --git a/keyboards/bakeneko60/readme.md b/keyboards/kkatano/bakeneko60/readme.md
similarity index 88%
rename from keyboards/bakeneko60/readme.md
rename to keyboards/kkatano/bakeneko60/readme.md
index 18b9d3c4d21..0e1c293f901 100644
--- a/keyboards/bakeneko60/readme.md
+++ b/keyboards/kkatano/bakeneko60/readme.md
@@ -8,10 +8,10 @@ A simple 60% keyboard
 
 Make example for this keyboard (after setting up your build environment):
 
-    make bakeneko60:default
+    make kkatano/bakeneko60:default
 
 Flashing example for this keyboard:
 
-    make bakeneko60:default:flash
+    make kkatano/bakeneko60: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/bakeneko60/rules.mk b/keyboards/kkatano/bakeneko60/rules.mk
similarity index 100%
rename from keyboards/bakeneko60/rules.mk
rename to keyboards/kkatano/bakeneko60/rules.mk
diff --git a/keyboards/bakeneko65/rev2/config.h b/keyboards/kkatano/bakeneko65/rev2/config.h
similarity index 100%
rename from keyboards/bakeneko65/rev2/config.h
rename to keyboards/kkatano/bakeneko65/rev2/config.h
diff --git a/keyboards/bakeneko65/rev2/info.json b/keyboards/kkatano/bakeneko65/rev2/info.json
similarity index 100%
rename from keyboards/bakeneko65/rev2/info.json
rename to keyboards/kkatano/bakeneko65/rev2/info.json
diff --git a/keyboards/bakeneko65/rev2/keymaps/default/keymap.c b/keyboards/kkatano/bakeneko65/rev2/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/bakeneko65/rev2/keymaps/default/keymap.c
rename to keyboards/kkatano/bakeneko65/rev2/keymaps/default/keymap.c
diff --git a/keyboards/bakeneko65/rev2/keymaps/default/readme.md b/keyboards/kkatano/bakeneko65/rev2/keymaps/default/readme.md
similarity index 100%
rename from keyboards/bakeneko65/rev2/keymaps/default/readme.md
rename to keyboards/kkatano/bakeneko65/rev2/keymaps/default/readme.md
diff --git a/keyboards/bakeneko65/rev2/keymaps/via/keymap.c b/keyboards/kkatano/bakeneko65/rev2/keymaps/via/keymap.c
similarity index 100%
rename from keyboards/bakeneko65/rev2/keymaps/via/keymap.c
rename to keyboards/kkatano/bakeneko65/rev2/keymaps/via/keymap.c
diff --git a/keyboards/bakeneko65/rev2/keymaps/via/rules.mk b/keyboards/kkatano/bakeneko65/rev2/keymaps/via/rules.mk
similarity index 100%
rename from keyboards/bakeneko65/rev2/keymaps/via/rules.mk
rename to keyboards/kkatano/bakeneko65/rev2/keymaps/via/rules.mk
diff --git a/keyboards/bakeneko65/rev2/readme.md b/keyboards/kkatano/bakeneko65/rev2/readme.md
similarity index 87%
rename from keyboards/bakeneko65/rev2/readme.md
rename to keyboards/kkatano/bakeneko65/rev2/readme.md
index 8d2fa6bc58f..a12eded0db9 100644
--- a/keyboards/bakeneko65/rev2/readme.md
+++ b/keyboards/kkatano/bakeneko65/rev2/readme.md
@@ -8,10 +8,10 @@ A simple 65% keyboard
 
 Make example for this keyboard (after setting up your build environment):
 
-    make bakeneko65/rev2:default
+    make kkatano/bakeneko65/rev2:default
 
 Flashing example for this keyboard:
 
-    make bakeneko65/rev2:default:flash
+    make kkatano/bakeneko65/rev2: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/bakeneko65/rev2/rev2.c b/keyboards/kkatano/bakeneko65/rev2/rev2.c
similarity index 100%
rename from keyboards/bakeneko65/rev2/rev2.c
rename to keyboards/kkatano/bakeneko65/rev2/rev2.c
diff --git a/keyboards/bakeneko65/rev2/rev2.h b/keyboards/kkatano/bakeneko65/rev2/rev2.h
similarity index 100%
rename from keyboards/bakeneko65/rev2/rev2.h
rename to keyboards/kkatano/bakeneko65/rev2/rev2.h
diff --git a/keyboards/bakeneko65/rev2/rules.mk b/keyboards/kkatano/bakeneko65/rev2/rules.mk
similarity index 100%
rename from keyboards/bakeneko65/rev2/rules.mk
rename to keyboards/kkatano/bakeneko65/rev2/rules.mk
diff --git a/keyboards/bakeneko65/rev3/config.h b/keyboards/kkatano/bakeneko65/rev3/config.h
similarity index 100%
rename from keyboards/bakeneko65/rev3/config.h
rename to keyboards/kkatano/bakeneko65/rev3/config.h
diff --git a/keyboards/bakeneko65/rev3/info.json b/keyboards/kkatano/bakeneko65/rev3/info.json
similarity index 100%
rename from keyboards/bakeneko65/rev3/info.json
rename to keyboards/kkatano/bakeneko65/rev3/info.json
diff --git a/keyboards/bakeneko65/rev3/keymaps/default/keymap.c b/keyboards/kkatano/bakeneko65/rev3/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/bakeneko65/rev3/keymaps/default/keymap.c
rename to keyboards/kkatano/bakeneko65/rev3/keymaps/default/keymap.c
diff --git a/keyboards/bakeneko65/rev3/keymaps/default/readme.md b/keyboards/kkatano/bakeneko65/rev3/keymaps/default/readme.md
similarity index 100%
rename from keyboards/bakeneko65/rev3/keymaps/default/readme.md
rename to keyboards/kkatano/bakeneko65/rev3/keymaps/default/readme.md
diff --git a/keyboards/bakeneko65/rev3/keymaps/via/keymap.c b/keyboards/kkatano/bakeneko65/rev3/keymaps/via/keymap.c
similarity index 100%
rename from keyboards/bakeneko65/rev3/keymaps/via/keymap.c
rename to keyboards/kkatano/bakeneko65/rev3/keymaps/via/keymap.c
diff --git a/keyboards/bakeneko65/rev3/keymaps/via/rules.mk b/keyboards/kkatano/bakeneko65/rev3/keymaps/via/rules.mk
similarity index 100%
rename from keyboards/bakeneko65/rev3/keymaps/via/rules.mk
rename to keyboards/kkatano/bakeneko65/rev3/keymaps/via/rules.mk
diff --git a/keyboards/bakeneko65/rev3/readme.md b/keyboards/kkatano/bakeneko65/rev3/readme.md
similarity index 87%
rename from keyboards/bakeneko65/rev3/readme.md
rename to keyboards/kkatano/bakeneko65/rev3/readme.md
index e147b11e6fd..18cd5773286 100644
--- a/keyboards/bakeneko65/rev3/readme.md
+++ b/keyboards/kkatano/bakeneko65/rev3/readme.md
@@ -8,10 +8,10 @@ A simple 65% keyboard
 
 Make example for this keyboard (after setting up your build environment):
 
-    make bakeneko65/rev3:default
+    make kkatano/bakeneko65/rev3:default
 
 Flashing example for this keyboard:
 
-    make bakeneko65/rev3:default:flash
+    make kkatano/bakeneko65/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/bakeneko65/rev3/rev3.c b/keyboards/kkatano/bakeneko65/rev3/rev3.c
similarity index 100%
rename from keyboards/bakeneko65/rev3/rev3.c
rename to keyboards/kkatano/bakeneko65/rev3/rev3.c
diff --git a/keyboards/bakeneko65/rev3/rev3.h b/keyboards/kkatano/bakeneko65/rev3/rev3.h
similarity index 100%
rename from keyboards/bakeneko65/rev3/rev3.h
rename to keyboards/kkatano/bakeneko65/rev3/rev3.h
diff --git a/keyboards/bakeneko65/rev3/rules.mk b/keyboards/kkatano/bakeneko65/rev3/rules.mk
similarity index 100%
rename from keyboards/bakeneko65/rev3/rules.mk
rename to keyboards/kkatano/bakeneko65/rev3/rules.mk
diff --git a/keyboards/bakeneko80/bakeneko80.c b/keyboards/kkatano/bakeneko80/bakeneko80.c
similarity index 100%
rename from keyboards/bakeneko80/bakeneko80.c
rename to keyboards/kkatano/bakeneko80/bakeneko80.c
diff --git a/keyboards/bakeneko80/bakeneko80.h b/keyboards/kkatano/bakeneko80/bakeneko80.h
similarity index 100%
rename from keyboards/bakeneko80/bakeneko80.h
rename to keyboards/kkatano/bakeneko80/bakeneko80.h
diff --git a/keyboards/bakeneko80/config.h b/keyboards/kkatano/bakeneko80/config.h
similarity index 100%
rename from keyboards/bakeneko80/config.h
rename to keyboards/kkatano/bakeneko80/config.h
diff --git a/keyboards/bakeneko80/info.json b/keyboards/kkatano/bakeneko80/info.json
similarity index 100%
rename from keyboards/bakeneko80/info.json
rename to keyboards/kkatano/bakeneko80/info.json
diff --git a/keyboards/bakeneko80/keymaps/default/keymap.c b/keyboards/kkatano/bakeneko80/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/bakeneko80/keymaps/default/keymap.c
rename to keyboards/kkatano/bakeneko80/keymaps/default/keymap.c
diff --git a/keyboards/bakeneko80/keymaps/default/readme.md b/keyboards/kkatano/bakeneko80/keymaps/default/readme.md
similarity index 100%
rename from keyboards/bakeneko80/keymaps/default/readme.md
rename to keyboards/kkatano/bakeneko80/keymaps/default/readme.md
diff --git a/keyboards/bakeneko80/readme.md b/keyboards/kkatano/bakeneko80/readme.md
similarity index 94%
rename from keyboards/bakeneko80/readme.md
rename to keyboards/kkatano/bakeneko80/readme.md
index 30f1b3e608b..cc04ab447bb 100644
--- a/keyboards/bakeneko80/readme.md
+++ b/keyboards/kkatano/bakeneko80/readme.md
@@ -8,6 +8,6 @@ Open source tenkeyless keyboard for DIYers
 
 Make example for this keyboard (after setting up your build environment):
 
-    make bakeneko80:default
+    make kkatano/bakeneko80: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/bakeneko80/rules.mk b/keyboards/kkatano/bakeneko80/rules.mk
similarity index 100%
rename from keyboards/bakeneko80/rules.mk
rename to keyboards/kkatano/bakeneko80/rules.mk
diff --git a/keyboards/wallaby/config.h b/keyboards/kkatano/wallaby/config.h
similarity index 100%
rename from keyboards/wallaby/config.h
rename to keyboards/kkatano/wallaby/config.h
diff --git a/keyboards/wallaby/info.json b/keyboards/kkatano/wallaby/info.json
similarity index 100%
rename from keyboards/wallaby/info.json
rename to keyboards/kkatano/wallaby/info.json
diff --git a/keyboards/wallaby/keymaps/default/keymap.c b/keyboards/kkatano/wallaby/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/wallaby/keymaps/default/keymap.c
rename to keyboards/kkatano/wallaby/keymaps/default/keymap.c
diff --git a/keyboards/wallaby/keymaps/default/readme.md b/keyboards/kkatano/wallaby/keymaps/default/readme.md
similarity index 100%
rename from keyboards/wallaby/keymaps/default/readme.md
rename to keyboards/kkatano/wallaby/keymaps/default/readme.md
diff --git a/keyboards/wallaby/readme.md b/keyboards/kkatano/wallaby/readme.md
similarity index 94%
rename from keyboards/wallaby/readme.md
rename to keyboards/kkatano/wallaby/readme.md
index 89c9f9c5670..6be5a059fd1 100644
--- a/keyboards/wallaby/readme.md
+++ b/keyboards/kkatano/wallaby/readme.md
@@ -8,6 +8,6 @@ A Tenkeyless PCB for YMDK aluminium case compatible with Filco
 
 Make example for this keyboard (after setting up your build environment):
 
-    make wallaby:default
+    make kkatano/wallaby: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/wallaby/rules.mk b/keyboards/kkatano/wallaby/rules.mk
similarity index 100%
rename from keyboards/wallaby/rules.mk
rename to keyboards/kkatano/wallaby/rules.mk
diff --git a/keyboards/wallaby/wallaby.c b/keyboards/kkatano/wallaby/wallaby.c
similarity index 100%
rename from keyboards/wallaby/wallaby.c
rename to keyboards/kkatano/wallaby/wallaby.c
diff --git a/keyboards/wallaby/wallaby.h b/keyboards/kkatano/wallaby/wallaby.h
similarity index 100%
rename from keyboards/wallaby/wallaby.h
rename to keyboards/kkatano/wallaby/wallaby.h
diff --git a/keyboards/yurei/config.h b/keyboards/kkatano/yurei/config.h
similarity index 100%
rename from keyboards/yurei/config.h
rename to keyboards/kkatano/yurei/config.h
diff --git a/keyboards/yurei/info.json b/keyboards/kkatano/yurei/info.json
similarity index 100%
rename from keyboards/yurei/info.json
rename to keyboards/kkatano/yurei/info.json
diff --git a/keyboards/yurei/keymaps/default/keymap.c b/keyboards/kkatano/yurei/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/yurei/keymaps/default/keymap.c
rename to keyboards/kkatano/yurei/keymaps/default/keymap.c
diff --git a/keyboards/yurei/keymaps/default/readme.md b/keyboards/kkatano/yurei/keymaps/default/readme.md
similarity index 100%
rename from keyboards/yurei/keymaps/default/readme.md
rename to keyboards/kkatano/yurei/keymaps/default/readme.md
diff --git a/keyboards/yurei/readme.md b/keyboards/kkatano/yurei/readme.md
similarity index 95%
rename from keyboards/yurei/readme.md
rename to keyboards/kkatano/yurei/readme.md
index fc5b3eb5c04..69bd3a7cbef 100644
--- a/keyboards/yurei/readme.md
+++ b/keyboards/kkatano/yurei/readme.md
@@ -8,6 +8,6 @@ A Tenkeyless PCB inspired by Phantom, for customizing Filco Majestouch 2.
 
 Make example for this keyboard (after setting up your build environment):
 
-    make yurei:default
+    make kkatano/yurei: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/yurei/rules.mk b/keyboards/kkatano/yurei/rules.mk
similarity index 100%
rename from keyboards/yurei/rules.mk
rename to keyboards/kkatano/yurei/rules.mk
diff --git a/keyboards/yurei/yurei.c b/keyboards/kkatano/yurei/yurei.c
similarity index 100%
rename from keyboards/yurei/yurei.c
rename to keyboards/kkatano/yurei/yurei.c
diff --git a/keyboards/yurei/yurei.h b/keyboards/kkatano/yurei/yurei.h
similarity index 100%
rename from keyboards/yurei/yurei.h
rename to keyboards/kkatano/yurei/yurei.h