diff --git a/keyboards/niu_mini/config.h b/keyboards/kbdfans/niu_mini/config.h
similarity index 100%
rename from keyboards/niu_mini/config.h
rename to keyboards/kbdfans/niu_mini/config.h
diff --git a/keyboards/niu_mini/info.json b/keyboards/kbdfans/niu_mini/info.json
similarity index 100%
rename from keyboards/niu_mini/info.json
rename to keyboards/kbdfans/niu_mini/info.json
diff --git a/keyboards/niu_mini/keymaps/abhixec/keymap.c b/keyboards/kbdfans/niu_mini/keymaps/abhixec/keymap.c
similarity index 100%
rename from keyboards/niu_mini/keymaps/abhixec/keymap.c
rename to keyboards/kbdfans/niu_mini/keymaps/abhixec/keymap.c
diff --git a/keyboards/niu_mini/keymaps/abhixec/readme.md b/keyboards/kbdfans/niu_mini/keymaps/abhixec/readme.md
similarity index 100%
rename from keyboards/niu_mini/keymaps/abhixec/readme.md
rename to keyboards/kbdfans/niu_mini/keymaps/abhixec/readme.md
diff --git a/keyboards/niu_mini/keymaps/abhixec/rules.mk b/keyboards/kbdfans/niu_mini/keymaps/abhixec/rules.mk
similarity index 100%
rename from keyboards/niu_mini/keymaps/abhixec/rules.mk
rename to keyboards/kbdfans/niu_mini/keymaps/abhixec/rules.mk
diff --git a/keyboards/niu_mini/keymaps/codecoffeecode/keymap.c b/keyboards/kbdfans/niu_mini/keymaps/codecoffeecode/keymap.c
similarity index 100%
rename from keyboards/niu_mini/keymaps/codecoffeecode/keymap.c
rename to keyboards/kbdfans/niu_mini/keymaps/codecoffeecode/keymap.c
diff --git a/keyboards/niu_mini/keymaps/codecoffeecode/readme.md b/keyboards/kbdfans/niu_mini/keymaps/codecoffeecode/readme.md
similarity index 100%
rename from keyboards/niu_mini/keymaps/codecoffeecode/readme.md
rename to keyboards/kbdfans/niu_mini/keymaps/codecoffeecode/readme.md
diff --git a/keyboards/niu_mini/keymaps/default/keymap.c b/keyboards/kbdfans/niu_mini/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/niu_mini/keymaps/default/keymap.c
rename to keyboards/kbdfans/niu_mini/keymaps/default/keymap.c
diff --git a/keyboards/niu_mini/keymaps/default/readme.md b/keyboards/kbdfans/niu_mini/keymaps/default/readme.md
similarity index 100%
rename from keyboards/niu_mini/keymaps/default/readme.md
rename to keyboards/kbdfans/niu_mini/keymaps/default/readme.md
diff --git a/keyboards/niu_mini/keymaps/dyesub/keymap.c b/keyboards/kbdfans/niu_mini/keymaps/dyesub/keymap.c
similarity index 100%
rename from keyboards/niu_mini/keymaps/dyesub/keymap.c
rename to keyboards/kbdfans/niu_mini/keymaps/dyesub/keymap.c
diff --git a/keyboards/niu_mini/keymaps/dyesub/readme.md b/keyboards/kbdfans/niu_mini/keymaps/dyesub/readme.md
similarity index 100%
rename from keyboards/niu_mini/keymaps/dyesub/readme.md
rename to keyboards/kbdfans/niu_mini/keymaps/dyesub/readme.md
diff --git a/keyboards/niu_mini/keymaps/dyesub/rules.mk b/keyboards/kbdfans/niu_mini/keymaps/dyesub/rules.mk
similarity index 100%
rename from keyboards/niu_mini/keymaps/dyesub/rules.mk
rename to keyboards/kbdfans/niu_mini/keymaps/dyesub/rules.mk
diff --git a/keyboards/niu_mini/keymaps/edvard/keymap.c b/keyboards/kbdfans/niu_mini/keymaps/edvard/keymap.c
similarity index 100%
rename from keyboards/niu_mini/keymaps/edvard/keymap.c
rename to keyboards/kbdfans/niu_mini/keymaps/edvard/keymap.c
diff --git a/keyboards/niu_mini/keymaps/edvard/readme.md b/keyboards/kbdfans/niu_mini/keymaps/edvard/readme.md
similarity index 100%
rename from keyboards/niu_mini/keymaps/edvard/readme.md
rename to keyboards/kbdfans/niu_mini/keymaps/edvard/readme.md
diff --git a/keyboards/niu_mini/keymaps/framtava/config.h b/keyboards/kbdfans/niu_mini/keymaps/framtava/config.h
similarity index 100%
rename from keyboards/niu_mini/keymaps/framtava/config.h
rename to keyboards/kbdfans/niu_mini/keymaps/framtava/config.h
diff --git a/keyboards/niu_mini/keymaps/framtava/keymap.c b/keyboards/kbdfans/niu_mini/keymaps/framtava/keymap.c
similarity index 100%
rename from keyboards/niu_mini/keymaps/framtava/keymap.c
rename to keyboards/kbdfans/niu_mini/keymaps/framtava/keymap.c
diff --git a/keyboards/niu_mini/keymaps/framtava/readme.md b/keyboards/kbdfans/niu_mini/keymaps/framtava/readme.md
similarity index 100%
rename from keyboards/niu_mini/keymaps/framtava/readme.md
rename to keyboards/kbdfans/niu_mini/keymaps/framtava/readme.md
diff --git a/keyboards/niu_mini/keymaps/framtava/rules.mk b/keyboards/kbdfans/niu_mini/keymaps/framtava/rules.mk
similarity index 100%
rename from keyboards/niu_mini/keymaps/framtava/rules.mk
rename to keyboards/kbdfans/niu_mini/keymaps/framtava/rules.mk
diff --git a/keyboards/niu_mini/keymaps/mason/keymap.c b/keyboards/kbdfans/niu_mini/keymaps/mason/keymap.c
similarity index 100%
rename from keyboards/niu_mini/keymaps/mason/keymap.c
rename to keyboards/kbdfans/niu_mini/keymaps/mason/keymap.c
diff --git a/keyboards/niu_mini/keymaps/nosarthur/README.md b/keyboards/kbdfans/niu_mini/keymaps/nosarthur/README.md
similarity index 100%
rename from keyboards/niu_mini/keymaps/nosarthur/README.md
rename to keyboards/kbdfans/niu_mini/keymaps/nosarthur/README.md
diff --git a/keyboards/niu_mini/keymaps/nosarthur/keymap.c b/keyboards/kbdfans/niu_mini/keymaps/nosarthur/keymap.c
similarity index 100%
rename from keyboards/niu_mini/keymaps/nosarthur/keymap.c
rename to keyboards/kbdfans/niu_mini/keymaps/nosarthur/keymap.c
diff --git a/keyboards/niu_mini/keymaps/nosarthur/keymap_colemak_dh.json b/keyboards/kbdfans/niu_mini/keymaps/nosarthur/keymap_colemak_dh.json
similarity index 100%
rename from keyboards/niu_mini/keymaps/nosarthur/keymap_colemak_dh.json
rename to keyboards/kbdfans/niu_mini/keymaps/nosarthur/keymap_colemak_dh.json
diff --git a/keyboards/niu_mini/keymaps/nosarthur/keymap_qwerty.json b/keyboards/kbdfans/niu_mini/keymaps/nosarthur/keymap_qwerty.json
similarity index 100%
rename from keyboards/niu_mini/keymaps/nosarthur/keymap_qwerty.json
rename to keyboards/kbdfans/niu_mini/keymaps/nosarthur/keymap_qwerty.json
diff --git a/keyboards/niu_mini/keymaps/nosarthur/rules.mk b/keyboards/kbdfans/niu_mini/keymaps/nosarthur/rules.mk
similarity index 100%
rename from keyboards/niu_mini/keymaps/nosarthur/rules.mk
rename to keyboards/kbdfans/niu_mini/keymaps/nosarthur/rules.mk
diff --git a/keyboards/niu_mini/keymaps/planck/config.h b/keyboards/kbdfans/niu_mini/keymaps/planck/config.h
similarity index 100%
rename from keyboards/niu_mini/keymaps/planck/config.h
rename to keyboards/kbdfans/niu_mini/keymaps/planck/config.h
diff --git a/keyboards/niu_mini/keymaps/planck/keymap.c b/keyboards/kbdfans/niu_mini/keymaps/planck/keymap.c
similarity index 100%
rename from keyboards/niu_mini/keymaps/planck/keymap.c
rename to keyboards/kbdfans/niu_mini/keymaps/planck/keymap.c
diff --git a/keyboards/niu_mini/keymaps/planck/readme.md b/keyboards/kbdfans/niu_mini/keymaps/planck/readme.md
similarity index 100%
rename from keyboards/niu_mini/keymaps/planck/readme.md
rename to keyboards/kbdfans/niu_mini/keymaps/planck/readme.md
diff --git a/keyboards/niu_mini/keymaps/planck/rules.mk b/keyboards/kbdfans/niu_mini/keymaps/planck/rules.mk
similarity index 100%
rename from keyboards/niu_mini/keymaps/planck/rules.mk
rename to keyboards/kbdfans/niu_mini/keymaps/planck/rules.mk
diff --git a/keyboards/niu_mini/keymaps/tobias/config.h b/keyboards/kbdfans/niu_mini/keymaps/tobias/config.h
similarity index 100%
rename from keyboards/niu_mini/keymaps/tobias/config.h
rename to keyboards/kbdfans/niu_mini/keymaps/tobias/config.h
diff --git a/keyboards/niu_mini/keymaps/tobias/keymap.c b/keyboards/kbdfans/niu_mini/keymaps/tobias/keymap.c
similarity index 100%
rename from keyboards/niu_mini/keymaps/tobias/keymap.c
rename to keyboards/kbdfans/niu_mini/keymaps/tobias/keymap.c
diff --git a/keyboards/niu_mini/keymaps/tobias/readme.md b/keyboards/kbdfans/niu_mini/keymaps/tobias/readme.md
similarity index 100%
rename from keyboards/niu_mini/keymaps/tobias/readme.md
rename to keyboards/kbdfans/niu_mini/keymaps/tobias/readme.md
diff --git a/keyboards/niu_mini/keymaps/tobias/rules.mk b/keyboards/kbdfans/niu_mini/keymaps/tobias/rules.mk
similarity index 100%
rename from keyboards/niu_mini/keymaps/tobias/rules.mk
rename to keyboards/kbdfans/niu_mini/keymaps/tobias/rules.mk
diff --git a/keyboards/niu_mini/keymaps/tucznak/config.h b/keyboards/kbdfans/niu_mini/keymaps/tucznak/config.h
similarity index 100%
rename from keyboards/niu_mini/keymaps/tucznak/config.h
rename to keyboards/kbdfans/niu_mini/keymaps/tucznak/config.h
diff --git a/keyboards/niu_mini/keymaps/tucznak/keymap.c b/keyboards/kbdfans/niu_mini/keymaps/tucznak/keymap.c
similarity index 100%
rename from keyboards/niu_mini/keymaps/tucznak/keymap.c
rename to keyboards/kbdfans/niu_mini/keymaps/tucznak/keymap.c
diff --git a/keyboards/niu_mini/keymaps/tucznak/readme.md b/keyboards/kbdfans/niu_mini/keymaps/tucznak/readme.md
similarity index 100%
rename from keyboards/niu_mini/keymaps/tucznak/readme.md
rename to keyboards/kbdfans/niu_mini/keymaps/tucznak/readme.md
diff --git a/keyboards/niu_mini/keymaps/tucznak/rules.mk b/keyboards/kbdfans/niu_mini/keymaps/tucznak/rules.mk
similarity index 100%
rename from keyboards/niu_mini/keymaps/tucznak/rules.mk
rename to keyboards/kbdfans/niu_mini/keymaps/tucznak/rules.mk
diff --git a/keyboards/niu_mini/keymaps/via/keymap.c b/keyboards/kbdfans/niu_mini/keymaps/via/keymap.c
similarity index 100%
rename from keyboards/niu_mini/keymaps/via/keymap.c
rename to keyboards/kbdfans/niu_mini/keymaps/via/keymap.c
diff --git a/keyboards/niu_mini/keymaps/via/rules.mk b/keyboards/kbdfans/niu_mini/keymaps/via/rules.mk
similarity index 100%
rename from keyboards/niu_mini/keymaps/via/rules.mk
rename to keyboards/kbdfans/niu_mini/keymaps/via/rules.mk
diff --git a/keyboards/niu_mini/keymaps/xtonhasvim/config.h b/keyboards/kbdfans/niu_mini/keymaps/xtonhasvim/config.h
similarity index 100%
rename from keyboards/niu_mini/keymaps/xtonhasvim/config.h
rename to keyboards/kbdfans/niu_mini/keymaps/xtonhasvim/config.h
diff --git a/keyboards/niu_mini/keymaps/xtonhasvim/keymap.c b/keyboards/kbdfans/niu_mini/keymaps/xtonhasvim/keymap.c
similarity index 100%
rename from keyboards/niu_mini/keymaps/xtonhasvim/keymap.c
rename to keyboards/kbdfans/niu_mini/keymaps/xtonhasvim/keymap.c
diff --git a/keyboards/niu_mini/keymaps/xtonhasvim/readme.md b/keyboards/kbdfans/niu_mini/keymaps/xtonhasvim/readme.md
similarity index 100%
rename from keyboards/niu_mini/keymaps/xtonhasvim/readme.md
rename to keyboards/kbdfans/niu_mini/keymaps/xtonhasvim/readme.md
diff --git a/keyboards/niu_mini/keymaps/xtonhasvim/rules.mk b/keyboards/kbdfans/niu_mini/keymaps/xtonhasvim/rules.mk
similarity index 100%
rename from keyboards/niu_mini/keymaps/xtonhasvim/rules.mk
rename to keyboards/kbdfans/niu_mini/keymaps/xtonhasvim/rules.mk
diff --git a/keyboards/niu_mini/keymaps/yttyx/README.md b/keyboards/kbdfans/niu_mini/keymaps/yttyx/README.md
similarity index 100%
rename from keyboards/niu_mini/keymaps/yttyx/README.md
rename to keyboards/kbdfans/niu_mini/keymaps/yttyx/README.md
diff --git a/keyboards/niu_mini/keymaps/yttyx/config.h b/keyboards/kbdfans/niu_mini/keymaps/yttyx/config.h
similarity index 100%
rename from keyboards/niu_mini/keymaps/yttyx/config.h
rename to keyboards/kbdfans/niu_mini/keymaps/yttyx/config.h
diff --git a/keyboards/niu_mini/keymaps/yttyx/keymap.c b/keyboards/kbdfans/niu_mini/keymaps/yttyx/keymap.c
similarity index 100%
rename from keyboards/niu_mini/keymaps/yttyx/keymap.c
rename to keyboards/kbdfans/niu_mini/keymaps/yttyx/keymap.c
diff --git a/keyboards/niu_mini/keymaps/yttyx/rules.mk b/keyboards/kbdfans/niu_mini/keymaps/yttyx/rules.mk
similarity index 100%
rename from keyboards/niu_mini/keymaps/yttyx/rules.mk
rename to keyboards/kbdfans/niu_mini/keymaps/yttyx/rules.mk
diff --git a/keyboards/niu_mini/niu_mini.c b/keyboards/kbdfans/niu_mini/niu_mini.c
similarity index 100%
rename from keyboards/niu_mini/niu_mini.c
rename to keyboards/kbdfans/niu_mini/niu_mini.c
diff --git a/keyboards/niu_mini/niu_mini.h b/keyboards/kbdfans/niu_mini/niu_mini.h
similarity index 100%
rename from keyboards/niu_mini/niu_mini.h
rename to keyboards/kbdfans/niu_mini/niu_mini.h
diff --git a/keyboards/niu_mini/readme.md b/keyboards/kbdfans/niu_mini/readme.md
similarity index 91%
rename from keyboards/niu_mini/readme.md
rename to keyboards/kbdfans/niu_mini/readme.md
index f4863d8549..1a91ece94b 100644
--- a/keyboards/niu_mini/readme.md
+++ b/keyboards/kbdfans/niu_mini/readme.md
@@ -10,10 +10,10 @@ Hardware Availability: [KBDFans](https://kbdfans.myshopify.com/products/niu-mini
 
 Make example for this keyboard (after setting up your build environment):
 
-    make niu_mini:default
+    make kbdfans/niu_mini:default
 
 Flashing example for this keyboard ([using the command line](https://docs.qmk.fm/#/newbs_flashing?id=flash-your-keyboard-from-the-command-line)):
 
-    make niu_mini:default:flash
+    make kbdfans/niu_mini:default:flash
 
 See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
diff --git a/keyboards/niu_mini/rules.mk b/keyboards/kbdfans/niu_mini/rules.mk
similarity index 100%
rename from keyboards/niu_mini/rules.mk
rename to keyboards/kbdfans/niu_mini/rules.mk