diff --git a/keyboards/bm16a/bm16a.c b/keyboards/kprepublic/bm16a/bm16a.c
similarity index 100%
rename from keyboards/bm16a/bm16a.c
rename to keyboards/kprepublic/bm16a/bm16a.c
diff --git a/keyboards/bm16a/bm16a.h b/keyboards/kprepublic/bm16a/bm16a.h
similarity index 100%
rename from keyboards/bm16a/bm16a.h
rename to keyboards/kprepublic/bm16a/bm16a.h
diff --git a/keyboards/bm16a/config.h b/keyboards/kprepublic/bm16a/config.h
similarity index 100%
rename from keyboards/bm16a/config.h
rename to keyboards/kprepublic/bm16a/config.h
diff --git a/keyboards/bm16a/info.json b/keyboards/kprepublic/bm16a/info.json
similarity index 100%
rename from keyboards/bm16a/info.json
rename to keyboards/kprepublic/bm16a/info.json
diff --git a/keyboards/bm16a/keymaps/default/config.h b/keyboards/kprepublic/bm16a/keymaps/default/config.h
similarity index 100%
rename from keyboards/bm16a/keymaps/default/config.h
rename to keyboards/kprepublic/bm16a/keymaps/default/config.h
diff --git a/keyboards/bm16a/keymaps/default/keymap.c b/keyboards/kprepublic/bm16a/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/bm16a/keymaps/default/keymap.c
rename to keyboards/kprepublic/bm16a/keymaps/default/keymap.c
diff --git a/keyboards/bm16a/keymaps/default/readme.md b/keyboards/kprepublic/bm16a/keymaps/default/readme.md
similarity index 100%
rename from keyboards/bm16a/keymaps/default/readme.md
rename to keyboards/kprepublic/bm16a/keymaps/default/readme.md
diff --git a/keyboards/bm16a/keymaps/factory/keymap.c b/keyboards/kprepublic/bm16a/keymaps/factory/keymap.c
similarity index 100%
rename from keyboards/bm16a/keymaps/factory/keymap.c
rename to keyboards/kprepublic/bm16a/keymaps/factory/keymap.c
diff --git a/keyboards/bm16a/keymaps/factory/readme.md b/keyboards/kprepublic/bm16a/keymaps/factory/readme.md
similarity index 100%
rename from keyboards/bm16a/keymaps/factory/readme.md
rename to keyboards/kprepublic/bm16a/keymaps/factory/readme.md
diff --git a/keyboards/bm16a/keymaps/via/keymap.c b/keyboards/kprepublic/bm16a/keymaps/via/keymap.c
similarity index 100%
rename from keyboards/bm16a/keymaps/via/keymap.c
rename to keyboards/kprepublic/bm16a/keymaps/via/keymap.c
diff --git a/keyboards/bm16a/keymaps/via/readme.md b/keyboards/kprepublic/bm16a/keymaps/via/readme.md
similarity index 100%
rename from keyboards/bm16a/keymaps/via/readme.md
rename to keyboards/kprepublic/bm16a/keymaps/via/readme.md
diff --git a/keyboards/bm16a/keymaps/via/rules.mk b/keyboards/kprepublic/bm16a/keymaps/via/rules.mk
similarity index 100%
rename from keyboards/bm16a/keymaps/via/rules.mk
rename to keyboards/kprepublic/bm16a/keymaps/via/rules.mk
diff --git a/keyboards/bm16a/readme.md b/keyboards/kprepublic/bm16a/readme.md
similarity index 100%
rename from keyboards/bm16a/readme.md
rename to keyboards/kprepublic/bm16a/readme.md
diff --git a/keyboards/bm16a/rules.mk b/keyboards/kprepublic/bm16a/rules.mk
similarity index 100%
rename from keyboards/bm16a/rules.mk
rename to keyboards/kprepublic/bm16a/rules.mk
diff --git a/keyboards/bm16s/bm16s.h b/keyboards/kprepublic/bm16s/bm16s.h
similarity index 100%
rename from keyboards/bm16s/bm16s.h
rename to keyboards/kprepublic/bm16s/bm16s.h
diff --git a/keyboards/bm16s/config.h b/keyboards/kprepublic/bm16s/config.h
similarity index 100%
rename from keyboards/bm16s/config.h
rename to keyboards/kprepublic/bm16s/config.h
diff --git a/keyboards/bm16s/info.json b/keyboards/kprepublic/bm16s/info.json
similarity index 100%
rename from keyboards/bm16s/info.json
rename to keyboards/kprepublic/bm16s/info.json
diff --git a/keyboards/bm16s/keymaps/default/keymap.c b/keyboards/kprepublic/bm16s/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/bm16s/keymaps/default/keymap.c
rename to keyboards/kprepublic/bm16s/keymaps/default/keymap.c
diff --git a/keyboards/bm16s/keymaps/media/keymap.c b/keyboards/kprepublic/bm16s/keymaps/media/keymap.c
similarity index 100%
rename from keyboards/bm16s/keymaps/media/keymap.c
rename to keyboards/kprepublic/bm16s/keymaps/media/keymap.c
diff --git a/keyboards/bm16s/keymaps/via/keymap.c b/keyboards/kprepublic/bm16s/keymaps/via/keymap.c
similarity index 100%
rename from keyboards/bm16s/keymaps/via/keymap.c
rename to keyboards/kprepublic/bm16s/keymaps/via/keymap.c
diff --git a/keyboards/bm16s/keymaps/via/readme.md b/keyboards/kprepublic/bm16s/keymaps/via/readme.md
similarity index 100%
rename from keyboards/bm16s/keymaps/via/readme.md
rename to keyboards/kprepublic/bm16s/keymaps/via/readme.md
diff --git a/keyboards/bm16s/keymaps/via/rules.mk b/keyboards/kprepublic/bm16s/keymaps/via/rules.mk
similarity index 100%
rename from keyboards/bm16s/keymaps/via/rules.mk
rename to keyboards/kprepublic/bm16s/keymaps/via/rules.mk
diff --git a/keyboards/bm16s/readme.md b/keyboards/kprepublic/bm16s/readme.md
similarity index 100%
rename from keyboards/bm16s/readme.md
rename to keyboards/kprepublic/bm16s/readme.md
diff --git a/keyboards/bm16s/rules.mk b/keyboards/kprepublic/bm16s/rules.mk
similarity index 100%
rename from keyboards/bm16s/rules.mk
rename to keyboards/kprepublic/bm16s/rules.mk
diff --git a/keyboards/bm40hsrgb/bm40hsrgb.c b/keyboards/kprepublic/bm40hsrgb/bm40hsrgb.c
similarity index 100%
rename from keyboards/bm40hsrgb/bm40hsrgb.c
rename to keyboards/kprepublic/bm40hsrgb/bm40hsrgb.c
diff --git a/keyboards/bm40hsrgb/bm40hsrgb.h b/keyboards/kprepublic/bm40hsrgb/bm40hsrgb.h
similarity index 100%
rename from keyboards/bm40hsrgb/bm40hsrgb.h
rename to keyboards/kprepublic/bm40hsrgb/bm40hsrgb.h
diff --git a/keyboards/bm40hsrgb/config.h b/keyboards/kprepublic/bm40hsrgb/config.h
similarity index 100%
rename from keyboards/bm40hsrgb/config.h
rename to keyboards/kprepublic/bm40hsrgb/config.h
diff --git a/keyboards/bm40hsrgb/info.json b/keyboards/kprepublic/bm40hsrgb/info.json
similarity index 100%
rename from keyboards/bm40hsrgb/info.json
rename to keyboards/kprepublic/bm40hsrgb/info.json
diff --git a/keyboards/bm40hsrgb/keymaps/default/keymap.c b/keyboards/kprepublic/bm40hsrgb/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/bm40hsrgb/keymaps/default/keymap.c
rename to keyboards/kprepublic/bm40hsrgb/keymaps/default/keymap.c
diff --git a/keyboards/bm40hsrgb/keymaps/default/readme.md b/keyboards/kprepublic/bm40hsrgb/keymaps/default/readme.md
similarity index 100%
rename from keyboards/bm40hsrgb/keymaps/default/readme.md
rename to keyboards/kprepublic/bm40hsrgb/keymaps/default/readme.md
diff --git a/keyboards/bm40hsrgb/keymaps/signynt/config.h b/keyboards/kprepublic/bm40hsrgb/keymaps/signynt/config.h
similarity index 100%
rename from keyboards/bm40hsrgb/keymaps/signynt/config.h
rename to keyboards/kprepublic/bm40hsrgb/keymaps/signynt/config.h
diff --git a/keyboards/bm40hsrgb/keymaps/signynt/keymap.c b/keyboards/kprepublic/bm40hsrgb/keymaps/signynt/keymap.c
similarity index 100%
rename from keyboards/bm40hsrgb/keymaps/signynt/keymap.c
rename to keyboards/kprepublic/bm40hsrgb/keymaps/signynt/keymap.c
diff --git a/keyboards/bm40hsrgb/keymaps/signynt/readme.md b/keyboards/kprepublic/bm40hsrgb/keymaps/signynt/readme.md
similarity index 100%
rename from keyboards/bm40hsrgb/keymaps/signynt/readme.md
rename to keyboards/kprepublic/bm40hsrgb/keymaps/signynt/readme.md
diff --git a/keyboards/bm40hsrgb/keymaps/signynt/rules.mk b/keyboards/kprepublic/bm40hsrgb/keymaps/signynt/rules.mk
similarity index 100%
rename from keyboards/bm40hsrgb/keymaps/signynt/rules.mk
rename to keyboards/kprepublic/bm40hsrgb/keymaps/signynt/rules.mk
diff --git a/keyboards/bm40hsrgb/keymaps/signynt_2_loud/config.h b/keyboards/kprepublic/bm40hsrgb/keymaps/signynt_2_loud/config.h
similarity index 100%
rename from keyboards/bm40hsrgb/keymaps/signynt_2_loud/config.h
rename to keyboards/kprepublic/bm40hsrgb/keymaps/signynt_2_loud/config.h
diff --git a/keyboards/bm40hsrgb/keymaps/signynt_2_loud/keymap.c b/keyboards/kprepublic/bm40hsrgb/keymaps/signynt_2_loud/keymap.c
similarity index 100%
rename from keyboards/bm40hsrgb/keymaps/signynt_2_loud/keymap.c
rename to keyboards/kprepublic/bm40hsrgb/keymaps/signynt_2_loud/keymap.c
diff --git a/keyboards/bm40hsrgb/keymaps/signynt_2_loud/readme.md b/keyboards/kprepublic/bm40hsrgb/keymaps/signynt_2_loud/readme.md
similarity index 100%
rename from keyboards/bm40hsrgb/keymaps/signynt_2_loud/readme.md
rename to keyboards/kprepublic/bm40hsrgb/keymaps/signynt_2_loud/readme.md
diff --git a/keyboards/bm40hsrgb/keymaps/signynt_2_loud/rules.mk b/keyboards/kprepublic/bm40hsrgb/keymaps/signynt_2_loud/rules.mk
similarity index 100%
rename from keyboards/bm40hsrgb/keymaps/signynt_2_loud/rules.mk
rename to keyboards/kprepublic/bm40hsrgb/keymaps/signynt_2_loud/rules.mk
diff --git a/keyboards/bm40hsrgb/keymaps/signynt_2_quiet/config.h b/keyboards/kprepublic/bm40hsrgb/keymaps/signynt_2_quiet/config.h
similarity index 100%
rename from keyboards/bm40hsrgb/keymaps/signynt_2_quiet/config.h
rename to keyboards/kprepublic/bm40hsrgb/keymaps/signynt_2_quiet/config.h
diff --git a/keyboards/bm40hsrgb/keymaps/signynt_2_quiet/keymap.c b/keyboards/kprepublic/bm40hsrgb/keymaps/signynt_2_quiet/keymap.c
similarity index 100%
rename from keyboards/bm40hsrgb/keymaps/signynt_2_quiet/keymap.c
rename to keyboards/kprepublic/bm40hsrgb/keymaps/signynt_2_quiet/keymap.c
diff --git a/keyboards/bm40hsrgb/keymaps/signynt_2_quiet/readme.md b/keyboards/kprepublic/bm40hsrgb/keymaps/signynt_2_quiet/readme.md
similarity index 100%
rename from keyboards/bm40hsrgb/keymaps/signynt_2_quiet/readme.md
rename to keyboards/kprepublic/bm40hsrgb/keymaps/signynt_2_quiet/readme.md
diff --git a/keyboards/bm40hsrgb/keymaps/signynt_2_quiet/rules.mk b/keyboards/kprepublic/bm40hsrgb/keymaps/signynt_2_quiet/rules.mk
similarity index 100%
rename from keyboards/bm40hsrgb/keymaps/signynt_2_quiet/rules.mk
rename to keyboards/kprepublic/bm40hsrgb/keymaps/signynt_2_quiet/rules.mk
diff --git a/keyboards/bm40hsrgb/keymaps/via/keymap.c b/keyboards/kprepublic/bm40hsrgb/keymaps/via/keymap.c
similarity index 100%
rename from keyboards/bm40hsrgb/keymaps/via/keymap.c
rename to keyboards/kprepublic/bm40hsrgb/keymaps/via/keymap.c
diff --git a/keyboards/bm40hsrgb/keymaps/via/readme.md b/keyboards/kprepublic/bm40hsrgb/keymaps/via/readme.md
similarity index 100%
rename from keyboards/bm40hsrgb/keymaps/via/readme.md
rename to keyboards/kprepublic/bm40hsrgb/keymaps/via/readme.md
diff --git a/keyboards/bm40hsrgb/keymaps/via/rules.mk b/keyboards/kprepublic/bm40hsrgb/keymaps/via/rules.mk
similarity index 100%
rename from keyboards/bm40hsrgb/keymaps/via/rules.mk
rename to keyboards/kprepublic/bm40hsrgb/keymaps/via/rules.mk
diff --git a/keyboards/bm40hsrgb/readme.md b/keyboards/kprepublic/bm40hsrgb/readme.md
similarity index 100%
rename from keyboards/bm40hsrgb/readme.md
rename to keyboards/kprepublic/bm40hsrgb/readme.md
diff --git a/keyboards/bm40hsrgb/rules.mk b/keyboards/kprepublic/bm40hsrgb/rules.mk
similarity index 100%
rename from keyboards/bm40hsrgb/rules.mk
rename to keyboards/kprepublic/bm40hsrgb/rules.mk
diff --git a/keyboards/bm43a/bm43a.c b/keyboards/kprepublic/bm43a/bm43a.c
similarity index 100%
rename from keyboards/bm43a/bm43a.c
rename to keyboards/kprepublic/bm43a/bm43a.c
diff --git a/keyboards/bm43a/bm43a.h b/keyboards/kprepublic/bm43a/bm43a.h
similarity index 100%
rename from keyboards/bm43a/bm43a.h
rename to keyboards/kprepublic/bm43a/bm43a.h
diff --git a/keyboards/bm43a/config.h b/keyboards/kprepublic/bm43a/config.h
similarity index 100%
rename from keyboards/bm43a/config.h
rename to keyboards/kprepublic/bm43a/config.h
diff --git a/keyboards/bm43a/info.json b/keyboards/kprepublic/bm43a/info.json
similarity index 100%
rename from keyboards/bm43a/info.json
rename to keyboards/kprepublic/bm43a/info.json
diff --git a/keyboards/bm43a/keymaps/default/config.h b/keyboards/kprepublic/bm43a/keymaps/default/config.h
similarity index 100%
rename from keyboards/bm43a/keymaps/default/config.h
rename to keyboards/kprepublic/bm43a/keymaps/default/config.h
diff --git a/keyboards/bm43a/keymaps/default/keymap.c b/keyboards/kprepublic/bm43a/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/bm43a/keymaps/default/keymap.c
rename to keyboards/kprepublic/bm43a/keymaps/default/keymap.c
diff --git a/keyboards/bm43a/keymaps/default/readme.md b/keyboards/kprepublic/bm43a/keymaps/default/readme.md
similarity index 100%
rename from keyboards/bm43a/keymaps/default/readme.md
rename to keyboards/kprepublic/bm43a/keymaps/default/readme.md
diff --git a/keyboards/bm43a/keymaps/stevexyz/keymap.c b/keyboards/kprepublic/bm43a/keymaps/stevexyz/keymap.c
similarity index 100%
rename from keyboards/bm43a/keymaps/stevexyz/keymap.c
rename to keyboards/kprepublic/bm43a/keymaps/stevexyz/keymap.c
diff --git a/keyboards/bm43a/keymaps/stevexyz/readme.md b/keyboards/kprepublic/bm43a/keymaps/stevexyz/readme.md
similarity index 100%
rename from keyboards/bm43a/keymaps/stevexyz/readme.md
rename to keyboards/kprepublic/bm43a/keymaps/stevexyz/readme.md
diff --git a/keyboards/bm43a/keymaps/stevexyz/rules.mk b/keyboards/kprepublic/bm43a/keymaps/stevexyz/rules.mk
similarity index 100%
rename from keyboards/bm43a/keymaps/stevexyz/rules.mk
rename to keyboards/kprepublic/bm43a/keymaps/stevexyz/rules.mk
diff --git a/keyboards/bm43a/readme.md b/keyboards/kprepublic/bm43a/readme.md
similarity index 100%
rename from keyboards/bm43a/readme.md
rename to keyboards/kprepublic/bm43a/readme.md
diff --git a/keyboards/bm43a/rules.mk b/keyboards/kprepublic/bm43a/rules.mk
similarity index 100%
rename from keyboards/bm43a/rules.mk
rename to keyboards/kprepublic/bm43a/rules.mk
diff --git a/keyboards/bm60poker/bm60poker.c b/keyboards/kprepublic/bm60poker/bm60poker.c
similarity index 100%
rename from keyboards/bm60poker/bm60poker.c
rename to keyboards/kprepublic/bm60poker/bm60poker.c
diff --git a/keyboards/bm60poker/bm60poker.h b/keyboards/kprepublic/bm60poker/bm60poker.h
similarity index 100%
rename from keyboards/bm60poker/bm60poker.h
rename to keyboards/kprepublic/bm60poker/bm60poker.h
diff --git a/keyboards/bm60poker/config.h b/keyboards/kprepublic/bm60poker/config.h
similarity index 100%
rename from keyboards/bm60poker/config.h
rename to keyboards/kprepublic/bm60poker/config.h
diff --git a/keyboards/bm60poker/info.json b/keyboards/kprepublic/bm60poker/info.json
similarity index 100%
rename from keyboards/bm60poker/info.json
rename to keyboards/kprepublic/bm60poker/info.json
diff --git a/keyboards/bm60poker/keymaps/default/keymap.c b/keyboards/kprepublic/bm60poker/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/bm60poker/keymaps/default/keymap.c
rename to keyboards/kprepublic/bm60poker/keymaps/default/keymap.c
diff --git a/keyboards/bm60poker/keymaps/ipetepete/keymap.c b/keyboards/kprepublic/bm60poker/keymaps/ipetepete/keymap.c
similarity index 100%
rename from keyboards/bm60poker/keymaps/ipetepete/keymap.c
rename to keyboards/kprepublic/bm60poker/keymaps/ipetepete/keymap.c
diff --git a/keyboards/bm60poker/keymaps/ipetepete/readme.md b/keyboards/kprepublic/bm60poker/keymaps/ipetepete/readme.md
similarity index 100%
rename from keyboards/bm60poker/keymaps/ipetepete/readme.md
rename to keyboards/kprepublic/bm60poker/keymaps/ipetepete/readme.md
diff --git a/keyboards/bm60poker/keymaps/ipetepete/rules.mk b/keyboards/kprepublic/bm60poker/keymaps/ipetepete/rules.mk
similarity index 100%
rename from keyboards/bm60poker/keymaps/ipetepete/rules.mk
rename to keyboards/kprepublic/bm60poker/keymaps/ipetepete/rules.mk
diff --git a/keyboards/bm60poker/keymaps/via/keymap.c b/keyboards/kprepublic/bm60poker/keymaps/via/keymap.c
similarity index 100%
rename from keyboards/bm60poker/keymaps/via/keymap.c
rename to keyboards/kprepublic/bm60poker/keymaps/via/keymap.c
diff --git a/keyboards/bm60poker/keymaps/via/rules.mk b/keyboards/kprepublic/bm60poker/keymaps/via/rules.mk
similarity index 100%
rename from keyboards/bm60poker/keymaps/via/rules.mk
rename to keyboards/kprepublic/bm60poker/keymaps/via/rules.mk
diff --git a/keyboards/bm60poker/readme.md b/keyboards/kprepublic/bm60poker/readme.md
similarity index 100%
rename from keyboards/bm60poker/readme.md
rename to keyboards/kprepublic/bm60poker/readme.md
diff --git a/keyboards/bm60poker/rules.mk b/keyboards/kprepublic/bm60poker/rules.mk
similarity index 100%
rename from keyboards/bm60poker/rules.mk
rename to keyboards/kprepublic/bm60poker/rules.mk
diff --git a/keyboards/bm60rgb/bm60rgb.c b/keyboards/kprepublic/bm60rgb/bm60rgb.c
similarity index 100%
rename from keyboards/bm60rgb/bm60rgb.c
rename to keyboards/kprepublic/bm60rgb/bm60rgb.c
diff --git a/keyboards/bm60rgb/bm60rgb.h b/keyboards/kprepublic/bm60rgb/bm60rgb.h
similarity index 100%
rename from keyboards/bm60rgb/bm60rgb.h
rename to keyboards/kprepublic/bm60rgb/bm60rgb.h
diff --git a/keyboards/bm60rgb/config.h b/keyboards/kprepublic/bm60rgb/config.h
similarity index 100%
rename from keyboards/bm60rgb/config.h
rename to keyboards/kprepublic/bm60rgb/config.h
diff --git a/keyboards/bm60rgb/info.json b/keyboards/kprepublic/bm60rgb/info.json
similarity index 100%
rename from keyboards/bm60rgb/info.json
rename to keyboards/kprepublic/bm60rgb/info.json
diff --git a/keyboards/bm60rgb/keymaps/default/keymap.c b/keyboards/kprepublic/bm60rgb/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/bm60rgb/keymaps/default/keymap.c
rename to keyboards/kprepublic/bm60rgb/keymaps/default/keymap.c
diff --git a/keyboards/bm60rgb/keymaps/default/readme.md b/keyboards/kprepublic/bm60rgb/keymaps/default/readme.md
similarity index 100%
rename from keyboards/bm60rgb/keymaps/default/readme.md
rename to keyboards/kprepublic/bm60rgb/keymaps/default/readme.md
diff --git a/keyboards/bm60rgb/keymaps/jbradforddillon/keymap.c b/keyboards/kprepublic/bm60rgb/keymaps/jbradforddillon/keymap.c
similarity index 100%
rename from keyboards/bm60rgb/keymaps/jbradforddillon/keymap.c
rename to keyboards/kprepublic/bm60rgb/keymaps/jbradforddillon/keymap.c
diff --git a/keyboards/bm60rgb/keymaps/jbradforddillon/readme.md b/keyboards/kprepublic/bm60rgb/keymaps/jbradforddillon/readme.md
similarity index 100%
rename from keyboards/bm60rgb/keymaps/jbradforddillon/readme.md
rename to keyboards/kprepublic/bm60rgb/keymaps/jbradforddillon/readme.md
diff --git a/keyboards/bm60rgb/keymaps/via/keymap.c b/keyboards/kprepublic/bm60rgb/keymaps/via/keymap.c
similarity index 100%
rename from keyboards/bm60rgb/keymaps/via/keymap.c
rename to keyboards/kprepublic/bm60rgb/keymaps/via/keymap.c
diff --git a/keyboards/bm60rgb/keymaps/via/readme.md b/keyboards/kprepublic/bm60rgb/keymaps/via/readme.md
similarity index 100%
rename from keyboards/bm60rgb/keymaps/via/readme.md
rename to keyboards/kprepublic/bm60rgb/keymaps/via/readme.md
diff --git a/keyboards/bm60rgb/keymaps/via/rules.mk b/keyboards/kprepublic/bm60rgb/keymaps/via/rules.mk
similarity index 100%
rename from keyboards/bm60rgb/keymaps/via/rules.mk
rename to keyboards/kprepublic/bm60rgb/keymaps/via/rules.mk
diff --git a/keyboards/bm60rgb/readme.md b/keyboards/kprepublic/bm60rgb/readme.md
similarity index 100%
rename from keyboards/bm60rgb/readme.md
rename to keyboards/kprepublic/bm60rgb/readme.md
diff --git a/keyboards/bm60rgb/rules.mk b/keyboards/kprepublic/bm60rgb/rules.mk
similarity index 100%
rename from keyboards/bm60rgb/rules.mk
rename to keyboards/kprepublic/bm60rgb/rules.mk
diff --git a/keyboards/bm60rgb_iso/bm60rgb_iso.c b/keyboards/kprepublic/bm60rgb_iso/bm60rgb_iso.c
similarity index 100%
rename from keyboards/bm60rgb_iso/bm60rgb_iso.c
rename to keyboards/kprepublic/bm60rgb_iso/bm60rgb_iso.c
diff --git a/keyboards/bm60rgb_iso/bm60rgb_iso.h b/keyboards/kprepublic/bm60rgb_iso/bm60rgb_iso.h
similarity index 100%
rename from keyboards/bm60rgb_iso/bm60rgb_iso.h
rename to keyboards/kprepublic/bm60rgb_iso/bm60rgb_iso.h
diff --git a/keyboards/bm60rgb_iso/config.h b/keyboards/kprepublic/bm60rgb_iso/config.h
similarity index 100%
rename from keyboards/bm60rgb_iso/config.h
rename to keyboards/kprepublic/bm60rgb_iso/config.h
diff --git a/keyboards/bm60rgb_iso/info.json b/keyboards/kprepublic/bm60rgb_iso/info.json
similarity index 100%
rename from keyboards/bm60rgb_iso/info.json
rename to keyboards/kprepublic/bm60rgb_iso/info.json
diff --git a/keyboards/bm60rgb_iso/keymaps/default/keymap.c b/keyboards/kprepublic/bm60rgb_iso/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/bm60rgb_iso/keymaps/default/keymap.c
rename to keyboards/kprepublic/bm60rgb_iso/keymaps/default/keymap.c
diff --git a/keyboards/bm60rgb_iso/keymaps/default/readme.md b/keyboards/kprepublic/bm60rgb_iso/keymaps/default/readme.md
similarity index 100%
rename from keyboards/bm60rgb_iso/keymaps/default/readme.md
rename to keyboards/kprepublic/bm60rgb_iso/keymaps/default/readme.md
diff --git a/keyboards/bm60rgb_iso/keymaps/iso_nordic_sleepmode/config.h b/keyboards/kprepublic/bm60rgb_iso/keymaps/iso_nordic_sleepmode/config.h
similarity index 100%
rename from keyboards/bm60rgb_iso/keymaps/iso_nordic_sleepmode/config.h
rename to keyboards/kprepublic/bm60rgb_iso/keymaps/iso_nordic_sleepmode/config.h
diff --git a/keyboards/bm60rgb_iso/keymaps/iso_nordic_sleepmode/keymap.c b/keyboards/kprepublic/bm60rgb_iso/keymaps/iso_nordic_sleepmode/keymap.c
similarity index 100%
rename from keyboards/bm60rgb_iso/keymaps/iso_nordic_sleepmode/keymap.c
rename to keyboards/kprepublic/bm60rgb_iso/keymaps/iso_nordic_sleepmode/keymap.c
diff --git a/keyboards/bm60rgb_iso/keymaps/iso_nordic_sleepmode/readme.md b/keyboards/kprepublic/bm60rgb_iso/keymaps/iso_nordic_sleepmode/readme.md
similarity index 100%
rename from keyboards/bm60rgb_iso/keymaps/iso_nordic_sleepmode/readme.md
rename to keyboards/kprepublic/bm60rgb_iso/keymaps/iso_nordic_sleepmode/readme.md
diff --git a/keyboards/bm60rgb_iso/readme.md b/keyboards/kprepublic/bm60rgb_iso/readme.md
similarity index 100%
rename from keyboards/bm60rgb_iso/readme.md
rename to keyboards/kprepublic/bm60rgb_iso/readme.md
diff --git a/keyboards/bm60rgb_iso/rules.mk b/keyboards/kprepublic/bm60rgb_iso/rules.mk
similarity index 100%
rename from keyboards/bm60rgb_iso/rules.mk
rename to keyboards/kprepublic/bm60rgb_iso/rules.mk
diff --git a/keyboards/bm65iso/bm65iso.c b/keyboards/kprepublic/bm65iso/bm65iso.c
similarity index 100%
rename from keyboards/bm65iso/bm65iso.c
rename to keyboards/kprepublic/bm65iso/bm65iso.c
diff --git a/keyboards/bm65iso/bm65iso.h b/keyboards/kprepublic/bm65iso/bm65iso.h
similarity index 100%
rename from keyboards/bm65iso/bm65iso.h
rename to keyboards/kprepublic/bm65iso/bm65iso.h
diff --git a/keyboards/bm65iso/config.h b/keyboards/kprepublic/bm65iso/config.h
similarity index 100%
rename from keyboards/bm65iso/config.h
rename to keyboards/kprepublic/bm65iso/config.h
diff --git a/keyboards/bm65iso/info.json b/keyboards/kprepublic/bm65iso/info.json
similarity index 100%
rename from keyboards/bm65iso/info.json
rename to keyboards/kprepublic/bm65iso/info.json
diff --git a/keyboards/bm65iso/keymaps/deadolus/config.h b/keyboards/kprepublic/bm65iso/keymaps/deadolus/config.h
similarity index 100%
rename from keyboards/bm65iso/keymaps/deadolus/config.h
rename to keyboards/kprepublic/bm65iso/keymaps/deadolus/config.h
diff --git a/keyboards/bm65iso/keymaps/deadolus/keymap.c b/keyboards/kprepublic/bm65iso/keymaps/deadolus/keymap.c
similarity index 100%
rename from keyboards/bm65iso/keymaps/deadolus/keymap.c
rename to keyboards/kprepublic/bm65iso/keymaps/deadolus/keymap.c
diff --git a/keyboards/bm65iso/keymaps/deadolus/keymap.h b/keyboards/kprepublic/bm65iso/keymaps/deadolus/keymap.h
similarity index 100%
rename from keyboards/bm65iso/keymaps/deadolus/keymap.h
rename to keyboards/kprepublic/bm65iso/keymaps/deadolus/keymap.h
diff --git a/keyboards/bm65iso/keymaps/deadolus/readme.md b/keyboards/kprepublic/bm65iso/keymaps/deadolus/readme.md
similarity index 100%
rename from keyboards/bm65iso/keymaps/deadolus/readme.md
rename to keyboards/kprepublic/bm65iso/keymaps/deadolus/readme.md
diff --git a/keyboards/bm65iso/keymaps/deadolus/rules.mk b/keyboards/kprepublic/bm65iso/keymaps/deadolus/rules.mk
similarity index 100%
rename from keyboards/bm65iso/keymaps/deadolus/rules.mk
rename to keyboards/kprepublic/bm65iso/keymaps/deadolus/rules.mk
diff --git a/keyboards/bm65iso/keymaps/default/keymap.c b/keyboards/kprepublic/bm65iso/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/bm65iso/keymaps/default/keymap.c
rename to keyboards/kprepublic/bm65iso/keymaps/default/keymap.c
diff --git a/keyboards/bm65iso/keymaps/via/keymap.c b/keyboards/kprepublic/bm65iso/keymaps/via/keymap.c
similarity index 100%
rename from keyboards/bm65iso/keymaps/via/keymap.c
rename to keyboards/kprepublic/bm65iso/keymaps/via/keymap.c
diff --git a/keyboards/bm65iso/keymaps/via/readme.md b/keyboards/kprepublic/bm65iso/keymaps/via/readme.md
similarity index 100%
rename from keyboards/bm65iso/keymaps/via/readme.md
rename to keyboards/kprepublic/bm65iso/keymaps/via/readme.md
diff --git a/keyboards/bm65iso/keymaps/via/rules.mk b/keyboards/kprepublic/bm65iso/keymaps/via/rules.mk
similarity index 100%
rename from keyboards/bm65iso/keymaps/via/rules.mk
rename to keyboards/kprepublic/bm65iso/keymaps/via/rules.mk
diff --git a/keyboards/bm65iso/readme.md b/keyboards/kprepublic/bm65iso/readme.md
similarity index 100%
rename from keyboards/bm65iso/readme.md
rename to keyboards/kprepublic/bm65iso/readme.md
diff --git a/keyboards/bm65iso/rules.mk b/keyboards/kprepublic/bm65iso/rules.mk
similarity index 100%
rename from keyboards/bm65iso/rules.mk
rename to keyboards/kprepublic/bm65iso/rules.mk
diff --git a/keyboards/bm68rgb/bm68rgb.c b/keyboards/kprepublic/bm68rgb/bm68rgb.c
similarity index 100%
rename from keyboards/bm68rgb/bm68rgb.c
rename to keyboards/kprepublic/bm68rgb/bm68rgb.c
diff --git a/keyboards/bm68rgb/bm68rgb.h b/keyboards/kprepublic/bm68rgb/bm68rgb.h
similarity index 100%
rename from keyboards/bm68rgb/bm68rgb.h
rename to keyboards/kprepublic/bm68rgb/bm68rgb.h
diff --git a/keyboards/bm68rgb/config.h b/keyboards/kprepublic/bm68rgb/config.h
similarity index 100%
rename from keyboards/bm68rgb/config.h
rename to keyboards/kprepublic/bm68rgb/config.h
diff --git a/keyboards/bm68rgb/info.json b/keyboards/kprepublic/bm68rgb/info.json
similarity index 100%
rename from keyboards/bm68rgb/info.json
rename to keyboards/kprepublic/bm68rgb/info.json
diff --git a/keyboards/bm68rgb/keymaps/default/keymap.c b/keyboards/kprepublic/bm68rgb/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/bm68rgb/keymaps/default/keymap.c
rename to keyboards/kprepublic/bm68rgb/keymaps/default/keymap.c
diff --git a/keyboards/bm68rgb/keymaps/default/readme.md b/keyboards/kprepublic/bm68rgb/keymaps/default/readme.md
similarity index 100%
rename from keyboards/bm68rgb/keymaps/default/readme.md
rename to keyboards/kprepublic/bm68rgb/keymaps/default/readme.md
diff --git a/keyboards/bm68rgb/keymaps/peepeetee/config.h b/keyboards/kprepublic/bm68rgb/keymaps/peepeetee/config.h
similarity index 100%
rename from keyboards/bm68rgb/keymaps/peepeetee/config.h
rename to keyboards/kprepublic/bm68rgb/keymaps/peepeetee/config.h
diff --git a/keyboards/bm68rgb/keymaps/peepeetee/keymap.c b/keyboards/kprepublic/bm68rgb/keymaps/peepeetee/keymap.c
similarity index 100%
rename from keyboards/bm68rgb/keymaps/peepeetee/keymap.c
rename to keyboards/kprepublic/bm68rgb/keymaps/peepeetee/keymap.c
diff --git a/keyboards/bm68rgb/keymaps/peepeetee/keymap.h b/keyboards/kprepublic/bm68rgb/keymaps/peepeetee/keymap.h
similarity index 100%
rename from keyboards/bm68rgb/keymaps/peepeetee/keymap.h
rename to keyboards/kprepublic/bm68rgb/keymaps/peepeetee/keymap.h
diff --git a/keyboards/bm68rgb/keymaps/peepeetee/readme.md b/keyboards/kprepublic/bm68rgb/keymaps/peepeetee/readme.md
similarity index 100%
rename from keyboards/bm68rgb/keymaps/peepeetee/readme.md
rename to keyboards/kprepublic/bm68rgb/keymaps/peepeetee/readme.md
diff --git a/keyboards/bm68rgb/keymaps/via/keymap.c b/keyboards/kprepublic/bm68rgb/keymaps/via/keymap.c
similarity index 100%
rename from keyboards/bm68rgb/keymaps/via/keymap.c
rename to keyboards/kprepublic/bm68rgb/keymaps/via/keymap.c
diff --git a/keyboards/bm68rgb/keymaps/via/readme.md b/keyboards/kprepublic/bm68rgb/keymaps/via/readme.md
similarity index 100%
rename from keyboards/bm68rgb/keymaps/via/readme.md
rename to keyboards/kprepublic/bm68rgb/keymaps/via/readme.md
diff --git a/keyboards/bm68rgb/keymaps/via/rules.mk b/keyboards/kprepublic/bm68rgb/keymaps/via/rules.mk
similarity index 100%
rename from keyboards/bm68rgb/keymaps/via/rules.mk
rename to keyboards/kprepublic/bm68rgb/keymaps/via/rules.mk
diff --git a/keyboards/bm68rgb/readme.md b/keyboards/kprepublic/bm68rgb/readme.md
similarity index 100%
rename from keyboards/bm68rgb/readme.md
rename to keyboards/kprepublic/bm68rgb/readme.md
diff --git a/keyboards/bm68rgb/rules.mk b/keyboards/kprepublic/bm68rgb/rules.mk
similarity index 100%
rename from keyboards/bm68rgb/rules.mk
rename to keyboards/kprepublic/bm68rgb/rules.mk
diff --git a/keyboards/cospad/config.h b/keyboards/kprepublic/cospad/config.h
similarity index 100%
rename from keyboards/cospad/config.h
rename to keyboards/kprepublic/cospad/config.h
diff --git a/keyboards/cospad/cospad.c b/keyboards/kprepublic/cospad/cospad.c
similarity index 100%
rename from keyboards/cospad/cospad.c
rename to keyboards/kprepublic/cospad/cospad.c
diff --git a/keyboards/cospad/cospad.h b/keyboards/kprepublic/cospad/cospad.h
similarity index 100%
rename from keyboards/cospad/cospad.h
rename to keyboards/kprepublic/cospad/cospad.h
diff --git a/keyboards/cospad/info.json b/keyboards/kprepublic/cospad/info.json
similarity index 100%
rename from keyboards/cospad/info.json
rename to keyboards/kprepublic/cospad/info.json
diff --git a/keyboards/cospad/keymaps/default/keymap.c b/keyboards/kprepublic/cospad/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/cospad/keymaps/default/keymap.c
rename to keyboards/kprepublic/cospad/keymaps/default/keymap.c
diff --git a/keyboards/cospad/keymaps/detrus/keymap.c b/keyboards/kprepublic/cospad/keymaps/detrus/keymap.c
similarity index 100%
rename from keyboards/cospad/keymaps/detrus/keymap.c
rename to keyboards/kprepublic/cospad/keymaps/detrus/keymap.c
diff --git a/keyboards/cospad/keymaps/split_plus_and_zero/keymap.c b/keyboards/kprepublic/cospad/keymaps/split_plus_and_zero/keymap.c
similarity index 100%
rename from keyboards/cospad/keymaps/split_plus_and_zero/keymap.c
rename to keyboards/kprepublic/cospad/keymaps/split_plus_and_zero/keymap.c
diff --git a/keyboards/cospad/keymaps/split_zero/keymap.c b/keyboards/kprepublic/cospad/keymaps/split_zero/keymap.c
similarity index 100%
rename from keyboards/cospad/keymaps/split_zero/keymap.c
rename to keyboards/kprepublic/cospad/keymaps/split_zero/keymap.c
diff --git a/keyboards/cospad/keymaps/via/keymap.c b/keyboards/kprepublic/cospad/keymaps/via/keymap.c
similarity index 100%
rename from keyboards/cospad/keymaps/via/keymap.c
rename to keyboards/kprepublic/cospad/keymaps/via/keymap.c
diff --git a/keyboards/cospad/keymaps/via/rules.mk b/keyboards/kprepublic/cospad/keymaps/via/rules.mk
similarity index 100%
rename from keyboards/cospad/keymaps/via/rules.mk
rename to keyboards/kprepublic/cospad/keymaps/via/rules.mk
diff --git a/keyboards/cospad/readme.md b/keyboards/kprepublic/cospad/readme.md
similarity index 100%
rename from keyboards/cospad/readme.md
rename to keyboards/kprepublic/cospad/readme.md
diff --git a/keyboards/cospad/rules.mk b/keyboards/kprepublic/cospad/rules.mk
similarity index 100%
rename from keyboards/cospad/rules.mk
rename to keyboards/kprepublic/cospad/rules.mk
diff --git a/keyboards/jj40/config.h b/keyboards/kprepublic/jj40/config.h
similarity index 100%
rename from keyboards/jj40/config.h
rename to keyboards/kprepublic/jj40/config.h
diff --git a/keyboards/jj40/info.json b/keyboards/kprepublic/jj40/info.json
similarity index 100%
rename from keyboards/jj40/info.json
rename to keyboards/kprepublic/jj40/info.json
diff --git a/keyboards/jj40/jj40.c b/keyboards/kprepublic/jj40/jj40.c
similarity index 100%
rename from keyboards/jj40/jj40.c
rename to keyboards/kprepublic/jj40/jj40.c
diff --git a/keyboards/jj40/jj40.h b/keyboards/kprepublic/jj40/jj40.h
similarity index 100%
rename from keyboards/jj40/jj40.h
rename to keyboards/kprepublic/jj40/jj40.h
diff --git a/keyboards/jj40/keymaps/ajp10304/readme.md b/keyboards/kprepublic/jj40/keymaps/ajp10304/readme.md
similarity index 100%
rename from keyboards/jj40/keymaps/ajp10304/readme.md
rename to keyboards/kprepublic/jj40/keymaps/ajp10304/readme.md
diff --git a/keyboards/jj40/keymaps/cockpit/keymap.c b/keyboards/kprepublic/jj40/keymaps/cockpit/keymap.c
similarity index 100%
rename from keyboards/jj40/keymaps/cockpit/keymap.c
rename to keyboards/kprepublic/jj40/keymaps/cockpit/keymap.c
diff --git a/keyboards/jj40/keymaps/cockpit/readme.md b/keyboards/kprepublic/jj40/keymaps/cockpit/readme.md
similarity index 100%
rename from keyboards/jj40/keymaps/cockpit/readme.md
rename to keyboards/kprepublic/jj40/keymaps/cockpit/readme.md
diff --git a/keyboards/jj40/keymaps/default/keymap.c b/keyboards/kprepublic/jj40/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/jj40/keymaps/default/keymap.c
rename to keyboards/kprepublic/jj40/keymaps/default/keymap.c
diff --git a/keyboards/jj40/keymaps/fun40/config.h b/keyboards/kprepublic/jj40/keymaps/fun40/config.h
similarity index 100%
rename from keyboards/jj40/keymaps/fun40/config.h
rename to keyboards/kprepublic/jj40/keymaps/fun40/config.h
diff --git a/keyboards/jj40/keymaps/fun40/keymap.c b/keyboards/kprepublic/jj40/keymaps/fun40/keymap.c
similarity index 100%
rename from keyboards/jj40/keymaps/fun40/keymap.c
rename to keyboards/kprepublic/jj40/keymaps/fun40/keymap.c
diff --git a/keyboards/jj40/keymaps/fun40/readme.md b/keyboards/kprepublic/jj40/keymaps/fun40/readme.md
similarity index 100%
rename from keyboards/jj40/keymaps/fun40/readme.md
rename to keyboards/kprepublic/jj40/keymaps/fun40/readme.md
diff --git a/keyboards/jj40/keymaps/fun40/rules.mk b/keyboards/kprepublic/jj40/keymaps/fun40/rules.mk
similarity index 100%
rename from keyboards/jj40/keymaps/fun40/rules.mk
rename to keyboards/kprepublic/jj40/keymaps/fun40/rules.mk
diff --git a/keyboards/jj40/keymaps/krusli/config.h b/keyboards/kprepublic/jj40/keymaps/krusli/config.h
similarity index 100%
rename from keyboards/jj40/keymaps/krusli/config.h
rename to keyboards/kprepublic/jj40/keymaps/krusli/config.h
diff --git a/keyboards/jj40/keymaps/krusli/keymap.c b/keyboards/kprepublic/jj40/keymaps/krusli/keymap.c
similarity index 100%
rename from keyboards/jj40/keymaps/krusli/keymap.c
rename to keyboards/kprepublic/jj40/keymaps/krusli/keymap.c
diff --git a/keyboards/jj40/keymaps/krusli/numpad.txt b/keyboards/kprepublic/jj40/keymaps/krusli/numpad.txt
similarity index 100%
rename from keyboards/jj40/keymaps/krusli/numpad.txt
rename to keyboards/kprepublic/jj40/keymaps/krusli/numpad.txt
diff --git a/keyboards/jj40/keymaps/krusli/readme.md b/keyboards/kprepublic/jj40/keymaps/krusli/readme.md
similarity index 100%
rename from keyboards/jj40/keymaps/krusli/readme.md
rename to keyboards/kprepublic/jj40/keymaps/krusli/readme.md
diff --git a/keyboards/jj40/keymaps/krusli/rules.mk b/keyboards/kprepublic/jj40/keymaps/krusli/rules.mk
similarity index 100%
rename from keyboards/jj40/keymaps/krusli/rules.mk
rename to keyboards/kprepublic/jj40/keymaps/krusli/rules.mk
diff --git a/keyboards/jj40/keymaps/oscillope/config.h b/keyboards/kprepublic/jj40/keymaps/oscillope/config.h
similarity index 100%
rename from keyboards/jj40/keymaps/oscillope/config.h
rename to keyboards/kprepublic/jj40/keymaps/oscillope/config.h
diff --git a/keyboards/jj40/keymaps/oscillope/keymap.c b/keyboards/kprepublic/jj40/keymaps/oscillope/keymap.c
similarity index 100%
rename from keyboards/jj40/keymaps/oscillope/keymap.c
rename to keyboards/kprepublic/jj40/keymaps/oscillope/keymap.c
diff --git a/keyboards/jj40/keymaps/oscillope/rules.mk b/keyboards/kprepublic/jj40/keymaps/oscillope/rules.mk
similarity index 100%
rename from keyboards/jj40/keymaps/oscillope/rules.mk
rename to keyboards/kprepublic/jj40/keymaps/oscillope/rules.mk
diff --git a/keyboards/jj40/keymaps/skewwhiffy/keymap.c b/keyboards/kprepublic/jj40/keymaps/skewwhiffy/keymap.c
similarity index 100%
rename from keyboards/jj40/keymaps/skewwhiffy/keymap.c
rename to keyboards/kprepublic/jj40/keymaps/skewwhiffy/keymap.c
diff --git a/keyboards/jj40/keymaps/stevexyz/config.h b/keyboards/kprepublic/jj40/keymaps/stevexyz/config.h
similarity index 100%
rename from keyboards/jj40/keymaps/stevexyz/config.h
rename to keyboards/kprepublic/jj40/keymaps/stevexyz/config.h
diff --git a/keyboards/jj40/keymaps/stevexyz/keymap.c b/keyboards/kprepublic/jj40/keymaps/stevexyz/keymap.c
similarity index 100%
rename from keyboards/jj40/keymaps/stevexyz/keymap.c
rename to keyboards/kprepublic/jj40/keymaps/stevexyz/keymap.c
diff --git a/keyboards/jj40/keymaps/stevexyz/readme.md b/keyboards/kprepublic/jj40/keymaps/stevexyz/readme.md
similarity index 100%
rename from keyboards/jj40/keymaps/stevexyz/readme.md
rename to keyboards/kprepublic/jj40/keymaps/stevexyz/readme.md
diff --git a/keyboards/jj40/keymaps/stevexyz/rules.mk b/keyboards/kprepublic/jj40/keymaps/stevexyz/rules.mk
similarity index 100%
rename from keyboards/jj40/keymaps/stevexyz/rules.mk
rename to keyboards/kprepublic/jj40/keymaps/stevexyz/rules.mk
diff --git a/keyboards/jj40/keymaps/suzuken/config.h b/keyboards/kprepublic/jj40/keymaps/suzuken/config.h
similarity index 100%
rename from keyboards/jj40/keymaps/suzuken/config.h
rename to keyboards/kprepublic/jj40/keymaps/suzuken/config.h
diff --git a/keyboards/jj40/keymaps/suzuken/keymap.c b/keyboards/kprepublic/jj40/keymaps/suzuken/keymap.c
similarity index 100%
rename from keyboards/jj40/keymaps/suzuken/keymap.c
rename to keyboards/kprepublic/jj40/keymaps/suzuken/keymap.c
diff --git a/keyboards/jj40/keymaps/via/keymap.c b/keyboards/kprepublic/jj40/keymaps/via/keymap.c
similarity index 100%
rename from keyboards/jj40/keymaps/via/keymap.c
rename to keyboards/kprepublic/jj40/keymaps/via/keymap.c
diff --git a/keyboards/jj40/keymaps/via/rules.mk b/keyboards/kprepublic/jj40/keymaps/via/rules.mk
similarity index 100%
rename from keyboards/jj40/keymaps/via/rules.mk
rename to keyboards/kprepublic/jj40/keymaps/via/rules.mk
diff --git a/keyboards/jj40/keymaps/waples/config.h b/keyboards/kprepublic/jj40/keymaps/waples/config.h
similarity index 100%
rename from keyboards/jj40/keymaps/waples/config.h
rename to keyboards/kprepublic/jj40/keymaps/waples/config.h
diff --git a/keyboards/jj40/keymaps/waples/keymap.c b/keyboards/kprepublic/jj40/keymaps/waples/keymap.c
similarity index 100%
rename from keyboards/jj40/keymaps/waples/keymap.c
rename to keyboards/kprepublic/jj40/keymaps/waples/keymap.c
diff --git a/keyboards/jj40/keymaps/waples/readme.md b/keyboards/kprepublic/jj40/keymaps/waples/readme.md
similarity index 100%
rename from keyboards/jj40/keymaps/waples/readme.md
rename to keyboards/kprepublic/jj40/keymaps/waples/readme.md
diff --git a/keyboards/jj40/keymaps/waples/rules.mk b/keyboards/kprepublic/jj40/keymaps/waples/rules.mk
similarity index 100%
rename from keyboards/jj40/keymaps/waples/rules.mk
rename to keyboards/kprepublic/jj40/keymaps/waples/rules.mk
diff --git a/keyboards/jj40/readme.md b/keyboards/kprepublic/jj40/readme.md
similarity index 100%
rename from keyboards/jj40/readme.md
rename to keyboards/kprepublic/jj40/readme.md
diff --git a/keyboards/jj40/rules.mk b/keyboards/kprepublic/jj40/rules.mk
similarity index 100%
rename from keyboards/jj40/rules.mk
rename to keyboards/kprepublic/jj40/rules.mk
diff --git a/keyboards/jj4x4/config.h b/keyboards/kprepublic/jj4x4/config.h
similarity index 100%
rename from keyboards/jj4x4/config.h
rename to keyboards/kprepublic/jj4x4/config.h
diff --git a/keyboards/jj4x4/info.json b/keyboards/kprepublic/jj4x4/info.json
similarity index 100%
rename from keyboards/jj4x4/info.json
rename to keyboards/kprepublic/jj4x4/info.json
diff --git a/keyboards/jj4x4/jj4x4.c b/keyboards/kprepublic/jj4x4/jj4x4.c
similarity index 100%
rename from keyboards/jj4x4/jj4x4.c
rename to keyboards/kprepublic/jj4x4/jj4x4.c
diff --git a/keyboards/jj4x4/jj4x4.h b/keyboards/kprepublic/jj4x4/jj4x4.h
similarity index 100%
rename from keyboards/jj4x4/jj4x4.h
rename to keyboards/kprepublic/jj4x4/jj4x4.h
diff --git a/keyboards/jj4x4/keymaps/default/keymap.c b/keyboards/kprepublic/jj4x4/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/jj4x4/keymaps/default/keymap.c
rename to keyboards/kprepublic/jj4x4/keymaps/default/keymap.c
diff --git a/keyboards/jj4x4/keymaps/via/keymap.c b/keyboards/kprepublic/jj4x4/keymaps/via/keymap.c
similarity index 100%
rename from keyboards/jj4x4/keymaps/via/keymap.c
rename to keyboards/kprepublic/jj4x4/keymaps/via/keymap.c
diff --git a/keyboards/jj4x4/keymaps/via/rules.mk b/keyboards/kprepublic/jj4x4/keymaps/via/rules.mk
similarity index 100%
rename from keyboards/jj4x4/keymaps/via/rules.mk
rename to keyboards/kprepublic/jj4x4/keymaps/via/rules.mk
diff --git a/keyboards/jj4x4/readme.md b/keyboards/kprepublic/jj4x4/readme.md
similarity index 100%
rename from keyboards/jj4x4/readme.md
rename to keyboards/kprepublic/jj4x4/readme.md
diff --git a/keyboards/jj4x4/rules.mk b/keyboards/kprepublic/jj4x4/rules.mk
similarity index 100%
rename from keyboards/jj4x4/rules.mk
rename to keyboards/kprepublic/jj4x4/rules.mk
diff --git a/keyboards/jj50/config.h b/keyboards/kprepublic/jj50/config.h
similarity index 100%
rename from keyboards/jj50/config.h
rename to keyboards/kprepublic/jj50/config.h
diff --git a/keyboards/jj50/info.json b/keyboards/kprepublic/jj50/info.json
similarity index 100%
rename from keyboards/jj50/info.json
rename to keyboards/kprepublic/jj50/info.json
diff --git a/keyboards/jj50/jj50.c b/keyboards/kprepublic/jj50/jj50.c
similarity index 100%
rename from keyboards/jj50/jj50.c
rename to keyboards/kprepublic/jj50/jj50.c
diff --git a/keyboards/jj50/jj50.h b/keyboards/kprepublic/jj50/jj50.h
similarity index 100%
rename from keyboards/jj50/jj50.h
rename to keyboards/kprepublic/jj50/jj50.h
diff --git a/keyboards/jj50/keymaps/abstractkb/config.h b/keyboards/kprepublic/jj50/keymaps/abstractkb/config.h
similarity index 100%
rename from keyboards/jj50/keymaps/abstractkb/config.h
rename to keyboards/kprepublic/jj50/keymaps/abstractkb/config.h
diff --git a/keyboards/jj50/keymaps/abstractkb/keymap.c b/keyboards/kprepublic/jj50/keymaps/abstractkb/keymap.c
similarity index 100%
rename from keyboards/jj50/keymaps/abstractkb/keymap.c
rename to keyboards/kprepublic/jj50/keymaps/abstractkb/keymap.c
diff --git a/keyboards/jj50/keymaps/abstractkb/readme.md b/keyboards/kprepublic/jj50/keymaps/abstractkb/readme.md
similarity index 100%
rename from keyboards/jj50/keymaps/abstractkb/readme.md
rename to keyboards/kprepublic/jj50/keymaps/abstractkb/readme.md
diff --git a/keyboards/jj50/keymaps/abstractkb_gergomatch/config.h b/keyboards/kprepublic/jj50/keymaps/abstractkb_gergomatch/config.h
similarity index 100%
rename from keyboards/jj50/keymaps/abstractkb_gergomatch/config.h
rename to keyboards/kprepublic/jj50/keymaps/abstractkb_gergomatch/config.h
diff --git a/keyboards/jj50/keymaps/abstractkb_gergomatch/keymap.c b/keyboards/kprepublic/jj50/keymaps/abstractkb_gergomatch/keymap.c
similarity index 100%
rename from keyboards/jj50/keymaps/abstractkb_gergomatch/keymap.c
rename to keyboards/kprepublic/jj50/keymaps/abstractkb_gergomatch/keymap.c
diff --git a/keyboards/jj50/keymaps/abstractkb_gergomatch/readme.md b/keyboards/kprepublic/jj50/keymaps/abstractkb_gergomatch/readme.md
similarity index 100%
rename from keyboards/jj50/keymaps/abstractkb_gergomatch/readme.md
rename to keyboards/kprepublic/jj50/keymaps/abstractkb_gergomatch/readme.md
diff --git a/keyboards/jj50/keymaps/archetype/README.md b/keyboards/kprepublic/jj50/keymaps/archetype/README.md
similarity index 100%
rename from keyboards/jj50/keymaps/archetype/README.md
rename to keyboards/kprepublic/jj50/keymaps/archetype/README.md
diff --git a/keyboards/jj50/keymaps/archetype/config.h b/keyboards/kprepublic/jj50/keymaps/archetype/config.h
similarity index 100%
rename from keyboards/jj50/keymaps/archetype/config.h
rename to keyboards/kprepublic/jj50/keymaps/archetype/config.h
diff --git a/keyboards/jj50/keymaps/archetype/keymap.c b/keyboards/kprepublic/jj50/keymaps/archetype/keymap.c
similarity index 100%
rename from keyboards/jj50/keymaps/archetype/keymap.c
rename to keyboards/kprepublic/jj50/keymaps/archetype/keymap.c
diff --git a/keyboards/jj50/keymaps/archetype/rules.mk b/keyboards/kprepublic/jj50/keymaps/archetype/rules.mk
similarity index 100%
rename from keyboards/jj50/keymaps/archetype/rules.mk
rename to keyboards/kprepublic/jj50/keymaps/archetype/rules.mk
diff --git a/keyboards/jj50/keymaps/default/README.md b/keyboards/kprepublic/jj50/keymaps/default/README.md
similarity index 100%
rename from keyboards/jj50/keymaps/default/README.md
rename to keyboards/kprepublic/jj50/keymaps/default/README.md
diff --git a/keyboards/jj50/keymaps/default/keymap.c b/keyboards/kprepublic/jj50/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/jj50/keymaps/default/keymap.c
rename to keyboards/kprepublic/jj50/keymaps/default/keymap.c
diff --git a/keyboards/jj50/keymaps/yoonbae81/config.h b/keyboards/kprepublic/jj50/keymaps/yoonbae81/config.h
similarity index 100%
rename from keyboards/jj50/keymaps/yoonbae81/config.h
rename to keyboards/kprepublic/jj50/keymaps/yoonbae81/config.h
diff --git a/keyboards/jj50/keymaps/yoonbae81/keymap.c b/keyboards/kprepublic/jj50/keymaps/yoonbae81/keymap.c
similarity index 100%
rename from keyboards/jj50/keymaps/yoonbae81/keymap.c
rename to keyboards/kprepublic/jj50/keymaps/yoonbae81/keymap.c
diff --git a/keyboards/jj50/keymaps/yoonbae81/rules.mk b/keyboards/kprepublic/jj50/keymaps/yoonbae81/rules.mk
similarity index 100%
rename from keyboards/jj50/keymaps/yoonbae81/rules.mk
rename to keyboards/kprepublic/jj50/keymaps/yoonbae81/rules.mk
diff --git a/keyboards/jj50/readme.md b/keyboards/kprepublic/jj50/readme.md
similarity index 100%
rename from keyboards/jj50/readme.md
rename to keyboards/kprepublic/jj50/readme.md
diff --git a/keyboards/jj50/rules.mk b/keyboards/kprepublic/jj50/rules.mk
similarity index 100%
rename from keyboards/jj50/rules.mk
rename to keyboards/kprepublic/jj50/rules.mk
diff --git a/keyboards/daisy/config.h b/keyboards/ktec/daisy/config.h
similarity index 100%
rename from keyboards/daisy/config.h
rename to keyboards/ktec/daisy/config.h
diff --git a/keyboards/daisy/daisy.c b/keyboards/ktec/daisy/daisy.c
similarity index 100%
rename from keyboards/daisy/daisy.c
rename to keyboards/ktec/daisy/daisy.c
diff --git a/keyboards/daisy/daisy.h b/keyboards/ktec/daisy/daisy.h
similarity index 100%
rename from keyboards/daisy/daisy.h
rename to keyboards/ktec/daisy/daisy.h
diff --git a/keyboards/daisy/info.json b/keyboards/ktec/daisy/info.json
similarity index 100%
rename from keyboards/daisy/info.json
rename to keyboards/ktec/daisy/info.json
diff --git a/keyboards/daisy/keymaps/default/keymap.c b/keyboards/ktec/daisy/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/daisy/keymaps/default/keymap.c
rename to keyboards/ktec/daisy/keymaps/default/keymap.c
diff --git a/keyboards/daisy/keymaps/default/readme.md b/keyboards/ktec/daisy/keymaps/default/readme.md
similarity index 100%
rename from keyboards/daisy/keymaps/default/readme.md
rename to keyboards/ktec/daisy/keymaps/default/readme.md
diff --git a/keyboards/daisy/keymaps/via/keymap.c b/keyboards/ktec/daisy/keymaps/via/keymap.c
similarity index 100%
rename from keyboards/daisy/keymaps/via/keymap.c
rename to keyboards/ktec/daisy/keymaps/via/keymap.c
diff --git a/keyboards/daisy/keymaps/via/readme.md b/keyboards/ktec/daisy/keymaps/via/readme.md
similarity index 100%
rename from keyboards/daisy/keymaps/via/readme.md
rename to keyboards/ktec/daisy/keymaps/via/readme.md
diff --git a/keyboards/daisy/keymaps/via/rules.mk b/keyboards/ktec/daisy/keymaps/via/rules.mk
similarity index 100%
rename from keyboards/daisy/keymaps/via/rules.mk
rename to keyboards/ktec/daisy/keymaps/via/rules.mk
diff --git a/keyboards/daisy/readme.md b/keyboards/ktec/daisy/readme.md
similarity index 100%
rename from keyboards/daisy/readme.md
rename to keyboards/ktec/daisy/readme.md
diff --git a/keyboards/daisy/rules.mk b/keyboards/ktec/daisy/rules.mk
similarity index 100%
rename from keyboards/daisy/rules.mk
rename to keyboards/ktec/daisy/rules.mk
diff --git a/keyboards/ergodone/config.h b/keyboards/ktec/ergodone/config.h
similarity index 100%
rename from keyboards/ergodone/config.h
rename to keyboards/ktec/ergodone/config.h
diff --git a/keyboards/ergodone/ergodone.c b/keyboards/ktec/ergodone/ergodone.c
similarity index 100%
rename from keyboards/ergodone/ergodone.c
rename to keyboards/ktec/ergodone/ergodone.c
diff --git a/keyboards/ergodone/ergodone.h b/keyboards/ktec/ergodone/ergodone.h
similarity index 100%
rename from keyboards/ergodone/ergodone.h
rename to keyboards/ktec/ergodone/ergodone.h
diff --git a/keyboards/ergodone/expander.c b/keyboards/ktec/ergodone/expander.c
similarity index 100%
rename from keyboards/ergodone/expander.c
rename to keyboards/ktec/ergodone/expander.c
diff --git a/keyboards/ergodone/expander.h b/keyboards/ktec/ergodone/expander.h
similarity index 100%
rename from keyboards/ergodone/expander.h
rename to keyboards/ktec/ergodone/expander.h
diff --git a/keyboards/ergodone/i2cmaster.h b/keyboards/ktec/ergodone/i2cmaster.h
similarity index 100%
rename from keyboards/ergodone/i2cmaster.h
rename to keyboards/ktec/ergodone/i2cmaster.h
diff --git a/keyboards/ergodone/info.json b/keyboards/ktec/ergodone/info.json
similarity index 100%
rename from keyboards/ergodone/info.json
rename to keyboards/ktec/ergodone/info.json
diff --git a/keyboards/ergodone/keymaps/art/keymap.c b/keyboards/ktec/ergodone/keymaps/art/keymap.c
similarity index 100%
rename from keyboards/ergodone/keymaps/art/keymap.c
rename to keyboards/ktec/ergodone/keymaps/art/keymap.c
diff --git a/keyboards/ergodone/keymaps/default/keymap.c b/keyboards/ktec/ergodone/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/ergodone/keymaps/default/keymap.c
rename to keyboards/ktec/ergodone/keymaps/default/keymap.c
diff --git a/keyboards/ergodone/keymaps/default/readme.md b/keyboards/ktec/ergodone/keymaps/default/readme.md
similarity index 100%
rename from keyboards/ergodone/keymaps/default/readme.md
rename to keyboards/ktec/ergodone/keymaps/default/readme.md
diff --git a/keyboards/ergodone/keymaps/eozaki/keymap.c b/keyboards/ktec/ergodone/keymaps/eozaki/keymap.c
similarity index 100%
rename from keyboards/ergodone/keymaps/eozaki/keymap.c
rename to keyboards/ktec/ergodone/keymaps/eozaki/keymap.c
diff --git a/keyboards/ergodone/keymaps/eozaki/readme.md b/keyboards/ktec/ergodone/keymaps/eozaki/readme.md
similarity index 100%
rename from keyboards/ergodone/keymaps/eozaki/readme.md
rename to keyboards/ktec/ergodone/keymaps/eozaki/readme.md
diff --git a/keyboards/ergodone/keymaps/erovia/config.h b/keyboards/ktec/ergodone/keymaps/erovia/config.h
similarity index 100%
rename from keyboards/ergodone/keymaps/erovia/config.h
rename to keyboards/ktec/ergodone/keymaps/erovia/config.h
diff --git a/keyboards/ergodone/keymaps/erovia/keymap.c b/keyboards/ktec/ergodone/keymaps/erovia/keymap.c
similarity index 100%
rename from keyboards/ergodone/keymaps/erovia/keymap.c
rename to keyboards/ktec/ergodone/keymaps/erovia/keymap.c
diff --git a/keyboards/ergodone/keymaps/erovia/readme.md b/keyboards/ktec/ergodone/keymaps/erovia/readme.md
similarity index 100%
rename from keyboards/ergodone/keymaps/erovia/readme.md
rename to keyboards/ktec/ergodone/keymaps/erovia/readme.md
diff --git a/keyboards/ergodone/keymaps/erovia/rules.mk b/keyboards/ktec/ergodone/keymaps/erovia/rules.mk
similarity index 100%
rename from keyboards/ergodone/keymaps/erovia/rules.mk
rename to keyboards/ktec/ergodone/keymaps/erovia/rules.mk
diff --git a/keyboards/ergodone/keymaps/kloki/keymap.c b/keyboards/ktec/ergodone/keymaps/kloki/keymap.c
similarity index 100%
rename from keyboards/ergodone/keymaps/kloki/keymap.c
rename to keyboards/ktec/ergodone/keymaps/kloki/keymap.c
diff --git a/keyboards/ergodone/keymaps/kloki/readme.md b/keyboards/ktec/ergodone/keymaps/kloki/readme.md
similarity index 100%
rename from keyboards/ergodone/keymaps/kloki/readme.md
rename to keyboards/ktec/ergodone/keymaps/kloki/readme.md
diff --git a/keyboards/ergodone/keymaps/vega/keymap.c b/keyboards/ktec/ergodone/keymaps/vega/keymap.c
similarity index 100%
rename from keyboards/ergodone/keymaps/vega/keymap.c
rename to keyboards/ktec/ergodone/keymaps/vega/keymap.c
diff --git a/keyboards/ergodone/keymaps/vega/rules.mk b/keyboards/ktec/ergodone/keymaps/vega/rules.mk
similarity index 100%
rename from keyboards/ergodone/keymaps/vega/rules.mk
rename to keyboards/ktec/ergodone/keymaps/vega/rules.mk
diff --git a/keyboards/ergodone/keymaps/via/config.h b/keyboards/ktec/ergodone/keymaps/via/config.h
similarity index 100%
rename from keyboards/ergodone/keymaps/via/config.h
rename to keyboards/ktec/ergodone/keymaps/via/config.h
diff --git a/keyboards/ergodone/keymaps/via/keymap.c b/keyboards/ktec/ergodone/keymaps/via/keymap.c
similarity index 100%
rename from keyboards/ergodone/keymaps/via/keymap.c
rename to keyboards/ktec/ergodone/keymaps/via/keymap.c
diff --git a/keyboards/ergodone/keymaps/via/readme.md b/keyboards/ktec/ergodone/keymaps/via/readme.md
similarity index 100%
rename from keyboards/ergodone/keymaps/via/readme.md
rename to keyboards/ktec/ergodone/keymaps/via/readme.md
diff --git a/keyboards/ergodone/keymaps/via/rules.mk b/keyboards/ktec/ergodone/keymaps/via/rules.mk
similarity index 100%
rename from keyboards/ergodone/keymaps/via/rules.mk
rename to keyboards/ktec/ergodone/keymaps/via/rules.mk
diff --git a/keyboards/ergodone/matrix.c b/keyboards/ktec/ergodone/matrix.c
similarity index 100%
rename from keyboards/ergodone/matrix.c
rename to keyboards/ktec/ergodone/matrix.c
diff --git a/keyboards/ergodone/readme.md b/keyboards/ktec/ergodone/readme.md
similarity index 100%
rename from keyboards/ergodone/readme.md
rename to keyboards/ktec/ergodone/readme.md
diff --git a/keyboards/ergodone/rules.mk b/keyboards/ktec/ergodone/rules.mk
similarity index 100%
rename from keyboards/ergodone/rules.mk
rename to keyboards/ktec/ergodone/rules.mk
diff --git a/keyboards/ergodone/twimaster.c b/keyboards/ktec/ergodone/twimaster.c
similarity index 100%
rename from keyboards/ergodone/twimaster.c
rename to keyboards/ktec/ergodone/twimaster.c
diff --git a/keyboards/staryu/backlight_staryu.h b/keyboards/ktec/staryu/backlight_staryu.h
similarity index 100%
rename from keyboards/staryu/backlight_staryu.h
rename to keyboards/ktec/staryu/backlight_staryu.h
diff --git a/keyboards/staryu/config.h b/keyboards/ktec/staryu/config.h
similarity index 100%
rename from keyboards/staryu/config.h
rename to keyboards/ktec/staryu/config.h
diff --git a/keyboards/staryu/info.json b/keyboards/ktec/staryu/info.json
similarity index 100%
rename from keyboards/staryu/info.json
rename to keyboards/ktec/staryu/info.json
diff --git a/keyboards/staryu/keymaps/default/README.md b/keyboards/ktec/staryu/keymaps/default/README.md
similarity index 100%
rename from keyboards/staryu/keymaps/default/README.md
rename to keyboards/ktec/staryu/keymaps/default/README.md
diff --git a/keyboards/staryu/keymaps/default/keymap.c b/keyboards/ktec/staryu/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/staryu/keymaps/default/keymap.c
rename to keyboards/ktec/staryu/keymaps/default/keymap.c
diff --git a/keyboards/staryu/keymaps/default/rules.mk b/keyboards/ktec/staryu/keymaps/default/rules.mk
similarity index 100%
rename from keyboards/staryu/keymaps/default/rules.mk
rename to keyboards/ktec/staryu/keymaps/default/rules.mk
diff --git a/keyboards/staryu/keymaps/krusli/README.md b/keyboards/ktec/staryu/keymaps/krusli/README.md
similarity index 100%
rename from keyboards/staryu/keymaps/krusli/README.md
rename to keyboards/ktec/staryu/keymaps/krusli/README.md
diff --git a/keyboards/staryu/keymaps/krusli/keymap.c b/keyboards/ktec/staryu/keymaps/krusli/keymap.c
similarity index 100%
rename from keyboards/staryu/keymaps/krusli/keymap.c
rename to keyboards/ktec/staryu/keymaps/krusli/keymap.c
diff --git a/keyboards/staryu/readme.md b/keyboards/ktec/staryu/readme.md
similarity index 100%
rename from keyboards/staryu/readme.md
rename to keyboards/ktec/staryu/readme.md
diff --git a/keyboards/staryu/rules.mk b/keyboards/ktec/staryu/rules.mk
similarity index 100%
rename from keyboards/staryu/rules.mk
rename to keyboards/ktec/staryu/rules.mk
diff --git a/keyboards/staryu/staryu.c b/keyboards/ktec/staryu/staryu.c
similarity index 100%
rename from keyboards/staryu/staryu.c
rename to keyboards/ktec/staryu/staryu.c
diff --git a/keyboards/staryu/staryu.h b/keyboards/ktec/staryu/staryu.h
similarity index 100%
rename from keyboards/staryu/staryu.h
rename to keyboards/ktec/staryu/staryu.h
diff --git a/keyboards/xd002/.noci b/keyboards/xiudi/xd002/.noci
similarity index 100%
rename from keyboards/xd002/.noci
rename to keyboards/xiudi/xd002/.noci
diff --git a/keyboards/xd002/config.h b/keyboards/xiudi/xd002/config.h
similarity index 100%
rename from keyboards/xd002/config.h
rename to keyboards/xiudi/xd002/config.h
diff --git a/keyboards/xd002/info.json b/keyboards/xiudi/xd002/info.json
similarity index 100%
rename from keyboards/xd002/info.json
rename to keyboards/xiudi/xd002/info.json
diff --git a/keyboards/xd002/keymaps/default/keymap.c b/keyboards/xiudi/xd002/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/xd002/keymaps/default/keymap.c
rename to keyboards/xiudi/xd002/keymaps/default/keymap.c
diff --git a/keyboards/xd002/keymaps/multilayer_rgb/config.h b/keyboards/xiudi/xd002/keymaps/multilayer_rgb/config.h
similarity index 100%
rename from keyboards/xd002/keymaps/multilayer_rgb/config.h
rename to keyboards/xiudi/xd002/keymaps/multilayer_rgb/config.h
diff --git a/keyboards/xd002/keymaps/multilayer_rgb/keymap.c b/keyboards/xiudi/xd002/keymaps/multilayer_rgb/keymap.c
similarity index 100%
rename from keyboards/xd002/keymaps/multilayer_rgb/keymap.c
rename to keyboards/xiudi/xd002/keymaps/multilayer_rgb/keymap.c
diff --git a/keyboards/xd002/keymaps/multilayer_rgb/rgblite.h b/keyboards/xiudi/xd002/keymaps/multilayer_rgb/rgblite.h
similarity index 100%
rename from keyboards/xd002/keymaps/multilayer_rgb/rgblite.h
rename to keyboards/xiudi/xd002/keymaps/multilayer_rgb/rgblite.h
diff --git a/keyboards/xd002/keymaps/multilayer_rgb/rules.mk b/keyboards/xiudi/xd002/keymaps/multilayer_rgb/rules.mk
similarity index 100%
rename from keyboards/xd002/keymaps/multilayer_rgb/rules.mk
rename to keyboards/xiudi/xd002/keymaps/multilayer_rgb/rules.mk
diff --git a/keyboards/xd002/keymaps/rgb/keymap.c b/keyboards/xiudi/xd002/keymaps/rgb/keymap.c
similarity index 100%
rename from keyboards/xd002/keymaps/rgb/keymap.c
rename to keyboards/xiudi/xd002/keymaps/rgb/keymap.c
diff --git a/keyboards/xd002/keymaps/rgb/rules.mk b/keyboards/xiudi/xd002/keymaps/rgb/rules.mk
similarity index 100%
rename from keyboards/xd002/keymaps/rgb/rules.mk
rename to keyboards/xiudi/xd002/keymaps/rgb/rules.mk
diff --git a/keyboards/xd002/keymaps/rgb_lite/keymap.c b/keyboards/xiudi/xd002/keymaps/rgb_lite/keymap.c
similarity index 100%
rename from keyboards/xd002/keymaps/rgb_lite/keymap.c
rename to keyboards/xiudi/xd002/keymaps/rgb_lite/keymap.c
diff --git a/keyboards/xd002/keymaps/rgb_lite/rgblite.h b/keyboards/xiudi/xd002/keymaps/rgb_lite/rgblite.h
similarity index 100%
rename from keyboards/xd002/keymaps/rgb_lite/rgblite.h
rename to keyboards/xiudi/xd002/keymaps/rgb_lite/rgblite.h
diff --git a/keyboards/xd002/keymaps/rgb_lite/rules.mk b/keyboards/xiudi/xd002/keymaps/rgb_lite/rules.mk
similarity index 100%
rename from keyboards/xd002/keymaps/rgb_lite/rules.mk
rename to keyboards/xiudi/xd002/keymaps/rgb_lite/rules.mk
diff --git a/keyboards/xd002/keymaps/tap_dance/config.h b/keyboards/xiudi/xd002/keymaps/tap_dance/config.h
similarity index 100%
rename from keyboards/xd002/keymaps/tap_dance/config.h
rename to keyboards/xiudi/xd002/keymaps/tap_dance/config.h
diff --git a/keyboards/xd002/keymaps/tap_dance/keymap.c b/keyboards/xiudi/xd002/keymaps/tap_dance/keymap.c
similarity index 100%
rename from keyboards/xd002/keymaps/tap_dance/keymap.c
rename to keyboards/xiudi/xd002/keymaps/tap_dance/keymap.c
diff --git a/keyboards/xd002/keymaps/tap_dance/rules.mk b/keyboards/xiudi/xd002/keymaps/tap_dance/rules.mk
similarity index 100%
rename from keyboards/xd002/keymaps/tap_dance/rules.mk
rename to keyboards/xiudi/xd002/keymaps/tap_dance/rules.mk
diff --git a/keyboards/xd002/keymaps/volume/keymap.c b/keyboards/xiudi/xd002/keymaps/volume/keymap.c
similarity index 100%
rename from keyboards/xd002/keymaps/volume/keymap.c
rename to keyboards/xiudi/xd002/keymaps/volume/keymap.c
diff --git a/keyboards/xd002/keymaps/volume/rules.mk b/keyboards/xiudi/xd002/keymaps/volume/rules.mk
similarity index 100%
rename from keyboards/xd002/keymaps/volume/rules.mk
rename to keyboards/xiudi/xd002/keymaps/volume/rules.mk
diff --git a/keyboards/xd002/readme.md b/keyboards/xiudi/xd002/readme.md
similarity index 100%
rename from keyboards/xd002/readme.md
rename to keyboards/xiudi/xd002/readme.md
diff --git a/keyboards/xd002/rules.mk b/keyboards/xiudi/xd002/rules.mk
similarity index 100%
rename from keyboards/xd002/rules.mk
rename to keyboards/xiudi/xd002/rules.mk
diff --git a/keyboards/xd002/xd002.c b/keyboards/xiudi/xd002/xd002.c
similarity index 100%
rename from keyboards/xd002/xd002.c
rename to keyboards/xiudi/xd002/xd002.c
diff --git a/keyboards/xd002/xd002.h b/keyboards/xiudi/xd002/xd002.h
similarity index 100%
rename from keyboards/xd002/xd002.h
rename to keyboards/xiudi/xd002/xd002.h
diff --git a/keyboards/xd004/info.json b/keyboards/xiudi/xd004/info.json
similarity index 100%
rename from keyboards/xd004/info.json
rename to keyboards/xiudi/xd004/info.json
diff --git a/keyboards/xd004/keymaps/default/keymap.c b/keyboards/xiudi/xd004/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/xd004/keymaps/default/keymap.c
rename to keyboards/xiudi/xd004/keymaps/default/keymap.c
diff --git a/keyboards/xd004/keymaps/default/readme.md b/keyboards/xiudi/xd004/keymaps/default/readme.md
similarity index 100%
rename from keyboards/xd004/keymaps/default/readme.md
rename to keyboards/xiudi/xd004/keymaps/default/readme.md
diff --git a/keyboards/xd004/keymaps/narze/keymap.c b/keyboards/xiudi/xd004/keymaps/narze/keymap.c
similarity index 100%
rename from keyboards/xd004/keymaps/narze/keymap.c
rename to keyboards/xiudi/xd004/keymaps/narze/keymap.c
diff --git a/keyboards/xd004/keymaps/narze/readme.md b/keyboards/xiudi/xd004/keymaps/narze/readme.md
similarity index 100%
rename from keyboards/xd004/keymaps/narze/readme.md
rename to keyboards/xiudi/xd004/keymaps/narze/readme.md
diff --git a/keyboards/xd004/keymaps/system_and_media/keymap.c b/keyboards/xiudi/xd004/keymaps/system_and_media/keymap.c
similarity index 100%
rename from keyboards/xd004/keymaps/system_and_media/keymap.c
rename to keyboards/xiudi/xd004/keymaps/system_and_media/keymap.c
diff --git a/keyboards/xd004/keymaps/system_and_media/readme.md b/keyboards/xiudi/xd004/keymaps/system_and_media/readme.md
similarity index 100%
rename from keyboards/xd004/keymaps/system_and_media/readme.md
rename to keyboards/xiudi/xd004/keymaps/system_and_media/readme.md
diff --git a/keyboards/xd004/readme.md b/keyboards/xiudi/xd004/readme.md
similarity index 100%
rename from keyboards/xd004/readme.md
rename to keyboards/xiudi/xd004/readme.md
diff --git a/keyboards/xd004/v1/config.h b/keyboards/xiudi/xd004/v1/config.h
similarity index 100%
rename from keyboards/xd004/v1/config.h
rename to keyboards/xiudi/xd004/v1/config.h
diff --git a/keyboards/xd004/v1/rules.mk b/keyboards/xiudi/xd004/v1/rules.mk
similarity index 100%
rename from keyboards/xd004/v1/rules.mk
rename to keyboards/xiudi/xd004/v1/rules.mk
diff --git a/keyboards/xd004/xd004.c b/keyboards/xiudi/xd004/xd004.c
similarity index 100%
rename from keyboards/xd004/xd004.c
rename to keyboards/xiudi/xd004/xd004.c
diff --git a/keyboards/xd004/xd004.h b/keyboards/xiudi/xd004/xd004.h
similarity index 100%
rename from keyboards/xd004/xd004.h
rename to keyboards/xiudi/xd004/xd004.h
diff --git a/keyboards/xd60/info.json b/keyboards/xiudi/xd60/info.json
similarity index 100%
rename from keyboards/xd60/info.json
rename to keyboards/xiudi/xd60/info.json
diff --git a/keyboards/xd60/keymaps/Jos/README.md b/keyboards/xiudi/xd60/keymaps/Jos/README.md
similarity index 100%
rename from keyboards/xd60/keymaps/Jos/README.md
rename to keyboards/xiudi/xd60/keymaps/Jos/README.md
diff --git a/keyboards/xd60/keymaps/Jos/config.h b/keyboards/xiudi/xd60/keymaps/Jos/config.h
similarity index 100%
rename from keyboards/xd60/keymaps/Jos/config.h
rename to keyboards/xiudi/xd60/keymaps/Jos/config.h
diff --git a/keyboards/xd60/keymaps/Jos/keymap.c b/keyboards/xiudi/xd60/keymaps/Jos/keymap.c
similarity index 100%
rename from keyboards/xd60/keymaps/Jos/keymap.c
rename to keyboards/xiudi/xd60/keymaps/Jos/keymap.c
diff --git a/keyboards/xd60/keymaps/Jos/rules.mk b/keyboards/xiudi/xd60/keymaps/Jos/rules.mk
similarity index 100%
rename from keyboards/xd60/keymaps/Jos/rules.mk
rename to keyboards/xiudi/xd60/keymaps/Jos/rules.mk
diff --git a/keyboards/xd60/keymaps/birkir/keymap.c b/keyboards/xiudi/xd60/keymaps/birkir/keymap.c
similarity index 100%
rename from keyboards/xd60/keymaps/birkir/keymap.c
rename to keyboards/xiudi/xd60/keymaps/birkir/keymap.c
diff --git a/keyboards/xd60/keymaps/birkir/readme.md b/keyboards/xiudi/xd60/keymaps/birkir/readme.md
similarity index 100%
rename from keyboards/xd60/keymaps/birkir/readme.md
rename to keyboards/xiudi/xd60/keymaps/birkir/readme.md
diff --git a/keyboards/xd60/keymaps/cheese/README.md b/keyboards/xiudi/xd60/keymaps/cheese/README.md
similarity index 100%
rename from keyboards/xd60/keymaps/cheese/README.md
rename to keyboards/xiudi/xd60/keymaps/cheese/README.md
diff --git a/keyboards/xd60/keymaps/cheese/keymap.c b/keyboards/xiudi/xd60/keymaps/cheese/keymap.c
similarity index 100%
rename from keyboards/xd60/keymaps/cheese/keymap.c
rename to keyboards/xiudi/xd60/keymaps/cheese/keymap.c
diff --git a/keyboards/xd60/keymaps/crd_ansi/README.md b/keyboards/xiudi/xd60/keymaps/crd_ansi/README.md
similarity index 100%
rename from keyboards/xd60/keymaps/crd_ansi/README.md
rename to keyboards/xiudi/xd60/keymaps/crd_ansi/README.md
diff --git a/keyboards/xd60/keymaps/crd_ansi/keymap.c b/keyboards/xiudi/xd60/keymaps/crd_ansi/keymap.c
similarity index 100%
rename from keyboards/xd60/keymaps/crd_ansi/keymap.c
rename to keyboards/xiudi/xd60/keymaps/crd_ansi/keymap.c
diff --git a/keyboards/xd60/keymaps/default/keymap.c b/keyboards/xiudi/xd60/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/xd60/keymaps/default/keymap.c
rename to keyboards/xiudi/xd60/keymaps/default/keymap.c
diff --git a/keyboards/xd60/keymaps/default/readme.md b/keyboards/xiudi/xd60/keymaps/default/readme.md
similarity index 100%
rename from keyboards/xd60/keymaps/default/readme.md
rename to keyboards/xiudi/xd60/keymaps/default/readme.md
diff --git a/keyboards/xd60/keymaps/edulpn/keymap.c b/keyboards/xiudi/xd60/keymaps/edulpn/keymap.c
similarity index 100%
rename from keyboards/xd60/keymaps/edulpn/keymap.c
rename to keyboards/xiudi/xd60/keymaps/edulpn/keymap.c
diff --git a/keyboards/xd60/keymaps/edulpn/readme.md b/keyboards/xiudi/xd60/keymaps/edulpn/readme.md
similarity index 100%
rename from keyboards/xd60/keymaps/edulpn/readme.md
rename to keyboards/xiudi/xd60/keymaps/edulpn/readme.md
diff --git a/keyboards/xd60/keymaps/edulpn64/keymap.c b/keyboards/xiudi/xd60/keymaps/edulpn64/keymap.c
similarity index 100%
rename from keyboards/xd60/keymaps/edulpn64/keymap.c
rename to keyboards/xiudi/xd60/keymaps/edulpn64/keymap.c
diff --git a/keyboards/xd60/keymaps/edulpn64/readme.md b/keyboards/xiudi/xd60/keymaps/edulpn64/readme.md
similarity index 100%
rename from keyboards/xd60/keymaps/edulpn64/readme.md
rename to keyboards/xiudi/xd60/keymaps/edulpn64/readme.md
diff --git a/keyboards/xd60/keymaps/fvolpe83/config.h b/keyboards/xiudi/xd60/keymaps/fvolpe83/config.h
similarity index 100%
rename from keyboards/xd60/keymaps/fvolpe83/config.h
rename to keyboards/xiudi/xd60/keymaps/fvolpe83/config.h
diff --git a/keyboards/xd60/keymaps/fvolpe83/keymap.c b/keyboards/xiudi/xd60/keymaps/fvolpe83/keymap.c
similarity index 100%
rename from keyboards/xd60/keymaps/fvolpe83/keymap.c
rename to keyboards/xiudi/xd60/keymaps/fvolpe83/keymap.c
diff --git a/keyboards/xd60/keymaps/fvolpe83/readme.md b/keyboards/xiudi/xd60/keymaps/fvolpe83/readme.md
similarity index 100%
rename from keyboards/xd60/keymaps/fvolpe83/readme.md
rename to keyboards/xiudi/xd60/keymaps/fvolpe83/readme.md
diff --git a/keyboards/xd60/keymaps/fvolpe83/rules.mk b/keyboards/xiudi/xd60/keymaps/fvolpe83/rules.mk
similarity index 100%
rename from keyboards/xd60/keymaps/fvolpe83/rules.mk
rename to keyboards/xiudi/xd60/keymaps/fvolpe83/rules.mk
diff --git a/keyboards/xd60/keymaps/iso/keymap.c b/keyboards/xiudi/xd60/keymaps/iso/keymap.c
similarity index 100%
rename from keyboards/xd60/keymaps/iso/keymap.c
rename to keyboards/xiudi/xd60/keymaps/iso/keymap.c
diff --git a/keyboards/xd60/keymaps/iso/readme.md b/keyboards/xiudi/xd60/keymaps/iso/readme.md
similarity index 100%
rename from keyboards/xd60/keymaps/iso/readme.md
rename to keyboards/xiudi/xd60/keymaps/iso/readme.md
diff --git a/keyboards/xd60/keymaps/kmontag42/keymap.c b/keyboards/xiudi/xd60/keymaps/kmontag42/keymap.c
similarity index 100%
rename from keyboards/xd60/keymaps/kmontag42/keymap.c
rename to keyboards/xiudi/xd60/keymaps/kmontag42/keymap.c
diff --git a/keyboards/xd60/keymaps/kmontag42/readme.md b/keyboards/xiudi/xd60/keymaps/kmontag42/readme.md
similarity index 100%
rename from keyboards/xd60/keymaps/kmontag42/readme.md
rename to keyboards/xiudi/xd60/keymaps/kmontag42/readme.md
diff --git a/keyboards/xd60/keymaps/kmontag42/rules.mk b/keyboards/xiudi/xd60/keymaps/kmontag42/rules.mk
similarity index 100%
rename from keyboards/xd60/keymaps/kmontag42/rules.mk
rename to keyboards/xiudi/xd60/keymaps/kmontag42/rules.mk
diff --git a/keyboards/xd60/keymaps/krusli/keymap.c b/keyboards/xiudi/xd60/keymaps/krusli/keymap.c
similarity index 100%
rename from keyboards/xd60/keymaps/krusli/keymap.c
rename to keyboards/xiudi/xd60/keymaps/krusli/keymap.c
diff --git a/keyboards/xd60/keymaps/krusli/readme.md b/keyboards/xiudi/xd60/keymaps/krusli/readme.md
similarity index 100%
rename from keyboards/xd60/keymaps/krusli/readme.md
rename to keyboards/xiudi/xd60/keymaps/krusli/readme.md
diff --git a/keyboards/xd60/keymaps/melka/.gitignore b/keyboards/xiudi/xd60/keymaps/melka/.gitignore
similarity index 100%
rename from keyboards/xd60/keymaps/melka/.gitignore
rename to keyboards/xiudi/xd60/keymaps/melka/.gitignore
diff --git a/keyboards/xd60/keymaps/melka/config.h b/keyboards/xiudi/xd60/keymaps/melka/config.h
similarity index 100%
rename from keyboards/xd60/keymaps/melka/config.h
rename to keyboards/xiudi/xd60/keymaps/melka/config.h
diff --git a/keyboards/xd60/keymaps/melka/keymap.c b/keyboards/xiudi/xd60/keymaps/melka/keymap.c
similarity index 100%
rename from keyboards/xd60/keymaps/melka/keymap.c
rename to keyboards/xiudi/xd60/keymaps/melka/keymap.c
diff --git a/keyboards/xd60/keymaps/melka/passwd_template.h b/keyboards/xiudi/xd60/keymaps/melka/passwd_template.h
similarity index 100%
rename from keyboards/xd60/keymaps/melka/passwd_template.h
rename to keyboards/xiudi/xd60/keymaps/melka/passwd_template.h
diff --git a/keyboards/xd60/keymaps/melka/readme.md b/keyboards/xiudi/xd60/keymaps/melka/readme.md
similarity index 100%
rename from keyboards/xd60/keymaps/melka/readme.md
rename to keyboards/xiudi/xd60/keymaps/melka/readme.md
diff --git a/keyboards/xd60/keymaps/petesmom/README.md b/keyboards/xiudi/xd60/keymaps/petesmom/README.md
similarity index 100%
rename from keyboards/xd60/keymaps/petesmom/README.md
rename to keyboards/xiudi/xd60/keymaps/petesmom/README.md
diff --git a/keyboards/xd60/keymaps/petesmom/keymap.c b/keyboards/xiudi/xd60/keymaps/petesmom/keymap.c
similarity index 100%
rename from keyboards/xd60/keymaps/petesmom/keymap.c
rename to keyboards/xiudi/xd60/keymaps/petesmom/keymap.c
diff --git a/keyboards/xd60/keymaps/rooski/instructions.txt b/keyboards/xiudi/xd60/keymaps/rooski/instructions.txt
similarity index 100%
rename from keyboards/xd60/keymaps/rooski/instructions.txt
rename to keyboards/xiudi/xd60/keymaps/rooski/instructions.txt
diff --git a/keyboards/xd60/keymaps/rooski/keymap.c b/keyboards/xiudi/xd60/keymaps/rooski/keymap.c
similarity index 100%
rename from keyboards/xd60/keymaps/rooski/keymap.c
rename to keyboards/xiudi/xd60/keymaps/rooski/keymap.c
diff --git a/keyboards/xd60/keymaps/semicolonsnet/keymap.c b/keyboards/xiudi/xd60/keymaps/semicolonsnet/keymap.c
similarity index 100%
rename from keyboards/xd60/keymaps/semicolonsnet/keymap.c
rename to keyboards/xiudi/xd60/keymaps/semicolonsnet/keymap.c
diff --git a/keyboards/xd60/keymaps/semicolonsnet/readme.md b/keyboards/xiudi/xd60/keymaps/semicolonsnet/readme.md
similarity index 100%
rename from keyboards/xd60/keymaps/semicolonsnet/readme.md
rename to keyboards/xiudi/xd60/keymaps/semicolonsnet/readme.md
diff --git a/keyboards/xd60/keymaps/split_bksp_arrows/keymap.c b/keyboards/xiudi/xd60/keymaps/split_bksp_arrows/keymap.c
similarity index 100%
rename from keyboards/xd60/keymaps/split_bksp_arrows/keymap.c
rename to keyboards/xiudi/xd60/keymaps/split_bksp_arrows/keymap.c
diff --git a/keyboards/xd60/keymaps/split_bksp_arrows/readme.md b/keyboards/xiudi/xd60/keymaps/split_bksp_arrows/readme.md
similarity index 100%
rename from keyboards/xd60/keymaps/split_bksp_arrows/readme.md
rename to keyboards/xiudi/xd60/keymaps/split_bksp_arrows/readme.md
diff --git a/keyboards/xd60/keymaps/stanleylai/keymap.c b/keyboards/xiudi/xd60/keymaps/stanleylai/keymap.c
similarity index 100%
rename from keyboards/xd60/keymaps/stanleylai/keymap.c
rename to keyboards/xiudi/xd60/keymaps/stanleylai/keymap.c
diff --git a/keyboards/xd60/keymaps/styr/keymap.c b/keyboards/xiudi/xd60/keymaps/styr/keymap.c
similarity index 100%
rename from keyboards/xd60/keymaps/styr/keymap.c
rename to keyboards/xiudi/xd60/keymaps/styr/keymap.c
diff --git a/keyboards/xd60/keymaps/styr/readme.md b/keyboards/xiudi/xd60/keymaps/styr/readme.md
similarity index 100%
rename from keyboards/xd60/keymaps/styr/readme.md
rename to keyboards/xiudi/xd60/keymaps/styr/readme.md
diff --git a/keyboards/xd60/keymaps/supercoffee/keymap.c b/keyboards/xiudi/xd60/keymaps/supercoffee/keymap.c
similarity index 100%
rename from keyboards/xd60/keymaps/supercoffee/keymap.c
rename to keyboards/xiudi/xd60/keymaps/supercoffee/keymap.c
diff --git a/keyboards/xd60/keymaps/supercoffee/readme.md b/keyboards/xiudi/xd60/keymaps/supercoffee/readme.md
similarity index 100%
rename from keyboards/xd60/keymaps/supercoffee/readme.md
rename to keyboards/xiudi/xd60/keymaps/supercoffee/readme.md
diff --git a/keyboards/xd60/keymaps/suryanisaac/README.md b/keyboards/xiudi/xd60/keymaps/suryanisaac/README.md
similarity index 100%
rename from keyboards/xd60/keymaps/suryanisaac/README.md
rename to keyboards/xiudi/xd60/keymaps/suryanisaac/README.md
diff --git a/keyboards/xd60/keymaps/suryanisaac/keymap.c b/keyboards/xiudi/xd60/keymaps/suryanisaac/keymap.c
similarity index 100%
rename from keyboards/xd60/keymaps/suryanisaac/keymap.c
rename to keyboards/xiudi/xd60/keymaps/suryanisaac/keymap.c
diff --git a/keyboards/xd60/keymaps/via/keymap.c b/keyboards/xiudi/xd60/keymaps/via/keymap.c
similarity index 100%
rename from keyboards/xd60/keymaps/via/keymap.c
rename to keyboards/xiudi/xd60/keymaps/via/keymap.c
diff --git a/keyboards/xd60/keymaps/via/readme.md b/keyboards/xiudi/xd60/keymaps/via/readme.md
similarity index 100%
rename from keyboards/xd60/keymaps/via/readme.md
rename to keyboards/xiudi/xd60/keymaps/via/readme.md
diff --git a/keyboards/xd60/keymaps/via/rules.mk b/keyboards/xiudi/xd60/keymaps/via/rules.mk
similarity index 100%
rename from keyboards/xd60/keymaps/via/rules.mk
rename to keyboards/xiudi/xd60/keymaps/via/rules.mk
diff --git a/keyboards/xd60/keymaps/yuuki/README.md b/keyboards/xiudi/xd60/keymaps/yuuki/README.md
similarity index 100%
rename from keyboards/xd60/keymaps/yuuki/README.md
rename to keyboards/xiudi/xd60/keymaps/yuuki/README.md
diff --git a/keyboards/xd60/keymaps/yuuki/keymap.c b/keyboards/xiudi/xd60/keymaps/yuuki/keymap.c
similarity index 100%
rename from keyboards/xd60/keymaps/yuuki/keymap.c
rename to keyboards/xiudi/xd60/keymaps/yuuki/keymap.c
diff --git a/keyboards/xd60/readme.md b/keyboards/xiudi/xd60/readme.md
similarity index 100%
rename from keyboards/xd60/readme.md
rename to keyboards/xiudi/xd60/readme.md
diff --git a/keyboards/xd60/rev2/.noci b/keyboards/xiudi/xd60/rev2/.noci
similarity index 100%
rename from keyboards/xd60/rev2/.noci
rename to keyboards/xiudi/xd60/rev2/.noci
diff --git a/keyboards/xd60/rev2/config.h b/keyboards/xiudi/xd60/rev2/config.h
similarity index 100%
rename from keyboards/xd60/rev2/config.h
rename to keyboards/xiudi/xd60/rev2/config.h
diff --git a/keyboards/xd60/rev2/rules.mk b/keyboards/xiudi/xd60/rev2/rules.mk
similarity index 100%
rename from keyboards/xd60/rev2/rules.mk
rename to keyboards/xiudi/xd60/rev2/rules.mk
diff --git a/keyboards/xd60/rev3/config.h b/keyboards/xiudi/xd60/rev3/config.h
similarity index 100%
rename from keyboards/xd60/rev3/config.h
rename to keyboards/xiudi/xd60/rev3/config.h
diff --git a/keyboards/xd60/rev3/rules.mk b/keyboards/xiudi/xd60/rev3/rules.mk
similarity index 100%
rename from keyboards/xd60/rev3/rules.mk
rename to keyboards/xiudi/xd60/rev3/rules.mk
diff --git a/keyboards/xd60/xd60.c b/keyboards/xiudi/xd60/xd60.c
similarity index 100%
rename from keyboards/xd60/xd60.c
rename to keyboards/xiudi/xd60/xd60.c
diff --git a/keyboards/xd60/xd60.h b/keyboards/xiudi/xd60/xd60.h
similarity index 100%
rename from keyboards/xd60/xd60.h
rename to keyboards/xiudi/xd60/xd60.h
diff --git a/keyboards/xd68/config.h b/keyboards/xiudi/xd68/config.h
similarity index 100%
rename from keyboards/xd68/config.h
rename to keyboards/xiudi/xd68/config.h
diff --git a/keyboards/xd68/info.json b/keyboards/xiudi/xd68/info.json
similarity index 100%
rename from keyboards/xd68/info.json
rename to keyboards/xiudi/xd68/info.json
diff --git a/keyboards/xd68/keymaps/default/keymap.c b/keyboards/xiudi/xd68/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/xd68/keymaps/default/keymap.c
rename to keyboards/xiudi/xd68/keymaps/default/keymap.c
diff --git a/keyboards/xd68/keymaps/default/readme.md b/keyboards/xiudi/xd68/keymaps/default/readme.md
similarity index 100%
rename from keyboards/xd68/keymaps/default/readme.md
rename to keyboards/xiudi/xd68/keymaps/default/readme.md
diff --git a/keyboards/xd68/keymaps/default_iso/keymap.c b/keyboards/xiudi/xd68/keymaps/default_iso/keymap.c
similarity index 100%
rename from keyboards/xd68/keymaps/default_iso/keymap.c
rename to keyboards/xiudi/xd68/keymaps/default_iso/keymap.c
diff --git a/keyboards/xd68/keymaps/default_iso/readme.md b/keyboards/xiudi/xd68/keymaps/default_iso/readme.md
similarity index 100%
rename from keyboards/xd68/keymaps/default_iso/readme.md
rename to keyboards/xiudi/xd68/keymaps/default_iso/readme.md
diff --git a/keyboards/xd68/keymaps/via/keymap.c b/keyboards/xiudi/xd68/keymaps/via/keymap.c
similarity index 100%
rename from keyboards/xd68/keymaps/via/keymap.c
rename to keyboards/xiudi/xd68/keymaps/via/keymap.c
diff --git a/keyboards/xd68/keymaps/via/readme.md b/keyboards/xiudi/xd68/keymaps/via/readme.md
similarity index 100%
rename from keyboards/xd68/keymaps/via/readme.md
rename to keyboards/xiudi/xd68/keymaps/via/readme.md
diff --git a/keyboards/xd68/keymaps/via/rules.mk b/keyboards/xiudi/xd68/keymaps/via/rules.mk
similarity index 100%
rename from keyboards/xd68/keymaps/via/rules.mk
rename to keyboards/xiudi/xd68/keymaps/via/rules.mk
diff --git a/keyboards/xd68/readme.md b/keyboards/xiudi/xd68/readme.md
similarity index 100%
rename from keyboards/xd68/readme.md
rename to keyboards/xiudi/xd68/readme.md
diff --git a/keyboards/xd68/rules.mk b/keyboards/xiudi/xd68/rules.mk
similarity index 100%
rename from keyboards/xd68/rules.mk
rename to keyboards/xiudi/xd68/rules.mk
diff --git a/keyboards/xd68/xd68.c b/keyboards/xiudi/xd68/xd68.c
similarity index 100%
rename from keyboards/xd68/xd68.c
rename to keyboards/xiudi/xd68/xd68.c
diff --git a/keyboards/xd68/xd68.h b/keyboards/xiudi/xd68/xd68.h
similarity index 100%
rename from keyboards/xd68/xd68.h
rename to keyboards/xiudi/xd68/xd68.h
diff --git a/keyboards/xd75/config.h b/keyboards/xiudi/xd75/config.h
similarity index 100%
rename from keyboards/xd75/config.h
rename to keyboards/xiudi/xd75/config.h
diff --git a/keyboards/xd75/info.json b/keyboards/xiudi/xd75/info.json
similarity index 100%
rename from keyboards/xd75/info.json
rename to keyboards/xiudi/xd75/info.json
diff --git a/keyboards/xd75/keymaps/4sstylz/config.h b/keyboards/xiudi/xd75/keymaps/4sstylz/config.h
similarity index 100%
rename from keyboards/xd75/keymaps/4sstylz/config.h
rename to keyboards/xiudi/xd75/keymaps/4sstylz/config.h
diff --git a/keyboards/xd75/keymaps/4sstylz/keycodes.h b/keyboards/xiudi/xd75/keymaps/4sstylz/keycodes.h
similarity index 100%
rename from keyboards/xd75/keymaps/4sstylz/keycodes.h
rename to keyboards/xiudi/xd75/keymaps/4sstylz/keycodes.h
diff --git a/keyboards/xd75/keymaps/4sstylz/keymap.c b/keyboards/xiudi/xd75/keymaps/4sstylz/keymap.c
similarity index 100%
rename from keyboards/xd75/keymaps/4sstylz/keymap.c
rename to keyboards/xiudi/xd75/keymaps/4sstylz/keymap.c
diff --git a/keyboards/xd75/keymaps/4sstylz/leds.h b/keyboards/xiudi/xd75/keymaps/4sstylz/leds.h
similarity index 100%
rename from keyboards/xd75/keymaps/4sstylz/leds.h
rename to keyboards/xiudi/xd75/keymaps/4sstylz/leds.h
diff --git a/keyboards/xd75/keymaps/4sstylz/readme.md b/keyboards/xiudi/xd75/keymaps/4sstylz/readme.md
similarity index 100%
rename from keyboards/xd75/keymaps/4sstylz/readme.md
rename to keyboards/xiudi/xd75/keymaps/4sstylz/readme.md
diff --git a/keyboards/xd75/keymaps/4sstylz/rules.mk b/keyboards/xiudi/xd75/keymaps/4sstylz/rules.mk
similarity index 100%
rename from keyboards/xd75/keymaps/4sstylz/rules.mk
rename to keyboards/xiudi/xd75/keymaps/4sstylz/rules.mk
diff --git a/keyboards/xd75/keymaps/adi/config.h b/keyboards/xiudi/xd75/keymaps/adi/config.h
similarity index 100%
rename from keyboards/xd75/keymaps/adi/config.h
rename to keyboards/xiudi/xd75/keymaps/adi/config.h
diff --git a/keyboards/xd75/keymaps/adi/keymap.c b/keyboards/xiudi/xd75/keymaps/adi/keymap.c
similarity index 100%
rename from keyboards/xd75/keymaps/adi/keymap.c
rename to keyboards/xiudi/xd75/keymaps/adi/keymap.c
diff --git a/keyboards/xd75/keymaps/adi/readme.md b/keyboards/xiudi/xd75/keymaps/adi/readme.md
similarity index 100%
rename from keyboards/xd75/keymaps/adi/readme.md
rename to keyboards/xiudi/xd75/keymaps/adi/readme.md
diff --git a/keyboards/xd75/keymaps/adi/rules.mk b/keyboards/xiudi/xd75/keymaps/adi/rules.mk
similarity index 100%
rename from keyboards/xd75/keymaps/adi/rules.mk
rename to keyboards/xiudi/xd75/keymaps/adi/rules.mk
diff --git a/keyboards/xd75/keymaps/arpinfidel/config.h b/keyboards/xiudi/xd75/keymaps/arpinfidel/config.h
similarity index 100%
rename from keyboards/xd75/keymaps/arpinfidel/config.h
rename to keyboards/xiudi/xd75/keymaps/arpinfidel/config.h
diff --git a/keyboards/xd75/keymaps/arpinfidel/keymap.c b/keyboards/xiudi/xd75/keymaps/arpinfidel/keymap.c
similarity index 100%
rename from keyboards/xd75/keymaps/arpinfidel/keymap.c
rename to keyboards/xiudi/xd75/keymaps/arpinfidel/keymap.c
diff --git a/keyboards/xd75/keymaps/arpinfidel/readme.md b/keyboards/xiudi/xd75/keymaps/arpinfidel/readme.md
similarity index 100%
rename from keyboards/xd75/keymaps/arpinfidel/readme.md
rename to keyboards/xiudi/xd75/keymaps/arpinfidel/readme.md
diff --git a/keyboards/xd75/keymaps/arpinfidel/rules.mk b/keyboards/xiudi/xd75/keymaps/arpinfidel/rules.mk
similarity index 100%
rename from keyboards/xd75/keymaps/arpinfidel/rules.mk
rename to keyboards/xiudi/xd75/keymaps/arpinfidel/rules.mk
diff --git a/keyboards/xd75/keymaps/atomic_style/config.h b/keyboards/xiudi/xd75/keymaps/atomic_style/config.h
similarity index 100%
rename from keyboards/xd75/keymaps/atomic_style/config.h
rename to keyboards/xiudi/xd75/keymaps/atomic_style/config.h
diff --git a/keyboards/xd75/keymaps/atomic_style/keymap.c b/keyboards/xiudi/xd75/keymaps/atomic_style/keymap.c
similarity index 100%
rename from keyboards/xd75/keymaps/atomic_style/keymap.c
rename to keyboards/xiudi/xd75/keymaps/atomic_style/keymap.c
diff --git a/keyboards/xd75/keymaps/atomic_style/readme.md b/keyboards/xiudi/xd75/keymaps/atomic_style/readme.md
similarity index 100%
rename from keyboards/xd75/keymaps/atomic_style/readme.md
rename to keyboards/xiudi/xd75/keymaps/atomic_style/readme.md
diff --git a/keyboards/xd75/keymaps/atomic_style/rules.mk b/keyboards/xiudi/xd75/keymaps/atomic_style/rules.mk
similarity index 100%
rename from keyboards/xd75/keymaps/atomic_style/rules.mk
rename to keyboards/xiudi/xd75/keymaps/atomic_style/rules.mk
diff --git a/keyboards/xd75/keymaps/atomic_style_jp/keymap.c b/keyboards/xiudi/xd75/keymaps/atomic_style_jp/keymap.c
similarity index 100%
rename from keyboards/xd75/keymaps/atomic_style_jp/keymap.c
rename to keyboards/xiudi/xd75/keymaps/atomic_style_jp/keymap.c
diff --git a/keyboards/xd75/keymaps/atomic_style_jp/readme.md b/keyboards/xiudi/xd75/keymaps/atomic_style_jp/readme.md
similarity index 100%
rename from keyboards/xd75/keymaps/atomic_style_jp/readme.md
rename to keyboards/xiudi/xd75/keymaps/atomic_style_jp/readme.md
diff --git a/keyboards/xd75/keymaps/bbaserdem/config.h b/keyboards/xiudi/xd75/keymaps/bbaserdem/config.h
similarity index 100%
rename from keyboards/xd75/keymaps/bbaserdem/config.h
rename to keyboards/xiudi/xd75/keymaps/bbaserdem/config.h
diff --git a/keyboards/xd75/keymaps/bbaserdem/keymap.c b/keyboards/xiudi/xd75/keymaps/bbaserdem/keymap.c
similarity index 100%
rename from keyboards/xd75/keymaps/bbaserdem/keymap.c
rename to keyboards/xiudi/xd75/keymaps/bbaserdem/keymap.c
diff --git a/keyboards/xd75/keymaps/bbaserdem/readme.md b/keyboards/xiudi/xd75/keymaps/bbaserdem/readme.md
similarity index 100%
rename from keyboards/xd75/keymaps/bbaserdem/readme.md
rename to keyboards/xiudi/xd75/keymaps/bbaserdem/readme.md
diff --git a/keyboards/xd75/keymaps/bbaserdem/rules.mk b/keyboards/xiudi/xd75/keymaps/bbaserdem/rules.mk
similarity index 100%
rename from keyboards/xd75/keymaps/bbaserdem/rules.mk
rename to keyboards/xiudi/xd75/keymaps/bbaserdem/rules.mk
diff --git a/keyboards/xd75/keymaps/billypython/config.h b/keyboards/xiudi/xd75/keymaps/billypython/config.h
similarity index 100%
rename from keyboards/xd75/keymaps/billypython/config.h
rename to keyboards/xiudi/xd75/keymaps/billypython/config.h
diff --git a/keyboards/xd75/keymaps/billypython/keymap.c b/keyboards/xiudi/xd75/keymaps/billypython/keymap.c
similarity index 100%
rename from keyboards/xd75/keymaps/billypython/keymap.c
rename to keyboards/xiudi/xd75/keymaps/billypython/keymap.c
diff --git a/keyboards/xd75/keymaps/billypython/rules.mk b/keyboards/xiudi/xd75/keymaps/billypython/rules.mk
similarity index 100%
rename from keyboards/xd75/keymaps/billypython/rules.mk
rename to keyboards/xiudi/xd75/keymaps/billypython/rules.mk
diff --git a/keyboards/xd75/keymaps/boy_314/config.h b/keyboards/xiudi/xd75/keymaps/boy_314/config.h
similarity index 100%
rename from keyboards/xd75/keymaps/boy_314/config.h
rename to keyboards/xiudi/xd75/keymaps/boy_314/config.h
diff --git a/keyboards/xd75/keymaps/boy_314/keymap.c b/keyboards/xiudi/xd75/keymaps/boy_314/keymap.c
similarity index 100%
rename from keyboards/xd75/keymaps/boy_314/keymap.c
rename to keyboards/xiudi/xd75/keymaps/boy_314/keymap.c
diff --git a/keyboards/xd75/keymaps/boy_314/readme.md b/keyboards/xiudi/xd75/keymaps/boy_314/readme.md
similarity index 100%
rename from keyboards/xd75/keymaps/boy_314/readme.md
rename to keyboards/xiudi/xd75/keymaps/boy_314/readme.md
diff --git a/keyboards/xd75/keymaps/boy_314/rules.mk b/keyboards/xiudi/xd75/keymaps/boy_314/rules.mk
similarity index 100%
rename from keyboards/xd75/keymaps/boy_314/rules.mk
rename to keyboards/xiudi/xd75/keymaps/boy_314/rules.mk
diff --git a/keyboards/xd75/keymaps/bramver/config.h b/keyboards/xiudi/xd75/keymaps/bramver/config.h
similarity index 100%
rename from keyboards/xd75/keymaps/bramver/config.h
rename to keyboards/xiudi/xd75/keymaps/bramver/config.h
diff --git a/keyboards/xd75/keymaps/bramver/keymap.c b/keyboards/xiudi/xd75/keymaps/bramver/keymap.c
similarity index 100%
rename from keyboards/xd75/keymaps/bramver/keymap.c
rename to keyboards/xiudi/xd75/keymaps/bramver/keymap.c
diff --git a/keyboards/xd75/keymaps/bramver/readme.md b/keyboards/xiudi/xd75/keymaps/bramver/readme.md
similarity index 100%
rename from keyboards/xd75/keymaps/bramver/readme.md
rename to keyboards/xiudi/xd75/keymaps/bramver/readme.md
diff --git a/keyboards/xd75/keymaps/bramver/rules.mk b/keyboards/xiudi/xd75/keymaps/bramver/rules.mk
similarity index 100%
rename from keyboards/xd75/keymaps/bramver/rules.mk
rename to keyboards/xiudi/xd75/keymaps/bramver/rules.mk
diff --git a/keyboards/xd75/keymaps/bulbizarre/config.h b/keyboards/xiudi/xd75/keymaps/bulbizarre/config.h
similarity index 100%
rename from keyboards/xd75/keymaps/bulbizarre/config.h
rename to keyboards/xiudi/xd75/keymaps/bulbizarre/config.h
diff --git a/keyboards/xd75/keymaps/bulbizarre/keymap.c b/keyboards/xiudi/xd75/keymaps/bulbizarre/keymap.c
similarity index 100%
rename from keyboards/xd75/keymaps/bulbizarre/keymap.c
rename to keyboards/xiudi/xd75/keymaps/bulbizarre/keymap.c
diff --git a/keyboards/xd75/keymaps/bulbizarre/readme.md b/keyboards/xiudi/xd75/keymaps/bulbizarre/readme.md
similarity index 100%
rename from keyboards/xd75/keymaps/bulbizarre/readme.md
rename to keyboards/xiudi/xd75/keymaps/bulbizarre/readme.md
diff --git a/keyboards/xd75/keymaps/bulbizarre/rules.mk b/keyboards/xiudi/xd75/keymaps/bulbizarre/rules.mk
similarity index 100%
rename from keyboards/xd75/keymaps/bulbizarre/rules.mk
rename to keyboards/xiudi/xd75/keymaps/bulbizarre/rules.mk
diff --git a/keyboards/xd75/keymaps/buzzlighter1/config.h b/keyboards/xiudi/xd75/keymaps/buzzlighter1/config.h
similarity index 100%
rename from keyboards/xd75/keymaps/buzzlighter1/config.h
rename to keyboards/xiudi/xd75/keymaps/buzzlighter1/config.h
diff --git a/keyboards/xd75/keymaps/buzzlighter1/keymap.c b/keyboards/xiudi/xd75/keymaps/buzzlighter1/keymap.c
similarity index 100%
rename from keyboards/xd75/keymaps/buzzlighter1/keymap.c
rename to keyboards/xiudi/xd75/keymaps/buzzlighter1/keymap.c
diff --git a/keyboards/xd75/keymaps/buzzlighter1/readme.md b/keyboards/xiudi/xd75/keymaps/buzzlighter1/readme.md
similarity index 100%
rename from keyboards/xd75/keymaps/buzzlighter1/readme.md
rename to keyboards/xiudi/xd75/keymaps/buzzlighter1/readme.md
diff --git a/keyboards/xd75/keymaps/buzzlighter1/rules.mk b/keyboards/xiudi/xd75/keymaps/buzzlighter1/rules.mk
similarity index 100%
rename from keyboards/xd75/keymaps/buzzlighter1/rules.mk
rename to keyboards/xiudi/xd75/keymaps/buzzlighter1/rules.mk
diff --git a/keyboards/xd75/keymaps/c4software_bepo/config.h b/keyboards/xiudi/xd75/keymaps/c4software_bepo/config.h
similarity index 100%
rename from keyboards/xd75/keymaps/c4software_bepo/config.h
rename to keyboards/xiudi/xd75/keymaps/c4software_bepo/config.h
diff --git a/keyboards/xd75/keymaps/c4software_bepo/keymap.c b/keyboards/xiudi/xd75/keymaps/c4software_bepo/keymap.c
similarity index 100%
rename from keyboards/xd75/keymaps/c4software_bepo/keymap.c
rename to keyboards/xiudi/xd75/keymaps/c4software_bepo/keymap.c
diff --git a/keyboards/xd75/keymaps/c4software_bepo/readme.md b/keyboards/xiudi/xd75/keymaps/c4software_bepo/readme.md
similarity index 100%
rename from keyboards/xd75/keymaps/c4software_bepo/readme.md
rename to keyboards/xiudi/xd75/keymaps/c4software_bepo/readme.md
diff --git a/keyboards/xd75/keymaps/c4software_bepo/rules.mk b/keyboards/xiudi/xd75/keymaps/c4software_bepo/rules.mk
similarity index 100%
rename from keyboards/xd75/keymaps/c4software_bepo/rules.mk
rename to keyboards/xiudi/xd75/keymaps/c4software_bepo/rules.mk
diff --git a/keyboards/xd75/keymaps/cbbrowne/config.h b/keyboards/xiudi/xd75/keymaps/cbbrowne/config.h
similarity index 100%
rename from keyboards/xd75/keymaps/cbbrowne/config.h
rename to keyboards/xiudi/xd75/keymaps/cbbrowne/config.h
diff --git a/keyboards/xd75/keymaps/cbbrowne/keymap.c b/keyboards/xiudi/xd75/keymaps/cbbrowne/keymap.c
similarity index 100%
rename from keyboards/xd75/keymaps/cbbrowne/keymap.c
rename to keyboards/xiudi/xd75/keymaps/cbbrowne/keymap.c
diff --git a/keyboards/xd75/keymaps/cbbrowne/readme.md b/keyboards/xiudi/xd75/keymaps/cbbrowne/readme.md
similarity index 100%
rename from keyboards/xd75/keymaps/cbbrowne/readme.md
rename to keyboards/xiudi/xd75/keymaps/cbbrowne/readme.md
diff --git a/keyboards/xd75/keymaps/cbbrowne/rules.mk b/keyboards/xiudi/xd75/keymaps/cbbrowne/rules.mk
similarity index 100%
rename from keyboards/xd75/keymaps/cbbrowne/rules.mk
rename to keyboards/xiudi/xd75/keymaps/cbbrowne/rules.mk
diff --git a/keyboards/xd75/keymaps/clanghans/config.h b/keyboards/xiudi/xd75/keymaps/clanghans/config.h
similarity index 100%
rename from keyboards/xd75/keymaps/clanghans/config.h
rename to keyboards/xiudi/xd75/keymaps/clanghans/config.h
diff --git a/keyboards/xd75/keymaps/clanghans/keymap.c b/keyboards/xiudi/xd75/keymaps/clanghans/keymap.c
similarity index 100%
rename from keyboards/xd75/keymaps/clanghans/keymap.c
rename to keyboards/xiudi/xd75/keymaps/clanghans/keymap.c
diff --git a/keyboards/xd75/keymaps/clanghans/readme.md b/keyboards/xiudi/xd75/keymaps/clanghans/readme.md
similarity index 100%
rename from keyboards/xd75/keymaps/clanghans/readme.md
rename to keyboards/xiudi/xd75/keymaps/clanghans/readme.md
diff --git a/keyboards/xd75/keymaps/colinta/config.h b/keyboards/xiudi/xd75/keymaps/colinta/config.h
similarity index 100%
rename from keyboards/xd75/keymaps/colinta/config.h
rename to keyboards/xiudi/xd75/keymaps/colinta/config.h
diff --git a/keyboards/xd75/keymaps/colinta/keymap.c b/keyboards/xiudi/xd75/keymaps/colinta/keymap.c
similarity index 100%
rename from keyboards/xd75/keymaps/colinta/keymap.c
rename to keyboards/xiudi/xd75/keymaps/colinta/keymap.c
diff --git a/keyboards/xd75/keymaps/colinta/readme.md b/keyboards/xiudi/xd75/keymaps/colinta/readme.md
similarity index 100%
rename from keyboards/xd75/keymaps/colinta/readme.md
rename to keyboards/xiudi/xd75/keymaps/colinta/readme.md
diff --git a/keyboards/xd75/keymaps/daniel/keymap.c b/keyboards/xiudi/xd75/keymaps/daniel/keymap.c
similarity index 100%
rename from keyboards/xd75/keymaps/daniel/keymap.c
rename to keyboards/xiudi/xd75/keymaps/daniel/keymap.c
diff --git a/keyboards/xd75/keymaps/daniel/readme.md b/keyboards/xiudi/xd75/keymaps/daniel/readme.md
similarity index 100%
rename from keyboards/xd75/keymaps/daniel/readme.md
rename to keyboards/xiudi/xd75/keymaps/daniel/readme.md
diff --git a/keyboards/xd75/keymaps/davidrambo/config.h b/keyboards/xiudi/xd75/keymaps/davidrambo/config.h
similarity index 100%
rename from keyboards/xd75/keymaps/davidrambo/config.h
rename to keyboards/xiudi/xd75/keymaps/davidrambo/config.h
diff --git a/keyboards/xd75/keymaps/davidrambo/keymap.c b/keyboards/xiudi/xd75/keymaps/davidrambo/keymap.c
similarity index 100%
rename from keyboards/xd75/keymaps/davidrambo/keymap.c
rename to keyboards/xiudi/xd75/keymaps/davidrambo/keymap.c
diff --git a/keyboards/xd75/keymaps/davidrambo/readme.md b/keyboards/xiudi/xd75/keymaps/davidrambo/readme.md
similarity index 100%
rename from keyboards/xd75/keymaps/davidrambo/readme.md
rename to keyboards/xiudi/xd75/keymaps/davidrambo/readme.md
diff --git a/keyboards/xd75/keymaps/davidrambo/rules.mk b/keyboards/xiudi/xd75/keymaps/davidrambo/rules.mk
similarity index 100%
rename from keyboards/xd75/keymaps/davidrambo/rules.mk
rename to keyboards/xiudi/xd75/keymaps/davidrambo/rules.mk
diff --git a/keyboards/xd75/keymaps/default/keymap.c b/keyboards/xiudi/xd75/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/xd75/keymaps/default/keymap.c
rename to keyboards/xiudi/xd75/keymaps/default/keymap.c
diff --git a/keyboards/xd75/keymaps/default/readme.md b/keyboards/xiudi/xd75/keymaps/default/readme.md
similarity index 100%
rename from keyboards/xd75/keymaps/default/readme.md
rename to keyboards/xiudi/xd75/keymaps/default/readme.md
diff --git a/keyboards/xd75/keymaps/developper_bepo/config.h b/keyboards/xiudi/xd75/keymaps/developper_bepo/config.h
similarity index 100%
rename from keyboards/xd75/keymaps/developper_bepo/config.h
rename to keyboards/xiudi/xd75/keymaps/developper_bepo/config.h
diff --git a/keyboards/xd75/keymaps/developper_bepo/keymap.c b/keyboards/xiudi/xd75/keymaps/developper_bepo/keymap.c
similarity index 100%
rename from keyboards/xd75/keymaps/developper_bepo/keymap.c
rename to keyboards/xiudi/xd75/keymaps/developper_bepo/keymap.c
diff --git a/keyboards/xd75/keymaps/developper_bepo/readme.md b/keyboards/xiudi/xd75/keymaps/developper_bepo/readme.md
similarity index 100%
rename from keyboards/xd75/keymaps/developper_bepo/readme.md
rename to keyboards/xiudi/xd75/keymaps/developper_bepo/readme.md
diff --git a/keyboards/xd75/keymaps/developper_bepo/rules.mk b/keyboards/xiudi/xd75/keymaps/developper_bepo/rules.mk
similarity index 100%
rename from keyboards/xd75/keymaps/developper_bepo/rules.mk
rename to keyboards/xiudi/xd75/keymaps/developper_bepo/rules.mk
diff --git a/keyboards/xd75/keymaps/dyn_macro_tap_dance/config.h b/keyboards/xiudi/xd75/keymaps/dyn_macro_tap_dance/config.h
similarity index 100%
rename from keyboards/xd75/keymaps/dyn_macro_tap_dance/config.h
rename to keyboards/xiudi/xd75/keymaps/dyn_macro_tap_dance/config.h
diff --git a/keyboards/xd75/keymaps/dyn_macro_tap_dance/keymap.c b/keyboards/xiudi/xd75/keymaps/dyn_macro_tap_dance/keymap.c
similarity index 100%
rename from keyboards/xd75/keymaps/dyn_macro_tap_dance/keymap.c
rename to keyboards/xiudi/xd75/keymaps/dyn_macro_tap_dance/keymap.c
diff --git a/keyboards/xd75/keymaps/dyn_macro_tap_dance/readme.md b/keyboards/xiudi/xd75/keymaps/dyn_macro_tap_dance/readme.md
similarity index 100%
rename from keyboards/xd75/keymaps/dyn_macro_tap_dance/readme.md
rename to keyboards/xiudi/xd75/keymaps/dyn_macro_tap_dance/readme.md
diff --git a/keyboards/xd75/keymaps/dyn_macro_tap_dance/rules.mk b/keyboards/xiudi/xd75/keymaps/dyn_macro_tap_dance/rules.mk
similarity index 100%
rename from keyboards/xd75/keymaps/dyn_macro_tap_dance/rules.mk
rename to keyboards/xiudi/xd75/keymaps/dyn_macro_tap_dance/rules.mk
diff --git a/keyboards/xd75/keymaps/emilyh/config.h b/keyboards/xiudi/xd75/keymaps/emilyh/config.h
similarity index 100%
rename from keyboards/xd75/keymaps/emilyh/config.h
rename to keyboards/xiudi/xd75/keymaps/emilyh/config.h
diff --git a/keyboards/xd75/keymaps/emilyh/keymap.c b/keyboards/xiudi/xd75/keymaps/emilyh/keymap.c
similarity index 100%
rename from keyboards/xd75/keymaps/emilyh/keymap.c
rename to keyboards/xiudi/xd75/keymaps/emilyh/keymap.c
diff --git a/keyboards/xd75/keymaps/emilyh/readme.md b/keyboards/xiudi/xd75/keymaps/emilyh/readme.md
similarity index 100%
rename from keyboards/xd75/keymaps/emilyh/readme.md
rename to keyboards/xiudi/xd75/keymaps/emilyh/readme.md
diff --git a/keyboards/xd75/keymaps/emilyh/rules.mk b/keyboards/xiudi/xd75/keymaps/emilyh/rules.mk
similarity index 100%
rename from keyboards/xd75/keymaps/emilyh/rules.mk
rename to keyboards/xiudi/xd75/keymaps/emilyh/rules.mk
diff --git a/keyboards/xd75/keymaps/ericgebhart/config.h b/keyboards/xiudi/xd75/keymaps/ericgebhart/config.h
similarity index 100%
rename from keyboards/xd75/keymaps/ericgebhart/config.h
rename to keyboards/xiudi/xd75/keymaps/ericgebhart/config.h
diff --git a/keyboards/xd75/keymaps/ericgebhart/keymap.c b/keyboards/xiudi/xd75/keymaps/ericgebhart/keymap.c
similarity index 100%
rename from keyboards/xd75/keymaps/ericgebhart/keymap.c
rename to keyboards/xiudi/xd75/keymaps/ericgebhart/keymap.c
diff --git a/keyboards/xd75/keymaps/ericgebhart/readme.md b/keyboards/xiudi/xd75/keymaps/ericgebhart/readme.md
similarity index 100%
rename from keyboards/xd75/keymaps/ericgebhart/readme.md
rename to keyboards/xiudi/xd75/keymaps/ericgebhart/readme.md
diff --git a/keyboards/xd75/keymaps/ericgebhart/rules.mk b/keyboards/xiudi/xd75/keymaps/ericgebhart/rules.mk
similarity index 100%
rename from keyboards/xd75/keymaps/ericgebhart/rules.mk
rename to keyboards/xiudi/xd75/keymaps/ericgebhart/rules.mk
diff --git a/keyboards/xd75/keymaps/fabian/config.h b/keyboards/xiudi/xd75/keymaps/fabian/config.h
similarity index 100%
rename from keyboards/xd75/keymaps/fabian/config.h
rename to keyboards/xiudi/xd75/keymaps/fabian/config.h
diff --git a/keyboards/xd75/keymaps/fabian/keymap.c b/keyboards/xiudi/xd75/keymaps/fabian/keymap.c
similarity index 100%
rename from keyboards/xd75/keymaps/fabian/keymap.c
rename to keyboards/xiudi/xd75/keymaps/fabian/keymap.c
diff --git a/keyboards/xd75/keymaps/fabian/rules.mk b/keyboards/xiudi/xd75/keymaps/fabian/rules.mk
similarity index 100%
rename from keyboards/xd75/keymaps/fabian/rules.mk
rename to keyboards/xiudi/xd75/keymaps/fabian/rules.mk
diff --git a/keyboards/xd75/keymaps/french/config.h b/keyboards/xiudi/xd75/keymaps/french/config.h
similarity index 100%
rename from keyboards/xd75/keymaps/french/config.h
rename to keyboards/xiudi/xd75/keymaps/french/config.h
diff --git a/keyboards/xd75/keymaps/french/keymap.c b/keyboards/xiudi/xd75/keymaps/french/keymap.c
similarity index 100%
rename from keyboards/xd75/keymaps/french/keymap.c
rename to keyboards/xiudi/xd75/keymaps/french/keymap.c
diff --git a/keyboards/xd75/keymaps/french/keymap_french.c b/keyboards/xiudi/xd75/keymaps/french/keymap_french.c
similarity index 100%
rename from keyboards/xd75/keymaps/french/keymap_french.c
rename to keyboards/xiudi/xd75/keymaps/french/keymap_french.c
diff --git a/keyboards/xd75/keymaps/french/readme.md b/keyboards/xiudi/xd75/keymaps/french/readme.md
similarity index 100%
rename from keyboards/xd75/keymaps/french/readme.md
rename to keyboards/xiudi/xd75/keymaps/french/readme.md
diff --git a/keyboards/xd75/keymaps/french/rules.mk b/keyboards/xiudi/xd75/keymaps/french/rules.mk
similarity index 100%
rename from keyboards/xd75/keymaps/french/rules.mk
rename to keyboards/xiudi/xd75/keymaps/french/rules.mk
diff --git a/keyboards/xd75/keymaps/germanized/config.h b/keyboards/xiudi/xd75/keymaps/germanized/config.h
similarity index 100%
rename from keyboards/xd75/keymaps/germanized/config.h
rename to keyboards/xiudi/xd75/keymaps/germanized/config.h
diff --git a/keyboards/xd75/keymaps/germanized/keymap.c b/keyboards/xiudi/xd75/keymaps/germanized/keymap.c
similarity index 100%
rename from keyboards/xd75/keymaps/germanized/keymap.c
rename to keyboards/xiudi/xd75/keymaps/germanized/keymap.c
diff --git a/keyboards/xd75/keymaps/germanized/readme.md b/keyboards/xiudi/xd75/keymaps/germanized/readme.md
similarity index 100%
rename from keyboards/xd75/keymaps/germanized/readme.md
rename to keyboards/xiudi/xd75/keymaps/germanized/readme.md
diff --git a/keyboards/xd75/keymaps/germanized/rules.mk b/keyboards/xiudi/xd75/keymaps/germanized/rules.mk
similarity index 100%
rename from keyboards/xd75/keymaps/germanized/rules.mk
rename to keyboards/xiudi/xd75/keymaps/germanized/rules.mk
diff --git a/keyboards/xd75/keymaps/hybrid/config.h b/keyboards/xiudi/xd75/keymaps/hybrid/config.h
similarity index 100%
rename from keyboards/xd75/keymaps/hybrid/config.h
rename to keyboards/xiudi/xd75/keymaps/hybrid/config.h
diff --git a/keyboards/xd75/keymaps/hybrid/keymap.c b/keyboards/xiudi/xd75/keymaps/hybrid/keymap.c
similarity index 100%
rename from keyboards/xd75/keymaps/hybrid/keymap.c
rename to keyboards/xiudi/xd75/keymaps/hybrid/keymap.c
diff --git a/keyboards/xd75/keymaps/hybrid/readme.md b/keyboards/xiudi/xd75/keymaps/hybrid/readme.md
similarity index 100%
rename from keyboards/xd75/keymaps/hybrid/readme.md
rename to keyboards/xiudi/xd75/keymaps/hybrid/readme.md
diff --git a/keyboards/xd75/keymaps/hybrid/rules.mk b/keyboards/xiudi/xd75/keymaps/hybrid/rules.mk
similarity index 100%
rename from keyboards/xd75/keymaps/hybrid/rules.mk
rename to keyboards/xiudi/xd75/keymaps/hybrid/rules.mk
diff --git a/keyboards/xd75/keymaps/jarred/keymap.c b/keyboards/xiudi/xd75/keymaps/jarred/keymap.c
similarity index 100%
rename from keyboards/xd75/keymaps/jarred/keymap.c
rename to keyboards/xiudi/xd75/keymaps/jarred/keymap.c
diff --git a/keyboards/xd75/keymaps/jarred/readme.md b/keyboards/xiudi/xd75/keymaps/jarred/readme.md
similarity index 100%
rename from keyboards/xd75/keymaps/jarred/readme.md
rename to keyboards/xiudi/xd75/keymaps/jarred/readme.md
diff --git a/keyboards/xd75/keymaps/kim-kim-xd73/config.h b/keyboards/xiudi/xd75/keymaps/kim-kim-xd73/config.h
similarity index 100%
rename from keyboards/xd75/keymaps/kim-kim-xd73/config.h
rename to keyboards/xiudi/xd75/keymaps/kim-kim-xd73/config.h
diff --git a/keyboards/xd75/keymaps/kim-kim-xd73/keymap.c b/keyboards/xiudi/xd75/keymaps/kim-kim-xd73/keymap.c
similarity index 100%
rename from keyboards/xd75/keymaps/kim-kim-xd73/keymap.c
rename to keyboards/xiudi/xd75/keymaps/kim-kim-xd73/keymap.c
diff --git a/keyboards/xd75/keymaps/kim-kim-xd73/rules.mk b/keyboards/xiudi/xd75/keymaps/kim-kim-xd73/rules.mk
similarity index 100%
rename from keyboards/xd75/keymaps/kim-kim-xd73/rules.mk
rename to keyboards/xiudi/xd75/keymaps/kim-kim-xd73/rules.mk
diff --git a/keyboards/xd75/keymaps/kim-kim/config.h b/keyboards/xiudi/xd75/keymaps/kim-kim/config.h
similarity index 100%
rename from keyboards/xd75/keymaps/kim-kim/config.h
rename to keyboards/xiudi/xd75/keymaps/kim-kim/config.h
diff --git a/keyboards/xd75/keymaps/kim-kim/keymap.c b/keyboards/xiudi/xd75/keymaps/kim-kim/keymap.c
similarity index 100%
rename from keyboards/xd75/keymaps/kim-kim/keymap.c
rename to keyboards/xiudi/xd75/keymaps/kim-kim/keymap.c
diff --git a/keyboards/xd75/keymaps/kim-kim/rules.mk b/keyboards/xiudi/xd75/keymaps/kim-kim/rules.mk
similarity index 100%
rename from keyboards/xd75/keymaps/kim-kim/rules.mk
rename to keyboards/xiudi/xd75/keymaps/kim-kim/rules.mk
diff --git a/keyboards/xd75/keymaps/kloki/config.h b/keyboards/xiudi/xd75/keymaps/kloki/config.h
similarity index 100%
rename from keyboards/xd75/keymaps/kloki/config.h
rename to keyboards/xiudi/xd75/keymaps/kloki/config.h
diff --git a/keyboards/xd75/keymaps/kloki/keymap.c b/keyboards/xiudi/xd75/keymaps/kloki/keymap.c
similarity index 100%
rename from keyboards/xd75/keymaps/kloki/keymap.c
rename to keyboards/xiudi/xd75/keymaps/kloki/keymap.c
diff --git a/keyboards/xd75/keymaps/kloki/readme.md b/keyboards/xiudi/xd75/keymaps/kloki/readme.md
similarity index 100%
rename from keyboards/xd75/keymaps/kloki/readme.md
rename to keyboards/xiudi/xd75/keymaps/kloki/readme.md
diff --git a/keyboards/xd75/keymaps/kloki/rules.mk b/keyboards/xiudi/xd75/keymaps/kloki/rules.mk
similarity index 100%
rename from keyboards/xd75/keymaps/kloki/rules.mk
rename to keyboards/xiudi/xd75/keymaps/kloki/rules.mk
diff --git a/keyboards/xd75/keymaps/markus/config.h b/keyboards/xiudi/xd75/keymaps/markus/config.h
similarity index 100%
rename from keyboards/xd75/keymaps/markus/config.h
rename to keyboards/xiudi/xd75/keymaps/markus/config.h
diff --git a/keyboards/xd75/keymaps/markus/keymap.c b/keyboards/xiudi/xd75/keymaps/markus/keymap.c
similarity index 100%
rename from keyboards/xd75/keymaps/markus/keymap.c
rename to keyboards/xiudi/xd75/keymaps/markus/keymap.c
diff --git a/keyboards/xd75/keymaps/markus/readme.md b/keyboards/xiudi/xd75/keymaps/markus/readme.md
similarity index 100%
rename from keyboards/xd75/keymaps/markus/readme.md
rename to keyboards/xiudi/xd75/keymaps/markus/readme.md
diff --git a/keyboards/xd75/keymaps/markus/rules.mk b/keyboards/xiudi/xd75/keymaps/markus/rules.mk
similarity index 100%
rename from keyboards/xd75/keymaps/markus/rules.mk
rename to keyboards/xiudi/xd75/keymaps/markus/rules.mk
diff --git a/keyboards/xd75/keymaps/msiu/config.h b/keyboards/xiudi/xd75/keymaps/msiu/config.h
similarity index 100%
rename from keyboards/xd75/keymaps/msiu/config.h
rename to keyboards/xiudi/xd75/keymaps/msiu/config.h
diff --git a/keyboards/xd75/keymaps/msiu/keymap.c b/keyboards/xiudi/xd75/keymaps/msiu/keymap.c
similarity index 100%
rename from keyboards/xd75/keymaps/msiu/keymap.c
rename to keyboards/xiudi/xd75/keymaps/msiu/keymap.c
diff --git a/keyboards/xd75/keymaps/msiu/readme.md b/keyboards/xiudi/xd75/keymaps/msiu/readme.md
similarity index 100%
rename from keyboards/xd75/keymaps/msiu/readme.md
rename to keyboards/xiudi/xd75/keymaps/msiu/readme.md
diff --git a/keyboards/xd75/keymaps/mtdjr/config.h b/keyboards/xiudi/xd75/keymaps/mtdjr/config.h
similarity index 100%
rename from keyboards/xd75/keymaps/mtdjr/config.h
rename to keyboards/xiudi/xd75/keymaps/mtdjr/config.h
diff --git a/keyboards/xd75/keymaps/mtdjr/keymap.c b/keyboards/xiudi/xd75/keymaps/mtdjr/keymap.c
similarity index 100%
rename from keyboards/xd75/keymaps/mtdjr/keymap.c
rename to keyboards/xiudi/xd75/keymaps/mtdjr/keymap.c
diff --git a/keyboards/xd75/keymaps/mtdjr/readme.md b/keyboards/xiudi/xd75/keymaps/mtdjr/readme.md
similarity index 100%
rename from keyboards/xd75/keymaps/mtdjr/readme.md
rename to keyboards/xiudi/xd75/keymaps/mtdjr/readme.md
diff --git a/keyboards/xd75/keymaps/mtdjr/rules.mk b/keyboards/xiudi/xd75/keymaps/mtdjr/rules.mk
similarity index 100%
rename from keyboards/xd75/keymaps/mtdjr/rules.mk
rename to keyboards/xiudi/xd75/keymaps/mtdjr/rules.mk
diff --git a/keyboards/xd75/keymaps/neothefox/keymap.c b/keyboards/xiudi/xd75/keymaps/neothefox/keymap.c
similarity index 100%
rename from keyboards/xd75/keymaps/neothefox/keymap.c
rename to keyboards/xiudi/xd75/keymaps/neothefox/keymap.c
diff --git a/keyboards/xd75/keymaps/neothefox/readme.md b/keyboards/xiudi/xd75/keymaps/neothefox/readme.md
similarity index 100%
rename from keyboards/xd75/keymaps/neothefox/readme.md
rename to keyboards/xiudi/xd75/keymaps/neothefox/readme.md
diff --git a/keyboards/xd75/keymaps/odyssey/config.h b/keyboards/xiudi/xd75/keymaps/odyssey/config.h
similarity index 100%
rename from keyboards/xd75/keymaps/odyssey/config.h
rename to keyboards/xiudi/xd75/keymaps/odyssey/config.h
diff --git a/keyboards/xd75/keymaps/odyssey/keymap.c b/keyboards/xiudi/xd75/keymaps/odyssey/keymap.c
similarity index 100%
rename from keyboards/xd75/keymaps/odyssey/keymap.c
rename to keyboards/xiudi/xd75/keymaps/odyssey/keymap.c
diff --git a/keyboards/xd75/keymaps/odyssey/readme.md b/keyboards/xiudi/xd75/keymaps/odyssey/readme.md
similarity index 100%
rename from keyboards/xd75/keymaps/odyssey/readme.md
rename to keyboards/xiudi/xd75/keymaps/odyssey/readme.md
diff --git a/keyboards/xd75/keymaps/odyssey/rules.mk b/keyboards/xiudi/xd75/keymaps/odyssey/rules.mk
similarity index 100%
rename from keyboards/xd75/keymaps/odyssey/rules.mk
rename to keyboards/xiudi/xd75/keymaps/odyssey/rules.mk
diff --git a/keyboards/xd75/keymaps/pitty/config.h b/keyboards/xiudi/xd75/keymaps/pitty/config.h
similarity index 100%
rename from keyboards/xd75/keymaps/pitty/config.h
rename to keyboards/xiudi/xd75/keymaps/pitty/config.h
diff --git a/keyboards/xd75/keymaps/pitty/keymap.c b/keyboards/xiudi/xd75/keymaps/pitty/keymap.c
similarity index 100%
rename from keyboards/xd75/keymaps/pitty/keymap.c
rename to keyboards/xiudi/xd75/keymaps/pitty/keymap.c
diff --git a/keyboards/xd75/keymaps/pitty/readme.md b/keyboards/xiudi/xd75/keymaps/pitty/readme.md
similarity index 100%
rename from keyboards/xd75/keymaps/pitty/readme.md
rename to keyboards/xiudi/xd75/keymaps/pitty/readme.md
diff --git a/keyboards/xd75/keymaps/pitty/rules.mk b/keyboards/xiudi/xd75/keymaps/pitty/rules.mk
similarity index 100%
rename from keyboards/xd75/keymaps/pitty/rules.mk
rename to keyboards/xiudi/xd75/keymaps/pitty/rules.mk
diff --git a/keyboards/xd75/keymaps/revok75/config.h b/keyboards/xiudi/xd75/keymaps/revok75/config.h
similarity index 100%
rename from keyboards/xd75/keymaps/revok75/config.h
rename to keyboards/xiudi/xd75/keymaps/revok75/config.h
diff --git a/keyboards/xd75/keymaps/revok75/keymap.c b/keyboards/xiudi/xd75/keymaps/revok75/keymap.c
similarity index 100%
rename from keyboards/xd75/keymaps/revok75/keymap.c
rename to keyboards/xiudi/xd75/keymaps/revok75/keymap.c
diff --git a/keyboards/xd75/keymaps/revok75/readme.md b/keyboards/xiudi/xd75/keymaps/revok75/readme.md
similarity index 100%
rename from keyboards/xd75/keymaps/revok75/readme.md
rename to keyboards/xiudi/xd75/keymaps/revok75/readme.md
diff --git a/keyboards/xd75/keymaps/revok75/rules.mk b/keyboards/xiudi/xd75/keymaps/revok75/rules.mk
similarity index 100%
rename from keyboards/xd75/keymaps/revok75/rules.mk
rename to keyboards/xiudi/xd75/keymaps/revok75/rules.mk
diff --git a/keyboards/xd75/keymaps/scheiklp/config.h b/keyboards/xiudi/xd75/keymaps/scheiklp/config.h
similarity index 100%
rename from keyboards/xd75/keymaps/scheiklp/config.h
rename to keyboards/xiudi/xd75/keymaps/scheiklp/config.h
diff --git a/keyboards/xd75/keymaps/scheiklp/keymap.c b/keyboards/xiudi/xd75/keymaps/scheiklp/keymap.c
similarity index 100%
rename from keyboards/xd75/keymaps/scheiklp/keymap.c
rename to keyboards/xiudi/xd75/keymaps/scheiklp/keymap.c
diff --git a/keyboards/xd75/keymaps/scheiklp/readme.md b/keyboards/xiudi/xd75/keymaps/scheiklp/readme.md
similarity index 100%
rename from keyboards/xd75/keymaps/scheiklp/readme.md
rename to keyboards/xiudi/xd75/keymaps/scheiklp/readme.md
diff --git a/keyboards/xd75/keymaps/scheiklp/rules.mk b/keyboards/xiudi/xd75/keymaps/scheiklp/rules.mk
similarity index 100%
rename from keyboards/xd75/keymaps/scheiklp/rules.mk
rename to keyboards/xiudi/xd75/keymaps/scheiklp/rules.mk
diff --git a/keyboards/xd75/keymaps/skewwhiffy/keymap.c b/keyboards/xiudi/xd75/keymaps/skewwhiffy/keymap.c
similarity index 100%
rename from keyboards/xd75/keymaps/skewwhiffy/keymap.c
rename to keyboards/xiudi/xd75/keymaps/skewwhiffy/keymap.c
diff --git a/keyboards/xd75/keymaps/skewwhiffy/readme.md b/keyboards/xiudi/xd75/keymaps/skewwhiffy/readme.md
similarity index 100%
rename from keyboards/xd75/keymaps/skewwhiffy/readme.md
rename to keyboards/xiudi/xd75/keymaps/skewwhiffy/readme.md
diff --git a/keyboards/xd75/keymaps/skewwhiffy/rules.mk b/keyboards/xiudi/xd75/keymaps/skewwhiffy/rules.mk
similarity index 100%
rename from keyboards/xd75/keymaps/skewwhiffy/rules.mk
rename to keyboards/xiudi/xd75/keymaps/skewwhiffy/rules.mk
diff --git a/keyboards/xd75/keymaps/tdl-jturner/config.h b/keyboards/xiudi/xd75/keymaps/tdl-jturner/config.h
similarity index 100%
rename from keyboards/xd75/keymaps/tdl-jturner/config.h
rename to keyboards/xiudi/xd75/keymaps/tdl-jturner/config.h
diff --git a/keyboards/xd75/keymaps/tdl-jturner/keymap.c b/keyboards/xiudi/xd75/keymaps/tdl-jturner/keymap.c
similarity index 100%
rename from keyboards/xd75/keymaps/tdl-jturner/keymap.c
rename to keyboards/xiudi/xd75/keymaps/tdl-jturner/keymap.c
diff --git a/keyboards/xd75/keymaps/tdl-jturner/readme.md b/keyboards/xiudi/xd75/keymaps/tdl-jturner/readme.md
similarity index 100%
rename from keyboards/xd75/keymaps/tdl-jturner/readme.md
rename to keyboards/xiudi/xd75/keymaps/tdl-jturner/readme.md
diff --git a/keyboards/xd75/keymaps/tdl-jturner/rules.mk b/keyboards/xiudi/xd75/keymaps/tdl-jturner/rules.mk
similarity index 100%
rename from keyboards/xd75/keymaps/tdl-jturner/rules.mk
rename to keyboards/xiudi/xd75/keymaps/tdl-jturner/rules.mk
diff --git a/keyboards/xd75/keymaps/tomswartz07/keymap.c b/keyboards/xiudi/xd75/keymaps/tomswartz07/keymap.c
similarity index 100%
rename from keyboards/xd75/keymaps/tomswartz07/keymap.c
rename to keyboards/xiudi/xd75/keymaps/tomswartz07/keymap.c
diff --git a/keyboards/xd75/keymaps/via/keymap.c b/keyboards/xiudi/xd75/keymaps/via/keymap.c
similarity index 100%
rename from keyboards/xd75/keymaps/via/keymap.c
rename to keyboards/xiudi/xd75/keymaps/via/keymap.c
diff --git a/keyboards/xd75/keymaps/via/readme.md b/keyboards/xiudi/xd75/keymaps/via/readme.md
similarity index 100%
rename from keyboards/xd75/keymaps/via/readme.md
rename to keyboards/xiudi/xd75/keymaps/via/readme.md
diff --git a/keyboards/xd75/keymaps/via/rules.mk b/keyboards/xiudi/xd75/keymaps/via/rules.mk
similarity index 100%
rename from keyboards/xd75/keymaps/via/rules.mk
rename to keyboards/xiudi/xd75/keymaps/via/rules.mk
diff --git a/keyboards/xd75/keymaps/xo/config.h b/keyboards/xiudi/xd75/keymaps/xo/config.h
similarity index 100%
rename from keyboards/xd75/keymaps/xo/config.h
rename to keyboards/xiudi/xd75/keymaps/xo/config.h
diff --git a/keyboards/xd75/keymaps/xo/keymap.c b/keyboards/xiudi/xd75/keymaps/xo/keymap.c
similarity index 100%
rename from keyboards/xd75/keymaps/xo/keymap.c
rename to keyboards/xiudi/xd75/keymaps/xo/keymap.c
diff --git a/keyboards/xd75/keymaps/xo/readme.md b/keyboards/xiudi/xd75/keymaps/xo/readme.md
similarity index 100%
rename from keyboards/xd75/keymaps/xo/readme.md
rename to keyboards/xiudi/xd75/keymaps/xo/readme.md
diff --git a/keyboards/xd75/keymaps/xo/rules.mk b/keyboards/xiudi/xd75/keymaps/xo/rules.mk
similarity index 100%
rename from keyboards/xd75/keymaps/xo/rules.mk
rename to keyboards/xiudi/xd75/keymaps/xo/rules.mk
diff --git a/keyboards/xd75/readme.md b/keyboards/xiudi/xd75/readme.md
similarity index 100%
rename from keyboards/xd75/readme.md
rename to keyboards/xiudi/xd75/readme.md
diff --git a/keyboards/xd75/rules.mk b/keyboards/xiudi/xd75/rules.mk
similarity index 100%
rename from keyboards/xd75/rules.mk
rename to keyboards/xiudi/xd75/rules.mk
diff --git a/keyboards/xd75/xd75.c b/keyboards/xiudi/xd75/xd75.c
similarity index 100%
rename from keyboards/xd75/xd75.c
rename to keyboards/xiudi/xd75/xd75.c
diff --git a/keyboards/xd75/xd75.h b/keyboards/xiudi/xd75/xd75.h
similarity index 100%
rename from keyboards/xd75/xd75.h
rename to keyboards/xiudi/xd75/xd75.h
diff --git a/keyboards/xd84/config.h b/keyboards/xiudi/xd84/config.h
similarity index 100%
rename from keyboards/xd84/config.h
rename to keyboards/xiudi/xd84/config.h
diff --git a/keyboards/xd84/dev.md b/keyboards/xiudi/xd84/dev.md
similarity index 100%
rename from keyboards/xd84/dev.md
rename to keyboards/xiudi/xd84/dev.md
diff --git a/keyboards/xd84/info.json b/keyboards/xiudi/xd84/info.json
similarity index 100%
rename from keyboards/xd84/info.json
rename to keyboards/xiudi/xd84/info.json
diff --git a/keyboards/xd84/keymaps/default/keymap.c b/keyboards/xiudi/xd84/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/xd84/keymaps/default/keymap.c
rename to keyboards/xiudi/xd84/keymaps/default/keymap.c
diff --git a/keyboards/xd84/keymaps/default_iso/keymap.c b/keyboards/xiudi/xd84/keymaps/default_iso/keymap.c
similarity index 100%
rename from keyboards/xd84/keymaps/default_iso/keymap.c
rename to keyboards/xiudi/xd84/keymaps/default_iso/keymap.c
diff --git a/keyboards/xd84/keymaps/via/keymap.c b/keyboards/xiudi/xd84/keymaps/via/keymap.c
similarity index 100%
rename from keyboards/xd84/keymaps/via/keymap.c
rename to keyboards/xiudi/xd84/keymaps/via/keymap.c
diff --git a/keyboards/xd84/keymaps/via/readme.md b/keyboards/xiudi/xd84/keymaps/via/readme.md
similarity index 100%
rename from keyboards/xd84/keymaps/via/readme.md
rename to keyboards/xiudi/xd84/keymaps/via/readme.md
diff --git a/keyboards/xd84/keymaps/via/rules.mk b/keyboards/xiudi/xd84/keymaps/via/rules.mk
similarity index 100%
rename from keyboards/xd84/keymaps/via/rules.mk
rename to keyboards/xiudi/xd84/keymaps/via/rules.mk
diff --git a/keyboards/xd84/matrix.c b/keyboards/xiudi/xd84/matrix.c
similarity index 100%
rename from keyboards/xd84/matrix.c
rename to keyboards/xiudi/xd84/matrix.c
diff --git a/keyboards/xd84/readme.md b/keyboards/xiudi/xd84/readme.md
similarity index 100%
rename from keyboards/xd84/readme.md
rename to keyboards/xiudi/xd84/readme.md
diff --git a/keyboards/xd84/rules.mk b/keyboards/xiudi/xd84/rules.mk
similarity index 100%
rename from keyboards/xd84/rules.mk
rename to keyboards/xiudi/xd84/rules.mk
diff --git a/keyboards/xd84/xd84.c b/keyboards/xiudi/xd84/xd84.c
similarity index 100%
rename from keyboards/xd84/xd84.c
rename to keyboards/xiudi/xd84/xd84.c
diff --git a/keyboards/xd84/xd84.h b/keyboards/xiudi/xd84/xd84.h
similarity index 100%
rename from keyboards/xd84/xd84.h
rename to keyboards/xiudi/xd84/xd84.h
diff --git a/keyboards/xd84pro/config.h b/keyboards/xiudi/xd84pro/config.h
similarity index 100%
rename from keyboards/xd84pro/config.h
rename to keyboards/xiudi/xd84pro/config.h
diff --git a/keyboards/xd84pro/dev.md b/keyboards/xiudi/xd84pro/dev.md
similarity index 100%
rename from keyboards/xd84pro/dev.md
rename to keyboards/xiudi/xd84pro/dev.md
diff --git a/keyboards/xd84pro/info.json b/keyboards/xiudi/xd84pro/info.json
similarity index 100%
rename from keyboards/xd84pro/info.json
rename to keyboards/xiudi/xd84pro/info.json
diff --git a/keyboards/xd84pro/keymaps/default/keymap.c b/keyboards/xiudi/xd84pro/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/xd84pro/keymaps/default/keymap.c
rename to keyboards/xiudi/xd84pro/keymaps/default/keymap.c
diff --git a/keyboards/xd84pro/keymaps/default_iso/keymap.c b/keyboards/xiudi/xd84pro/keymaps/default_iso/keymap.c
similarity index 100%
rename from keyboards/xd84pro/keymaps/default_iso/keymap.c
rename to keyboards/xiudi/xd84pro/keymaps/default_iso/keymap.c
diff --git a/keyboards/xd84pro/keymaps/via/keymap.c b/keyboards/xiudi/xd84pro/keymaps/via/keymap.c
similarity index 100%
rename from keyboards/xd84pro/keymaps/via/keymap.c
rename to keyboards/xiudi/xd84pro/keymaps/via/keymap.c
diff --git a/keyboards/xd84pro/keymaps/via/readme.md b/keyboards/xiudi/xd84pro/keymaps/via/readme.md
similarity index 100%
rename from keyboards/xd84pro/keymaps/via/readme.md
rename to keyboards/xiudi/xd84pro/keymaps/via/readme.md
diff --git a/keyboards/xd84pro/keymaps/via/rules.mk b/keyboards/xiudi/xd84pro/keymaps/via/rules.mk
similarity index 100%
rename from keyboards/xd84pro/keymaps/via/rules.mk
rename to keyboards/xiudi/xd84pro/keymaps/via/rules.mk
diff --git a/keyboards/xd84pro/readme.md b/keyboards/xiudi/xd84pro/readme.md
similarity index 100%
rename from keyboards/xd84pro/readme.md
rename to keyboards/xiudi/xd84pro/readme.md
diff --git a/keyboards/xd84pro/rules.mk b/keyboards/xiudi/xd84pro/rules.mk
similarity index 100%
rename from keyboards/xd84pro/rules.mk
rename to keyboards/xiudi/xd84pro/rules.mk
diff --git a/keyboards/xd84pro/xd84pro.c b/keyboards/xiudi/xd84pro/xd84pro.c
similarity index 100%
rename from keyboards/xd84pro/xd84pro.c
rename to keyboards/xiudi/xd84pro/xd84pro.c
diff --git a/keyboards/xd84pro/xd84pro.h b/keyboards/xiudi/xd84pro/xd84pro.h
similarity index 100%
rename from keyboards/xd84pro/xd84pro.h
rename to keyboards/xiudi/xd84pro/xd84pro.h
diff --git a/keyboards/xd87/config.h b/keyboards/xiudi/xd87/config.h
similarity index 100%
rename from keyboards/xd87/config.h
rename to keyboards/xiudi/xd87/config.h
diff --git a/keyboards/xd87/info.json b/keyboards/xiudi/xd87/info.json
similarity index 100%
rename from keyboards/xd87/info.json
rename to keyboards/xiudi/xd87/info.json
diff --git a/keyboards/xd87/keymaps/default/config.h b/keyboards/xiudi/xd87/keymaps/default/config.h
similarity index 100%
rename from keyboards/xd87/keymaps/default/config.h
rename to keyboards/xiudi/xd87/keymaps/default/config.h
diff --git a/keyboards/xd87/keymaps/default/keymap.c b/keyboards/xiudi/xd87/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/xd87/keymaps/default/keymap.c
rename to keyboards/xiudi/xd87/keymaps/default/keymap.c
diff --git a/keyboards/xd87/keymaps/default/readme.md b/keyboards/xiudi/xd87/keymaps/default/readme.md
similarity index 100%
rename from keyboards/xd87/keymaps/default/readme.md
rename to keyboards/xiudi/xd87/keymaps/default/readme.md
diff --git a/keyboards/xd87/keymaps/default_underglow/config.h b/keyboards/xiudi/xd87/keymaps/default_underglow/config.h
similarity index 100%
rename from keyboards/xd87/keymaps/default_underglow/config.h
rename to keyboards/xiudi/xd87/keymaps/default_underglow/config.h
diff --git a/keyboards/xd87/keymaps/default_underglow/keymap.c b/keyboards/xiudi/xd87/keymaps/default_underglow/keymap.c
similarity index 100%
rename from keyboards/xd87/keymaps/default_underglow/keymap.c
rename to keyboards/xiudi/xd87/keymaps/default_underglow/keymap.c
diff --git a/keyboards/xd87/keymaps/default_underglow/readme.md b/keyboards/xiudi/xd87/keymaps/default_underglow/readme.md
similarity index 100%
rename from keyboards/xd87/keymaps/default_underglow/readme.md
rename to keyboards/xiudi/xd87/keymaps/default_underglow/readme.md
diff --git a/keyboards/xd87/keymaps/default_underglow/rules.mk b/keyboards/xiudi/xd87/keymaps/default_underglow/rules.mk
similarity index 100%
rename from keyboards/xd87/keymaps/default_underglow/rules.mk
rename to keyboards/xiudi/xd87/keymaps/default_underglow/rules.mk
diff --git a/keyboards/xd87/keymaps/mac_underglow/keymap.c b/keyboards/xiudi/xd87/keymaps/mac_underglow/keymap.c
similarity index 100%
rename from keyboards/xd87/keymaps/mac_underglow/keymap.c
rename to keyboards/xiudi/xd87/keymaps/mac_underglow/keymap.c
diff --git a/keyboards/xd87/keymaps/mac_underglow/readme.md b/keyboards/xiudi/xd87/keymaps/mac_underglow/readme.md
similarity index 100%
rename from keyboards/xd87/keymaps/mac_underglow/readme.md
rename to keyboards/xiudi/xd87/keymaps/mac_underglow/readme.md
diff --git a/keyboards/xd87/keymaps/mac_underglow/rules.mk b/keyboards/xiudi/xd87/keymaps/mac_underglow/rules.mk
similarity index 100%
rename from keyboards/xd87/keymaps/mac_underglow/rules.mk
rename to keyboards/xiudi/xd87/keymaps/mac_underglow/rules.mk
diff --git a/keyboards/xd87/keymaps/via/keymap.c b/keyboards/xiudi/xd87/keymaps/via/keymap.c
similarity index 100%
rename from keyboards/xd87/keymaps/via/keymap.c
rename to keyboards/xiudi/xd87/keymaps/via/keymap.c
diff --git a/keyboards/xd87/keymaps/via/readme.md b/keyboards/xiudi/xd87/keymaps/via/readme.md
similarity index 100%
rename from keyboards/xd87/keymaps/via/readme.md
rename to keyboards/xiudi/xd87/keymaps/via/readme.md
diff --git a/keyboards/xd87/keymaps/via/rules.mk b/keyboards/xiudi/xd87/keymaps/via/rules.mk
similarity index 100%
rename from keyboards/xd87/keymaps/via/rules.mk
rename to keyboards/xiudi/xd87/keymaps/via/rules.mk
diff --git a/keyboards/xd87/readme.md b/keyboards/xiudi/xd87/readme.md
similarity index 100%
rename from keyboards/xd87/readme.md
rename to keyboards/xiudi/xd87/readme.md
diff --git a/keyboards/xd87/rules.mk b/keyboards/xiudi/xd87/rules.mk
similarity index 100%
rename from keyboards/xd87/rules.mk
rename to keyboards/xiudi/xd87/rules.mk
diff --git a/keyboards/xd87/xd87.c b/keyboards/xiudi/xd87/xd87.c
similarity index 100%
rename from keyboards/xd87/xd87.c
rename to keyboards/xiudi/xd87/xd87.c
diff --git a/keyboards/xd87/xd87.h b/keyboards/xiudi/xd87/xd87.h
similarity index 100%
rename from keyboards/xd87/xd87.h
rename to keyboards/xiudi/xd87/xd87.h
diff --git a/keyboards/xd96/config.h b/keyboards/xiudi/xd96/config.h
similarity index 100%
rename from keyboards/xd96/config.h
rename to keyboards/xiudi/xd96/config.h
diff --git a/keyboards/xd96/info.json b/keyboards/xiudi/xd96/info.json
similarity index 100%
rename from keyboards/xd96/info.json
rename to keyboards/xiudi/xd96/info.json
diff --git a/keyboards/xd96/keymaps/default/keymap.c b/keyboards/xiudi/xd96/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/xd96/keymaps/default/keymap.c
rename to keyboards/xiudi/xd96/keymaps/default/keymap.c
diff --git a/keyboards/xd96/keymaps/default_iso/keymap.c b/keyboards/xiudi/xd96/keymaps/default_iso/keymap.c
similarity index 100%
rename from keyboards/xd96/keymaps/default_iso/keymap.c
rename to keyboards/xiudi/xd96/keymaps/default_iso/keymap.c
diff --git a/keyboards/xd96/keymaps/uuupah/keymap.c b/keyboards/xiudi/xd96/keymaps/uuupah/keymap.c
similarity index 100%
rename from keyboards/xd96/keymaps/uuupah/keymap.c
rename to keyboards/xiudi/xd96/keymaps/uuupah/keymap.c
diff --git a/keyboards/xd96/keymaps/via/keymap.c b/keyboards/xiudi/xd96/keymaps/via/keymap.c
similarity index 100%
rename from keyboards/xd96/keymaps/via/keymap.c
rename to keyboards/xiudi/xd96/keymaps/via/keymap.c
diff --git a/keyboards/xd96/keymaps/via/readme.md b/keyboards/xiudi/xd96/keymaps/via/readme.md
similarity index 100%
rename from keyboards/xd96/keymaps/via/readme.md
rename to keyboards/xiudi/xd96/keymaps/via/readme.md
diff --git a/keyboards/xd96/keymaps/via/rules.mk b/keyboards/xiudi/xd96/keymaps/via/rules.mk
similarity index 100%
rename from keyboards/xd96/keymaps/via/rules.mk
rename to keyboards/xiudi/xd96/keymaps/via/rules.mk
diff --git a/keyboards/xd96/matrix.c b/keyboards/xiudi/xd96/matrix.c
similarity index 100%
rename from keyboards/xd96/matrix.c
rename to keyboards/xiudi/xd96/matrix.c
diff --git a/keyboards/xd96/readme.md b/keyboards/xiudi/xd96/readme.md
similarity index 100%
rename from keyboards/xd96/readme.md
rename to keyboards/xiudi/xd96/readme.md
diff --git a/keyboards/xd96/rules.mk b/keyboards/xiudi/xd96/rules.mk
similarity index 100%
rename from keyboards/xd96/rules.mk
rename to keyboards/xiudi/xd96/rules.mk
diff --git a/keyboards/xd96/xd96.c b/keyboards/xiudi/xd96/xd96.c
similarity index 100%
rename from keyboards/xd96/xd96.c
rename to keyboards/xiudi/xd96/xd96.c
diff --git a/keyboards/xd96/xd96.h b/keyboards/xiudi/xd96/xd96.h
similarity index 100%
rename from keyboards/xd96/xd96.h
rename to keyboards/xiudi/xd96/xd96.h