diff --git a/keyboards/ymd75/ymd75.h b/keyboards/ymd75/ymd75.h
deleted file mode 100644
index 134f08060f..0000000000
--- a/keyboards/ymd75/ymd75.h
+++ /dev/null
@@ -1,11 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#if defined(KEYBOARD_ymd75_rev1)
-    #include "rev1.h"
-#elif defined(KEYBOARD_ymd75_rev2)
-    #include "rev2.h"
-#elif defined(KEYBOARD_ymd75_rev3)
-    #include "rev3.h"
-#endif
diff --git a/keyboards/ymd75/config.h b/keyboards/ymdk/ymd75/config.h
similarity index 100%
rename from keyboards/ymd75/config.h
rename to keyboards/ymdk/ymd75/config.h
diff --git a/keyboards/ymd75/info.json b/keyboards/ymdk/ymd75/info.json
similarity index 100%
rename from keyboards/ymd75/info.json
rename to keyboards/ymdk/ymd75/info.json
diff --git a/keyboards/ymd75/keymaps/default/keymap.c b/keyboards/ymdk/ymd75/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/ymd75/keymaps/default/keymap.c
rename to keyboards/ymdk/ymd75/keymaps/default/keymap.c
diff --git a/keyboards/ymd75/keymaps/default_iso/keymap.c b/keyboards/ymdk/ymd75/keymaps/default_iso/keymap.c
similarity index 100%
rename from keyboards/ymd75/keymaps/default_iso/keymap.c
rename to keyboards/ymdk/ymd75/keymaps/default_iso/keymap.c
diff --git a/keyboards/ymd75/keymaps/default_iso_rwkl/keymap.c b/keyboards/ymdk/ymd75/keymaps/default_iso_rwkl/keymap.c
similarity index 100%
rename from keyboards/ymd75/keymaps/default_iso_rwkl/keymap.c
rename to keyboards/ymdk/ymd75/keymaps/default_iso_rwkl/keymap.c
diff --git a/keyboards/ymd75/keymaps/via/keymap.c b/keyboards/ymdk/ymd75/keymaps/via/keymap.c
similarity index 100%
rename from keyboards/ymd75/keymaps/via/keymap.c
rename to keyboards/ymdk/ymd75/keymaps/via/keymap.c
diff --git a/keyboards/ymd75/keymaps/via/rules.mk b/keyboards/ymdk/ymd75/keymaps/via/rules.mk
similarity index 100%
rename from keyboards/ymd75/keymaps/via/rules.mk
rename to keyboards/ymdk/ymd75/keymaps/via/rules.mk
diff --git a/keyboards/ymd75/readme.md b/keyboards/ymdk/ymd75/readme.md
similarity index 94%
rename from keyboards/ymd75/readme.md
rename to keyboards/ymdk/ymd75/readme.md
index 99e9f656c0..78b4d089af 100644
--- a/keyboards/ymd75/readme.md
+++ b/keyboards/ymdk/ymd75/readme.md
@@ -13,11 +13,11 @@ This firmware can also be flashed onto the KBDFans KBD75 Round 2 Bootmapper Clie
 
 Make example for this keyboard (after setting up your build environment):
 
-    make ymd75/rev1:default
+    make ymdk/ymd75/rev1:default
 
 Flashing example for this keyboard ([after setting up the bootloadHID flashing environment](https://docs.qmk.fm/#/flashing_bootloadhid))
 
-    make ymd75/rev1:default:flash
+    make ymdk/ymd75/rev1:default:flash
 
 **Reset Key**: Hold down the key located at *Key below the top right key*, commonly programmed as *Backspace* while plugging in the keyboard. On PCB revision 2, enter the bootloader by holding `L_CTRL` while plugging in the keyboard.
 
diff --git a/keyboards/ymd75/rev1/.noci b/keyboards/ymdk/ymd75/rev1/.noci
similarity index 100%
rename from keyboards/ymd75/rev1/.noci
rename to keyboards/ymdk/ymd75/rev1/.noci
diff --git a/keyboards/ymd75/rev1/config.h b/keyboards/ymdk/ymd75/rev1/config.h
similarity index 100%
rename from keyboards/ymd75/rev1/config.h
rename to keyboards/ymdk/ymd75/rev1/config.h
diff --git a/keyboards/ymd75/rev1/rev1.c b/keyboards/ymdk/ymd75/rev1/rev1.c
similarity index 100%
rename from keyboards/ymd75/rev1/rev1.c
rename to keyboards/ymdk/ymd75/rev1/rev1.c
diff --git a/keyboards/ymd75/rev1/rev1.h b/keyboards/ymdk/ymd75/rev1/rev1.h
similarity index 100%
rename from keyboards/ymd75/rev1/rev1.h
rename to keyboards/ymdk/ymd75/rev1/rev1.h
diff --git a/keyboards/ymd75/rev1/rules.mk b/keyboards/ymdk/ymd75/rev1/rules.mk
similarity index 100%
rename from keyboards/ymd75/rev1/rules.mk
rename to keyboards/ymdk/ymd75/rev1/rules.mk
diff --git a/keyboards/ymd75/rev2/.noci b/keyboards/ymdk/ymd75/rev2/.noci
similarity index 100%
rename from keyboards/ymd75/rev2/.noci
rename to keyboards/ymdk/ymd75/rev2/.noci
diff --git a/keyboards/ymd75/rev2/config.h b/keyboards/ymdk/ymd75/rev2/config.h
similarity index 100%
rename from keyboards/ymd75/rev2/config.h
rename to keyboards/ymdk/ymd75/rev2/config.h
diff --git a/keyboards/ymd75/rev2/rev2.c b/keyboards/ymdk/ymd75/rev2/rev2.c
similarity index 100%
rename from keyboards/ymd75/rev2/rev2.c
rename to keyboards/ymdk/ymd75/rev2/rev2.c
diff --git a/keyboards/ymd75/rev2/rev2.h b/keyboards/ymdk/ymd75/rev2/rev2.h
similarity index 100%
rename from keyboards/ymd75/rev2/rev2.h
rename to keyboards/ymdk/ymd75/rev2/rev2.h
diff --git a/keyboards/ymd75/rev2/rules.mk b/keyboards/ymdk/ymd75/rev2/rules.mk
similarity index 100%
rename from keyboards/ymd75/rev2/rules.mk
rename to keyboards/ymdk/ymd75/rev2/rules.mk
diff --git a/keyboards/ymd75/rev3/config.h b/keyboards/ymdk/ymd75/rev3/config.h
similarity index 100%
rename from keyboards/ymd75/rev3/config.h
rename to keyboards/ymdk/ymd75/rev3/config.h
diff --git a/keyboards/ymd75/rev3/rev3.c b/keyboards/ymdk/ymd75/rev3/rev3.c
similarity index 100%
rename from keyboards/ymd75/rev3/rev3.c
rename to keyboards/ymdk/ymd75/rev3/rev3.c
diff --git a/keyboards/ymd75/rev3/rev3.h b/keyboards/ymdk/ymd75/rev3/rev3.h
similarity index 100%
rename from keyboards/ymd75/rev3/rev3.h
rename to keyboards/ymdk/ymd75/rev3/rev3.h
diff --git a/keyboards/ymd75/rev3/rules.mk b/keyboards/ymdk/ymd75/rev3/rules.mk
similarity index 100%
rename from keyboards/ymd75/rev3/rules.mk
rename to keyboards/ymdk/ymd75/rev3/rules.mk
diff --git a/keyboards/ymd75/rules.mk b/keyboards/ymdk/ymd75/rules.mk
similarity index 100%
rename from keyboards/ymd75/rules.mk
rename to keyboards/ymdk/ymd75/rules.mk
diff --git a/keyboards/ymd75/ymd75.c b/keyboards/ymdk/ymd75/ymd75.c
similarity index 100%
rename from keyboards/ymd75/ymd75.c
rename to keyboards/ymdk/ymd75/ymd75.c
diff --git a/keyboards/ymdk/ymd75/ymd75.h b/keyboards/ymdk/ymd75/ymd75.h
new file mode 100644
index 0000000000..dbaf93e7db
--- /dev/null
+++ b/keyboards/ymdk/ymd75/ymd75.h
@@ -0,0 +1,11 @@
+#pragma once
+
+#include "quantum.h"
+
+#if defined(KEYBOARD_ymdk_ymd75_rev1)
+    #include "rev1.h"
+#elif defined(KEYBOARD_ymdk_ymd75_rev2)
+    #include "rev2.h"
+#elif defined(KEYBOARD_ymdk_ymd75_rev3)
+    #include "rev3.h"
+#endif