diff --git a/keyboards/ymdk/yd60mq/12led/config.h b/keyboards/yd60mq/12led/config.h
similarity index 100%
rename from keyboards/ymdk/yd60mq/12led/config.h
rename to keyboards/yd60mq/12led/config.h
diff --git a/keyboards/ymdk/yd60mq/12led/readme.md b/keyboards/yd60mq/12led/readme.md
similarity index 100%
rename from keyboards/ymdk/yd60mq/12led/readme.md
rename to keyboards/yd60mq/12led/readme.md
diff --git a/keyboards/ymdk/yd60mq/12led/rules.mk b/keyboards/yd60mq/12led/rules.mk
similarity index 100%
rename from keyboards/ymdk/yd60mq/12led/rules.mk
rename to keyboards/yd60mq/12led/rules.mk
diff --git a/keyboards/ymdk/yd60mq/16led/config.h b/keyboards/yd60mq/16led/config.h
similarity index 100%
rename from keyboards/ymdk/yd60mq/16led/config.h
rename to keyboards/yd60mq/16led/config.h
diff --git a/keyboards/ymdk/yd60mq/16led/readme.md b/keyboards/yd60mq/16led/readme.md
similarity index 100%
rename from keyboards/ymdk/yd60mq/16led/readme.md
rename to keyboards/yd60mq/16led/readme.md
diff --git a/keyboards/ymdk/yd60mq/16led/rules.mk b/keyboards/yd60mq/16led/rules.mk
similarity index 100%
rename from keyboards/ymdk/yd60mq/16led/rules.mk
rename to keyboards/yd60mq/16led/rules.mk
diff --git a/keyboards/ymdk/yd60mq/config.h b/keyboards/yd60mq/config.h
similarity index 100%
rename from keyboards/ymdk/yd60mq/config.h
rename to keyboards/yd60mq/config.h
diff --git a/keyboards/ymdk/yd60mq/info.json b/keyboards/yd60mq/info.json
similarity index 100%
rename from keyboards/ymdk/yd60mq/info.json
rename to keyboards/yd60mq/info.json
diff --git a/keyboards/ymdk/yd60mq/keymaps/64key/keymap.c b/keyboards/yd60mq/keymaps/64key/keymap.c
similarity index 100%
rename from keyboards/ymdk/yd60mq/keymaps/64key/keymap.c
rename to keyboards/yd60mq/keymaps/64key/keymap.c
diff --git a/keyboards/ymdk/yd60mq/keymaps/default/keymap.c b/keyboards/yd60mq/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/ymdk/yd60mq/keymaps/default/keymap.c
rename to keyboards/yd60mq/keymaps/default/keymap.c
diff --git a/keyboards/ymdk/yd60mq/keymaps/iso/keymap.c b/keyboards/yd60mq/keymaps/iso/keymap.c
similarity index 100%
rename from keyboards/ymdk/yd60mq/keymaps/iso/keymap.c
rename to keyboards/yd60mq/keymaps/iso/keymap.c
diff --git a/keyboards/ymdk/yd60mq/keymaps/krusli/keymap.c b/keyboards/yd60mq/keymaps/krusli/keymap.c
similarity index 100%
rename from keyboards/ymdk/yd60mq/keymaps/krusli/keymap.c
rename to keyboards/yd60mq/keymaps/krusli/keymap.c
diff --git a/keyboards/ymdk/yd60mq/keymaps/via/keymap.c b/keyboards/yd60mq/keymaps/via/keymap.c
similarity index 100%
rename from keyboards/ymdk/yd60mq/keymaps/via/keymap.c
rename to keyboards/yd60mq/keymaps/via/keymap.c
diff --git a/keyboards/ymdk/yd60mq/keymaps/via/rules.mk b/keyboards/yd60mq/keymaps/via/rules.mk
similarity index 100%
rename from keyboards/ymdk/yd60mq/keymaps/via/rules.mk
rename to keyboards/yd60mq/keymaps/via/rules.mk
diff --git a/keyboards/ymdk/yd60mq/readme.md b/keyboards/yd60mq/readme.md
similarity index 100%
rename from keyboards/ymdk/yd60mq/readme.md
rename to keyboards/yd60mq/readme.md
diff --git a/keyboards/ymdk/yd60mq/rules.mk b/keyboards/yd60mq/rules.mk
similarity index 100%
rename from keyboards/ymdk/yd60mq/rules.mk
rename to keyboards/yd60mq/rules.mk
diff --git a/keyboards/ymdk/yd60mq/yd60mq.c b/keyboards/yd60mq/yd60mq.c
similarity index 100%
rename from keyboards/ymdk/yd60mq/yd60mq.c
rename to keyboards/yd60mq/yd60mq.c
diff --git a/keyboards/ymdk/yd60mq/yd60mq.h b/keyboards/yd60mq/yd60mq.h
similarity index 100%
rename from keyboards/ymdk/yd60mq/yd60mq.h
rename to keyboards/yd60mq/yd60mq.h
diff --git a/keyboards/ymdk/ymd75/.noci b/keyboards/ymd75/.noci
similarity index 100%
rename from keyboards/ymdk/ymd75/.noci
rename to keyboards/ymd75/.noci
diff --git a/keyboards/ymdk/ymd75/config.h b/keyboards/ymd75/config.h
similarity index 100%
rename from keyboards/ymdk/ymd75/config.h
rename to keyboards/ymd75/config.h
diff --git a/keyboards/ymdk/ymd75/info.json b/keyboards/ymd75/info.json
similarity index 100%
rename from keyboards/ymdk/ymd75/info.json
rename to keyboards/ymd75/info.json
diff --git a/keyboards/ymdk/ymd75/keymaps/default/keymap.c b/keyboards/ymd75/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/ymdk/ymd75/keymaps/default/keymap.c
rename to keyboards/ymd75/keymaps/default/keymap.c
diff --git a/keyboards/ymdk/ymd75/keymaps/default_iso/keymap.c b/keyboards/ymd75/keymaps/default_iso/keymap.c
similarity index 100%
rename from keyboards/ymdk/ymd75/keymaps/default_iso/keymap.c
rename to keyboards/ymd75/keymaps/default_iso/keymap.c
diff --git a/keyboards/ymdk/ymd75/keymaps/default_iso_rwkl/keymap.c b/keyboards/ymd75/keymaps/default_iso_rwkl/keymap.c
similarity index 100%
rename from keyboards/ymdk/ymd75/keymaps/default_iso_rwkl/keymap.c
rename to keyboards/ymd75/keymaps/default_iso_rwkl/keymap.c
diff --git a/keyboards/ymdk/ymd75/keymaps/via/keymap.c b/keyboards/ymd75/keymaps/via/keymap.c
similarity index 100%
rename from keyboards/ymdk/ymd75/keymaps/via/keymap.c
rename to keyboards/ymd75/keymaps/via/keymap.c
diff --git a/keyboards/ymdk/ymd75/keymaps/via/rules.mk b/keyboards/ymd75/keymaps/via/rules.mk
similarity index 100%
rename from keyboards/ymdk/ymd75/keymaps/via/rules.mk
rename to keyboards/ymd75/keymaps/via/rules.mk
diff --git a/keyboards/ymdk/ymd75/readme.md b/keyboards/ymd75/readme.md
similarity index 100%
rename from keyboards/ymdk/ymd75/readme.md
rename to keyboards/ymd75/readme.md
diff --git a/keyboards/ymdk/ymd75/rev1/.noci b/keyboards/ymd75/rev1/.noci
similarity index 100%
rename from keyboards/ymdk/ymd75/rev1/.noci
rename to keyboards/ymd75/rev1/.noci
diff --git a/keyboards/ymdk/ymd75/rev1/config.h b/keyboards/ymd75/rev1/config.h
similarity index 100%
rename from keyboards/ymdk/ymd75/rev1/config.h
rename to keyboards/ymd75/rev1/config.h
diff --git a/keyboards/ymdk/ymd75/rev1/rev1.c b/keyboards/ymd75/rev1/rev1.c
similarity index 100%
rename from keyboards/ymdk/ymd75/rev1/rev1.c
rename to keyboards/ymd75/rev1/rev1.c
diff --git a/keyboards/ymdk/ymd75/rev1/rev1.h b/keyboards/ymd75/rev1/rev1.h
similarity index 100%
rename from keyboards/ymdk/ymd75/rev1/rev1.h
rename to keyboards/ymd75/rev1/rev1.h
diff --git a/keyboards/ymdk/ymd75/rev1/rules.mk b/keyboards/ymd75/rev1/rules.mk
similarity index 100%
rename from keyboards/ymdk/ymd75/rev1/rules.mk
rename to keyboards/ymd75/rev1/rules.mk
diff --git a/keyboards/ymdk/ymd75/rev2/.noci b/keyboards/ymd75/rev2/.noci
similarity index 100%
rename from keyboards/ymdk/ymd75/rev2/.noci
rename to keyboards/ymd75/rev2/.noci
diff --git a/keyboards/ymdk/ymd75/rev2/config.h b/keyboards/ymd75/rev2/config.h
similarity index 100%
rename from keyboards/ymdk/ymd75/rev2/config.h
rename to keyboards/ymd75/rev2/config.h
diff --git a/keyboards/ymdk/ymd75/rev2/rev2.c b/keyboards/ymd75/rev2/rev2.c
similarity index 100%
rename from keyboards/ymdk/ymd75/rev2/rev2.c
rename to keyboards/ymd75/rev2/rev2.c
diff --git a/keyboards/ymdk/ymd75/rev2/rev2.h b/keyboards/ymd75/rev2/rev2.h
similarity index 100%
rename from keyboards/ymdk/ymd75/rev2/rev2.h
rename to keyboards/ymd75/rev2/rev2.h
diff --git a/keyboards/ymdk/ymd75/rev2/rules.mk b/keyboards/ymd75/rev2/rules.mk
similarity index 100%
rename from keyboards/ymdk/ymd75/rev2/rules.mk
rename to keyboards/ymd75/rev2/rules.mk
diff --git a/keyboards/ymdk/ymd75/rev3/config.h b/keyboards/ymd75/rev3/config.h
similarity index 100%
rename from keyboards/ymdk/ymd75/rev3/config.h
rename to keyboards/ymd75/rev3/config.h
diff --git a/keyboards/ymdk/ymd75/rev3/rev3.c b/keyboards/ymd75/rev3/rev3.c
similarity index 100%
rename from keyboards/ymdk/ymd75/rev3/rev3.c
rename to keyboards/ymd75/rev3/rev3.c
diff --git a/keyboards/ymdk/ymd75/rev3/rev3.h b/keyboards/ymd75/rev3/rev3.h
similarity index 100%
rename from keyboards/ymdk/ymd75/rev3/rev3.h
rename to keyboards/ymd75/rev3/rev3.h
diff --git a/keyboards/ymdk/ymd75/rev3/rules.mk b/keyboards/ymd75/rev3/rules.mk
similarity index 100%
rename from keyboards/ymdk/ymd75/rev3/rules.mk
rename to keyboards/ymd75/rev3/rules.mk
diff --git a/keyboards/ymdk/ymd75/rules.mk b/keyboards/ymd75/rules.mk
similarity index 100%
rename from keyboards/ymdk/ymd75/rules.mk
rename to keyboards/ymd75/rules.mk
diff --git a/keyboards/ymdk/ymd75/ymd75.c b/keyboards/ymd75/ymd75.c
similarity index 100%
rename from keyboards/ymdk/ymd75/ymd75.c
rename to keyboards/ymd75/ymd75.c
diff --git a/keyboards/ymdk/ymd75/ymd75.h b/keyboards/ymd75/ymd75.h
similarity index 100%
rename from keyboards/ymdk/ymd75/ymd75.h
rename to keyboards/ymd75/ymd75.h
diff --git a/keyboards/ymdk/ymd96/config.h b/keyboards/ymd96/config.h
similarity index 100%
rename from keyboards/ymdk/ymd96/config.h
rename to keyboards/ymd96/config.h
diff --git a/keyboards/ymdk/ymd96/info.json b/keyboards/ymd96/info.json
similarity index 100%
rename from keyboards/ymdk/ymd96/info.json
rename to keyboards/ymd96/info.json
diff --git a/keyboards/ymdk/ymd96/keymaps/AnthonyWharton/README.md b/keyboards/ymd96/keymaps/AnthonyWharton/README.md
similarity index 100%
rename from keyboards/ymdk/ymd96/keymaps/AnthonyWharton/README.md
rename to keyboards/ymd96/keymaps/AnthonyWharton/README.md
diff --git a/keyboards/ymdk/ymd96/keymaps/AnthonyWharton/config.h b/keyboards/ymd96/keymaps/AnthonyWharton/config.h
similarity index 100%
rename from keyboards/ymdk/ymd96/keymaps/AnthonyWharton/config.h
rename to keyboards/ymd96/keymaps/AnthonyWharton/config.h
diff --git a/keyboards/ymdk/ymd96/keymaps/AnthonyWharton/keymap.c b/keyboards/ymd96/keymaps/AnthonyWharton/keymap.c
similarity index 100%
rename from keyboards/ymdk/ymd96/keymaps/AnthonyWharton/keymap.c
rename to keyboards/ymd96/keymaps/AnthonyWharton/keymap.c
diff --git a/keyboards/ymdk/ymd96/keymaps/default/keymap.c b/keyboards/ymd96/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/ymdk/ymd96/keymaps/default/keymap.c
rename to keyboards/ymd96/keymaps/default/keymap.c
diff --git a/keyboards/ymdk/ymd96/keymaps/epx/keymap.c b/keyboards/ymd96/keymaps/epx/keymap.c
similarity index 100%
rename from keyboards/ymdk/ymd96/keymaps/epx/keymap.c
rename to keyboards/ymd96/keymaps/epx/keymap.c
diff --git a/keyboards/ymdk/ymd96/keymaps/hgoel89/config.h b/keyboards/ymd96/keymaps/hgoel89/config.h
similarity index 100%
rename from keyboards/ymdk/ymd96/keymaps/hgoel89/config.h
rename to keyboards/ymd96/keymaps/hgoel89/config.h
diff --git a/keyboards/ymdk/ymd96/keymaps/hgoel89/keymap.c b/keyboards/ymd96/keymaps/hgoel89/keymap.c
similarity index 100%
rename from keyboards/ymdk/ymd96/keymaps/hgoel89/keymap.c
rename to keyboards/ymd96/keymaps/hgoel89/keymap.c
diff --git a/keyboards/ymdk/ymd96/keymaps/hgoel89/readme.md b/keyboards/ymd96/keymaps/hgoel89/readme.md
similarity index 100%
rename from keyboards/ymdk/ymd96/keymaps/hgoel89/readme.md
rename to keyboards/ymd96/keymaps/hgoel89/readme.md
diff --git a/keyboards/ymdk/ymd96/keymaps/hgoel89/rules.mk b/keyboards/ymd96/keymaps/hgoel89/rules.mk
similarity index 100%
rename from keyboards/ymdk/ymd96/keymaps/hgoel89/rules.mk
rename to keyboards/ymd96/keymaps/hgoel89/rules.mk
diff --git a/keyboards/ymdk/ymd96/readme.md b/keyboards/ymd96/readme.md
similarity index 100%
rename from keyboards/ymdk/ymd96/readme.md
rename to keyboards/ymd96/readme.md
diff --git a/keyboards/ymdk/ymd96/rules.mk b/keyboards/ymd96/rules.mk
similarity index 100%
rename from keyboards/ymdk/ymd96/rules.mk
rename to keyboards/ymd96/rules.mk
diff --git a/keyboards/ymdk/ymd96/ymd96.c b/keyboards/ymd96/ymd96.c
similarity index 100%
rename from keyboards/ymdk/ymd96/ymd96.c
rename to keyboards/ymd96/ymd96.c
diff --git a/keyboards/ymdk/ymd96/ymd96.h b/keyboards/ymd96/ymd96.h
similarity index 100%
rename from keyboards/ymdk/ymd96/ymd96.h
rename to keyboards/ymd96/ymd96.h
diff --git a/keyboards/ymdk/ymdk_np21/config.h b/keyboards/ymdk_np21/config.h
similarity index 100%
rename from keyboards/ymdk/ymdk_np21/config.h
rename to keyboards/ymdk_np21/config.h
diff --git a/keyboards/ymdk/ymdk_np21/info.json b/keyboards/ymdk_np21/info.json
similarity index 100%
rename from keyboards/ymdk/ymdk_np21/info.json
rename to keyboards/ymdk_np21/info.json
diff --git a/keyboards/ymdk/ymdk_np21/keymaps/default/keymap.c b/keyboards/ymdk_np21/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/ymdk/ymdk_np21/keymaps/default/keymap.c
rename to keyboards/ymdk_np21/keymaps/default/keymap.c
diff --git a/keyboards/ymdk/ymdk_np21/keymaps/default/readme.md b/keyboards/ymdk_np21/keymaps/default/readme.md
similarity index 100%
rename from keyboards/ymdk/ymdk_np21/keymaps/default/readme.md
rename to keyboards/ymdk_np21/keymaps/default/readme.md
diff --git a/keyboards/ymdk/ymdk_np21/readme.md b/keyboards/ymdk_np21/readme.md
similarity index 100%
rename from keyboards/ymdk/ymdk_np21/readme.md
rename to keyboards/ymdk_np21/readme.md
diff --git a/keyboards/ymdk/ymdk_np21/rules.mk b/keyboards/ymdk_np21/rules.mk
similarity index 100%
rename from keyboards/ymdk/ymdk_np21/rules.mk
rename to keyboards/ymdk_np21/rules.mk
diff --git a/keyboards/ymdk/ymdk_np21/ymdk_np21.c b/keyboards/ymdk_np21/ymdk_np21.c
similarity index 100%
rename from keyboards/ymdk/ymdk_np21/ymdk_np21.c
rename to keyboards/ymdk_np21/ymdk_np21.c
diff --git a/keyboards/ymdk/ymdk_np21/ymdk_np21.h b/keyboards/ymdk_np21/ymdk_np21.h
similarity index 100%
rename from keyboards/ymdk/ymdk_np21/ymdk_np21.h
rename to keyboards/ymdk_np21/ymdk_np21.h