diff --git a/keyboards/ymdk_np21/config.h b/keyboards/ymdk/np21/config.h
similarity index 100%
rename from keyboards/ymdk_np21/config.h
rename to keyboards/ymdk/np21/config.h
diff --git a/keyboards/ymdk_np21/info.json b/keyboards/ymdk/np21/info.json
similarity index 100%
rename from keyboards/ymdk_np21/info.json
rename to keyboards/ymdk/np21/info.json
diff --git a/keyboards/ymdk_np21/keymaps/default/keymap.c b/keyboards/ymdk/np21/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/ymdk_np21/keymaps/default/keymap.c
rename to keyboards/ymdk/np21/keymaps/default/keymap.c
diff --git a/keyboards/ymdk_np21/keymaps/default/readme.md b/keyboards/ymdk/np21/keymaps/default/readme.md
similarity index 100%
rename from keyboards/ymdk_np21/keymaps/default/readme.md
rename to keyboards/ymdk/np21/keymaps/default/readme.md
diff --git a/keyboards/ymdk_np21/keymaps/via/keymap.c b/keyboards/ymdk/np21/keymaps/via/keymap.c
similarity index 100%
rename from keyboards/ymdk_np21/keymaps/via/keymap.c
rename to keyboards/ymdk/np21/keymaps/via/keymap.c
diff --git a/keyboards/ymdk_np21/keymaps/via/rules.mk b/keyboards/ymdk/np21/keymaps/via/rules.mk
similarity index 100%
rename from keyboards/ymdk_np21/keymaps/via/rules.mk
rename to keyboards/ymdk/np21/keymaps/via/rules.mk
diff --git a/keyboards/ymdk_np21/ymdk_np21.c b/keyboards/ymdk/np21/np21.c
similarity index 96%
rename from keyboards/ymdk_np21/ymdk_np21.c
rename to keyboards/ymdk/np21/np21.c
index 3ca0e8baa04a..824cfb0d1a6e 100644
--- a/keyboards/ymdk_np21/ymdk_np21.c
+++ b/keyboards/ymdk/np21/np21.c
@@ -16,4 +16,4 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "ymdk_np21.h"
+#include "np21.h"
diff --git a/keyboards/ymdk_np21/ymdk_np21.h b/keyboards/ymdk/np21/np21.h
similarity index 100%
rename from keyboards/ymdk_np21/ymdk_np21.h
rename to keyboards/ymdk/np21/np21.h
diff --git a/keyboards/ymdk_np21/readme.md b/keyboards/ymdk/np21/readme.md
similarity index 94%
rename from keyboards/ymdk_np21/readme.md
rename to keyboards/ymdk/np21/readme.md
index decd30b27577..e9eaad9b7be1 100644
--- a/keyboards/ymdk_np21/readme.md
+++ b/keyboards/ymdk/np21/readme.md
@@ -10,11 +10,11 @@ ps2avrGB based number-pad sold fully assembled by YMDK on Aliexpress.
 
 Make example for this keyboard (after setting up your build environment):
 
-    make ymdk_np21:default
+    make ymdk/np21:default
 
 Flashing example for this keyboard ([after setting up the bootloadHID flashing environment](https://docs.qmk.fm/#/flashing_bootloadhid))
 
-    make ymdk_np21:default:flash
+    make ymdk/np21:default:flash
 
 **Reset Key**: Hold down the 'Top Left Key' (USB on top) while plugging in the keyboard.
 
diff --git a/keyboards/ymdk_np21/rules.mk b/keyboards/ymdk/np21/rules.mk
similarity index 100%
rename from keyboards/ymdk_np21/rules.mk
rename to keyboards/ymdk/np21/rules.mk