diff --git a/keyboards/melody96/config.h b/keyboards/ymdk/melody96/config.h
similarity index 100%
rename from keyboards/melody96/config.h
rename to keyboards/ymdk/melody96/config.h
diff --git a/keyboards/melody96/info.json b/keyboards/ymdk/melody96/info.json
similarity index 100%
rename from keyboards/melody96/info.json
rename to keyboards/ymdk/melody96/info.json
diff --git a/keyboards/melody96/keymaps/crilith/keymap.c b/keyboards/ymdk/melody96/keymaps/crilith/keymap.c
similarity index 100%
rename from keyboards/melody96/keymaps/crilith/keymap.c
rename to keyboards/ymdk/melody96/keymaps/crilith/keymap.c
diff --git a/keyboards/melody96/keymaps/default/keymap.c b/keyboards/ymdk/melody96/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/melody96/keymaps/default/keymap.c
rename to keyboards/ymdk/melody96/keymaps/default/keymap.c
diff --git a/keyboards/melody96/keymaps/default_96_with60_split_num0/keymap.c b/keyboards/ymdk/melody96/keymaps/default_96_with60_split_num0/keymap.c
similarity index 100%
rename from keyboards/melody96/keymaps/default_96_with60_split_num0/keymap.c
rename to keyboards/ymdk/melody96/keymaps/default_96_with60_split_num0/keymap.c
diff --git a/keyboards/melody96/keymaps/dvz/config.h b/keyboards/ymdk/melody96/keymaps/dvz/config.h
similarity index 100%
rename from keyboards/melody96/keymaps/dvz/config.h
rename to keyboards/ymdk/melody96/keymaps/dvz/config.h
diff --git a/keyboards/melody96/keymaps/dvz/keymap.c b/keyboards/ymdk/melody96/keymaps/dvz/keymap.c
similarity index 100%
rename from keyboards/melody96/keymaps/dvz/keymap.c
rename to keyboards/ymdk/melody96/keymaps/dvz/keymap.c
diff --git a/keyboards/melody96/keymaps/dvz/readme.md b/keyboards/ymdk/melody96/keymaps/dvz/readme.md
similarity index 100%
rename from keyboards/melody96/keymaps/dvz/readme.md
rename to keyboards/ymdk/melody96/keymaps/dvz/readme.md
diff --git a/keyboards/melody96/keymaps/dvz/rules.mk b/keyboards/ymdk/melody96/keymaps/dvz/rules.mk
similarity index 100%
rename from keyboards/melody96/keymaps/dvz/rules.mk
rename to keyboards/ymdk/melody96/keymaps/dvz/rules.mk
diff --git a/keyboards/melody96/keymaps/konstantin/config.h b/keyboards/ymdk/melody96/keymaps/konstantin/config.h
similarity index 100%
rename from keyboards/melody96/keymaps/konstantin/config.h
rename to keyboards/ymdk/melody96/keymaps/konstantin/config.h
diff --git a/keyboards/melody96/keymaps/konstantin/keymap.c b/keyboards/ymdk/melody96/keymaps/konstantin/keymap.c
similarity index 100%
rename from keyboards/melody96/keymaps/konstantin/keymap.c
rename to keyboards/ymdk/melody96/keymaps/konstantin/keymap.c
diff --git a/keyboards/melody96/keymaps/konstantin/rules.mk b/keyboards/ymdk/melody96/keymaps/konstantin/rules.mk
similarity index 100%
rename from keyboards/melody96/keymaps/konstantin/rules.mk
rename to keyboards/ymdk/melody96/keymaps/konstantin/rules.mk
diff --git a/keyboards/melody96/keymaps/via/keymap.c b/keyboards/ymdk/melody96/keymaps/via/keymap.c
similarity index 100%
rename from keyboards/melody96/keymaps/via/keymap.c
rename to keyboards/ymdk/melody96/keymaps/via/keymap.c
diff --git a/keyboards/melody96/keymaps/via/rules.mk b/keyboards/ymdk/melody96/keymaps/via/rules.mk
similarity index 100%
rename from keyboards/melody96/keymaps/via/rules.mk
rename to keyboards/ymdk/melody96/keymaps/via/rules.mk
diff --git a/keyboards/melody96/keymaps/zunger/config.h b/keyboards/ymdk/melody96/keymaps/zunger/config.h
similarity index 100%
rename from keyboards/melody96/keymaps/zunger/config.h
rename to keyboards/ymdk/melody96/keymaps/zunger/config.h
diff --git a/keyboards/melody96/keymaps/zunger/keymap.c b/keyboards/ymdk/melody96/keymaps/zunger/keymap.c
similarity index 100%
rename from keyboards/melody96/keymaps/zunger/keymap.c
rename to keyboards/ymdk/melody96/keymaps/zunger/keymap.c
diff --git a/keyboards/melody96/keymaps/zunger/readme.md b/keyboards/ymdk/melody96/keymaps/zunger/readme.md
similarity index 100%
rename from keyboards/melody96/keymaps/zunger/readme.md
rename to keyboards/ymdk/melody96/keymaps/zunger/readme.md
diff --git a/keyboards/melody96/keymaps/zunger/rules.mk b/keyboards/ymdk/melody96/keymaps/zunger/rules.mk
similarity index 100%
rename from keyboards/melody96/keymaps/zunger/rules.mk
rename to keyboards/ymdk/melody96/keymaps/zunger/rules.mk
diff --git a/keyboards/melody96/melody96.c b/keyboards/ymdk/melody96/melody96.c
similarity index 100%
rename from keyboards/melody96/melody96.c
rename to keyboards/ymdk/melody96/melody96.c
diff --git a/keyboards/melody96/melody96.h b/keyboards/ymdk/melody96/melody96.h
similarity index 100%
rename from keyboards/melody96/melody96.h
rename to keyboards/ymdk/melody96/melody96.h
diff --git a/keyboards/melody96/readme.md b/keyboards/ymdk/melody96/readme.md
similarity index 96%
rename from keyboards/melody96/readme.md
rename to keyboards/ymdk/melody96/readme.md
index 16338e9ed3..a6bf470b32 100644
--- a/keyboards/melody96/readme.md
+++ b/keyboards/ymdk/melody96/readme.md
@@ -10,7 +10,7 @@
 
 Make example for this keyboard (after setting up your build environment):
 
-    make melody96:default
+    make ymdk/melody96:default
 
 Flashing example for this keyboard:
 
diff --git a/keyboards/melody96/rules.mk b/keyboards/ymdk/melody96/rules.mk
similarity index 100%
rename from keyboards/melody96/rules.mk
rename to keyboards/ymdk/melody96/rules.mk