22 files changed, 9 insertions, 3 deletions
diff --git a/data/mappings/keyboard_aliases.hjson b/data/mappings/keyboard_aliases.hjson
index bc9c66a033..1378267b81 100644
--- a/data/mappings/keyboard_aliases.hjson
+++ b/data/mappings/keyboard_aliases.hjson
@@ -329,6 +329,12 @@
     "keycapsss/plaid_pad": {
         "target": "keycapsss/plaid_pad/rev1"
     },
+    "kira75": {
+        "target": "kira/kira75"
+    },
+    "kira80": {
+        "target": "kira/kira80"
+    },
     "kudox": {
         "target": "kumaokobo/kudox/rev1"
     },
diff --git a/keyboards/kira75/config.h b/keyboards/kira/kira75/config.h
index d876570c80..d876570c80 100644
--- a/keyboards/kira75/config.h
+++ b/keyboards/kira/kira75/config.h
diff --git a/keyboards/kira75/info.json b/keyboards/kira/kira75/info.json
index 0a923fa44e..0a923fa44e 100644
--- a/keyboards/kira75/info.json
+++ b/keyboards/kira/kira75/info.json
diff --git a/keyboards/kira75/keymaps/default/keymap.c b/keyboards/kira/kira75/keymaps/default/keymap.c
index e0f5cbe0b7..e0f5cbe0b7 100644
--- a/keyboards/kira75/keymaps/default/keymap.c
+++ b/keyboards/kira/kira75/keymaps/default/keymap.c
diff --git a/keyboards/kira75/keymaps/default/readme.md b/keyboards/kira/kira75/keymaps/default/readme.md
index fcf6f71110..fcf6f71110 100644
--- a/keyboards/kira75/keymaps/default/readme.md
+++ b/keyboards/kira/kira75/keymaps/default/readme.md
diff --git a/keyboards/kira75/kira75.h b/keyboards/kira/kira75/kira75.h
index 8001d69e40..8001d69e40 100644
--- a/keyboards/kira75/kira75.h
+++ b/keyboards/kira/kira75/kira75.h
diff --git a/keyboards/kira75/readme.md b/keyboards/kira/kira75/readme.md
index 5ab0b3f2cc..a30b60d179 100644
--- a/keyboards/kira75/readme.md
+++ b/keyboards/kira/kira75/readme.md
@@ -10,6 +10,6 @@ Hardware Availability: Group Buy
 
 Make example for this keyboard (after setting up your build environment):
 
-    make kira75:default
+    make kira/kira75:default
 
 See [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) then the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information.
diff --git a/keyboards/kira75/rules.mk b/keyboards/kira/kira75/rules.mk
index 609fcf84a8..609fcf84a8 100644
--- a/keyboards/kira75/rules.mk
+++ b/keyboards/kira/kira75/rules.mk
diff --git a/keyboards/kira80/info.json b/keyboards/kira/kira80/info.json
index 0ec9e0b258..0ec9e0b258 100644
--- a/keyboards/kira80/info.json
+++ b/keyboards/kira/kira80/info.json
diff --git a/keyboards/kira80/keymaps/ansi/keymap.c b/keyboards/kira/kira80/keymaps/ansi/keymap.c
index cadda95908..cadda95908 100644
--- a/keyboards/kira80/keymaps/ansi/keymap.c
+++ b/keyboards/kira/kira80/keymaps/ansi/keymap.c
diff --git a/keyboards/kira80/keymaps/ansi/readme.md b/keyboards/kira/kira80/keymaps/ansi/readme.md
index 183eeaf748..183eeaf748 100644
--- a/keyboards/kira80/keymaps/ansi/readme.md
+++ b/keyboards/kira/kira80/keymaps/ansi/readme.md
diff --git a/keyboards/kira80/keymaps/ansi_wkl/keymap.c b/keyboards/kira/kira80/keymaps/ansi_wkl/keymap.c
index d3b1130a11..d3b1130a11 100644
--- a/keyboards/kira80/keymaps/ansi_wkl/keymap.c
+++ b/keyboards/kira/kira80/keymaps/ansi_wkl/keymap.c
diff --git a/keyboards/kira80/keymaps/ansi_wkl/readme.md b/keyboards/kira/kira80/keymaps/ansi_wkl/readme.md
index 6e87b5dca3..6e87b5dca3 100644
--- a/keyboards/kira80/keymaps/ansi_wkl/readme.md
+++ b/keyboards/kira/kira80/keymaps/ansi_wkl/readme.md
diff --git a/keyboards/kira80/keymaps/default/keymap.c b/keyboards/kira/kira80/keymaps/default/keymap.c
index c433b4351c..c433b4351c 100644
--- a/keyboards/kira80/keymaps/default/keymap.c
+++ b/keyboards/kira/kira80/keymaps/default/keymap.c
diff --git a/keyboards/kira80/keymaps/default/readme.md b/keyboards/kira/kira80/keymaps/default/readme.md
index 1441cdf666..1441cdf666 100644
--- a/keyboards/kira80/keymaps/default/readme.md
+++ b/keyboards/kira/kira80/keymaps/default/readme.md
diff --git a/keyboards/kira80/keymaps/iso/keymap.c b/keyboards/kira/kira80/keymaps/iso/keymap.c
index a6502d5ffa..a6502d5ffa 100644
--- a/keyboards/kira80/keymaps/iso/keymap.c
+++ b/keyboards/kira/kira80/keymaps/iso/keymap.c
diff --git a/keyboards/kira80/keymaps/iso/readme.md b/keyboards/kira/kira80/keymaps/iso/readme.md
index 538d1f5945..538d1f5945 100644
--- a/keyboards/kira80/keymaps/iso/readme.md
+++ b/keyboards/kira/kira80/keymaps/iso/readme.md
diff --git a/keyboards/kira80/keymaps/via/keymap.c b/keyboards/kira/kira80/keymaps/via/keymap.c
index ab04b07a0a..ab04b07a0a 100644
--- a/keyboards/kira80/keymaps/via/keymap.c
+++ b/keyboards/kira/kira80/keymaps/via/keymap.c
diff --git a/keyboards/kira80/keymaps/via/readme.md b/keyboards/kira/kira80/keymaps/via/readme.md
index a72e88c8ba..a72e88c8ba 100644
--- a/keyboards/kira80/keymaps/via/readme.md
+++ b/keyboards/kira/kira80/keymaps/via/readme.md
diff --git a/keyboards/kira80/keymaps/via/rules.mk b/keyboards/kira/kira80/keymaps/via/rules.mk
index 36b7ba9cbc..36b7ba9cbc 100644
--- a/keyboards/kira80/keymaps/via/rules.mk
+++ b/keyboards/kira/kira80/keymaps/via/rules.mk
diff --git a/keyboards/kira80/readme.md b/keyboards/kira/kira80/readme.md
index 535e191bf4..c9816a1246 100644
--- a/keyboards/kira80/readme.md
+++ b/keyboards/kira/kira80/readme.md
@@ -11,11 +11,11 @@ Custom TKL keyboard designed and made by Thesiscamper and EVE
 
 Make example for this keyboard (after setting up your build environment):
 
-    make kira80:default
+    make kira/kira80:default
 
 Flashing example for this keyboard ([after setting up the bootloadHID flashing environment](https://docs.qmk.fm/#/flashing_bootloadhid))
 
-    make kira80:default:flash
+    make kira/kira80:default:flash
 
 **Reset Key:** Hold down the key located at `K102`, commonly programmed as 'Pause' while plugging in the keyboard.
 
diff --git a/keyboards/kira80/rules.mk b/keyboards/kira/kira80/rules.mk
index f761646203..f761646203 100644
--- a/keyboards/kira80/rules.mk
+++ b/keyboards/kira/kira80/rules.mk