diff --git a/keyboards/angel17/.noci b/keyboards/kakunpc/angel17/.noci
similarity index 100%
rename from keyboards/angel17/.noci
rename to keyboards/kakunpc/angel17/.noci
diff --git a/keyboards/angel17/alpha/.noci b/keyboards/kakunpc/angel17/alpha/.noci
similarity index 100%
rename from keyboards/angel17/alpha/.noci
rename to keyboards/kakunpc/angel17/alpha/.noci
diff --git a/keyboards/angel17/alpha/alpha.c b/keyboards/kakunpc/angel17/alpha/alpha.c
similarity index 100%
rename from keyboards/angel17/alpha/alpha.c
rename to keyboards/kakunpc/angel17/alpha/alpha.c
diff --git a/keyboards/angel17/alpha/alpha.h b/keyboards/kakunpc/angel17/alpha/alpha.h
similarity index 100%
rename from keyboards/angel17/alpha/alpha.h
rename to keyboards/kakunpc/angel17/alpha/alpha.h
diff --git a/keyboards/angel17/alpha/config.h b/keyboards/kakunpc/angel17/alpha/config.h
similarity index 100%
rename from keyboards/angel17/alpha/config.h
rename to keyboards/kakunpc/angel17/alpha/config.h
diff --git a/keyboards/angel17/alpha/rules.mk b/keyboards/kakunpc/angel17/alpha/rules.mk
similarity index 100%
rename from keyboards/angel17/alpha/rules.mk
rename to keyboards/kakunpc/angel17/alpha/rules.mk
diff --git a/keyboards/angel17/info.json b/keyboards/kakunpc/angel17/info.json
similarity index 100%
rename from keyboards/angel17/info.json
rename to keyboards/kakunpc/angel17/info.json
diff --git a/keyboards/angel17/keymaps/default/keymap.c b/keyboards/kakunpc/angel17/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/angel17/keymaps/default/keymap.c
rename to keyboards/kakunpc/angel17/keymaps/default/keymap.c
diff --git a/keyboards/angel17/keymaps/default/readme.md b/keyboards/kakunpc/angel17/keymaps/default/readme.md
similarity index 100%
rename from keyboards/angel17/keymaps/default/readme.md
rename to keyboards/kakunpc/angel17/keymaps/default/readme.md
diff --git a/keyboards/angel17/readme.md b/keyboards/kakunpc/angel17/readme.md
similarity index 94%
rename from keyboards/angel17/readme.md
rename to keyboards/kakunpc/angel17/readme.md
index 8c9b806685..16914887a6 100644
--- a/keyboards/angel17/readme.md
+++ b/keyboards/kakunpc/angel17/readme.md
@@ -10,6 +10,6 @@ Hardware Availability: booth([@kakunpc](https://kakunpc.booth.pm/))
Make example for this keyboard (after setting up your build environment):
- make angel17:default
+ make kakunpc/angel17/rev1: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/angel17/rev1/config.h b/keyboards/kakunpc/angel17/rev1/config.h
similarity index 100%
rename from keyboards/angel17/rev1/config.h
rename to keyboards/kakunpc/angel17/rev1/config.h
diff --git a/keyboards/angel17/rev1/rev1.c b/keyboards/kakunpc/angel17/rev1/rev1.c
similarity index 100%
rename from keyboards/angel17/rev1/rev1.c
rename to keyboards/kakunpc/angel17/rev1/rev1.c
diff --git a/keyboards/angel17/rev1/rev1.h b/keyboards/kakunpc/angel17/rev1/rev1.h
similarity index 100%
rename from keyboards/angel17/rev1/rev1.h
rename to keyboards/kakunpc/angel17/rev1/rev1.h
diff --git a/keyboards/angel17/rev1/rules.mk b/keyboards/kakunpc/angel17/rev1/rules.mk
similarity index 100%
rename from keyboards/angel17/rev1/rules.mk
rename to keyboards/kakunpc/angel17/rev1/rules.mk
diff --git a/keyboards/angel17/rules.mk b/keyboards/kakunpc/angel17/rules.mk
similarity index 94%
rename from keyboards/angel17/rules.mk
rename to keyboards/kakunpc/angel17/rules.mk
index 6c73399ec1..35c999d465 100644
--- a/keyboards/angel17/rules.mk
+++ b/keyboards/kakunpc/angel17/rules.mk
@@ -19,4 +19,4 @@ AUDIO_ENABLE = no # Audio output
LAYOUTS = numpad_5x4
-DEFAULT_FOLDER = angel17/rev1
+DEFAULT_FOLDER = kakunpc/angel17/rev1
diff --git a/keyboards/angel64/.noci b/keyboards/kakunpc/angel64/.noci
similarity index 100%
rename from keyboards/angel64/.noci
rename to keyboards/kakunpc/angel64/.noci
diff --git a/keyboards/angel64/alpha/.noci b/keyboards/kakunpc/angel64/alpha/.noci
similarity index 100%
rename from keyboards/angel64/alpha/.noci
rename to keyboards/kakunpc/angel64/alpha/.noci
diff --git a/keyboards/angel64/alpha/alpha.c b/keyboards/kakunpc/angel64/alpha/alpha.c
similarity index 100%
rename from keyboards/angel64/alpha/alpha.c
rename to keyboards/kakunpc/angel64/alpha/alpha.c
diff --git a/keyboards/angel64/alpha/alpha.h b/keyboards/kakunpc/angel64/alpha/alpha.h
similarity index 100%
rename from keyboards/angel64/alpha/alpha.h
rename to keyboards/kakunpc/angel64/alpha/alpha.h
diff --git a/keyboards/angel64/alpha/config.h b/keyboards/kakunpc/angel64/alpha/config.h
similarity index 100%
rename from keyboards/angel64/alpha/config.h
rename to keyboards/kakunpc/angel64/alpha/config.h
diff --git a/keyboards/angel64/alpha/info.json b/keyboards/kakunpc/angel64/alpha/info.json
similarity index 100%
rename from keyboards/angel64/alpha/info.json
rename to keyboards/kakunpc/angel64/alpha/info.json
diff --git a/keyboards/angel64/alpha/keymaps/default/keymap.c b/keyboards/kakunpc/angel64/alpha/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/angel64/alpha/keymaps/default/keymap.c
rename to keyboards/kakunpc/angel64/alpha/keymaps/default/keymap.c
diff --git a/keyboards/angel64/alpha/keymaps/default/readme.md b/keyboards/kakunpc/angel64/alpha/keymaps/default/readme.md
similarity index 100%
rename from keyboards/angel64/alpha/keymaps/default/readme.md
rename to keyboards/kakunpc/angel64/alpha/keymaps/default/readme.md
diff --git a/keyboards/angel64/alpha/matrix.c b/keyboards/kakunpc/angel64/alpha/matrix.c
similarity index 100%
rename from keyboards/angel64/alpha/matrix.c
rename to keyboards/kakunpc/angel64/alpha/matrix.c
diff --git a/keyboards/angel64/alpha/readme.md b/keyboards/kakunpc/angel64/alpha/readme.md
similarity index 94%
rename from keyboards/angel64/alpha/readme.md
rename to keyboards/kakunpc/angel64/alpha/readme.md
index d646edeb7e..4de66e6706 100644
--- a/keyboards/angel64/alpha/readme.md
+++ b/keyboards/kakunpc/angel64/alpha/readme.md
@@ -10,6 +10,6 @@ Keyboard for tablets.
Make example for this keyboard (after setting up your build environment):
- make angel64/alpha:default
+ make kakunpc/angel64/alpha: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/angel64/alpha/rules.mk b/keyboards/kakunpc/angel64/alpha/rules.mk
similarity index 100%
rename from keyboards/angel64/alpha/rules.mk
rename to keyboards/kakunpc/angel64/alpha/rules.mk
diff --git a/keyboards/angel64/readme.md b/keyboards/kakunpc/angel64/readme.md
similarity index 94%
rename from keyboards/angel64/readme.md
rename to keyboards/kakunpc/angel64/readme.md
index 791620144e..41f8233afb 100644
--- a/keyboards/angel64/readme.md
+++ b/keyboards/kakunpc/angel64/readme.md
@@ -10,6 +10,6 @@ Keyboard for tablets.
Make example for this keyboard (after setting up your build environment):
- make angel64:default
+ make kakunpc/angel64/rev1: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/angel64/rev1/config.h b/keyboards/kakunpc/angel64/rev1/config.h
similarity index 100%
rename from keyboards/angel64/rev1/config.h
rename to keyboards/kakunpc/angel64/rev1/config.h
diff --git a/keyboards/angel64/rev1/info.json b/keyboards/kakunpc/angel64/rev1/info.json
similarity index 100%
rename from keyboards/angel64/rev1/info.json
rename to keyboards/kakunpc/angel64/rev1/info.json
diff --git a/keyboards/angel64/rev1/keymaps/default/keymap.c b/keyboards/kakunpc/angel64/rev1/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/angel64/rev1/keymaps/default/keymap.c
rename to keyboards/kakunpc/angel64/rev1/keymaps/default/keymap.c
diff --git a/keyboards/angel64/rev1/keymaps/default/readme.md b/keyboards/kakunpc/angel64/rev1/keymaps/default/readme.md
similarity index 100%
rename from keyboards/angel64/rev1/keymaps/default/readme.md
rename to keyboards/kakunpc/angel64/rev1/keymaps/default/readme.md
diff --git a/keyboards/angel64/rev1/keymaps/kakunpc/config.h b/keyboards/kakunpc/angel64/rev1/keymaps/kakunpc/config.h
similarity index 100%
rename from keyboards/angel64/rev1/keymaps/kakunpc/config.h
rename to keyboards/kakunpc/angel64/rev1/keymaps/kakunpc/config.h
diff --git a/keyboards/angel64/rev1/keymaps/kakunpc/keymap.c b/keyboards/kakunpc/angel64/rev1/keymaps/kakunpc/keymap.c
similarity index 100%
rename from keyboards/angel64/rev1/keymaps/kakunpc/keymap.c
rename to keyboards/kakunpc/angel64/rev1/keymaps/kakunpc/keymap.c
diff --git a/keyboards/angel64/rev1/keymaps/kakunpc/readme.md b/keyboards/kakunpc/angel64/rev1/keymaps/kakunpc/readme.md
similarity index 100%
rename from keyboards/angel64/rev1/keymaps/kakunpc/readme.md
rename to keyboards/kakunpc/angel64/rev1/keymaps/kakunpc/readme.md
diff --git a/keyboards/angel64/rev1/matrix.c b/keyboards/kakunpc/angel64/rev1/matrix.c
similarity index 100%
rename from keyboards/angel64/rev1/matrix.c
rename to keyboards/kakunpc/angel64/rev1/matrix.c
diff --git a/keyboards/angel64/rev1/readme.md b/keyboards/kakunpc/angel64/rev1/readme.md
similarity index 94%
rename from keyboards/angel64/rev1/readme.md
rename to keyboards/kakunpc/angel64/rev1/readme.md
index 4ce77807c9..4809710a43 100644
--- a/keyboards/angel64/rev1/readme.md
+++ b/keyboards/kakunpc/angel64/rev1/readme.md
@@ -10,6 +10,6 @@ Keyboard for tablets.
Make example for this keyboard (after setting up your build environment):
- make angel64/rev1:default
+ make kakunpc/angel64/rev1: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/angel64/rev1/rev1.c b/keyboards/kakunpc/angel64/rev1/rev1.c
similarity index 100%
rename from keyboards/angel64/rev1/rev1.c
rename to keyboards/kakunpc/angel64/rev1/rev1.c
diff --git a/keyboards/angel64/rev1/rev1.h b/keyboards/kakunpc/angel64/rev1/rev1.h
similarity index 100%
rename from keyboards/angel64/rev1/rev1.h
rename to keyboards/kakunpc/angel64/rev1/rev1.h
diff --git a/keyboards/angel64/rev1/rules.mk b/keyboards/kakunpc/angel64/rev1/rules.mk
similarity index 100%
rename from keyboards/angel64/rev1/rules.mk
rename to keyboards/kakunpc/angel64/rev1/rules.mk
diff --git a/keyboards/angel64/rules.mk b/keyboards/kakunpc/angel64/rules.mk
similarity index 94%
rename from keyboards/angel64/rules.mk
rename to keyboards/kakunpc/angel64/rules.mk
index 9bf41a18cc..ca4e93f35c 100644
--- a/keyboards/angel64/rules.mk
+++ b/keyboards/kakunpc/angel64/rules.mk
@@ -22,4 +22,4 @@ CUSTOM_MATRIX = yes
SRC += matrix.c
-DEFAULT_FOLDER = angel64/rev1
+DEFAULT_FOLDER = kakunpc/angel64/rev1
diff --git a/keyboards/business_card/.noci b/keyboards/kakunpc/business_card/.noci
similarity index 100%
rename from keyboards/business_card/.noci
rename to keyboards/kakunpc/business_card/.noci
diff --git a/keyboards/business_card/alpha/.noci b/keyboards/kakunpc/business_card/alpha/.noci
similarity index 100%
rename from keyboards/business_card/alpha/.noci
rename to keyboards/kakunpc/business_card/alpha/.noci
diff --git a/keyboards/business_card/alpha/alpha.c b/keyboards/kakunpc/business_card/alpha/alpha.c
similarity index 100%
rename from keyboards/business_card/alpha/alpha.c
rename to keyboards/kakunpc/business_card/alpha/alpha.c
diff --git a/keyboards/business_card/alpha/alpha.h b/keyboards/kakunpc/business_card/alpha/alpha.h
similarity index 100%
rename from keyboards/business_card/alpha/alpha.h
rename to keyboards/kakunpc/business_card/alpha/alpha.h
diff --git a/keyboards/business_card/alpha/config.h b/keyboards/kakunpc/business_card/alpha/config.h
similarity index 100%
rename from keyboards/business_card/alpha/config.h
rename to keyboards/kakunpc/business_card/alpha/config.h
diff --git a/keyboards/business_card/alpha/info.json b/keyboards/kakunpc/business_card/alpha/info.json
similarity index 100%
rename from keyboards/business_card/alpha/info.json
rename to keyboards/kakunpc/business_card/alpha/info.json
diff --git a/keyboards/business_card/alpha/keymaps/default/config.h b/keyboards/kakunpc/business_card/alpha/keymaps/default/config.h
similarity index 100%
rename from keyboards/business_card/alpha/keymaps/default/config.h
rename to keyboards/kakunpc/business_card/alpha/keymaps/default/config.h
diff --git a/keyboards/business_card/alpha/keymaps/default/keymap.c b/keyboards/kakunpc/business_card/alpha/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/business_card/alpha/keymaps/default/keymap.c
rename to keyboards/kakunpc/business_card/alpha/keymaps/default/keymap.c
diff --git a/keyboards/business_card/alpha/keymaps/default/readme.md b/keyboards/kakunpc/business_card/alpha/keymaps/default/readme.md
similarity index 100%
rename from keyboards/business_card/alpha/keymaps/default/readme.md
rename to keyboards/kakunpc/business_card/alpha/keymaps/default/readme.md
diff --git a/keyboards/business_card/alpha/rules.mk b/keyboards/kakunpc/business_card/alpha/rules.mk
similarity index 100%
rename from keyboards/business_card/alpha/rules.mk
rename to keyboards/kakunpc/business_card/alpha/rules.mk
diff --git a/keyboards/business_card/beta/beta.c b/keyboards/kakunpc/business_card/beta/beta.c
similarity index 100%
rename from keyboards/business_card/beta/beta.c
rename to keyboards/kakunpc/business_card/beta/beta.c
diff --git a/keyboards/business_card/beta/beta.h b/keyboards/kakunpc/business_card/beta/beta.h
similarity index 100%
rename from keyboards/business_card/beta/beta.h
rename to keyboards/kakunpc/business_card/beta/beta.h
diff --git a/keyboards/business_card/beta/config.h b/keyboards/kakunpc/business_card/beta/config.h
similarity index 100%
rename from keyboards/business_card/beta/config.h
rename to keyboards/kakunpc/business_card/beta/config.h
diff --git a/keyboards/business_card/beta/info.json b/keyboards/kakunpc/business_card/beta/info.json
similarity index 100%
rename from keyboards/business_card/beta/info.json
rename to keyboards/kakunpc/business_card/beta/info.json
diff --git a/keyboards/business_card/beta/keymaps/default/config.h b/keyboards/kakunpc/business_card/beta/keymaps/default/config.h
similarity index 100%
rename from keyboards/business_card/beta/keymaps/default/config.h
rename to keyboards/kakunpc/business_card/beta/keymaps/default/config.h
diff --git a/keyboards/business_card/beta/keymaps/default/keymap.c b/keyboards/kakunpc/business_card/beta/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/business_card/beta/keymaps/default/keymap.c
rename to keyboards/kakunpc/business_card/beta/keymaps/default/keymap.c
diff --git a/keyboards/business_card/beta/keymaps/default/readme.md b/keyboards/kakunpc/business_card/beta/keymaps/default/readme.md
similarity index 100%
rename from keyboards/business_card/beta/keymaps/default/readme.md
rename to keyboards/kakunpc/business_card/beta/keymaps/default/readme.md
diff --git a/keyboards/business_card/beta/rules.mk b/keyboards/kakunpc/business_card/beta/rules.mk
similarity index 100%
rename from keyboards/business_card/beta/rules.mk
rename to keyboards/kakunpc/business_card/beta/rules.mk
diff --git a/keyboards/business_card/business_card.c b/keyboards/kakunpc/business_card/business_card.c
similarity index 100%
rename from keyboards/business_card/business_card.c
rename to keyboards/kakunpc/business_card/business_card.c
diff --git a/keyboards/business_card/business_card.h b/keyboards/kakunpc/business_card/business_card.h
similarity index 89%
rename from keyboards/business_card/business_card.h
rename to keyboards/kakunpc/business_card/business_card.h
index f330a01822..125c3080d6 100644
--- a/keyboards/business_card/business_card.h
+++ b/keyboards/kakunpc/business_card/business_card.h
@@ -15,10 +15,10 @@
*/
#pragma once
-#ifdef KEYBOARD_business_card_alpha
+#ifdef KEYBOARD_kakunpc_business_card_alpha
#include "alpha.h"
#endif
-#ifdef KEYBOARD_business_card_beta
+#ifdef KEYBOARD_kakunpc_business_card_beta
#include "beta.h"
#endif
diff --git a/keyboards/business_card/config.h b/keyboards/kakunpc/business_card/config.h
similarity index 100%
rename from keyboards/business_card/config.h
rename to keyboards/kakunpc/business_card/config.h
diff --git a/keyboards/business_card/readme.md b/keyboards/kakunpc/business_card/readme.md
similarity index 93%
rename from keyboards/business_card/readme.md
rename to keyboards/kakunpc/business_card/readme.md
index c1bb32c9c3..cbd05af410 100644
--- a/keyboards/business_card/readme.md
+++ b/keyboards/kakunpc/business_card/readme.md
@@ -10,6 +10,6 @@ Hardware Availability: links to where you can find this hardware
Make example for this keyboard (after setting up your build environment):
- make business_card:default
+ make kakunpc/business_card/beta: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/business_card/rules.mk b/keyboards/kakunpc/business_card/rules.mk
similarity index 93%
rename from keyboards/business_card/rules.mk
rename to keyboards/kakunpc/business_card/rules.mk
index cda401220e..ad9ea936af 100644
--- a/keyboards/business_card/rules.mk
+++ b/keyboards/kakunpc/business_card/rules.mk
@@ -17,4 +17,4 @@ BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow
AUDIO_ENABLE = no # Audio output
-DEFAULT_FOLDER = business_card/beta
+DEFAULT_FOLDER = kakunpc/business_card/beta
diff --git a/keyboards/choc_taro/choc_taro.c b/keyboards/kakunpc/choc_taro/choc_taro.c
similarity index 100%
rename from keyboards/choc_taro/choc_taro.c
rename to keyboards/kakunpc/choc_taro/choc_taro.c
diff --git a/keyboards/choc_taro/choc_taro.h b/keyboards/kakunpc/choc_taro/choc_taro.h
similarity index 100%
rename from keyboards/choc_taro/choc_taro.h
rename to keyboards/kakunpc/choc_taro/choc_taro.h
diff --git a/keyboards/choc_taro/config.h b/keyboards/kakunpc/choc_taro/config.h
similarity index 100%
rename from keyboards/choc_taro/config.h
rename to keyboards/kakunpc/choc_taro/config.h
diff --git a/keyboards/choc_taro/info.json b/keyboards/kakunpc/choc_taro/info.json
similarity index 100%
rename from keyboards/choc_taro/info.json
rename to keyboards/kakunpc/choc_taro/info.json
diff --git a/keyboards/choc_taro/keymaps/default/keymap.c b/keyboards/kakunpc/choc_taro/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/choc_taro/keymaps/default/keymap.c
rename to keyboards/kakunpc/choc_taro/keymaps/default/keymap.c
diff --git a/keyboards/choc_taro/keymaps/default/readme.md b/keyboards/kakunpc/choc_taro/keymaps/default/readme.md
similarity index 100%
rename from keyboards/choc_taro/keymaps/default/readme.md
rename to keyboards/kakunpc/choc_taro/keymaps/default/readme.md
diff --git a/keyboards/choc_taro/keymaps/via/keymap.c b/keyboards/kakunpc/choc_taro/keymaps/via/keymap.c
similarity index 100%
rename from keyboards/choc_taro/keymaps/via/keymap.c
rename to keyboards/kakunpc/choc_taro/keymaps/via/keymap.c
diff --git a/keyboards/choc_taro/keymaps/via/readme.md b/keyboards/kakunpc/choc_taro/keymaps/via/readme.md
similarity index 100%
rename from keyboards/choc_taro/keymaps/via/readme.md
rename to keyboards/kakunpc/choc_taro/keymaps/via/readme.md
diff --git a/keyboards/choc_taro/keymaps/via/rules.mk b/keyboards/kakunpc/choc_taro/keymaps/via/rules.mk
similarity index 100%
rename from keyboards/choc_taro/keymaps/via/rules.mk
rename to keyboards/kakunpc/choc_taro/keymaps/via/rules.mk
diff --git a/keyboards/choc_taro/matrix.c b/keyboards/kakunpc/choc_taro/matrix.c
similarity index 100%
rename from keyboards/choc_taro/matrix.c
rename to keyboards/kakunpc/choc_taro/matrix.c
diff --git a/keyboards/choc_taro/readme.md b/keyboards/kakunpc/choc_taro/readme.md
similarity index 94%
rename from keyboards/choc_taro/readme.md
rename to keyboards/kakunpc/choc_taro/readme.md
index f0900c2fe4..8e641c72b8 100644
--- a/keyboards/choc_taro/readme.md
+++ b/keyboards/kakunpc/choc_taro/readme.md
@@ -10,6 +10,6 @@ gh60 compatible choc keyboard
Make example for this keyboard (after setting up your build environment):
- make choc_taro:default
+ make kakunpc/choc_taro: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/choc_taro/rules.mk b/keyboards/kakunpc/choc_taro/rules.mk
similarity index 100%
rename from keyboards/choc_taro/rules.mk
rename to keyboards/kakunpc/choc_taro/rules.mk
diff --git a/keyboards/rabbit_capture_plan/config.h b/keyboards/kakunpc/rabbit_capture_plan/config.h
similarity index 100%
rename from keyboards/rabbit_capture_plan/config.h
rename to keyboards/kakunpc/rabbit_capture_plan/config.h
diff --git a/keyboards/rabbit_capture_plan/info.json b/keyboards/kakunpc/rabbit_capture_plan/info.json
similarity index 100%
rename from keyboards/rabbit_capture_plan/info.json
rename to keyboards/kakunpc/rabbit_capture_plan/info.json
diff --git a/keyboards/rabbit_capture_plan/keymaps/default/keymap.c b/keyboards/kakunpc/rabbit_capture_plan/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/rabbit_capture_plan/keymaps/default/keymap.c
rename to keyboards/kakunpc/rabbit_capture_plan/keymaps/default/keymap.c
diff --git a/keyboards/rabbit_capture_plan/keymaps/default/readme.md b/keyboards/kakunpc/rabbit_capture_plan/keymaps/default/readme.md
similarity index 100%
rename from keyboards/rabbit_capture_plan/keymaps/default/readme.md
rename to keyboards/kakunpc/rabbit_capture_plan/keymaps/default/readme.md
diff --git a/keyboards/rabbit_capture_plan/keymaps/via/keymap.c b/keyboards/kakunpc/rabbit_capture_plan/keymaps/via/keymap.c
similarity index 100%
rename from keyboards/rabbit_capture_plan/keymaps/via/keymap.c
rename to keyboards/kakunpc/rabbit_capture_plan/keymaps/via/keymap.c
diff --git a/keyboards/rabbit_capture_plan/keymaps/via/readme.md b/keyboards/kakunpc/rabbit_capture_plan/keymaps/via/readme.md
similarity index 100%
rename from keyboards/rabbit_capture_plan/keymaps/via/readme.md
rename to keyboards/kakunpc/rabbit_capture_plan/keymaps/via/readme.md
diff --git a/keyboards/rabbit_capture_plan/keymaps/via/rules.mk b/keyboards/kakunpc/rabbit_capture_plan/keymaps/via/rules.mk
similarity index 100%
rename from keyboards/rabbit_capture_plan/keymaps/via/rules.mk
rename to keyboards/kakunpc/rabbit_capture_plan/keymaps/via/rules.mk
diff --git a/keyboards/rabbit_capture_plan/rabbit_capture_plan.c b/keyboards/kakunpc/rabbit_capture_plan/rabbit_capture_plan.c
similarity index 100%
rename from keyboards/rabbit_capture_plan/rabbit_capture_plan.c
rename to keyboards/kakunpc/rabbit_capture_plan/rabbit_capture_plan.c
diff --git a/keyboards/rabbit_capture_plan/rabbit_capture_plan.h b/keyboards/kakunpc/rabbit_capture_plan/rabbit_capture_plan.h
similarity index 100%
rename from keyboards/rabbit_capture_plan/rabbit_capture_plan.h
rename to keyboards/kakunpc/rabbit_capture_plan/rabbit_capture_plan.h
diff --git a/keyboards/rabbit_capture_plan/readme.md b/keyboards/kakunpc/rabbit_capture_plan/readme.md
similarity index 88%
rename from keyboards/rabbit_capture_plan/readme.md
rename to keyboards/kakunpc/rabbit_capture_plan/readme.md
index bc6f9d5dea..fa80367a12 100644
--- a/keyboards/rabbit_capture_plan/readme.md
+++ b/keyboards/kakunpc/rabbit_capture_plan/readme.md
@@ -10,10 +10,10 @@ This is 70 keys split keyboard with trackball.
Make example for this keyboard (after setting up your build environment):
- make rabbit_capture_plan:default
+ make kakunpc/rabbit_capture_plan:default
Flashing example for this keyboard:
- make rabbit_capture_plan:default:flash
+ make kakunpc/rabbit_capture_plan: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/rabbit_capture_plan/rules.mk b/keyboards/kakunpc/rabbit_capture_plan/rules.mk
similarity index 100%
rename from keyboards/rabbit_capture_plan/rules.mk
rename to keyboards/kakunpc/rabbit_capture_plan/rules.mk
diff --git a/keyboards/suihankey/alpha/alpha.c b/keyboards/kakunpc/suihankey/alpha/alpha.c
similarity index 100%
rename from keyboards/suihankey/alpha/alpha.c
rename to keyboards/kakunpc/suihankey/alpha/alpha.c
diff --git a/keyboards/suihankey/alpha/alpha.h b/keyboards/kakunpc/suihankey/alpha/alpha.h
similarity index 100%
rename from keyboards/suihankey/alpha/alpha.h
rename to keyboards/kakunpc/suihankey/alpha/alpha.h
diff --git a/keyboards/suihankey/alpha/config.h b/keyboards/kakunpc/suihankey/alpha/config.h
similarity index 100%
rename from keyboards/suihankey/alpha/config.h
rename to keyboards/kakunpc/suihankey/alpha/config.h
diff --git a/keyboards/suihankey/alpha/info.json b/keyboards/kakunpc/suihankey/alpha/info.json
similarity index 100%
rename from keyboards/suihankey/alpha/info.json
rename to keyboards/kakunpc/suihankey/alpha/info.json
diff --git a/keyboards/suihankey/alpha/keymaps/default/keymap.c b/keyboards/kakunpc/suihankey/alpha/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/suihankey/alpha/keymaps/default/keymap.c
rename to keyboards/kakunpc/suihankey/alpha/keymaps/default/keymap.c
diff --git a/keyboards/suihankey/alpha/keymaps/default/readme.md b/keyboards/kakunpc/suihankey/alpha/keymaps/default/readme.md
similarity index 100%
rename from keyboards/suihankey/alpha/keymaps/default/readme.md
rename to keyboards/kakunpc/suihankey/alpha/keymaps/default/readme.md
diff --git a/keyboards/suihankey/alpha/readme.md b/keyboards/kakunpc/suihankey/alpha/readme.md
similarity index 100%
rename from keyboards/suihankey/alpha/readme.md
rename to keyboards/kakunpc/suihankey/alpha/readme.md
diff --git a/keyboards/suihankey/alpha/rules.mk b/keyboards/kakunpc/suihankey/alpha/rules.mk
similarity index 100%
rename from keyboards/suihankey/alpha/rules.mk
rename to keyboards/kakunpc/suihankey/alpha/rules.mk
diff --git a/keyboards/suihankey/readme.md b/keyboards/kakunpc/suihankey/readme.md
similarity index 94%
rename from keyboards/suihankey/readme.md
rename to keyboards/kakunpc/suihankey/readme.md
index 29d82323d3..e8099dbca4 100644
--- a/keyboards/suihankey/readme.md
+++ b/keyboards/kakunpc/suihankey/readme.md
@@ -13,6 +13,6 @@ Hardware Availability: booth([@kakunpc](https://kakunpc.booth.pm/))
Make example for this keyboard (after setting up your build environment):
- make suihankey:default
+ make kakunpc/suihankey/rev1: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/suihankey/rev1/config.h b/keyboards/kakunpc/suihankey/rev1/config.h
similarity index 100%
rename from keyboards/suihankey/rev1/config.h
rename to keyboards/kakunpc/suihankey/rev1/config.h
diff --git a/keyboards/suihankey/rev1/info.json b/keyboards/kakunpc/suihankey/rev1/info.json
similarity index 100%
rename from keyboards/suihankey/rev1/info.json
rename to keyboards/kakunpc/suihankey/rev1/info.json
diff --git a/keyboards/suihankey/rev1/keymaps/default/keymap.c b/keyboards/kakunpc/suihankey/rev1/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/suihankey/rev1/keymaps/default/keymap.c
rename to keyboards/kakunpc/suihankey/rev1/keymaps/default/keymap.c
diff --git a/keyboards/suihankey/rev1/keymaps/default/readme.md b/keyboards/kakunpc/suihankey/rev1/keymaps/default/readme.md
similarity index 100%
rename from keyboards/suihankey/rev1/keymaps/default/readme.md
rename to keyboards/kakunpc/suihankey/rev1/keymaps/default/readme.md
diff --git a/keyboards/suihankey/rev1/readme.md b/keyboards/kakunpc/suihankey/rev1/readme.md
similarity index 100%
rename from keyboards/suihankey/rev1/readme.md
rename to keyboards/kakunpc/suihankey/rev1/readme.md
diff --git a/keyboards/suihankey/rev1/rev1.c b/keyboards/kakunpc/suihankey/rev1/rev1.c
similarity index 100%
rename from keyboards/suihankey/rev1/rev1.c
rename to keyboards/kakunpc/suihankey/rev1/rev1.c
diff --git a/keyboards/suihankey/rev1/rev1.h b/keyboards/kakunpc/suihankey/rev1/rev1.h
similarity index 100%
rename from keyboards/suihankey/rev1/rev1.h
rename to keyboards/kakunpc/suihankey/rev1/rev1.h
diff --git a/keyboards/suihankey/rev1/rules.mk b/keyboards/kakunpc/suihankey/rev1/rules.mk
similarity index 100%
rename from keyboards/suihankey/rev1/rules.mk
rename to keyboards/kakunpc/suihankey/rev1/rules.mk
diff --git a/keyboards/suihankey/rules.mk b/keyboards/kakunpc/suihankey/rules.mk
similarity index 94%
rename from keyboards/suihankey/rules.mk
rename to keyboards/kakunpc/suihankey/rules.mk
index 8e1e7f7856..332c7d7355 100644
--- a/keyboards/suihankey/rules.mk
+++ b/keyboards/kakunpc/suihankey/rules.mk
@@ -20,4 +20,4 @@ OLED_ENABLE = yes
OLED_DRIVER = SSD1306
SPLIT_KEYBOARD = no
-DEFAULT_FOLDER = suihankey/rev1
+DEFAULT_FOLDER = kakunpc/suihankey/rev1
diff --git a/keyboards/suihankey/split/.noci b/keyboards/kakunpc/suihankey/split/.noci
similarity index 100%
rename from keyboards/suihankey/split/.noci
rename to keyboards/kakunpc/suihankey/split/.noci
diff --git a/keyboards/suihankey/split/alpha/.noci b/keyboards/kakunpc/suihankey/split/alpha/.noci
similarity index 100%
rename from keyboards/suihankey/split/alpha/.noci
rename to keyboards/kakunpc/suihankey/split/alpha/.noci
diff --git a/keyboards/suihankey/split/alpha/alpha.c b/keyboards/kakunpc/suihankey/split/alpha/alpha.c
similarity index 100%
rename from keyboards/suihankey/split/alpha/alpha.c
rename to keyboards/kakunpc/suihankey/split/alpha/alpha.c
diff --git a/keyboards/suihankey/split/alpha/alpha.h b/keyboards/kakunpc/suihankey/split/alpha/alpha.h
similarity index 100%
rename from keyboards/suihankey/split/alpha/alpha.h
rename to keyboards/kakunpc/suihankey/split/alpha/alpha.h
diff --git a/keyboards/suihankey/split/alpha/config.h b/keyboards/kakunpc/suihankey/split/alpha/config.h
similarity index 100%
rename from keyboards/suihankey/split/alpha/config.h
rename to keyboards/kakunpc/suihankey/split/alpha/config.h
diff --git a/keyboards/suihankey/split/alpha/readme.md b/keyboards/kakunpc/suihankey/split/alpha/readme.md
similarity index 94%
rename from keyboards/suihankey/split/alpha/readme.md
rename to keyboards/kakunpc/suihankey/split/alpha/readme.md
index 2ea1503eb3..4a26a34b97 100644
--- a/keyboards/suihankey/split/alpha/readme.md
+++ b/keyboards/kakunpc/suihankey/split/alpha/readme.md
@@ -13,6 +13,6 @@ Hardware Availability: booth([@kakunpc](https://kakunpc.booth.pm/))
Make example for this keyboard (after setting up your build environment):
- make suihankey/alpha:default
+ make kakunpc/suihankey/alpha: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/suihankey/split/alpha/rules.mk b/keyboards/kakunpc/suihankey/split/alpha/rules.mk
similarity index 100%
rename from keyboards/suihankey/split/alpha/rules.mk
rename to keyboards/kakunpc/suihankey/split/alpha/rules.mk
diff --git a/keyboards/suihankey/split/info.json b/keyboards/kakunpc/suihankey/split/info.json
similarity index 100%
rename from keyboards/suihankey/split/info.json
rename to keyboards/kakunpc/suihankey/split/info.json
diff --git a/keyboards/suihankey/split/keymaps/default/keymap.c b/keyboards/kakunpc/suihankey/split/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/suihankey/split/keymaps/default/keymap.c
rename to keyboards/kakunpc/suihankey/split/keymaps/default/keymap.c
diff --git a/keyboards/suihankey/split/keymaps/default/readme.md b/keyboards/kakunpc/suihankey/split/keymaps/default/readme.md
similarity index 100%
rename from keyboards/suihankey/split/keymaps/default/readme.md
rename to keyboards/kakunpc/suihankey/split/keymaps/default/readme.md
diff --git a/keyboards/suihankey/split/readme.md b/keyboards/kakunpc/suihankey/split/readme.md
similarity index 94%
rename from keyboards/suihankey/split/readme.md
rename to keyboards/kakunpc/suihankey/split/readme.md
index 34d30580d1..ed2058290b 100644
--- a/keyboards/suihankey/split/readme.md
+++ b/keyboards/kakunpc/suihankey/split/readme.md
@@ -13,6 +13,6 @@ Hardware Availability: booth([@kakunpc](https://kakunpc.booth.pm/))
Make example for this keyboard (after setting up your build environment):
- make suihankey/split:default
+ make kakunpc/suihankey/split: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/suihankey/split/rev1/config.h b/keyboards/kakunpc/suihankey/split/rev1/config.h
similarity index 100%
rename from keyboards/suihankey/split/rev1/config.h
rename to keyboards/kakunpc/suihankey/split/rev1/config.h
diff --git a/keyboards/suihankey/split/rev1/readme.md b/keyboards/kakunpc/suihankey/split/rev1/readme.md
similarity index 94%
rename from keyboards/suihankey/split/rev1/readme.md
rename to keyboards/kakunpc/suihankey/split/rev1/readme.md
index f7c4bce166..a4e60fe1b9 100644
--- a/keyboards/suihankey/split/rev1/readme.md
+++ b/keyboards/kakunpc/suihankey/split/rev1/readme.md
@@ -13,6 +13,6 @@ Hardware Availability: booth([@kakunpc](https://kakunpc.booth.pm/))
Make example for this keyboard (after setting up your build environment):
- make suihankey/rev1:default
+ make kakunpc/suihankey/rev1: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/suihankey/split/rev1/rev1.c b/keyboards/kakunpc/suihankey/split/rev1/rev1.c
similarity index 100%
rename from keyboards/suihankey/split/rev1/rev1.c
rename to keyboards/kakunpc/suihankey/split/rev1/rev1.c
diff --git a/keyboards/suihankey/split/rev1/rev1.h b/keyboards/kakunpc/suihankey/split/rev1/rev1.h
similarity index 100%
rename from keyboards/suihankey/split/rev1/rev1.h
rename to keyboards/kakunpc/suihankey/split/rev1/rev1.h
diff --git a/keyboards/suihankey/split/rev1/rules.mk b/keyboards/kakunpc/suihankey/split/rev1/rules.mk
similarity index 100%
rename from keyboards/suihankey/split/rev1/rules.mk
rename to keyboards/kakunpc/suihankey/split/rev1/rules.mk
diff --git a/keyboards/suihankey/split/rules.mk b/keyboards/kakunpc/suihankey/split/rules.mk
similarity index 100%
rename from keyboards/suihankey/split/rules.mk
rename to keyboards/kakunpc/suihankey/split/rules.mk
diff --git a/keyboards/thedogkeyboard/config.h b/keyboards/kakunpc/thedogkeyboard/config.h
similarity index 100%
rename from keyboards/thedogkeyboard/config.h
rename to keyboards/kakunpc/thedogkeyboard/config.h
diff --git a/keyboards/thedogkeyboard/info.json b/keyboards/kakunpc/thedogkeyboard/info.json
similarity index 100%
rename from keyboards/thedogkeyboard/info.json
rename to keyboards/kakunpc/thedogkeyboard/info.json
diff --git a/keyboards/thedogkeyboard/keymaps/default/keymap.c b/keyboards/kakunpc/thedogkeyboard/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/thedogkeyboard/keymaps/default/keymap.c
rename to keyboards/kakunpc/thedogkeyboard/keymaps/default/keymap.c
diff --git a/keyboards/thedogkeyboard/keymaps/default/readme.md b/keyboards/kakunpc/thedogkeyboard/keymaps/default/readme.md
similarity index 100%
rename from keyboards/thedogkeyboard/keymaps/default/readme.md
rename to keyboards/kakunpc/thedogkeyboard/keymaps/default/readme.md
diff --git a/keyboards/thedogkeyboard/keymaps/kakunpc/keymap.c b/keyboards/kakunpc/thedogkeyboard/keymaps/kakunpc/keymap.c
similarity index 100%
rename from keyboards/thedogkeyboard/keymaps/kakunpc/keymap.c
rename to keyboards/kakunpc/thedogkeyboard/keymaps/kakunpc/keymap.c
diff --git a/keyboards/thedogkeyboard/keymaps/kakunpc/readme.md b/keyboards/kakunpc/thedogkeyboard/keymaps/kakunpc/readme.md
similarity index 100%
rename from keyboards/thedogkeyboard/keymaps/kakunpc/readme.md
rename to keyboards/kakunpc/thedogkeyboard/keymaps/kakunpc/readme.md
diff --git a/keyboards/thedogkeyboard/matrix.c b/keyboards/kakunpc/thedogkeyboard/matrix.c
similarity index 100%
rename from keyboards/thedogkeyboard/matrix.c
rename to keyboards/kakunpc/thedogkeyboard/matrix.c
diff --git a/keyboards/thedogkeyboard/readme.md b/keyboards/kakunpc/thedogkeyboard/readme.md
similarity index 94%
rename from keyboards/thedogkeyboard/readme.md
rename to keyboards/kakunpc/thedogkeyboard/readme.md
index 789149ca82..c3f73c5303 100644
--- a/keyboards/thedogkeyboard/readme.md
+++ b/keyboards/kakunpc/thedogkeyboard/readme.md
@@ -10,6 +10,6 @@ ProMicro 100% Keyboard.
Make example for this keyboard (after setting up your build environment):
- make thedogkeyboard:default
+ make kakunpc/thedogkeyboard: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/thedogkeyboard/rules.mk b/keyboards/kakunpc/thedogkeyboard/rules.mk
similarity index 100%
rename from keyboards/thedogkeyboard/rules.mk
rename to keyboards/kakunpc/thedogkeyboard/rules.mk
diff --git a/keyboards/thedogkeyboard/thedogkeyboard.c b/keyboards/kakunpc/thedogkeyboard/thedogkeyboard.c
similarity index 100%
rename from keyboards/thedogkeyboard/thedogkeyboard.c
rename to keyboards/kakunpc/thedogkeyboard/thedogkeyboard.c
diff --git a/keyboards/thedogkeyboard/thedogkeyboard.h b/keyboards/kakunpc/thedogkeyboard/thedogkeyboard.h
similarity index 100%
rename from keyboards/thedogkeyboard/thedogkeyboard.h
rename to keyboards/kakunpc/thedogkeyboard/thedogkeyboard.h