diff --git a/keyboards/chidori/.noci b/keyboards/kagizaraya/chidori/.noci
similarity index 100%
rename from keyboards/chidori/.noci
rename to keyboards/kagizaraya/chidori/.noci
diff --git a/keyboards/chidori/board.c b/keyboards/kagizaraya/chidori/board.c
similarity index 100%
rename from keyboards/chidori/board.c
rename to keyboards/kagizaraya/chidori/board.c
diff --git a/keyboards/chidori/board.h b/keyboards/kagizaraya/chidori/board.h
similarity index 100%
rename from keyboards/chidori/board.h
rename to keyboards/kagizaraya/chidori/board.h
diff --git a/keyboards/chidori/chidori.c b/keyboards/kagizaraya/chidori/chidori.c
similarity index 100%
rename from keyboards/chidori/chidori.c
rename to keyboards/kagizaraya/chidori/chidori.c
diff --git a/keyboards/chidori/chidori.h b/keyboards/kagizaraya/chidori/chidori.h
similarity index 100%
rename from keyboards/chidori/chidori.h
rename to keyboards/kagizaraya/chidori/chidori.h
diff --git a/keyboards/chidori/config.h b/keyboards/kagizaraya/chidori/config.h
similarity index 100%
rename from keyboards/chidori/config.h
rename to keyboards/kagizaraya/chidori/config.h
diff --git a/keyboards/chidori/info.json b/keyboards/kagizaraya/chidori/info.json
similarity index 100%
rename from keyboards/chidori/info.json
rename to keyboards/kagizaraya/chidori/info.json
diff --git a/keyboards/chidori/keymaps/default/config.h b/keyboards/kagizaraya/chidori/keymaps/default/config.h
similarity index 100%
rename from keyboards/chidori/keymaps/default/config.h
rename to keyboards/kagizaraya/chidori/keymaps/default/config.h
diff --git a/keyboards/chidori/keymaps/default/keymap.c b/keyboards/kagizaraya/chidori/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/chidori/keymaps/default/keymap.c
rename to keyboards/kagizaraya/chidori/keymaps/default/keymap.c
diff --git a/keyboards/chidori/keymaps/default/readme.md b/keyboards/kagizaraya/chidori/keymaps/default/readme.md
similarity index 100%
rename from keyboards/chidori/keymaps/default/readme.md
rename to keyboards/kagizaraya/chidori/keymaps/default/readme.md
diff --git a/keyboards/chidori/keymaps/extended/config.h b/keyboards/kagizaraya/chidori/keymaps/extended/config.h
similarity index 100%
rename from keyboards/chidori/keymaps/extended/config.h
rename to keyboards/kagizaraya/chidori/keymaps/extended/config.h
diff --git a/keyboards/chidori/keymaps/extended/keymap.c b/keyboards/kagizaraya/chidori/keymaps/extended/keymap.c
similarity index 100%
rename from keyboards/chidori/keymaps/extended/keymap.c
rename to keyboards/kagizaraya/chidori/keymaps/extended/keymap.c
diff --git a/keyboards/chidori/keymaps/extended/readme.md b/keyboards/kagizaraya/chidori/keymaps/extended/readme.md
similarity index 100%
rename from keyboards/chidori/keymaps/extended/readme.md
rename to keyboards/kagizaraya/chidori/keymaps/extended/readme.md
diff --git a/keyboards/chidori/keymaps/oled_sample/keymap.c b/keyboards/kagizaraya/chidori/keymaps/oled_sample/keymap.c
similarity index 100%
rename from keyboards/chidori/keymaps/oled_sample/keymap.c
rename to keyboards/kagizaraya/chidori/keymaps/oled_sample/keymap.c
diff --git a/keyboards/chidori/keymaps/oled_sample/readme.md b/keyboards/kagizaraya/chidori/keymaps/oled_sample/readme.md
similarity index 100%
rename from keyboards/chidori/keymaps/oled_sample/readme.md
rename to keyboards/kagizaraya/chidori/keymaps/oled_sample/readme.md
diff --git a/keyboards/chidori/keymaps/oled_sample/rules.mk b/keyboards/kagizaraya/chidori/keymaps/oled_sample/rules.mk
similarity index 100%
rename from keyboards/chidori/keymaps/oled_sample/rules.mk
rename to keyboards/kagizaraya/chidori/keymaps/oled_sample/rules.mk
diff --git a/keyboards/chidori/matrix.c b/keyboards/kagizaraya/chidori/matrix.c
similarity index 100%
rename from keyboards/chidori/matrix.c
rename to keyboards/kagizaraya/chidori/matrix.c
diff --git a/keyboards/chidori/readme.md b/keyboards/kagizaraya/chidori/readme.md
similarity index 94%
rename from keyboards/chidori/readme.md
rename to keyboards/kagizaraya/chidori/readme.md
index d02b50a758..b776583491 100644
--- a/keyboards/chidori/readme.md
+++ b/keyboards/kagizaraya/chidori/readme.md
@@ -10,6 +10,6 @@ Yet another split keyboard made with only through-hole components.
 
 Make example for this keyboard (after setting up your build environment):
 
-    make chidori:default:usbasp
+    make kagizaraya/chidori:default:usbasp
 
 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/chidori/rules.mk b/keyboards/kagizaraya/chidori/rules.mk
similarity index 100%
rename from keyboards/chidori/rules.mk
rename to keyboards/kagizaraya/chidori/rules.mk
diff --git a/keyboards/halberd/config.h b/keyboards/kagizaraya/halberd/config.h
similarity index 100%
rename from keyboards/halberd/config.h
rename to keyboards/kagizaraya/halberd/config.h
diff --git a/keyboards/halberd/halberd.c b/keyboards/kagizaraya/halberd/halberd.c
similarity index 100%
rename from keyboards/halberd/halberd.c
rename to keyboards/kagizaraya/halberd/halberd.c
diff --git a/keyboards/halberd/halberd.h b/keyboards/kagizaraya/halberd/halberd.h
similarity index 100%
rename from keyboards/halberd/halberd.h
rename to keyboards/kagizaraya/halberd/halberd.h
diff --git a/keyboards/halberd/info.json b/keyboards/kagizaraya/halberd/info.json
similarity index 100%
rename from keyboards/halberd/info.json
rename to keyboards/kagizaraya/halberd/info.json
diff --git a/keyboards/halberd/keymaps/default/keymap.c b/keyboards/kagizaraya/halberd/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/halberd/keymaps/default/keymap.c
rename to keyboards/kagizaraya/halberd/keymaps/default/keymap.c
diff --git a/keyboards/halberd/keymaps/default/readme.md b/keyboards/kagizaraya/halberd/keymaps/default/readme.md
similarity index 100%
rename from keyboards/halberd/keymaps/default/readme.md
rename to keyboards/kagizaraya/halberd/keymaps/default/readme.md
diff --git a/keyboards/halberd/keymaps/right_modifiers/keymap.c b/keyboards/kagizaraya/halberd/keymaps/right_modifiers/keymap.c
similarity index 100%
rename from keyboards/halberd/keymaps/right_modifiers/keymap.c
rename to keyboards/kagizaraya/halberd/keymaps/right_modifiers/keymap.c
diff --git a/keyboards/halberd/keymaps/right_modifiers/readme.md b/keyboards/kagizaraya/halberd/keymaps/right_modifiers/readme.md
similarity index 100%
rename from keyboards/halberd/keymaps/right_modifiers/readme.md
rename to keyboards/kagizaraya/halberd/keymaps/right_modifiers/readme.md
diff --git a/keyboards/halberd/readme.md b/keyboards/kagizaraya/halberd/readme.md
similarity index 94%
rename from keyboards/halberd/readme.md
rename to keyboards/kagizaraya/halberd/readme.md
index 7fa0388fda..51c1736996 100644
--- a/keyboards/halberd/readme.md
+++ b/keyboards/kagizaraya/halberd/readme.md
@@ -10,6 +10,6 @@ Hardware Availability: [@kagizaraya](https://twitter.com/kagizaraya)
 
 Make example for this keyboard (after setting up your build environment):
 
-    make halberd:default:dfu
+    make kagizaraya/halberd:default:dfu
 
 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/halberd/rules.mk b/keyboards/kagizaraya/halberd/rules.mk
similarity index 100%
rename from keyboards/halberd/rules.mk
rename to keyboards/kagizaraya/halberd/rules.mk
diff --git a/keyboards/scythe/config.h b/keyboards/kagizaraya/scythe/config.h
similarity index 100%
rename from keyboards/scythe/config.h
rename to keyboards/kagizaraya/scythe/config.h
diff --git a/keyboards/scythe/info.json b/keyboards/kagizaraya/scythe/info.json
similarity index 100%
rename from keyboards/scythe/info.json
rename to keyboards/kagizaraya/scythe/info.json
diff --git a/keyboards/scythe/keymaps/default/keymap.c b/keyboards/kagizaraya/scythe/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/scythe/keymaps/default/keymap.c
rename to keyboards/kagizaraya/scythe/keymaps/default/keymap.c
diff --git a/keyboards/scythe/keymaps/default/readme.md b/keyboards/kagizaraya/scythe/keymaps/default/readme.md
similarity index 100%
rename from keyboards/scythe/keymaps/default/readme.md
rename to keyboards/kagizaraya/scythe/keymaps/default/readme.md
diff --git a/keyboards/scythe/keymaps/forties/keymap.c b/keyboards/kagizaraya/scythe/keymaps/forties/keymap.c
similarity index 100%
rename from keyboards/scythe/keymaps/forties/keymap.c
rename to keyboards/kagizaraya/scythe/keymaps/forties/keymap.c
diff --git a/keyboards/scythe/keymaps/forties/readme.md b/keyboards/kagizaraya/scythe/keymaps/forties/readme.md
similarity index 100%
rename from keyboards/scythe/keymaps/forties/readme.md
rename to keyboards/kagizaraya/scythe/keymaps/forties/readme.md
diff --git a/keyboards/scythe/readme.md b/keyboards/kagizaraya/scythe/readme.md
similarity index 94%
rename from keyboards/scythe/readme.md
rename to keyboards/kagizaraya/scythe/readme.md
index fed4a77e2f..d87b1f82bf 100644
--- a/keyboards/scythe/readme.md
+++ b/keyboards/kagizaraya/scythe/readme.md
@@ -10,6 +10,6 @@ Hardware Availability: [@kagizaraya](https://twitter.com/kagizaraya)
 
 Make example for this keyboard (after setting up your build environment):
 
-    make scythe:default:dfu
+    make kagizaraya/scythe:default:dfu
 
 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/scythe/rules.mk b/keyboards/kagizaraya/scythe/rules.mk
similarity index 100%
rename from keyboards/scythe/rules.mk
rename to keyboards/kagizaraya/scythe/rules.mk
diff --git a/keyboards/scythe/scythe.c b/keyboards/kagizaraya/scythe/scythe.c
similarity index 100%
rename from keyboards/scythe/scythe.c
rename to keyboards/kagizaraya/scythe/scythe.c
diff --git a/keyboards/scythe/scythe.h b/keyboards/kagizaraya/scythe/scythe.h
similarity index 100%
rename from keyboards/scythe/scythe.h
rename to keyboards/kagizaraya/scythe/scythe.h