diff --git a/keyboard/planck/keymaps/Jacob/planck.hex b/keyboard/planck/keymaps/Jacob/planck.hex
deleted file mode 100644
index 3ea701202c..0000000000
Binary files a/keyboard/planck/keymaps/Jacob/planck.hex and /dev/null differ
diff --git a/keyboard/planck/keymaps/alexey.c b/keyboard/planck/keymaps/alexey/alexey.c
similarity index 100%
rename from keyboard/planck/keymaps/alexey.c
rename to keyboard/planck/keymaps/alexey/alexey.c
diff --git a/keyboard/planck/keymaps/angerthosenear.c b/keyboard/planck/keymaps/angerthosenear/angerthosenear.c
similarity index 100%
rename from keyboard/planck/keymaps/angerthosenear.c
rename to keyboard/planck/keymaps/angerthosenear/angerthosenear.c
diff --git a/keyboard/planck/keymaps/austin.c b/keyboard/planck/keymaps/austin/austin.c
similarity index 100%
rename from keyboard/planck/keymaps/austin.c
rename to keyboard/planck/keymaps/austin/austin.c
diff --git a/keyboard/planck/keymaps/bone2planck.c b/keyboard/planck/keymaps/bone2planck/bone2planck.c
similarity index 100%
rename from keyboard/planck/keymaps/bone2planck.c
rename to keyboard/planck/keymaps/bone2planck/bone2planck.c
diff --git a/keyboard/planck/keymaps/brandon.c b/keyboard/planck/keymaps/brandon/brandon.c
similarity index 100%
rename from keyboard/planck/keymaps/brandon.c
rename to keyboard/planck/keymaps/brandon/brandon.c
diff --git a/keyboard/planck/keymaps/charlie.c b/keyboard/planck/keymaps/charlie/charlie.c
similarity index 100%
rename from keyboard/planck/keymaps/charlie.c
rename to keyboard/planck/keymaps/charlie/charlie.c
diff --git a/keyboard/planck/keymaps/daniel.c b/keyboard/planck/keymaps/daniel/daniel.c
similarity index 100%
rename from keyboard/planck/keymaps/daniel.c
rename to keyboard/planck/keymaps/daniel/daniel.c
diff --git a/keyboard/planck/keymaps/david.c b/keyboard/planck/keymaps/david/david.c
similarity index 100%
rename from keyboard/planck/keymaps/david.c
rename to keyboard/planck/keymaps/david/david.c
diff --git a/keyboard/planck/keymaps/dzobert.c b/keyboard/planck/keymaps/dzobert/dzobert.c
similarity index 100%
rename from keyboard/planck/keymaps/dzobert.c
rename to keyboard/planck/keymaps/dzobert/dzobert.c
diff --git a/keyboard/planck/keymaps/gabriel.c b/keyboard/planck/keymaps/gabriel/gabriel.c
similarity index 100%
rename from keyboard/planck/keymaps/gabriel.c
rename to keyboard/planck/keymaps/gabriel/gabriel.c
diff --git a/keyboard/planck/keymaps/Jacob/Keyboard Layout.PNG b/keyboard/planck/keymaps/jacob/Keyboard Layout.PNG
similarity index 100%
rename from keyboard/planck/keymaps/Jacob/Keyboard Layout.PNG
rename to keyboard/planck/keymaps/jacob/Keyboard Layout.PNG
diff --git a/keyboard/planck/keymaps/Jacob/keymap.c b/keyboard/planck/keymaps/jacob/keymap.c
similarity index 100%
rename from keyboard/planck/keymaps/Jacob/keymap.c
rename to keyboard/planck/keymaps/jacob/keymap.c
diff --git a/keyboard/planck/keymaps/Jacob/readme.md b/keyboard/planck/keymaps/jacob/readme.md
similarity index 100%
rename from keyboard/planck/keymaps/Jacob/readme.md
rename to keyboard/planck/keymaps/jacob/readme.md
diff --git a/keyboard/planck/keymaps/joe.c b/keyboard/planck/keymaps/joe/joe.c
similarity index 100%
rename from keyboard/planck/keymaps/joe.c
rename to keyboard/planck/keymaps/joe/joe.c
diff --git a/keyboard/planck/keymaps/kyle.c b/keyboard/planck/keymaps/kyle/kyle.c
similarity index 100%
rename from keyboard/planck/keymaps/kyle.c
rename to keyboard/planck/keymaps/kyle/kyle.c
diff --git a/keyboard/planck/keymaps/leo.c b/keyboard/planck/keymaps/leo/leo.c
similarity index 100%
rename from keyboard/planck/keymaps/leo.c
rename to keyboard/planck/keymaps/leo/leo.c
diff --git a/keyboard/planck/keymaps/lucas.c b/keyboard/planck/keymaps/lucas/lucas.c
similarity index 100%
rename from keyboard/planck/keymaps/lucas.c
rename to keyboard/planck/keymaps/lucas/lucas.c
diff --git a/keyboard/planck/keymaps/lukas.c b/keyboard/planck/keymaps/lukas/lukas.c
similarity index 100%
rename from keyboard/planck/keymaps/lukas.c
rename to keyboard/planck/keymaps/lukas/lukas.c
diff --git a/keyboard/planck/keymaps/max.c b/keyboard/planck/keymaps/max/max.c
similarity index 100%
rename from keyboard/planck/keymaps/max.c
rename to keyboard/planck/keymaps/max/max.c
diff --git a/keyboard/planck/keymaps/mollat.c b/keyboard/planck/keymaps/mollat/mollat.c
similarity index 100%
rename from keyboard/planck/keymaps/mollat.c
rename to keyboard/planck/keymaps/mollat/mollat.c
diff --git a/keyboard/planck/keymaps/monkey.c b/keyboard/planck/keymaps/monkey/monkey.c
similarity index 100%
rename from keyboard/planck/keymaps/monkey.c
rename to keyboard/planck/keymaps/monkey/monkey.c
diff --git a/keyboard/planck/keymaps/nico.c b/keyboard/planck/keymaps/nico/nico.c
similarity index 100%
rename from keyboard/planck/keymaps/nico.c
rename to keyboard/planck/keymaps/nico/nico.c
diff --git a/keyboard/planck/keymaps/numpad.c b/keyboard/planck/keymaps/numpad/numpad.c
similarity index 100%
rename from keyboard/planck/keymaps/numpad.c
rename to keyboard/planck/keymaps/numpad/numpad.c
diff --git a/keyboard/planck/keymaps/tak3over.c b/keyboard/planck/keymaps/tak3over/tak3over.c
similarity index 100%
rename from keyboard/planck/keymaps/tak3over.c
rename to keyboard/planck/keymaps/tak3over/tak3over.c