diff --git a/public/keymaps/1upkeyboards_1up60hse_default.json b/public/keymaps/1upkeyboards/1up60hse/1upkeyboards_1up60hse_default.json
similarity index 100%
rename from public/keymaps/1upkeyboards_1up60hse_default.json
rename to public/keymaps/1upkeyboards/1up60hse/1upkeyboards_1up60hse_default.json
diff --git a/public/keymaps/1upkeyboards_1up60hte_default.json b/public/keymaps/1upkeyboards/1up60hte/1upkeyboards_1up60hte_default.json
similarity index 100%
rename from public/keymaps/1upkeyboards_1up60hte_default.json
rename to public/keymaps/1upkeyboards/1up60hte/1upkeyboards_1up60hte_default.json
diff --git a/public/keymaps/1upkeyboards_1up60rgb_default.json b/public/keymaps/1upkeyboards/1up60rgb/1upkeyboards_1up60rgb_default.json
similarity index 100%
rename from public/keymaps/1upkeyboards_1up60rgb_default.json
rename to public/keymaps/1upkeyboards/1up60rgb/1upkeyboards_1up60rgb_default.json
diff --git a/public/keymaps/1upkeyboards_super16_default.json b/public/keymaps/1upkeyboards/super16/1upkeyboards_super16_default.json
similarity index 100%
rename from public/keymaps/1upkeyboards_super16_default.json
rename to public/keymaps/1upkeyboards/super16/1upkeyboards_super16_default.json
diff --git a/public/keymaps/1upkeyboards_sweet16_v1_default.json b/public/keymaps/1upkeyboards/sweet16/v1/1upkeyboards_sweet16_v1_default.json
similarity index 100%
rename from public/keymaps/1upkeyboards_sweet16_v1_default.json
rename to public/keymaps/1upkeyboards/sweet16/v1/1upkeyboards_sweet16_v1_default.json
diff --git a/public/keymaps/1upkeyboards_sweet16_v2_promicro_default.json b/public/keymaps/1upkeyboards/sweet16/v2/promicro/1upkeyboards_sweet16_v2_promicro_default.json
similarity index 100%
rename from public/keymaps/1upkeyboards_sweet16_v2_promicro_default.json
rename to public/keymaps/1upkeyboards/sweet16/v2/promicro/1upkeyboards_sweet16_v2_promicro_default.json
diff --git a/public/keymaps/1upkeyboards_sweet16_v2_proton_c_default.json b/public/keymaps/1upkeyboards/sweet16/v2/proton_c/1upkeyboards_sweet16_v2_proton_c_default.json
similarity index 100%
rename from public/keymaps/1upkeyboards_sweet16_v2_proton_c_default.json
rename to public/keymaps/1upkeyboards/sweet16/v2/proton_c/1upkeyboards_sweet16_v2_proton_c_default.json
diff --git a/public/keymaps/2_milk_default.json b/public/keymaps/2_milk/2_milk_default.json
similarity index 100%
rename from public/keymaps/2_milk_default.json
rename to public/keymaps/2_milk/2_milk_default.json
diff --git a/public/keymaps/2key2crawl_default.json b/public/keymaps/2key2crawl/2key2crawl_default.json
similarity index 100%
rename from public/keymaps/2key2crawl_default.json
rename to public/keymaps/2key2crawl/2key2crawl_default.json
diff --git a/public/keymaps/30wer_default.json b/public/keymaps/30wer/30wer_default.json
similarity index 100%
rename from public/keymaps/30wer_default.json
rename to public/keymaps/30wer/30wer_default.json
diff --git a/public/keymaps/40percentclub_25_default.json b/public/keymaps/40percentclub/25/40percentclub_25_default.json
similarity index 100%
rename from public/keymaps/40percentclub_25_default.json
rename to public/keymaps/40percentclub/25/40percentclub_25_default.json
diff --git a/public/keymaps/40percentclub_4pack_default.json b/public/keymaps/40percentclub/4pack/40percentclub_4pack_default.json
similarity index 100%
rename from public/keymaps/40percentclub_4pack_default.json
rename to public/keymaps/40percentclub/4pack/40percentclub_4pack_default.json
diff --git a/public/keymaps/40percentclub_4x4_default.json b/public/keymaps/40percentclub/4x4/40percentclub_4x4_default.json
similarity index 100%
rename from public/keymaps/40percentclub_4x4_default.json
rename to public/keymaps/40percentclub/4x4/40percentclub_4x4_default.json
diff --git a/public/keymaps/40percentclub_5x5_default.json b/public/keymaps/40percentclub/5x5/40percentclub_5x5_default.json
similarity index 100%
rename from public/keymaps/40percentclub_5x5_default.json
rename to public/keymaps/40percentclub/5x5/40percentclub_5x5_default.json
diff --git a/public/keymaps/40percentclub_6lit_default.json b/public/keymaps/40percentclub/6lit/40percentclub_6lit_default.json
similarity index 100%
rename from public/keymaps/40percentclub_6lit_default.json
rename to public/keymaps/40percentclub/6lit/40percentclub_6lit_default.json
diff --git a/public/keymaps/40percentclub_foobar_default.json b/public/keymaps/40percentclub/foobar/40percentclub_foobar_default.json
similarity index 100%
rename from public/keymaps/40percentclub_foobar_default.json
rename to public/keymaps/40percentclub/foobar/40percentclub_foobar_default.json
diff --git a/public/keymaps/40percentclub_gherkin_default.json b/public/keymaps/40percentclub/gherkin/40percentclub_gherkin_default.json
similarity index 100%
rename from public/keymaps/40percentclub_gherkin_default.json
rename to public/keymaps/40percentclub/gherkin/40percentclub_gherkin_default.json
diff --git a/public/keymaps/40percentclub_half_n_half_default.json b/public/keymaps/40percentclub/half_n_half/40percentclub_half_n_half_default.json
similarity index 100%
rename from public/keymaps/40percentclub_half_n_half_default.json
rename to public/keymaps/40percentclub/half_n_half/40percentclub_half_n_half_default.json
diff --git a/public/keymaps/40percentclub_i75_promicro_default.json b/public/keymaps/40percentclub/i75/promicro/40percentclub_i75_promicro_default.json
similarity index 100%
rename from public/keymaps/40percentclub_i75_promicro_default.json
rename to public/keymaps/40percentclub/i75/promicro/40percentclub_i75_promicro_default.json
diff --git a/public/keymaps/40percentclub_i75_teensy2_default.json b/public/keymaps/40percentclub/i75/teensy2/40percentclub_i75_teensy2_default.json
similarity index 100%
rename from public/keymaps/40percentclub_i75_teensy2_default.json
rename to public/keymaps/40percentclub/i75/teensy2/40percentclub_i75_teensy2_default.json
diff --git a/public/keymaps/40percentclub_luddite_default.json b/public/keymaps/40percentclub/luddite/40percentclub_luddite_default.json
similarity index 100%
rename from public/keymaps/40percentclub_luddite_default.json
rename to public/keymaps/40percentclub/luddite/40percentclub_luddite_default.json
diff --git a/public/keymaps/40percentclub_mf68_default.json b/public/keymaps/40percentclub/mf68/40percentclub_mf68_default.json
similarity index 100%
rename from public/keymaps/40percentclub_mf68_default.json
rename to public/keymaps/40percentclub/mf68/40percentclub_mf68_default.json
diff --git a/public/keymaps/40percentclub_nano_default.json b/public/keymaps/40percentclub/nano/40percentclub_nano_default.json
similarity index 100%
rename from public/keymaps/40percentclub_nano_default.json
rename to public/keymaps/40percentclub/nano/40percentclub_nano_default.json
diff --git a/public/keymaps/40percentclub_nein_default.json b/public/keymaps/40percentclub/nein/40percentclub_nein_default.json
similarity index 100%
rename from public/keymaps/40percentclub_nein_default.json
rename to public/keymaps/40percentclub/nein/40percentclub_nein_default.json
diff --git a/public/keymaps/40percentclub_nori_default.json b/public/keymaps/40percentclub/nori/40percentclub_nori_default.json
similarity index 100%
rename from public/keymaps/40percentclub_nori_default.json
rename to public/keymaps/40percentclub/nori/40percentclub_nori_default.json
diff --git a/public/keymaps/40percentclub_tomato_default.json b/public/keymaps/40percentclub/tomato/40percentclub_tomato_default.json
similarity index 100%
rename from public/keymaps/40percentclub_tomato_default.json
rename to public/keymaps/40percentclub/tomato/40percentclub_tomato_default.json
diff --git a/public/keymaps/40percentclub_ut47_default.json b/public/keymaps/40percentclub/ut47/40percentclub_ut47_default.json
similarity index 100%
rename from public/keymaps/40percentclub_ut47_default.json
rename to public/keymaps/40percentclub/ut47/40percentclub_ut47_default.json
diff --git a/public/keymaps/4by3_default.json b/public/keymaps/4by3/4by3_default.json
similarity index 100%
rename from public/keymaps/4by3_default.json
rename to public/keymaps/4by3/4by3_default.json
diff --git a/public/keymaps/6ball_default.json b/public/keymaps/6ball/6ball_default.json
similarity index 100%
rename from public/keymaps/6ball_default.json
rename to public/keymaps/6ball/6ball_default.json
diff --git a/public/keymaps/7skb_rev1_default.json b/public/keymaps/7skb/rev1/7skb_rev1_default.json
similarity index 100%
rename from public/keymaps/7skb_rev1_default.json
rename to public/keymaps/7skb/rev1/7skb_rev1_default.json
diff --git a/public/keymaps/8pack_rev11_default.json b/public/keymaps/8pack/rev11/8pack_rev11_default.json
similarity index 100%
rename from public/keymaps/8pack_rev11_default.json
rename to public/keymaps/8pack/rev11/8pack_rev11_default.json
diff --git a/public/keymaps/8pack_rev12_default.json b/public/keymaps/8pack/rev12/8pack_rev12_default.json
similarity index 100%
rename from public/keymaps/8pack_rev12_default.json
rename to public/keymaps/8pack/rev12/8pack_rev12_default.json
diff --git a/public/keymaps/9key_default.json b/public/keymaps/9key/9key_default.json
similarity index 100%
rename from public/keymaps/9key_default.json
rename to public/keymaps/9key/9key_default.json
diff --git a/public/keymaps/abstract_ellipse_rev1_default.json b/public/keymaps/abstract/ellipse/rev1/abstract_ellipse_rev1_default.json
similarity index 100%
rename from public/keymaps/abstract_ellipse_rev1_default.json
rename to public/keymaps/abstract/ellipse/rev1/abstract_ellipse_rev1_default.json
diff --git a/public/keymaps/acheron_shark_default.json b/public/keymaps/acheron/shark/acheron_shark_default.json
similarity index 100%
rename from public/keymaps/acheron_shark_default.json
rename to public/keymaps/acheron/shark/acheron_shark_default.json
diff --git a/public/keymaps/acr60_default.json b/public/keymaps/acr60/acr60_default.json
similarity index 100%
rename from public/keymaps/acr60_default.json
rename to public/keymaps/acr60/acr60_default.json
diff --git a/public/keymaps/adkb96_rev1_default.json b/public/keymaps/adkb96/rev1/adkb96_rev1_default.json
similarity index 100%
rename from public/keymaps/adkb96_rev1_default.json
rename to public/keymaps/adkb96/rev1/adkb96_rev1_default.json
diff --git a/public/keymaps/aeboards_aegis_default.json b/public/keymaps/aeboards/aegis/aeboards_aegis_default.json
similarity index 100%
rename from public/keymaps/aeboards_aegis_default.json
rename to public/keymaps/aeboards/aegis/aeboards_aegis_default.json
diff --git a/public/keymaps/aeboards_ext65_default.json b/public/keymaps/aeboards/ext65/aeboards_ext65_default.json
similarity index 100%
rename from public/keymaps/aeboards_ext65_default.json
rename to public/keymaps/aeboards/ext65/aeboards_ext65_default.json
diff --git a/public/keymaps/ai03_lunar_default.json b/public/keymaps/ai03/lunar/ai03_lunar_default.json
similarity index 100%
rename from public/keymaps/ai03_lunar_default.json
rename to public/keymaps/ai03/lunar/ai03_lunar_default.json
diff --git a/public/keymaps/ai03_orbit_default.json b/public/keymaps/ai03/orbit/ai03_orbit_default.json
similarity index 100%
rename from public/keymaps/ai03_orbit_default.json
rename to public/keymaps/ai03/orbit/ai03_orbit_default.json
diff --git a/public/keymaps/ai03_quasar_default.json b/public/keymaps/ai03/quasar/ai03_quasar_default.json
similarity index 100%
rename from public/keymaps/ai03_quasar_default.json
rename to public/keymaps/ai03/quasar/ai03_quasar_default.json
diff --git a/public/keymaps/ai03_soyuz_default.json b/public/keymaps/ai03/soyuz/ai03_soyuz_default.json
similarity index 100%
rename from public/keymaps/ai03_soyuz_default.json
rename to public/keymaps/ai03/soyuz/ai03_soyuz_default.json
diff --git a/public/keymaps/akb_eb46_default.json b/public/keymaps/akb/eb46/akb_eb46_default.json
similarity index 100%
rename from public/keymaps/akb_eb46_default.json
rename to public/keymaps/akb/eb46/akb_eb46_default.json
diff --git a/public/keymaps/akb_raine_default.json b/public/keymaps/akb/raine/akb_raine_default.json
similarity index 100%
rename from public/keymaps/akb_raine_default.json
rename to public/keymaps/akb/raine/akb_raine_default.json
diff --git a/public/keymaps/al1_default.json b/public/keymaps/al1/al1_default.json
similarity index 100%
rename from public/keymaps/al1_default.json
rename to public/keymaps/al1/al1_default.json
diff --git a/public/keymaps/alf_dc60_default.json b/public/keymaps/alf/dc60/alf_dc60_default.json
similarity index 100%
rename from public/keymaps/alf_dc60_default.json
rename to public/keymaps/alf/dc60/alf_dc60_default.json
diff --git a/public/keymaps/alf_x11_default.json b/public/keymaps/alf/x11/alf_x11_default.json
similarity index 100%
rename from public/keymaps/alf_x11_default.json
rename to public/keymaps/alf/x11/alf_x11_default.json
diff --git a/public/keymaps/alf_x2_default.json b/public/keymaps/alf/x2/alf_x2_default.json
similarity index 100%
rename from public/keymaps/alf_x2_default.json
rename to public/keymaps/alf/x2/alf_x2_default.json
diff --git a/public/keymaps/alpha_default.json b/public/keymaps/alpha/alpha_default.json
similarity index 100%
rename from public/keymaps/alpha_default.json
rename to public/keymaps/alpha/alpha_default.json
diff --git a/public/keymaps/alps64_default.json b/public/keymaps/alps64/alps64_default.json
similarity index 100%
rename from public/keymaps/alps64_default.json
rename to public/keymaps/alps64/alps64_default.json
diff --git a/public/keymaps/alu84_default.json b/public/keymaps/alu84/alu84_default.json
similarity index 100%
rename from public/keymaps/alu84_default.json
rename to public/keymaps/alu84/alu84_default.json
diff --git a/public/keymaps/amj40_default.json b/public/keymaps/amj40/amj40_default.json
similarity index 100%
rename from public/keymaps/amj40_default.json
rename to public/keymaps/amj40/amj40_default.json
diff --git a/public/keymaps/amj60_default.json b/public/keymaps/amj60/amj60_default.json
similarity index 100%
rename from public/keymaps/amj60_default.json
rename to public/keymaps/amj60/amj60_default.json
diff --git a/public/keymaps/amj96_default.json b/public/keymaps/amj96/amj96_default.json
similarity index 100%
rename from public/keymaps/amj96_default.json
rename to public/keymaps/amj96/amj96_default.json
diff --git a/public/keymaps/amjkeyboard_amj66_default.json b/public/keymaps/amjkeyboard/amj66/amjkeyboard_amj66_default.json
similarity index 100%
rename from public/keymaps/amjkeyboard_amj66_default.json
rename to public/keymaps/amjkeyboard/amj66/amjkeyboard_amj66_default.json
diff --git a/public/keymaps/amjpad_default.json b/public/keymaps/amjpad/amjpad_default.json
similarity index 100%
rename from public/keymaps/amjpad_default.json
rename to public/keymaps/amjpad/amjpad_default.json
diff --git a/public/keymaps/angel17_alpha_default.json b/public/keymaps/angel17/alpha/angel17_alpha_default.json
similarity index 100%
rename from public/keymaps/angel17_alpha_default.json
rename to public/keymaps/angel17/alpha/angel17_alpha_default.json
diff --git a/public/keymaps/angel17_rev1_default.json b/public/keymaps/angel17/rev1/angel17_rev1_default.json
similarity index 100%
rename from public/keymaps/angel17_rev1_default.json
rename to public/keymaps/angel17/rev1/angel17_rev1_default.json
diff --git a/public/keymaps/angel64_alpha_default.json b/public/keymaps/angel64/alpha/angel64_alpha_default.json
similarity index 100%
rename from public/keymaps/angel64_alpha_default.json
rename to public/keymaps/angel64/alpha/angel64_alpha_default.json
diff --git a/public/keymaps/angel64_rev1_default.json b/public/keymaps/angel64/rev1/angel64_rev1_default.json
similarity index 100%
rename from public/keymaps/angel64_rev1_default.json
rename to public/keymaps/angel64/rev1/angel64_rev1_default.json
diff --git a/public/keymaps/ares_default.json b/public/keymaps/ares/ares_default.json
similarity index 100%
rename from public/keymaps/ares_default.json
rename to public/keymaps/ares/ares_default.json
diff --git a/public/keymaps/ash1800_default.json b/public/keymaps/ash1800/ash1800_default.json
similarity index 100%
rename from public/keymaps/ash1800_default.json
rename to public/keymaps/ash1800/ash1800_default.json
diff --git a/public/keymaps/ashpil_modelm_usbc_default.json b/public/keymaps/ashpil/modelm_usbc/ashpil_modelm_usbc_default.json
similarity index 100%
rename from public/keymaps/ashpil_modelm_usbc_default.json
rename to public/keymaps/ashpil/modelm_usbc/ashpil_modelm_usbc_default.json
diff --git a/public/keymaps/at101_blackheart_default.json b/public/keymaps/at101_blackheart/at101_blackheart_default.json
similarity index 100%
rename from public/keymaps/at101_blackheart_default.json
rename to public/keymaps/at101_blackheart/at101_blackheart_default.json
diff --git a/public/keymaps/at_at_660m_default.json b/public/keymaps/at_at/660m/at_at_660m_default.json
similarity index 100%
rename from public/keymaps/at_at_660m_default.json
rename to public/keymaps/at_at/660m/at_at_660m_default.json
diff --git a/public/keymaps/atomic_default.json b/public/keymaps/atomic/atomic_default.json
similarity index 100%
rename from public/keymaps/atomic_default.json
rename to public/keymaps/atomic/atomic_default.json
diff --git a/public/keymaps/atreus_astar_default.json b/public/keymaps/atreus/astar/atreus_astar_default.json
similarity index 100%
rename from public/keymaps/atreus_astar_default.json
rename to public/keymaps/atreus/astar/atreus_astar_default.json
diff --git a/public/keymaps/atreus_astar_mirrored_default.json b/public/keymaps/atreus/astar_mirrored/atreus_astar_mirrored_default.json
similarity index 100%
rename from public/keymaps/atreus_astar_mirrored_default.json
rename to public/keymaps/atreus/astar_mirrored/atreus_astar_mirrored_default.json
diff --git a/public/keymaps/atreus_teensy2_default.json b/public/keymaps/atreus/teensy2/atreus_teensy2_default.json
similarity index 100%
rename from public/keymaps/atreus_teensy2_default.json
rename to public/keymaps/atreus/teensy2/atreus_teensy2_default.json
diff --git a/public/keymaps/atreus62_default.json b/public/keymaps/atreus62/atreus62_default.json
similarity index 100%
rename from public/keymaps/atreus62_default.json
rename to public/keymaps/atreus62/atreus62_default.json
diff --git a/public/keymaps/baguette_default.json b/public/keymaps/baguette/baguette_default.json
similarity index 100%
rename from public/keymaps/baguette_default.json
rename to public/keymaps/baguette/baguette_default.json
diff --git a/public/keymaps/bantam44_default.json b/public/keymaps/bantam44/bantam44_default.json
similarity index 100%
rename from public/keymaps/bantam44_default.json
rename to public/keymaps/bantam44/bantam44_default.json
diff --git a/public/keymaps/bfake_default.json b/public/keymaps/bfake/bfake_default.json
similarity index 100%
rename from public/keymaps/bfake_default.json
rename to public/keymaps/bfake/bfake_default.json
diff --git a/public/keymaps/bigseries_1key_default.json b/public/keymaps/bigseries/1key/bigseries_1key_default.json
similarity index 100%
rename from public/keymaps/bigseries_1key_default.json
rename to public/keymaps/bigseries/1key/bigseries_1key_default.json
diff --git a/public/keymaps/bigseries_2key_default.json b/public/keymaps/bigseries/2key/bigseries_2key_default.json
similarity index 100%
rename from public/keymaps/bigseries_2key_default.json
rename to public/keymaps/bigseries/2key/bigseries_2key_default.json
diff --git a/public/keymaps/bigseries_3key_default.json b/public/keymaps/bigseries/3key/bigseries_3key_default.json
similarity index 100%
rename from public/keymaps/bigseries_3key_default.json
rename to public/keymaps/bigseries/3key/bigseries_3key_default.json
diff --git a/public/keymaps/bigseries_4key_default.json b/public/keymaps/bigseries/4key/bigseries_4key_default.json
similarity index 100%
rename from public/keymaps/bigseries_4key_default.json
rename to public/keymaps/bigseries/4key/bigseries_4key_default.json
diff --git a/public/keymaps/bigswitch_default.json b/public/keymaps/bigswitch/bigswitch_default.json
similarity index 100%
rename from public/keymaps/bigswitch_default.json
rename to public/keymaps/bigswitch/bigswitch_default.json
diff --git a/public/keymaps/blackplum_default.json b/public/keymaps/blackplum/blackplum_default.json
similarity index 100%
rename from public/keymaps/blackplum_default.json
rename to public/keymaps/blackplum/blackplum_default.json
diff --git a/public/keymaps/blockey_default.json b/public/keymaps/blockey/blockey_default.json
similarity index 100%
rename from public/keymaps/blockey_default.json
rename to public/keymaps/blockey/blockey_default.json
diff --git a/public/keymaps/bm16a_default.json b/public/keymaps/bm16a/bm16a_default.json
similarity index 100%
rename from public/keymaps/bm16a_default.json
rename to public/keymaps/bm16a/bm16a_default.json
diff --git a/public/keymaps/bm16s_default.json b/public/keymaps/bm16s/bm16s_default.json
similarity index 100%
rename from public/keymaps/bm16s_default.json
rename to public/keymaps/bm16s/bm16s_default.json
diff --git a/public/keymaps/bm43a_default.json b/public/keymaps/bm43a/bm43a_default.json
similarity index 100%
rename from public/keymaps/bm43a_default.json
rename to public/keymaps/bm43a/bm43a_default.json
diff --git a/public/keymaps/boardwalk_default.json b/public/keymaps/boardwalk/boardwalk_default.json
similarity index 100%
rename from public/keymaps/boardwalk_default.json
rename to public/keymaps/boardwalk/boardwalk_default.json
diff --git a/public/keymaps/boston_meetup_2019_default.json b/public/keymaps/boston_meetup/2019/boston_meetup_2019_default.json
similarity index 100%
rename from public/keymaps/boston_meetup_2019_default.json
rename to public/keymaps/boston_meetup/2019/boston_meetup_2019_default.json
diff --git a/public/keymaps/bpiphany_frosty_flake_default.json b/public/keymaps/bpiphany/frosty_flake/bpiphany_frosty_flake_default.json
similarity index 100%
rename from public/keymaps/bpiphany_frosty_flake_default.json
rename to public/keymaps/bpiphany/frosty_flake/bpiphany_frosty_flake_default.json
diff --git a/public/keymaps/bpiphany_kitten_paw_default.json b/public/keymaps/bpiphany/kitten_paw/bpiphany_kitten_paw_default.json
similarity index 100%
rename from public/keymaps/bpiphany_kitten_paw_default.json
rename to public/keymaps/bpiphany/kitten_paw/bpiphany_kitten_paw_default.json
diff --git a/public/keymaps/bpiphany_pegasushoof_2013_default.json b/public/keymaps/bpiphany/pegasushoof/2013/bpiphany_pegasushoof_2013_default.json
similarity index 100%
rename from public/keymaps/bpiphany_pegasushoof_2013_default.json
rename to public/keymaps/bpiphany/pegasushoof/2013/bpiphany_pegasushoof_2013_default.json
diff --git a/public/keymaps/bpiphany_pegasushoof_2015_default.json b/public/keymaps/bpiphany/pegasushoof/2015/bpiphany_pegasushoof_2015_default.json
similarity index 100%
rename from public/keymaps/bpiphany_pegasushoof_2015_default.json
rename to public/keymaps/bpiphany/pegasushoof/2015/bpiphany_pegasushoof_2015_default.json
diff --git a/public/keymaps/bpiphany_sixshooter_default.json b/public/keymaps/bpiphany/sixshooter/bpiphany_sixshooter_default.json
similarity index 100%
rename from public/keymaps/bpiphany_sixshooter_default.json
rename to public/keymaps/bpiphany/sixshooter/bpiphany_sixshooter_default.json
diff --git a/public/keymaps/bpiphany_tiger_lily_default.json b/public/keymaps/bpiphany/tiger_lily/bpiphany_tiger_lily_default.json
similarity index 100%
rename from public/keymaps/bpiphany_tiger_lily_default.json
rename to public/keymaps/bpiphany/tiger_lily/bpiphany_tiger_lily_default.json
diff --git a/public/keymaps/bpiphany_unloved_bastard_default.json b/public/keymaps/bpiphany/unloved_bastard/bpiphany_unloved_bastard_default.json
similarity index 100%
rename from public/keymaps/bpiphany_unloved_bastard_default.json
rename to public/keymaps/bpiphany/unloved_bastard/bpiphany_unloved_bastard_default.json
diff --git a/public/keymaps/bthlabs_geekpad_default.json b/public/keymaps/bthlabs/geekpad/bthlabs_geekpad_default.json
similarity index 100%
rename from public/keymaps/bthlabs_geekpad_default.json
rename to public/keymaps/bthlabs/geekpad/bthlabs_geekpad_default.json
diff --git a/public/keymaps/business_card_alpha_default.json b/public/keymaps/business_card/alpha/business_card_alpha_default.json
similarity index 100%
rename from public/keymaps/business_card_alpha_default.json
rename to public/keymaps/business_card/alpha/business_card_alpha_default.json
diff --git a/public/keymaps/business_card_beta_default.json b/public/keymaps/business_card/beta/business_card_beta_default.json
similarity index 100%
rename from public/keymaps/business_card_beta_default.json
rename to public/keymaps/business_card/beta/business_card_beta_default.json
diff --git a/public/keymaps/c39_default.json b/public/keymaps/c39/c39_default.json
similarity index 100%
rename from public/keymaps/c39_default.json
rename to public/keymaps/c39/c39_default.json
diff --git a/public/keymaps/candybar_default.json b/public/keymaps/candybar/candybar_default.json
similarity index 100%
rename from public/keymaps/candybar_default.json
rename to public/keymaps/candybar/candybar_default.json
diff --git a/public/keymaps/cannonkeys_an_c_default.json b/public/keymaps/cannonkeys/an_c/cannonkeys_an_c_default.json
similarity index 100%
rename from public/keymaps/cannonkeys_an_c_default.json
rename to public/keymaps/cannonkeys/an_c/cannonkeys_an_c_default.json
diff --git a/public/keymaps/cannonkeys_chimera65_default.json b/public/keymaps/cannonkeys/chimera65/cannonkeys_chimera65_default.json
similarity index 100%
rename from public/keymaps/cannonkeys_chimera65_default.json
rename to public/keymaps/cannonkeys/chimera65/cannonkeys_chimera65_default.json
diff --git a/public/keymaps/cannonkeys_instant60_default.json b/public/keymaps/cannonkeys/instant60/cannonkeys_instant60_default.json
similarity index 100%
rename from public/keymaps/cannonkeys_instant60_default.json
rename to public/keymaps/cannonkeys/instant60/cannonkeys_instant60_default.json
diff --git a/public/keymaps/cannonkeys_iron165_default.json b/public/keymaps/cannonkeys/iron165/cannonkeys_iron165_default.json
similarity index 100%
rename from public/keymaps/cannonkeys_iron165_default.json
rename to public/keymaps/cannonkeys/iron165/cannonkeys_iron165_default.json
diff --git a/public/keymaps/cannonkeys_ortho48_default.json b/public/keymaps/cannonkeys/ortho48/cannonkeys_ortho48_default.json
similarity index 100%
rename from public/keymaps/cannonkeys_ortho48_default.json
rename to public/keymaps/cannonkeys/ortho48/cannonkeys_ortho48_default.json
diff --git a/public/keymaps/cannonkeys_ortho60_default.json b/public/keymaps/cannonkeys/ortho60/cannonkeys_ortho60_default.json
similarity index 100%
rename from public/keymaps/cannonkeys_ortho60_default.json
rename to public/keymaps/cannonkeys/ortho60/cannonkeys_ortho60_default.json
diff --git a/public/keymaps/cannonkeys_ortho75_default.json b/public/keymaps/cannonkeys/ortho75/cannonkeys_ortho75_default.json
similarity index 100%
rename from public/keymaps/cannonkeys_ortho75_default.json
rename to public/keymaps/cannonkeys/ortho75/cannonkeys_ortho75_default.json
diff --git a/public/keymaps/cannonkeys_practice60_default.json b/public/keymaps/cannonkeys/practice60/cannonkeys_practice60_default.json
similarity index 100%
rename from public/keymaps/cannonkeys_practice60_default.json
rename to public/keymaps/cannonkeys/practice60/cannonkeys_practice60_default.json
diff --git a/public/keymaps/cannonkeys_practice65_default.json b/public/keymaps/cannonkeys/practice65/cannonkeys_practice65_default.json
similarity index 100%
rename from public/keymaps/cannonkeys_practice65_default.json
rename to public/keymaps/cannonkeys/practice65/cannonkeys_practice65_default.json
diff --git a/public/keymaps/cannonkeys_satisfaction75_prototype_default.json b/public/keymaps/cannonkeys/satisfaction75/prototype/cannonkeys_satisfaction75_prototype_default.json
similarity index 100%
rename from public/keymaps/cannonkeys_satisfaction75_prototype_default.json
rename to public/keymaps/cannonkeys/satisfaction75/prototype/cannonkeys_satisfaction75_prototype_default.json
diff --git a/public/keymaps/cannonkeys_satisfaction75_rev1_default.json b/public/keymaps/cannonkeys/satisfaction75/rev1/cannonkeys_satisfaction75_rev1_default.json
similarity index 100%
rename from public/keymaps/cannonkeys_satisfaction75_rev1_default.json
rename to public/keymaps/cannonkeys/satisfaction75/rev1/cannonkeys_satisfaction75_rev1_default.json
diff --git a/public/keymaps/cannonkeys_savage65_default.json b/public/keymaps/cannonkeys/savage65/cannonkeys_savage65_default.json
similarity index 100%
rename from public/keymaps/cannonkeys_savage65_default.json
rename to public/keymaps/cannonkeys/savage65/cannonkeys_savage65_default.json
diff --git a/public/keymaps/cannonkeys_tmov2_default.json b/public/keymaps/cannonkeys/tmov2/cannonkeys_tmov2_default.json
similarity index 100%
rename from public/keymaps/cannonkeys_tmov2_default.json
rename to public/keymaps/cannonkeys/tmov2/cannonkeys_tmov2_default.json
diff --git a/public/keymaps/catch22_default.json b/public/keymaps/catch22/catch22_default.json
similarity index 100%
rename from public/keymaps/catch22_default.json
rename to public/keymaps/catch22/catch22_default.json
diff --git a/public/keymaps/chimera_ergo_default.json b/public/keymaps/chimera_ergo/chimera_ergo_default.json
similarity index 100%
rename from public/keymaps/chimera_ergo_default.json
rename to public/keymaps/chimera_ergo/chimera_ergo_default.json
diff --git a/public/keymaps/chimera_ls_default.json b/public/keymaps/chimera_ls/chimera_ls_default.json
similarity index 100%
rename from public/keymaps/chimera_ls_default.json
rename to public/keymaps/chimera_ls/chimera_ls_default.json
diff --git a/public/keymaps/chimera_ortho_default.json b/public/keymaps/chimera_ortho/chimera_ortho_default.json
similarity index 100%
rename from public/keymaps/chimera_ortho_default.json
rename to public/keymaps/chimera_ortho/chimera_ortho_default.json
diff --git a/public/keymaps/choco60_default.json b/public/keymaps/choco60/choco60_default.json
similarity index 100%
rename from public/keymaps/choco60_default.json
rename to public/keymaps/choco60/choco60_default.json
diff --git a/public/keymaps/christmas_tree_V2017_default.json b/public/keymaps/christmas_tree/V2017/christmas_tree_V2017_default.json
similarity index 100%
rename from public/keymaps/christmas_tree_V2017_default.json
rename to public/keymaps/christmas_tree/V2017/christmas_tree_V2017_default.json
diff --git a/public/keymaps/ckeys_handwire_101_default.json b/public/keymaps/ckeys/handwire_101/ckeys_handwire_101_default.json
similarity index 100%
rename from public/keymaps/ckeys_handwire_101_default.json
rename to public/keymaps/ckeys/handwire_101/ckeys_handwire_101_default.json
diff --git a/public/keymaps/ckeys_nakey_default.json b/public/keymaps/ckeys/nakey/ckeys_nakey_default.json
similarity index 100%
rename from public/keymaps/ckeys_nakey_default.json
rename to public/keymaps/ckeys/nakey/ckeys_nakey_default.json
diff --git a/public/keymaps/ckeys_obelus_default.json b/public/keymaps/ckeys/obelus/ckeys_obelus_default.json
similarity index 100%
rename from public/keymaps/ckeys_obelus_default.json
rename to public/keymaps/ckeys/obelus/ckeys_obelus_default.json
diff --git a/public/keymaps/ckeys_thedora_default.json b/public/keymaps/ckeys/thedora/ckeys_thedora_default.json
similarity index 100%
rename from public/keymaps/ckeys_thedora_default.json
rename to public/keymaps/ckeys/thedora/ckeys_thedora_default.json
diff --git a/public/keymaps/claw44_rev1_default.json b/public/keymaps/claw44/rev1/claw44_rev1_default.json
similarity index 100%
rename from public/keymaps/claw44_rev1_default.json
rename to public/keymaps/claw44/rev1/claw44_rev1_default.json
diff --git a/public/keymaps/clueboard_17_default.json b/public/keymaps/clueboard/17/clueboard_17_default.json
similarity index 100%
rename from public/keymaps/clueboard_17_default.json
rename to public/keymaps/clueboard/17/clueboard_17_default.json
diff --git a/public/keymaps/clueboard_2x1800_default.json b/public/keymaps/clueboard/2x1800/clueboard_2x1800_default.json
similarity index 100%
rename from public/keymaps/clueboard_2x1800_default.json
rename to public/keymaps/clueboard/2x1800/clueboard_2x1800_default.json
diff --git a/public/keymaps/clueboard_60_default.json b/public/keymaps/clueboard/60/clueboard_60_default.json
similarity index 100%
rename from public/keymaps/clueboard_60_default.json
rename to public/keymaps/clueboard/60/clueboard_60_default.json
diff --git a/public/keymaps/clueboard_66_rev1_default.json b/public/keymaps/clueboard/66/rev1/clueboard_66_rev1_default.json
similarity index 100%
rename from public/keymaps/clueboard_66_rev1_default.json
rename to public/keymaps/clueboard/66/rev1/clueboard_66_rev1_default.json
diff --git a/public/keymaps/clueboard_66_rev2_default.json b/public/keymaps/clueboard/66/rev2/clueboard_66_rev2_default.json
similarity index 100%
rename from public/keymaps/clueboard_66_rev2_default.json
rename to public/keymaps/clueboard/66/rev2/clueboard_66_rev2_default.json
diff --git a/public/keymaps/clueboard_66_rev3_default.json b/public/keymaps/clueboard/66/rev3/clueboard_66_rev3_default.json
similarity index 100%
rename from public/keymaps/clueboard_66_rev3_default.json
rename to public/keymaps/clueboard/66/rev3/clueboard_66_rev3_default.json
diff --git a/public/keymaps/clueboard_66_rev4_default.json b/public/keymaps/clueboard/66/rev4/clueboard_66_rev4_default.json
similarity index 100%
rename from public/keymaps/clueboard_66_rev4_default.json
rename to public/keymaps/clueboard/66/rev4/clueboard_66_rev4_default.json
diff --git a/public/keymaps/clueboard_66_hotswap_gen1_default.json b/public/keymaps/clueboard/66_hotswap/gen1/clueboard_66_hotswap_gen1_default.json
similarity index 100%
rename from public/keymaps/clueboard_66_hotswap_gen1_default.json
rename to public/keymaps/clueboard/66_hotswap/gen1/clueboard_66_hotswap_gen1_default.json
diff --git a/public/keymaps/clueboard_66_hotswap_prototype_default.json b/public/keymaps/clueboard/66_hotswap/prototype/clueboard_66_hotswap_prototype_default.json
similarity index 100%
rename from public/keymaps/clueboard_66_hotswap_prototype_default.json
rename to public/keymaps/clueboard/66_hotswap/prototype/clueboard_66_hotswap_prototype_default.json
diff --git a/public/keymaps/clueboard_california_default.json b/public/keymaps/clueboard/california/clueboard_california_default.json
similarity index 100%
rename from public/keymaps/clueboard_california_default.json
rename to public/keymaps/clueboard/california/clueboard_california_default.json
diff --git a/public/keymaps/clueboard_card_default.json b/public/keymaps/clueboard/card/clueboard_card_default.json
similarity index 100%
rename from public/keymaps/clueboard_card_default.json
rename to public/keymaps/clueboard/card/clueboard_card_default.json
diff --git a/public/keymaps/cocoa40_default.json b/public/keymaps/cocoa40/cocoa40_default.json
similarity index 100%
rename from public/keymaps/cocoa40_default.json
rename to public/keymaps/cocoa40/cocoa40_default.json
diff --git a/public/keymaps/comet46_default.json b/public/keymaps/comet46/comet46_default.json
similarity index 100%
rename from public/keymaps/comet46_default.json
rename to public/keymaps/comet46/comet46_default.json
diff --git a/public/keymaps/contra_default.json b/public/keymaps/contra/contra_default.json
similarity index 100%
rename from public/keymaps/contra_default.json
rename to public/keymaps/contra/contra_default.json
diff --git a/public/keymaps/converter_adb_usb_default.json b/public/keymaps/converter/adb_usb/converter_adb_usb_default.json
similarity index 100%
rename from public/keymaps/converter_adb_usb_default.json
rename to public/keymaps/converter/adb_usb/converter_adb_usb_default.json
diff --git a/public/keymaps/converter_hp_46010a_default.json b/public/keymaps/converter/hp_46010a/converter_hp_46010a_default.json
similarity index 100%
rename from public/keymaps/converter_hp_46010a_default.json
rename to public/keymaps/converter/hp_46010a/converter_hp_46010a_default.json
diff --git a/public/keymaps/converter_ibm_5291_default.json b/public/keymaps/converter/ibm_5291/converter_ibm_5291_default.json
similarity index 100%
rename from public/keymaps/converter_ibm_5291_default.json
rename to public/keymaps/converter/ibm_5291/converter_ibm_5291_default.json
diff --git a/public/keymaps/converter_ibm_terminal_default.json b/public/keymaps/converter/ibm_terminal/converter_ibm_terminal_default.json
similarity index 100%
rename from public/keymaps/converter_ibm_terminal_default.json
rename to public/keymaps/converter/ibm_terminal/converter_ibm_terminal_default.json
diff --git a/public/keymaps/converter_m0110_usb_default.json b/public/keymaps/converter/m0110_usb/converter_m0110_usb_default.json
similarity index 100%
rename from public/keymaps/converter_m0110_usb_default.json
rename to public/keymaps/converter/m0110_usb/converter_m0110_usb_default.json
diff --git a/public/keymaps/converter_modelm101_default.json b/public/keymaps/converter/modelm101/converter_modelm101_default.json
similarity index 100%
rename from public/keymaps/converter_modelm101_default.json
rename to public/keymaps/converter/modelm101/converter_modelm101_default.json
diff --git a/public/keymaps/converter_numeric_keypad_IIe_default.json b/public/keymaps/converter/numeric_keypad_IIe/converter_numeric_keypad_IIe_default.json
similarity index 100%
rename from public/keymaps/converter_numeric_keypad_IIe_default.json
rename to public/keymaps/converter/numeric_keypad_IIe/converter_numeric_keypad_IIe_default.json
diff --git a/public/keymaps/converter_palm_usb_stowaway_default.json b/public/keymaps/converter/palm_usb/stowaway/converter_palm_usb_stowaway_default.json
similarity index 100%
rename from public/keymaps/converter_palm_usb_stowaway_default.json
rename to public/keymaps/converter/palm_usb/stowaway/converter_palm_usb_stowaway_default.json
diff --git a/public/keymaps/converter_siemens_tastatur_default.json b/public/keymaps/converter/siemens_tastatur/converter_siemens_tastatur_default.json
similarity index 100%
rename from public/keymaps/converter_siemens_tastatur_default.json
rename to public/keymaps/converter/siemens_tastatur/converter_siemens_tastatur_default.json
diff --git a/public/keymaps/converter_sun_usb_type3_default.json b/public/keymaps/converter/sun_usb/type3/converter_sun_usb_type3_default.json
similarity index 100%
rename from public/keymaps/converter_sun_usb_type3_default.json
rename to public/keymaps/converter/sun_usb/type3/converter_sun_usb_type3_default.json
diff --git a/public/keymaps/converter_sun_usb_type5_default.json b/public/keymaps/converter/sun_usb/type5/converter_sun_usb_type5_default.json
similarity index 100%
rename from public/keymaps/converter_sun_usb_type5_default.json
rename to public/keymaps/converter/sun_usb/type5/converter_sun_usb_type5_default.json
diff --git a/public/keymaps/converter_usb_usb_ble_default.json b/public/keymaps/converter/usb_usb/ble/converter_usb_usb_ble_default.json
similarity index 100%
rename from public/keymaps/converter_usb_usb_ble_default.json
rename to public/keymaps/converter/usb_usb/ble/converter_usb_usb_ble_default.json
diff --git a/public/keymaps/converter_usb_usb_hasu_default.json b/public/keymaps/converter/usb_usb/hasu/converter_usb_usb_hasu_default.json
similarity index 100%
rename from public/keymaps/converter_usb_usb_hasu_default.json
rename to public/keymaps/converter/usb_usb/hasu/converter_usb_usb_hasu_default.json
diff --git a/public/keymaps/converter_usb_usb_pro_micro_default.json b/public/keymaps/converter/usb_usb/pro_micro/converter_usb_usb_pro_micro_default.json
similarity index 100%
rename from public/keymaps/converter_usb_usb_pro_micro_default.json
rename to public/keymaps/converter/usb_usb/pro_micro/converter_usb_usb_pro_micro_default.json
diff --git a/public/keymaps/converter_xt_usb_default.json b/public/keymaps/converter/xt_usb/converter_xt_usb_default.json
similarity index 100%
rename from public/keymaps/converter_xt_usb_default.json
rename to public/keymaps/converter/xt_usb/converter_xt_usb_default.json
diff --git a/public/keymaps/coseyfannitutti_discipad_default.json b/public/keymaps/coseyfannitutti/discipad/coseyfannitutti_discipad_default.json
similarity index 100%
rename from public/keymaps/coseyfannitutti_discipad_default.json
rename to public/keymaps/coseyfannitutti/discipad/coseyfannitutti_discipad_default.json
diff --git a/public/keymaps/coseyfannitutti_discipline_default.json b/public/keymaps/coseyfannitutti/discipline/coseyfannitutti_discipline_default.json
similarity index 100%
rename from public/keymaps/coseyfannitutti_discipline_default.json
rename to public/keymaps/coseyfannitutti/discipline/coseyfannitutti_discipline_default.json
diff --git a/public/keymaps/coseyfannitutti_mullet_default.json b/public/keymaps/coseyfannitutti/mullet/coseyfannitutti_mullet_default.json
similarity index 100%
rename from public/keymaps/coseyfannitutti_mullet_default.json
rename to public/keymaps/coseyfannitutti/mullet/coseyfannitutti_mullet_default.json
diff --git a/public/keymaps/coseyfannitutti_mulletpad_default.json b/public/keymaps/coseyfannitutti/mulletpad/coseyfannitutti_mulletpad_default.json
similarity index 100%
rename from public/keymaps/coseyfannitutti_mulletpad_default.json
rename to public/keymaps/coseyfannitutti/mulletpad/coseyfannitutti_mulletpad_default.json
diff --git a/public/keymaps/coseyfannitutti_mysterium_default.json b/public/keymaps/coseyfannitutti/mysterium/coseyfannitutti_mysterium_default.json
similarity index 100%
rename from public/keymaps/coseyfannitutti_mysterium_default.json
rename to public/keymaps/coseyfannitutti/mysterium/coseyfannitutti_mysterium_default.json
diff --git a/public/keymaps/cospad_default.json b/public/keymaps/cospad/cospad_default.json
similarity index 100%
rename from public/keymaps/cospad_default.json
rename to public/keymaps/cospad/cospad_default.json
diff --git a/public/keymaps/crawlpad_default.json b/public/keymaps/crawlpad/crawlpad_default.json
similarity index 100%
rename from public/keymaps/crawlpad_default.json
rename to public/keymaps/crawlpad/crawlpad_default.json
diff --git a/public/keymaps/crkbd_rev1_default.json b/public/keymaps/crkbd/rev1/crkbd_rev1_default.json
similarity index 100%
rename from public/keymaps/crkbd_rev1_default.json
rename to public/keymaps/crkbd/rev1/crkbd_rev1_default.json
diff --git a/public/keymaps/cu24_default.json b/public/keymaps/cu24/cu24_default.json
similarity index 100%
rename from public/keymaps/cu24_default.json
rename to public/keymaps/cu24/cu24_default.json
diff --git a/public/keymaps/cu75_default.json b/public/keymaps/cu75/cu75_default.json
similarity index 100%
rename from public/keymaps/cu75_default.json
rename to public/keymaps/cu75/cu75_default.json
diff --git a/public/keymaps/cutie_club_wraith_default.json b/public/keymaps/cutie_club/wraith/cutie_club_wraith_default.json
similarity index 100%
rename from public/keymaps/cutie_club_wraith_default.json
rename to public/keymaps/cutie_club/wraith/cutie_club_wraith_default.json
diff --git a/public/keymaps/daisy_default.json b/public/keymaps/daisy/daisy_default.json
similarity index 100%
rename from public/keymaps/daisy_default.json
rename to public/keymaps/daisy/daisy_default.json
diff --git a/public/keymaps/db_db63_default.json b/public/keymaps/db/db63/db_db63_default.json
similarity index 100%
rename from public/keymaps/db_db63_default.json
rename to public/keymaps/db/db63/db_db63_default.json
diff --git a/public/keymaps/dc01_arrow_default.json b/public/keymaps/dc01/arrow/dc01_arrow_default.json
similarity index 100%
rename from public/keymaps/dc01_arrow_default.json
rename to public/keymaps/dc01/arrow/dc01_arrow_default.json
diff --git a/public/keymaps/dc01_left_default.json b/public/keymaps/dc01/left/dc01_left_default.json
similarity index 100%
rename from public/keymaps/dc01_left_default.json
rename to public/keymaps/dc01/left/dc01_left_default.json
diff --git a/public/keymaps/dc01_numpad_default.json b/public/keymaps/dc01/numpad/dc01_numpad_default.json
similarity index 100%
rename from public/keymaps/dc01_numpad_default.json
rename to public/keymaps/dc01/numpad/dc01_numpad_default.json
diff --git a/public/keymaps/dc01_right_default.json b/public/keymaps/dc01/right/dc01_right_default.json
similarity index 100%
rename from public/keymaps/dc01_right_default.json
rename to public/keymaps/dc01/right/dc01_right_default.json
diff --git a/public/keymaps/deltasplit75_v2_default.json b/public/keymaps/deltasplit75/v2/deltasplit75_v2_default.json
similarity index 100%
rename from public/keymaps/deltasplit75_v2_default.json
rename to public/keymaps/deltasplit75/v2/deltasplit75_v2_default.json
diff --git a/public/keymaps/diverge3_default.json b/public/keymaps/diverge3/diverge3_default.json
similarity index 100%
rename from public/keymaps/diverge3_default.json
rename to public/keymaps/diverge3/diverge3_default.json
diff --git a/public/keymaps/divergetm2_default.json b/public/keymaps/divergetm2/divergetm2_default.json
similarity index 100%
rename from public/keymaps/divergetm2_default.json
rename to public/keymaps/divergetm2/divergetm2_default.json
diff --git a/public/keymaps/dk60_default.json b/public/keymaps/dk60/dk60_default.json
similarity index 100%
rename from public/keymaps/dk60_default.json
rename to public/keymaps/dk60/dk60_default.json
diff --git a/public/keymaps/do60_default.json b/public/keymaps/do60/do60_default.json
similarity index 100%
rename from public/keymaps/do60_default.json
rename to public/keymaps/do60/do60_default.json
diff --git a/public/keymaps/donutcables_budget96_default.json b/public/keymaps/donutcables/budget96/donutcables_budget96_default.json
similarity index 100%
rename from public/keymaps/donutcables_budget96_default.json
rename to public/keymaps/donutcables/budget96/donutcables_budget96_default.json
diff --git a/public/keymaps/donutcables_scrabblepad_default.json b/public/keymaps/donutcables/scrabblepad/donutcables_scrabblepad_default.json
similarity index 100%
rename from public/keymaps/donutcables_scrabblepad_default.json
rename to public/keymaps/donutcables/scrabblepad/donutcables_scrabblepad_default.json
diff --git a/public/keymaps/doppelganger_default.json b/public/keymaps/doppelganger/doppelganger_default.json
similarity index 100%
rename from public/keymaps/doppelganger_default.json
rename to public/keymaps/doppelganger/doppelganger_default.json
diff --git a/public/keymaps/doro67_multi_default.json b/public/keymaps/doro67/multi/doro67_multi_default.json
similarity index 100%
rename from public/keymaps/doro67_multi_default.json
rename to public/keymaps/doro67/multi/doro67_multi_default.json
diff --git a/public/keymaps/doro67_regular_default.json b/public/keymaps/doro67/regular/doro67_regular_default.json
similarity index 100%
rename from public/keymaps/doro67_regular_default.json
rename to public/keymaps/doro67/regular/doro67_regular_default.json
diff --git a/public/keymaps/doro67_rgb_default.json b/public/keymaps/doro67/rgb/doro67_rgb_default.json
similarity index 100%
rename from public/keymaps/doro67_rgb_default.json
rename to public/keymaps/doro67/rgb/doro67_rgb_default.json
diff --git a/public/keymaps/dozen0_default.json b/public/keymaps/dozen0/dozen0_default.json
similarity index 100%
rename from public/keymaps/dozen0_default.json
rename to public/keymaps/dozen0/dozen0_default.json
diff --git a/public/keymaps/dp60_default.json b/public/keymaps/dp60/dp60_default.json
similarity index 100%
rename from public/keymaps/dp60_default.json
rename to public/keymaps/dp60/dp60_default.json
diff --git a/public/keymaps/duck_eagle_viper_v2_default.json b/public/keymaps/duck/eagle_viper/v2/duck_eagle_viper_v2_default.json
similarity index 100%
rename from public/keymaps/duck_eagle_viper_v2_default.json
rename to public/keymaps/duck/eagle_viper/v2/duck_eagle_viper_v2_default.json
diff --git a/public/keymaps/duck_jetfire_default.json b/public/keymaps/duck/jetfire/duck_jetfire_default.json
similarity index 100%
rename from public/keymaps/duck_jetfire_default.json
rename to public/keymaps/duck/jetfire/duck_jetfire_default.json
diff --git a/public/keymaps/duck_lightsaver_default.json b/public/keymaps/duck/lightsaver/duck_lightsaver_default.json
similarity index 100%
rename from public/keymaps/duck_lightsaver_default.json
rename to public/keymaps/duck/lightsaver/duck_lightsaver_default.json
diff --git a/public/keymaps/duck_octagon_v1_default.json b/public/keymaps/duck/octagon/v1/duck_octagon_v1_default.json
similarity index 100%
rename from public/keymaps/duck_octagon_v1_default.json
rename to public/keymaps/duck/octagon/v1/duck_octagon_v1_default.json
diff --git a/public/keymaps/duck_octagon_v2_default.json b/public/keymaps/duck/octagon/v2/duck_octagon_v2_default.json
similarity index 100%
rename from public/keymaps/duck_octagon_v2_default.json
rename to public/keymaps/duck/octagon/v2/duck_octagon_v2_default.json
diff --git a/public/keymaps/duck_orion_v3_default.json b/public/keymaps/duck/orion/v3/duck_orion_v3_default.json
similarity index 100%
rename from public/keymaps/duck_orion_v3_default.json
rename to public/keymaps/duck/orion/v3/duck_orion_v3_default.json
diff --git a/public/keymaps/dumbpad_default.json b/public/keymaps/dumbpad/dumbpad_default.json
similarity index 100%
rename from public/keymaps/dumbpad_default.json
rename to public/keymaps/dumbpad/dumbpad_default.json
diff --git a/public/keymaps/dz60_default.json b/public/keymaps/dz60/dz60_default.json
similarity index 100%
rename from public/keymaps/dz60_default.json
rename to public/keymaps/dz60/dz60_default.json
diff --git a/public/keymaps/dztech_dz60rgb_v1_default.json b/public/keymaps/dztech/dz60rgb/v1/dztech_dz60rgb_v1_default.json
similarity index 100%
rename from public/keymaps/dztech_dz60rgb_v1_default.json
rename to public/keymaps/dztech/dz60rgb/v1/dztech_dz60rgb_v1_default.json
diff --git a/public/keymaps/dztech_dz60rgb_v2_default.json b/public/keymaps/dztech/dz60rgb/v2/dztech_dz60rgb_v2_default.json
similarity index 100%
rename from public/keymaps/dztech_dz60rgb_v2_default.json
rename to public/keymaps/dztech/dz60rgb/v2/dztech_dz60rgb_v2_default.json
diff --git a/public/keymaps/dztech_dz60rgb_ansi_v1_default.json b/public/keymaps/dztech/dz60rgb_ansi/v1/dztech_dz60rgb_ansi_v1_default.json
similarity index 100%
rename from public/keymaps/dztech_dz60rgb_ansi_v1_default.json
rename to public/keymaps/dztech/dz60rgb_ansi/v1/dztech_dz60rgb_ansi_v1_default.json
diff --git a/public/keymaps/dztech_dz60rgb_ansi_v2_default.json b/public/keymaps/dztech/dz60rgb_ansi/v2/dztech_dz60rgb_ansi_v2_default.json
similarity index 100%
rename from public/keymaps/dztech_dz60rgb_ansi_v2_default.json
rename to public/keymaps/dztech/dz60rgb_ansi/v2/dztech_dz60rgb_ansi_v2_default.json
diff --git a/public/keymaps/dztech_dz60rgb_wkl_v1_default.json b/public/keymaps/dztech/dz60rgb_wkl/v1/dztech_dz60rgb_wkl_v1_default.json
similarity index 100%
rename from public/keymaps/dztech_dz60rgb_wkl_v1_default.json
rename to public/keymaps/dztech/dz60rgb_wkl/v1/dztech_dz60rgb_wkl_v1_default.json
diff --git a/public/keymaps/dztech_dz60rgb_wkl_v2_default.json b/public/keymaps/dztech/dz60rgb_wkl/v2/dztech_dz60rgb_wkl_v2_default.json
similarity index 100%
rename from public/keymaps/dztech_dz60rgb_wkl_v2_default.json
rename to public/keymaps/dztech/dz60rgb_wkl/v2/dztech_dz60rgb_wkl_v2_default.json
diff --git a/public/keymaps/dztech_dz65rgb_v1_default.json b/public/keymaps/dztech/dz65rgb/v1/dztech_dz65rgb_v1_default.json
similarity index 100%
rename from public/keymaps/dztech_dz65rgb_v1_default.json
rename to public/keymaps/dztech/dz65rgb/v1/dztech_dz65rgb_v1_default.json
diff --git a/public/keymaps/dztech_dz65rgb_v2_default.json b/public/keymaps/dztech/dz65rgb/v2/dztech_dz65rgb_v2_default.json
similarity index 100%
rename from public/keymaps/dztech_dz65rgb_v2_default.json
rename to public/keymaps/dztech/dz65rgb/v2/dztech_dz65rgb_v2_default.json
diff --git a/public/keymaps/eco_rev1_default.json b/public/keymaps/eco/rev1/eco_rev1_default.json
similarity index 100%
rename from public/keymaps/eco_rev1_default.json
rename to public/keymaps/eco/rev1/eco_rev1_default.json
diff --git a/public/keymaps/eco_rev2_default.json b/public/keymaps/eco/rev2/eco_rev2_default.json
similarity index 100%
rename from public/keymaps/eco_rev2_default.json
rename to public/keymaps/eco/rev2/eco_rev2_default.json
diff --git a/public/keymaps/efreet_default.json b/public/keymaps/efreet/efreet_default.json
similarity index 100%
rename from public/keymaps/efreet_default.json
rename to public/keymaps/efreet/efreet_default.json
diff --git a/public/keymaps/ep_40_default.json b/public/keymaps/ep/40/ep_40_default.json
similarity index 100%
rename from public/keymaps/ep_40_default.json
rename to public/keymaps/ep/40/ep_40_default.json
diff --git a/public/keymaps/ep_96_default.json b/public/keymaps/ep/96/ep_96_default.json
similarity index 100%
rename from public/keymaps/ep_96_default.json
rename to public/keymaps/ep/96/ep_96_default.json
diff --git a/public/keymaps/ep_comsn_hs68_default.json b/public/keymaps/ep/comsn/hs68/ep_comsn_hs68_default.json
similarity index 100%
rename from public/keymaps/ep_comsn_hs68_default.json
rename to public/keymaps/ep/comsn/hs68/ep_comsn_hs68_default.json
diff --git a/public/keymaps/ep_comsn_mollydooker_default.json b/public/keymaps/ep/comsn/mollydooker/ep_comsn_mollydooker_default.json
similarity index 100%
rename from public/keymaps/ep_comsn_mollydooker_default.json
rename to public/keymaps/ep/comsn/mollydooker/ep_comsn_mollydooker_default.json
diff --git a/public/keymaps/ep_comsn_tf_longeboye_default.json b/public/keymaps/ep/comsn/tf_longeboye/ep_comsn_tf_longeboye_default.json
similarity index 100%
rename from public/keymaps/ep_comsn_tf_longeboye_default.json
rename to public/keymaps/ep/comsn/tf_longeboye/ep_comsn_tf_longeboye_default.json
diff --git a/public/keymaps/ergo42_rev1_default.json b/public/keymaps/ergo42/rev1/ergo42_rev1_default.json
similarity index 100%
rename from public/keymaps/ergo42_rev1_default.json
rename to public/keymaps/ergo42/rev1/ergo42_rev1_default.json
diff --git a/public/keymaps/ergodash_mini_default.json b/public/keymaps/ergodash/mini/ergodash_mini_default.json
similarity index 100%
rename from public/keymaps/ergodash_mini_default.json
rename to public/keymaps/ergodash/mini/ergodash_mini_default.json
diff --git a/public/keymaps/ergodash_rev1_default.json b/public/keymaps/ergodash/rev1/ergodash_rev1_default.json
similarity index 100%
rename from public/keymaps/ergodash_rev1_default.json
rename to public/keymaps/ergodash/rev1/ergodash_rev1_default.json
diff --git a/public/keymaps/ergodone_default.json b/public/keymaps/ergodone/ergodone_default.json
similarity index 100%
rename from public/keymaps/ergodone_default.json
rename to public/keymaps/ergodone/ergodone_default.json
diff --git a/public/keymaps/ergodox_ez_default.json b/public/keymaps/ergodox_ez/ergodox_ez_default.json
similarity index 100%
rename from public/keymaps/ergodox_ez_default.json
rename to public/keymaps/ergodox_ez/ergodox_ez_default.json
diff --git a/public/keymaps/ergodox_stm32_default.json b/public/keymaps/ergodox_stm32/ergodox_stm32_default.json
similarity index 100%
rename from public/keymaps/ergodox_stm32_default.json
rename to public/keymaps/ergodox_stm32/ergodox_stm32_default.json
diff --git a/public/keymaps/ergoinu_default.json b/public/keymaps/ergoinu/ergoinu_default.json
similarity index 100%
rename from public/keymaps/ergoinu_default.json
rename to public/keymaps/ergoinu/ergoinu_default.json
diff --git a/public/keymaps/ergosaurus_default.json b/public/keymaps/ergosaurus/ergosaurus_default.json
similarity index 100%
rename from public/keymaps/ergosaurus_default.json
rename to public/keymaps/ergosaurus/ergosaurus_default.json
diff --git a/public/keymaps/ergotaco_default.json b/public/keymaps/ergotaco/ergotaco_default.json
similarity index 100%
rename from public/keymaps/ergotaco_default.json
rename to public/keymaps/ergotaco/ergotaco_default.json
diff --git a/public/keymaps/ergotravel_rev1_default.json b/public/keymaps/ergotravel/rev1/ergotravel_rev1_default.json
similarity index 100%
rename from public/keymaps/ergotravel_rev1_default.json
rename to public/keymaps/ergotravel/rev1/ergotravel_rev1_default.json
diff --git a/public/keymaps/espectro_default.json b/public/keymaps/espectro/espectro_default.json
similarity index 100%
rename from public/keymaps/espectro_default.json
rename to public/keymaps/espectro/espectro_default.json
diff --git a/public/keymaps/eve_meteor_default.json b/public/keymaps/eve/meteor/eve_meteor_default.json
similarity index 100%
rename from public/keymaps/eve_meteor_default.json
rename to public/keymaps/eve/meteor/eve_meteor_default.json
diff --git a/public/keymaps/evil80_default.json b/public/keymaps/evil80/evil80_default.json
similarity index 100%
rename from public/keymaps/evil80_default.json
rename to public/keymaps/evil80/evil80_default.json
diff --git a/public/keymaps/exclusive_e65_default.json b/public/keymaps/exclusive/e65/exclusive_e65_default.json
similarity index 100%
rename from public/keymaps/exclusive_e65_default.json
rename to public/keymaps/exclusive/e65/exclusive_e65_default.json
diff --git a/public/keymaps/exclusive_e6_rgb_default.json b/public/keymaps/exclusive/e6_rgb/exclusive_e6_rgb_default.json
similarity index 100%
rename from public/keymaps/exclusive_e6_rgb_default.json
rename to public/keymaps/exclusive/e6_rgb/exclusive_e6_rgb_default.json
diff --git a/public/keymaps/exclusive_e6v2_le_default.json b/public/keymaps/exclusive/e6v2/le/exclusive_e6v2_le_default.json
similarity index 100%
rename from public/keymaps/exclusive_e6v2_le_default.json
rename to public/keymaps/exclusive/e6v2/le/exclusive_e6v2_le_default.json
diff --git a/public/keymaps/exclusive_e6v2_le_bmc_default.json b/public/keymaps/exclusive/e6v2/le_bmc/exclusive_e6v2_le_bmc_default.json
similarity index 100%
rename from public/keymaps/exclusive_e6v2_le_bmc_default.json
rename to public/keymaps/exclusive/e6v2/le_bmc/exclusive_e6v2_le_bmc_default.json
diff --git a/public/keymaps/exclusive_e6v2_oe_default.json b/public/keymaps/exclusive/e6v2/oe/exclusive_e6v2_oe_default.json
similarity index 100%
rename from public/keymaps/exclusive_e6v2_oe_default.json
rename to public/keymaps/exclusive/e6v2/oe/exclusive_e6v2_oe_default.json
diff --git a/public/keymaps/exclusive_e6v2_oe_bmc_default.json b/public/keymaps/exclusive/e6v2/oe_bmc/exclusive_e6v2_oe_bmc_default.json
similarity index 100%
rename from public/keymaps/exclusive_e6v2_oe_bmc_default.json
rename to public/keymaps/exclusive/e6v2/oe_bmc/exclusive_e6v2_oe_bmc_default.json
diff --git a/public/keymaps/exclusive_e7v1_default.json b/public/keymaps/exclusive/e7v1/exclusive_e7v1_default.json
similarity index 100%
rename from public/keymaps/exclusive_e7v1_default.json
rename to public/keymaps/exclusive/e7v1/exclusive_e7v1_default.json
diff --git a/public/keymaps/exent_default.json b/public/keymaps/exent/exent_default.json
similarity index 100%
rename from public/keymaps/exent_default.json
rename to public/keymaps/exent/exent_default.json
diff --git a/public/keymaps/facew_default.json b/public/keymaps/facew/facew_default.json
similarity index 100%
rename from public/keymaps/facew_default.json
rename to public/keymaps/facew/facew_default.json
diff --git a/public/keymaps/fc660c_default.json b/public/keymaps/fc660c/fc660c_default.json
similarity index 100%
rename from public/keymaps/fc660c_default.json
rename to public/keymaps/fc660c/fc660c_default.json
diff --git a/public/keymaps/fc980c_default.json b/public/keymaps/fc980c/fc980c_default.json
similarity index 100%
rename from public/keymaps/fc980c_default.json
rename to public/keymaps/fc980c/fc980c_default.json
diff --git a/public/keymaps/felix_default.json b/public/keymaps/felix/felix_default.json
similarity index 100%
rename from public/keymaps/felix_default.json
rename to public/keymaps/felix/felix_default.json
diff --git a/public/keymaps/fleuron_default.json b/public/keymaps/fleuron/fleuron_default.json
similarity index 100%
rename from public/keymaps/fleuron_default.json
rename to public/keymaps/fleuron/fleuron_default.json
diff --git a/public/keymaps/fluorite_default.json b/public/keymaps/fluorite/fluorite_default.json
similarity index 100%
rename from public/keymaps/fluorite_default.json
rename to public/keymaps/fluorite/fluorite_default.json
diff --git a/public/keymaps/flx_virgo_default.json b/public/keymaps/flx/virgo/flx_virgo_default.json
similarity index 100%
rename from public/keymaps/flx_virgo_default.json
rename to public/keymaps/flx/virgo/flx_virgo_default.json
diff --git a/public/keymaps/fortitude60_rev1_default.json b/public/keymaps/fortitude60/rev1/fortitude60_rev1_default.json
similarity index 100%
rename from public/keymaps/fortitude60_rev1_default.json
rename to public/keymaps/fortitude60/rev1/fortitude60_rev1_default.json
diff --git a/public/keymaps/four_banger_default.json b/public/keymaps/four_banger/four_banger_default.json
similarity index 100%
rename from public/keymaps/four_banger_default.json
rename to public/keymaps/four_banger/four_banger_default.json
diff --git a/public/keymaps/foxlab_leaf60_hotswap_default.json b/public/keymaps/foxlab/leaf60/hotswap/foxlab_leaf60_hotswap_default.json
similarity index 100%
rename from public/keymaps/foxlab_leaf60_hotswap_default.json
rename to public/keymaps/foxlab/leaf60/hotswap/foxlab_leaf60_hotswap_default.json
diff --git a/public/keymaps/foxlab_leaf60_universal_default.json b/public/keymaps/foxlab/leaf60/universal/foxlab_leaf60_universal_default.json
similarity index 100%
rename from public/keymaps/foxlab_leaf60_universal_default.json
rename to public/keymaps/foxlab/leaf60/universal/foxlab_leaf60_universal_default.json
diff --git a/public/keymaps/fractal_default.json b/public/keymaps/fractal/fractal_default.json
similarity index 100%
rename from public/keymaps/fractal_default.json
rename to public/keymaps/fractal/fractal_default.json
diff --git a/public/keymaps/freyr_default.json b/public/keymaps/freyr/freyr_default.json
similarity index 100%
rename from public/keymaps/freyr_default.json
rename to public/keymaps/freyr/freyr_default.json
diff --git a/public/keymaps/ft_mars80_default.json b/public/keymaps/ft/mars80/ft_mars80_default.json
similarity index 100%
rename from public/keymaps/ft_mars80_default.json
rename to public/keymaps/ft/mars80/ft_mars80_default.json
diff --git a/public/keymaps/geekboards_tester_default.json b/public/keymaps/geekboards/tester/geekboards_tester_default.json
similarity index 100%
rename from public/keymaps/geekboards_tester_default.json
rename to public/keymaps/geekboards/tester/geekboards_tester_default.json
diff --git a/public/keymaps/gergo_default.json b/public/keymaps/gergo/gergo_default.json
similarity index 100%
rename from public/keymaps/gergo_default.json
rename to public/keymaps/gergo/gergo_default.json
diff --git a/public/keymaps/gh60_revc_default.json b/public/keymaps/gh60/revc/gh60_revc_default.json
similarity index 100%
rename from public/keymaps/gh60_revc_default.json
rename to public/keymaps/gh60/revc/gh60_revc_default.json
diff --git a/public/keymaps/gh60_satan_default.json b/public/keymaps/gh60/satan/gh60_satan_default.json
similarity index 100%
rename from public/keymaps/gh60_satan_default.json
rename to public/keymaps/gh60/satan/gh60_satan_default.json
diff --git a/public/keymaps/gh80_3000_default.json b/public/keymaps/gh80_3000/gh80_3000_default.json
similarity index 100%
rename from public/keymaps/gh80_3000_default.json
rename to public/keymaps/gh80_3000/gh80_3000_default.json
diff --git a/public/keymaps/gingham_default.json b/public/keymaps/gingham/gingham_default.json
similarity index 100%
rename from public/keymaps/gingham_default.json
rename to public/keymaps/gingham/gingham_default.json
diff --git a/public/keymaps/gray_studio_cod67_default.json b/public/keymaps/gray_studio/cod67/gray_studio_cod67_default.json
similarity index 100%
rename from public/keymaps/gray_studio_cod67_default.json
rename to public/keymaps/gray_studio/cod67/gray_studio_cod67_default.json
diff --git a/public/keymaps/gray_studio_hb85_default.json b/public/keymaps/gray_studio/hb85/gray_studio_hb85_default.json
similarity index 100%
rename from public/keymaps/gray_studio_hb85_default.json
rename to public/keymaps/gray_studio/hb85/gray_studio_hb85_default.json
diff --git a/public/keymaps/gray_studio_space65_default.json b/public/keymaps/gray_studio/space65/gray_studio_space65_default.json
similarity index 100%
rename from public/keymaps/gray_studio_space65_default.json
rename to public/keymaps/gray_studio/space65/gray_studio_space65_default.json
diff --git a/public/keymaps/gray_studio_think65_hotswap_default.json b/public/keymaps/gray_studio/think65/hotswap/gray_studio_think65_hotswap_default.json
similarity index 100%
rename from public/keymaps/gray_studio_think65_hotswap_default.json
rename to public/keymaps/gray_studio/think65/hotswap/gray_studio_think65_hotswap_default.json
diff --git a/public/keymaps/gray_studio_think65_solder_default.json b/public/keymaps/gray_studio/think65/solder/gray_studio_think65_solder_default.json
similarity index 100%
rename from public/keymaps/gray_studio_think65_solder_default.json
rename to public/keymaps/gray_studio/think65/solder/gray_studio_think65_solder_default.json
diff --git a/public/keymaps/grid600_press_default.json b/public/keymaps/grid600/press/grid600_press_default.json
similarity index 100%
rename from public/keymaps/grid600_press_default.json
rename to public/keymaps/grid600/press/grid600_press_default.json
diff --git a/public/keymaps/gskt00_default.json b/public/keymaps/gskt00/gskt00_default.json
similarity index 100%
rename from public/keymaps/gskt00_default.json
rename to public/keymaps/gskt00/gskt00_default.json
diff --git a/public/keymaps/hadron_ver2_default.json b/public/keymaps/hadron/ver2/hadron_ver2_default.json
similarity index 100%
rename from public/keymaps/hadron_ver2_default.json
rename to public/keymaps/hadron/ver2/hadron_ver2_default.json
diff --git a/public/keymaps/hadron_ver3_default.json b/public/keymaps/hadron/ver3/hadron_ver3_default.json
similarity index 100%
rename from public/keymaps/hadron_ver3_default.json
rename to public/keymaps/hadron/ver3/hadron_ver3_default.json
diff --git a/public/keymaps/halberd_default.json b/public/keymaps/halberd/halberd_default.json
similarity index 100%
rename from public/keymaps/halberd_default.json
rename to public/keymaps/halberd/halberd_default.json
diff --git a/public/keymaps/handwired_108key_trackpoint_default.json b/public/keymaps/handwired/108key_trackpoint/handwired_108key_trackpoint_default.json
similarity index 100%
rename from public/keymaps/handwired_108key_trackpoint_default.json
rename to public/keymaps/handwired/108key_trackpoint/handwired_108key_trackpoint_default.json
diff --git a/public/keymaps/handwired_2x5keypad_default.json b/public/keymaps/handwired/2x5keypad/handwired_2x5keypad_default.json
similarity index 100%
rename from public/keymaps/handwired_2x5keypad_default.json
rename to public/keymaps/handwired/2x5keypad/handwired_2x5keypad_default.json
diff --git a/public/keymaps/handwired_412_64_default.json b/public/keymaps/handwired/412_64/handwired_412_64_default.json
similarity index 100%
rename from public/keymaps/handwired_412_64_default.json
rename to public/keymaps/handwired/412_64/handwired_412_64_default.json
diff --git a/public/keymaps/handwired_arrow_pad_default.json b/public/keymaps/handwired/arrow_pad/handwired_arrow_pad_default.json
similarity index 100%
rename from public/keymaps/handwired_arrow_pad_default.json
rename to public/keymaps/handwired/arrow_pad/handwired_arrow_pad_default.json
diff --git a/public/keymaps/handwired_atreus50_default.json b/public/keymaps/handwired/atreus50/handwired_atreus50_default.json
similarity index 100%
rename from public/keymaps/handwired_atreus50_default.json
rename to public/keymaps/handwired/atreus50/handwired_atreus50_default.json
diff --git a/public/keymaps/handwired_bluepill_bluepill70_default.json b/public/keymaps/handwired/bluepill/bluepill70/handwired_bluepill_bluepill70_default.json
similarity index 100%
rename from public/keymaps/handwired_bluepill_bluepill70_default.json
rename to public/keymaps/handwired/bluepill/bluepill70/handwired_bluepill_bluepill70_default.json
diff --git a/public/keymaps/handwired_chiron_default.json b/public/keymaps/handwired/chiron/handwired_chiron_default.json
similarity index 100%
rename from public/keymaps/handwired_chiron_default.json
rename to public/keymaps/handwired/chiron/handwired_chiron_default.json
diff --git a/public/keymaps/handwired_ck4x4_default.json b/public/keymaps/handwired/ck4x4/handwired_ck4x4_default.json
similarity index 100%
rename from public/keymaps/handwired_ck4x4_default.json
rename to public/keymaps/handwired/ck4x4/handwired_ck4x4_default.json
diff --git a/public/keymaps/handwired_cmd60_default.json b/public/keymaps/handwired/cmd60/handwired_cmd60_default.json
similarity index 100%
rename from public/keymaps/handwired_cmd60_default.json
rename to public/keymaps/handwired/cmd60/handwired_cmd60_default.json
diff --git a/public/keymaps/handwired_co60_rev1_default.json b/public/keymaps/handwired/co60/rev1/handwired_co60_rev1_default.json
similarity index 100%
rename from public/keymaps/handwired_co60_rev1_default.json
rename to public/keymaps/handwired/co60/rev1/handwired_co60_rev1_default.json
diff --git a/public/keymaps/handwired_co60_rev6_default.json b/public/keymaps/handwired/co60/rev6/handwired_co60_rev6_default.json
similarity index 100%
rename from public/keymaps/handwired_co60_rev6_default.json
rename to public/keymaps/handwired/co60/rev6/handwired_co60_rev6_default.json
diff --git a/public/keymaps/handwired_co60_rev7_default.json b/public/keymaps/handwired/co60/rev7/handwired_co60_rev7_default.json
similarity index 100%
rename from public/keymaps/handwired_co60_rev7_default.json
rename to public/keymaps/handwired/co60/rev7/handwired_co60_rev7_default.json
diff --git a/public/keymaps/handwired_dactyl_default.json b/public/keymaps/handwired/dactyl/handwired_dactyl_default.json
similarity index 100%
rename from public/keymaps/handwired_dactyl_default.json
rename to public/keymaps/handwired/dactyl/handwired_dactyl_default.json
diff --git a/public/keymaps/handwired_dactyl_left_default.json b/public/keymaps/handwired/dactyl_left/handwired_dactyl_left_default.json
similarity index 100%
rename from public/keymaps/handwired_dactyl_left_default.json
rename to public/keymaps/handwired/dactyl_left/handwired_dactyl_left_default.json
diff --git a/public/keymaps/handwired_dactyl_manuform_4x5_default.json b/public/keymaps/handwired/dactyl_manuform/4x5/handwired_dactyl_manuform_4x5_default.json
similarity index 100%
rename from public/keymaps/handwired_dactyl_manuform_4x5_default.json
rename to public/keymaps/handwired/dactyl_manuform/4x5/handwired_dactyl_manuform_4x5_default.json
diff --git a/public/keymaps/handwired_dactyl_manuform_4x6_default.json b/public/keymaps/handwired/dactyl_manuform/4x6/handwired_dactyl_manuform_4x6_default.json
similarity index 100%
rename from public/keymaps/handwired_dactyl_manuform_4x6_default.json
rename to public/keymaps/handwired/dactyl_manuform/4x6/handwired_dactyl_manuform_4x6_default.json
diff --git a/public/keymaps/handwired_dactyl_manuform_5x6_default.json b/public/keymaps/handwired/dactyl_manuform/5x6/handwired_dactyl_manuform_5x6_default.json
similarity index 100%
rename from public/keymaps/handwired_dactyl_manuform_5x6_default.json
rename to public/keymaps/handwired/dactyl_manuform/5x6/handwired_dactyl_manuform_5x6_default.json
diff --git a/public/keymaps/handwired_dactyl_manuform_5x7_default.json b/public/keymaps/handwired/dactyl_manuform/5x7/handwired_dactyl_manuform_5x7_default.json
similarity index 100%
rename from public/keymaps/handwired_dactyl_manuform_5x7_default.json
rename to public/keymaps/handwired/dactyl_manuform/5x7/handwired_dactyl_manuform_5x7_default.json
diff --git a/public/keymaps/handwired_dactyl_manuform_6x6_default.json b/public/keymaps/handwired/dactyl_manuform/6x6/handwired_dactyl_manuform_6x6_default.json
similarity index 100%
rename from public/keymaps/handwired_dactyl_manuform_6x6_default.json
rename to public/keymaps/handwired/dactyl_manuform/6x6/handwired_dactyl_manuform_6x6_default.json
diff --git a/public/keymaps/handwired_dactyl_manuform_dmote_62key_default.json b/public/keymaps/handwired/dactyl_manuform/dmote/62key/handwired_dactyl_manuform_dmote_62key_default.json
similarity index 100%
rename from public/keymaps/handwired_dactyl_manuform_dmote_62key_default.json
rename to public/keymaps/handwired/dactyl_manuform/dmote/62key/handwired_dactyl_manuform_dmote_62key_default.json
diff --git a/public/keymaps/handwired_dactyl_promicro_default.json b/public/keymaps/handwired/dactyl_promicro/handwired_dactyl_promicro_default.json
similarity index 100%
rename from public/keymaps/handwired_dactyl_promicro_default.json
rename to public/keymaps/handwired/dactyl_promicro/handwired_dactyl_promicro_default.json
diff --git a/public/keymaps/handwired_daishi_default.json b/public/keymaps/handwired/daishi/handwired_daishi_default.json
similarity index 100%
rename from public/keymaps/handwired_daishi_default.json
rename to public/keymaps/handwired/daishi/handwired_daishi_default.json
diff --git a/public/keymaps/handwired_downbubble_default.json b/public/keymaps/handwired/downbubble/handwired_downbubble_default.json
similarity index 100%
rename from public/keymaps/handwired_downbubble_default.json
rename to public/keymaps/handwired/downbubble/handwired_downbubble_default.json
diff --git a/public/keymaps/handwired_fivethirteen_default.json b/public/keymaps/handwired/fivethirteen/handwired_fivethirteen_default.json
similarity index 100%
rename from public/keymaps/handwired_fivethirteen_default.json
rename to public/keymaps/handwired/fivethirteen/handwired_fivethirteen_default.json
diff --git a/public/keymaps/handwired_fruity60_default.json b/public/keymaps/handwired/fruity60/handwired_fruity60_default.json
similarity index 100%
rename from public/keymaps/handwired_fruity60_default.json
rename to public/keymaps/handwired/fruity60/handwired_fruity60_default.json
diff --git a/public/keymaps/handwired_gamenum_default.json b/public/keymaps/handwired/gamenum/handwired_gamenum_default.json
similarity index 100%
rename from public/keymaps/handwired_gamenum_default.json
rename to public/keymaps/handwired/gamenum/handwired_gamenum_default.json
diff --git a/public/keymaps/handwired_hacked_motospeed_default.json b/public/keymaps/handwired/hacked_motospeed/handwired_hacked_motospeed_default.json
similarity index 100%
rename from public/keymaps/handwired_hacked_motospeed_default.json
rename to public/keymaps/handwired/hacked_motospeed/handwired_hacked_motospeed_default.json
diff --git a/public/keymaps/handwired_hexon38_default.json b/public/keymaps/handwired/hexon38/handwired_hexon38_default.json
similarity index 100%
rename from public/keymaps/handwired_hexon38_default.json
rename to public/keymaps/handwired/hexon38/handwired_hexon38_default.json
diff --git a/public/keymaps/handwired_hnah108_default.json b/public/keymaps/handwired/hnah108/handwired_hnah108_default.json
similarity index 100%
rename from public/keymaps/handwired_hnah108_default.json
rename to public/keymaps/handwired/hnah108/handwired_hnah108_default.json
diff --git a/public/keymaps/handwired_hnah40_default.json b/public/keymaps/handwired/hnah40/handwired_hnah40_default.json
similarity index 100%
rename from public/keymaps/handwired_hnah40_default.json
rename to public/keymaps/handwired/hnah40/handwired_hnah40_default.json
diff --git a/public/keymaps/handwired_hnah40rgb_default.json b/public/keymaps/handwired/hnah40rgb/handwired_hnah40rgb_default.json
similarity index 100%
rename from public/keymaps/handwired_hnah40rgb_default.json
rename to public/keymaps/handwired/hnah40rgb/handwired_hnah40rgb_default.json
diff --git a/public/keymaps/handwired_ibm122m_default.json b/public/keymaps/handwired/ibm122m/handwired_ibm122m_default.json
similarity index 100%
rename from public/keymaps/handwired_ibm122m_default.json
rename to public/keymaps/handwired/ibm122m/handwired_ibm122m_default.json
diff --git a/public/keymaps/handwired_jn68m_default.json b/public/keymaps/handwired/jn68m/handwired_jn68m_default.json
similarity index 100%
rename from public/keymaps/handwired_jn68m_default.json
rename to public/keymaps/handwired/jn68m/handwired_jn68m_default.json
diff --git a/public/keymaps/handwired_jopr_default.json b/public/keymaps/handwired/jopr/handwired_jopr_default.json
similarity index 100%
rename from public/keymaps/handwired_jopr_default.json
rename to public/keymaps/handwired/jopr/handwired_jopr_default.json
diff --git a/public/keymaps/handwired_jot50_default.json b/public/keymaps/handwired/jot50/handwired_jot50_default.json
similarity index 100%
rename from public/keymaps/handwired_jot50_default.json
rename to public/keymaps/handwired/jot50/handwired_jot50_default.json
diff --git a/public/keymaps/handwired_jotanck_default.json b/public/keymaps/handwired/jotanck/handwired_jotanck_default.json
similarity index 100%
rename from public/keymaps/handwired_jotanck_default.json
rename to public/keymaps/handwired/jotanck/handwired_jotanck_default.json
diff --git a/public/keymaps/handwired_jotpad16_default.json b/public/keymaps/handwired/jotpad16/handwired_jotpad16_default.json
similarity index 100%
rename from public/keymaps/handwired_jotpad16_default.json
rename to public/keymaps/handwired/jotpad16/handwired_jotpad16_default.json
diff --git a/public/keymaps/handwired_kbod_default.json b/public/keymaps/handwired/kbod/handwired_kbod_default.json
similarity index 100%
rename from public/keymaps/handwired_kbod_default.json
rename to public/keymaps/handwired/kbod/handwired_kbod_default.json
diff --git a/public/keymaps/handwired_maartenwut_default.json b/public/keymaps/handwired/maartenwut/handwired_maartenwut_default.json
similarity index 100%
rename from public/keymaps/handwired_maartenwut_default.json
rename to public/keymaps/handwired/maartenwut/handwired_maartenwut_default.json
diff --git a/public/keymaps/handwired_magicforce61_default.json b/public/keymaps/handwired/magicforce61/handwired_magicforce61_default.json
similarity index 100%
rename from public/keymaps/handwired_magicforce61_default.json
rename to public/keymaps/handwired/magicforce61/handwired_magicforce61_default.json
diff --git a/public/keymaps/handwired_magicforce68_default.json b/public/keymaps/handwired/magicforce68/handwired_magicforce68_default.json
similarity index 100%
rename from public/keymaps/handwired_magicforce68_default.json
rename to public/keymaps/handwired/magicforce68/handwired_magicforce68_default.json
diff --git a/public/keymaps/handwired_minorca_default.json b/public/keymaps/handwired/minorca/handwired_minorca_default.json
similarity index 100%
rename from public/keymaps/handwired_minorca_default.json
rename to public/keymaps/handwired/minorca/handwired_minorca_default.json
diff --git a/public/keymaps/handwired_ms_sculpt_mobile_default.json b/public/keymaps/handwired/ms_sculpt_mobile/handwired_ms_sculpt_mobile_default.json
similarity index 100%
rename from public/keymaps/handwired_ms_sculpt_mobile_default.json
rename to public/keymaps/handwired/ms_sculpt_mobile/handwired_ms_sculpt_mobile_default.json
diff --git a/public/keymaps/handwired_not_so_minidox_default.json b/public/keymaps/handwired/not_so_minidox/handwired_not_so_minidox_default.json
similarity index 100%
rename from public/keymaps/handwired_not_so_minidox_default.json
rename to public/keymaps/handwired/not_so_minidox/handwired_not_so_minidox_default.json
diff --git a/public/keymaps/handwired_numbrero_default.json b/public/keymaps/handwired/numbrero/handwired_numbrero_default.json
similarity index 100%
rename from public/keymaps/handwired_numbrero_default.json
rename to public/keymaps/handwired/numbrero/handwired_numbrero_default.json
diff --git a/public/keymaps/handwired_numpad20_default.json b/public/keymaps/handwired/numpad20/handwired_numpad20_default.json
similarity index 100%
rename from public/keymaps/handwired_numpad20_default.json
rename to public/keymaps/handwired/numpad20/handwired_numpad20_default.json
diff --git a/public/keymaps/handwired_onekey_bluepill_default.json b/public/keymaps/handwired/onekey/bluepill/handwired_onekey_bluepill_default.json
similarity index 100%
rename from public/keymaps/handwired_onekey_bluepill_default.json
rename to public/keymaps/handwired/onekey/bluepill/handwired_onekey_bluepill_default.json
diff --git a/public/keymaps/handwired_onekey_elite_c_default.json b/public/keymaps/handwired/onekey/elite_c/handwired_onekey_elite_c_default.json
similarity index 100%
rename from public/keymaps/handwired_onekey_elite_c_default.json
rename to public/keymaps/handwired/onekey/elite_c/handwired_onekey_elite_c_default.json
diff --git a/public/keymaps/handwired_onekey_promicro_default.json b/public/keymaps/handwired/onekey/promicro/handwired_onekey_promicro_default.json
similarity index 100%
rename from public/keymaps/handwired_onekey_promicro_default.json
rename to public/keymaps/handwired/onekey/promicro/handwired_onekey_promicro_default.json
diff --git a/public/keymaps/handwired_onekey_proton_c_default.json b/public/keymaps/handwired/onekey/proton_c/handwired_onekey_proton_c_default.json
similarity index 100%
rename from public/keymaps/handwired_onekey_proton_c_default.json
rename to public/keymaps/handwired/onekey/proton_c/handwired_onekey_proton_c_default.json
diff --git a/public/keymaps/handwired_onekey_teensy_2_default.json b/public/keymaps/handwired/onekey/teensy_2/handwired_onekey_teensy_2_default.json
similarity index 100%
rename from public/keymaps/handwired_onekey_teensy_2_default.json
rename to public/keymaps/handwired/onekey/teensy_2/handwired_onekey_teensy_2_default.json
diff --git a/public/keymaps/handwired_onekey_teensy_2pp_default.json b/public/keymaps/handwired/onekey/teensy_2pp/handwired_onekey_teensy_2pp_default.json
similarity index 100%
rename from public/keymaps/handwired_onekey_teensy_2pp_default.json
rename to public/keymaps/handwired/onekey/teensy_2pp/handwired_onekey_teensy_2pp_default.json
diff --git a/public/keymaps/handwired_onekey_teensy_32_default.json b/public/keymaps/handwired/onekey/teensy_32/handwired_onekey_teensy_32_default.json
similarity index 100%
rename from public/keymaps/handwired_onekey_teensy_32_default.json
rename to public/keymaps/handwired/onekey/teensy_32/handwired_onekey_teensy_32_default.json
diff --git a/public/keymaps/handwired_onekey_teensy_lc_default.json b/public/keymaps/handwired/onekey/teensy_lc/handwired_onekey_teensy_lc_default.json
similarity index 100%
rename from public/keymaps/handwired_onekey_teensy_lc_default.json
rename to public/keymaps/handwired/onekey/teensy_lc/handwired_onekey_teensy_lc_default.json
diff --git a/public/keymaps/handwired_ortho5x13_default.json b/public/keymaps/handwired/ortho5x13/handwired_ortho5x13_default.json
similarity index 100%
rename from public/keymaps/handwired_ortho5x13_default.json
rename to public/keymaps/handwired/ortho5x13/handwired_ortho5x13_default.json
diff --git a/public/keymaps/handwired_owlet60_default.json b/public/keymaps/handwired/owlet60/handwired_owlet60_default.json
similarity index 100%
rename from public/keymaps/handwired_owlet60_default.json
rename to public/keymaps/handwired/owlet60/handwired_owlet60_default.json
diff --git a/public/keymaps/handwired_pilcrow_default.json b/public/keymaps/handwired/pilcrow/handwired_pilcrow_default.json
similarity index 100%
rename from public/keymaps/handwired_pilcrow_default.json
rename to public/keymaps/handwired/pilcrow/handwired_pilcrow_default.json
diff --git a/public/keymaps/handwired_prime_exl_default.json b/public/keymaps/handwired/prime_exl/handwired_prime_exl_default.json
similarity index 100%
rename from public/keymaps/handwired_prime_exl_default.json
rename to public/keymaps/handwired/prime_exl/handwired_prime_exl_default.json
diff --git a/public/keymaps/handwired_pteron_default.json b/public/keymaps/handwired/pteron/handwired_pteron_default.json
similarity index 100%
rename from public/keymaps/handwired_pteron_default.json
rename to public/keymaps/handwired/pteron/handwired_pteron_default.json
diff --git a/public/keymaps/handwired_qc60_proto_default.json b/public/keymaps/handwired/qc60/proto/handwired_qc60_proto_default.json
similarity index 100%
rename from public/keymaps/handwired_qc60_proto_default.json
rename to public/keymaps/handwired/qc60/proto/handwired_qc60_proto_default.json
diff --git a/public/keymaps/handwired_reddot_default.json b/public/keymaps/handwired/reddot/handwired_reddot_default.json
similarity index 100%
rename from public/keymaps/handwired_reddot_default.json
rename to public/keymaps/handwired/reddot/handwired_reddot_default.json
diff --git a/public/keymaps/handwired_retro_refit_default.json b/public/keymaps/handwired/retro_refit/handwired_retro_refit_default.json
similarity index 100%
rename from public/keymaps/handwired_retro_refit_default.json
rename to public/keymaps/handwired/retro_refit/handwired_retro_refit_default.json
diff --git a/public/keymaps/handwired_rs60_default.json b/public/keymaps/handwired/rs60/handwired_rs60_default.json
similarity index 100%
rename from public/keymaps/handwired_rs60_default.json
rename to public/keymaps/handwired/rs60/handwired_rs60_default.json
diff --git a/public/keymaps/handwired_slash_default.json b/public/keymaps/handwired/slash/handwired_slash_default.json
similarity index 100%
rename from public/keymaps/handwired_slash_default.json
rename to public/keymaps/handwired/slash/handwired_slash_default.json
diff --git a/public/keymaps/handwired_splittest_default.json b/public/keymaps/handwired/splittest/handwired_splittest_default.json
similarity index 100%
rename from public/keymaps/handwired_splittest_default.json
rename to public/keymaps/handwired/splittest/handwired_splittest_default.json
diff --git a/public/keymaps/handwired_splittest_promicro_default.json b/public/keymaps/handwired/splittest/promicro/handwired_splittest_promicro_default.json
similarity index 100%
rename from public/keymaps/handwired_splittest_promicro_default.json
rename to public/keymaps/handwired/splittest/promicro/handwired_splittest_promicro_default.json
diff --git a/public/keymaps/handwired_splittest_teensy_2_default.json b/public/keymaps/handwired/splittest/teensy_2/handwired_splittest_teensy_2_default.json
similarity index 100%
rename from public/keymaps/handwired_splittest_teensy_2_default.json
rename to public/keymaps/handwired/splittest/teensy_2/handwired_splittest_teensy_2_default.json
diff --git a/public/keymaps/handwired_steamvan_rev1_default.json b/public/keymaps/handwired/steamvan/rev1/handwired_steamvan_rev1_default.json
similarity index 100%
rename from public/keymaps/handwired_steamvan_rev1_default.json
rename to public/keymaps/handwired/steamvan/rev1/handwired_steamvan_rev1_default.json
diff --git a/public/keymaps/handwired_sticc14_default.json b/public/keymaps/handwired/sticc14/handwired_sticc14_default.json
similarity index 100%
rename from public/keymaps/handwired_sticc14_default.json
rename to public/keymaps/handwired/sticc14/handwired_sticc14_default.json
diff --git a/public/keymaps/handwired_symmetry60_default.json b/public/keymaps/handwired/symmetry60/handwired_symmetry60_default.json
similarity index 100%
rename from public/keymaps/handwired_symmetry60_default.json
rename to public/keymaps/handwired/symmetry60/handwired_symmetry60_default.json
diff --git a/public/keymaps/handwired_tennie_default.json b/public/keymaps/handwired/tennie/handwired_tennie_default.json
similarity index 100%
rename from public/keymaps/handwired_tennie_default.json
rename to public/keymaps/handwired/tennie/handwired_tennie_default.json
diff --git a/public/keymaps/handwired_terminus_mini_default.json b/public/keymaps/handwired/terminus_mini/handwired_terminus_mini_default.json
similarity index 100%
rename from public/keymaps/handwired_terminus_mini_default.json
rename to public/keymaps/handwired/terminus_mini/handwired_terminus_mini_default.json
diff --git a/public/keymaps/handwired_trackpoint_default.json b/public/keymaps/handwired/trackpoint/handwired_trackpoint_default.json
similarity index 100%
rename from public/keymaps/handwired_trackpoint_default.json
rename to public/keymaps/handwired/trackpoint/handwired_trackpoint_default.json
diff --git a/public/keymaps/handwired_tritium_numpad_default.json b/public/keymaps/handwired/tritium_numpad/handwired_tritium_numpad_default.json
similarity index 100%
rename from public/keymaps/handwired_tritium_numpad_default.json
rename to public/keymaps/handwired/tritium_numpad/handwired_tritium_numpad_default.json
diff --git a/public/keymaps/handwired_woodpad_default.json b/public/keymaps/handwired/woodpad/handwired_woodpad_default.json
similarity index 100%
rename from public/keymaps/handwired_woodpad_default.json
rename to public/keymaps/handwired/woodpad/handwired_woodpad_default.json
diff --git a/public/keymaps/handwired_xealous_rev1_default.json b/public/keymaps/handwired/xealous/rev1/handwired_xealous_rev1_default.json
similarity index 100%
rename from public/keymaps/handwired_xealous_rev1_default.json
rename to public/keymaps/handwired/xealous/rev1/handwired_xealous_rev1_default.json
diff --git a/public/keymaps/hecomi_alpha_default.json b/public/keymaps/hecomi/alpha/hecomi_alpha_default.json
similarity index 100%
rename from public/keymaps/hecomi_alpha_default.json
rename to public/keymaps/hecomi/alpha/hecomi_alpha_default.json
diff --git a/public/keymaps/heliar_wm1_hotswap_default.json b/public/keymaps/heliar/wm1_hotswap/heliar_wm1_hotswap_default.json
similarity index 100%
rename from public/keymaps/heliar_wm1_hotswap_default.json
rename to public/keymaps/heliar/wm1_hotswap/heliar_wm1_hotswap_default.json
diff --git a/public/keymaps/helix_pico_back_default.json b/public/keymaps/helix/pico/back/helix_pico_back_default.json
similarity index 100%
rename from public/keymaps/helix_pico_back_default.json
rename to public/keymaps/helix/pico/back/helix_pico_back_default.json
diff --git a/public/keymaps/helix_pico_default.json b/public/keymaps/helix/pico/helix_pico_default.json
similarity index 100%
rename from public/keymaps/helix_pico_default.json
rename to public/keymaps/helix/pico/helix_pico_default.json
diff --git a/public/keymaps/helix_pico_under_default.json b/public/keymaps/helix/pico/under/helix_pico_under_default.json
similarity index 100%
rename from public/keymaps/helix_pico_under_default.json
rename to public/keymaps/helix/pico/under/helix_pico_under_default.json
diff --git a/public/keymaps/helix_rev1_default.json b/public/keymaps/helix/rev1/helix_rev1_default.json
similarity index 100%
rename from public/keymaps/helix_rev1_default.json
rename to public/keymaps/helix/rev1/helix_rev1_default.json
diff --git a/public/keymaps/helix_rev2_back_default.json b/public/keymaps/helix/rev2/back/helix_rev2_back_default.json
similarity index 100%
rename from public/keymaps/helix_rev2_back_default.json
rename to public/keymaps/helix/rev2/back/helix_rev2_back_default.json
diff --git a/public/keymaps/helix_rev2_back_oled_default.json b/public/keymaps/helix/rev2/back/oled/helix_rev2_back_oled_default.json
similarity index 100%
rename from public/keymaps/helix_rev2_back_oled_default.json
rename to public/keymaps/helix/rev2/back/oled/helix_rev2_back_oled_default.json
diff --git a/public/keymaps/helix_rev2_default.json b/public/keymaps/helix/rev2/helix_rev2_default.json
similarity index 100%
rename from public/keymaps/helix_rev2_default.json
rename to public/keymaps/helix/rev2/helix_rev2_default.json
diff --git a/public/keymaps/helix_rev2_oled_back_default.json b/public/keymaps/helix/rev2/oled/back/helix_rev2_oled_back_default.json
similarity index 100%
rename from public/keymaps/helix_rev2_oled_back_default.json
rename to public/keymaps/helix/rev2/oled/back/helix_rev2_oled_back_default.json
diff --git a/public/keymaps/helix_rev2_oled_default.json b/public/keymaps/helix/rev2/oled/helix_rev2_oled_default.json
similarity index 100%
rename from public/keymaps/helix_rev2_oled_default.json
rename to public/keymaps/helix/rev2/oled/helix_rev2_oled_default.json
diff --git a/public/keymaps/helix_rev2_oled_under_default.json b/public/keymaps/helix/rev2/oled/under/helix_rev2_oled_under_default.json
similarity index 100%
rename from public/keymaps/helix_rev2_oled_under_default.json
rename to public/keymaps/helix/rev2/oled/under/helix_rev2_oled_under_default.json
diff --git a/public/keymaps/helix_rev2_under_default.json b/public/keymaps/helix/rev2/under/helix_rev2_under_default.json
similarity index 100%
rename from public/keymaps/helix_rev2_under_default.json
rename to public/keymaps/helix/rev2/under/helix_rev2_under_default.json
diff --git a/public/keymaps/helix_rev2_under_oled_default.json b/public/keymaps/helix/rev2/under/oled/helix_rev2_under_oled_default.json
similarity index 100%
rename from public/keymaps/helix_rev2_under_oled_default.json
rename to public/keymaps/helix/rev2/under/oled/helix_rev2_under_oled_default.json
diff --git a/public/keymaps/hhkb_default.json b/public/keymaps/hhkb/hhkb_default.json
similarity index 100%
rename from public/keymaps/hhkb_default.json
rename to public/keymaps/hhkb/hhkb_default.json
diff --git a/public/keymaps/hid_liber_default.json b/public/keymaps/hid_liber/hid_liber_default.json
similarity index 100%
rename from public/keymaps/hid_liber_default.json
rename to public/keymaps/hid_liber/hid_liber_default.json
diff --git a/public/keymaps/hifumi_default.json b/public/keymaps/hifumi/hifumi_default.json
similarity index 100%
rename from public/keymaps/hifumi_default.json
rename to public/keymaps/hifumi/hifumi_default.json
diff --git a/public/keymaps/hineybush_h87a_default.json b/public/keymaps/hineybush/h87a/hineybush_h87a_default.json
similarity index 100%
rename from public/keymaps/hineybush_h87a_default.json
rename to public/keymaps/hineybush/h87a/hineybush_h87a_default.json
diff --git a/public/keymaps/hineybush_h88_default.json b/public/keymaps/hineybush/h88/hineybush_h88_default.json
similarity index 100%
rename from public/keymaps/hineybush_h88_default.json
rename to public/keymaps/hineybush/h88/hineybush_h88_default.json
diff --git a/public/keymaps/hineybush_hbcp_default.json b/public/keymaps/hineybush/hbcp/hineybush_hbcp_default.json
similarity index 100%
rename from public/keymaps/hineybush_hbcp_default.json
rename to public/keymaps/hineybush/hbcp/hineybush_hbcp_default.json
diff --git a/public/keymaps/hineybush_hineyg80_default.json b/public/keymaps/hineybush/hineyg80/hineybush_hineyg80_default.json
similarity index 100%
rename from public/keymaps/hineybush_hineyg80_default.json
rename to public/keymaps/hineybush/hineyg80/hineybush_hineyg80_default.json
diff --git a/public/keymaps/hineybush_sm68_default.json b/public/keymaps/hineybush/sm68/hineybush_sm68_default.json
similarity index 100%
rename from public/keymaps/hineybush_sm68_default.json
rename to public/keymaps/hineybush/sm68/hineybush_sm68_default.json
diff --git a/public/keymaps/honeycomb_default.json b/public/keymaps/honeycomb/honeycomb_default.json
similarity index 100%
rename from public/keymaps/honeycomb_default.json
rename to public/keymaps/honeycomb/honeycomb_default.json
diff --git a/public/keymaps/hotdox_default.json b/public/keymaps/hotdox/hotdox_default.json
similarity index 100%
rename from public/keymaps/hotdox_default.json
rename to public/keymaps/hotdox/hotdox_default.json
diff --git a/public/keymaps/hs60_v1_default.json b/public/keymaps/hs60/v1/hs60_v1_default.json
similarity index 100%
rename from public/keymaps/hs60_v1_default.json
rename to public/keymaps/hs60/v1/hs60_v1_default.json
diff --git a/public/keymaps/hs60_v2_ansi_default.json b/public/keymaps/hs60/v2/ansi/hs60_v2_ansi_default.json
similarity index 100%
rename from public/keymaps/hs60_v2_ansi_default.json
rename to public/keymaps/hs60/v2/ansi/hs60_v2_ansi_default.json
diff --git a/public/keymaps/hs60_v2_hhkb_default.json b/public/keymaps/hs60/v2/hhkb/hs60_v2_hhkb_default.json
similarity index 100%
rename from public/keymaps/hs60_v2_hhkb_default.json
rename to public/keymaps/hs60/v2/hhkb/hs60_v2_hhkb_default.json
diff --git a/public/keymaps/hs60_v2_iso_default.json b/public/keymaps/hs60/v2/iso/hs60_v2_iso_default.json
similarity index 100%
rename from public/keymaps/hs60_v2_iso_default.json
rename to public/keymaps/hs60/v2/iso/hs60_v2_iso_default.json
diff --git a/public/keymaps/idb_60_default.json b/public/keymaps/idb/idb_60/idb_idb_60_default.json
similarity index 98%
rename from public/keymaps/idb_60_default.json
rename to public/keymaps/idb/idb_60/idb_idb_60_default.json
index 60ac649fbd..033ff0cea7 100644
--- a/public/keymaps/idb_60_default.json
+++ b/public/keymaps/idb/idb_60/idb_idb_60_default.json
@@ -1,5 +1,5 @@
 {
-  "keyboard": "idb_60",
+  "keyboard": "idb/idb_60",
   "keymap": "default_2558466",
   "commit": "2558466d78a2c2436dedeff593491bdb20780cfc",
   "layout": "LAYOUT",
diff --git a/public/keymaps/idobo_default.json b/public/keymaps/idobo/idobo_default.json
similarity index 100%
rename from public/keymaps/idobo_default.json
rename to public/keymaps/idobo/idobo_default.json
diff --git a/public/keymaps/infinity60_default.json b/public/keymaps/infinity60/infinity60_default.json
similarity index 100%
rename from public/keymaps/infinity60_default.json
rename to public/keymaps/infinity60/infinity60_default.json
diff --git a/public/keymaps/ivy_rev1_default.json b/public/keymaps/ivy/rev1/ivy_rev1_default.json
similarity index 100%
rename from public/keymaps/ivy_rev1_default.json
rename to public/keymaps/ivy/rev1/ivy_rev1_default.json
diff --git a/public/keymaps/j80_default.json b/public/keymaps/j80/j80_default.json
similarity index 100%
rename from public/keymaps/j80_default.json
rename to public/keymaps/j80/j80_default.json
diff --git a/public/keymaps/jae_j01_default.json b/public/keymaps/jae/j01/jae_j01_default.json
similarity index 100%
rename from public/keymaps/jae_j01_default.json
rename to public/keymaps/jae/j01/jae_j01_default.json
diff --git a/public/keymaps/jc65_v32a_default.json b/public/keymaps/jc65/v32a/jc65_v32a_default.json
similarity index 100%
rename from public/keymaps/jc65_v32a_default.json
rename to public/keymaps/jc65/v32a/jc65_v32a_default.json
diff --git a/public/keymaps/jc65_v32u4_default.json b/public/keymaps/jc65/v32u4/jc65_v32u4_default.json
similarity index 100%
rename from public/keymaps/jc65_v32u4_default.json
rename to public/keymaps/jc65/v32u4/jc65_v32u4_default.json
diff --git a/public/keymaps/jd40_default.json b/public/keymaps/jd40/jd40_default.json
similarity index 100%
rename from public/keymaps/jd40_default.json
rename to public/keymaps/jd40/jd40_default.json
diff --git a/public/keymaps/jd45_default.json b/public/keymaps/jd45/jd45_default.json
similarity index 100%
rename from public/keymaps/jd45_default.json
rename to public/keymaps/jd45/jd45_default.json
diff --git a/public/keymaps/jj40_default.json b/public/keymaps/jj40/jj40_default.json
similarity index 100%
rename from public/keymaps/jj40_default.json
rename to public/keymaps/jj40/jj40_default.json
diff --git a/public/keymaps/jj4x4_default.json b/public/keymaps/jj4x4/jj4x4_default.json
similarity index 100%
rename from public/keymaps/jj4x4_default.json
rename to public/keymaps/jj4x4/jj4x4_default.json
diff --git a/public/keymaps/jj50_default.json b/public/keymaps/jj50/jj50_default.json
similarity index 100%
rename from public/keymaps/jj50_default.json
rename to public/keymaps/jj50/jj50_default.json
diff --git a/public/keymaps/jm60_default.json b/public/keymaps/jm60/jm60_default.json
similarity index 100%
rename from public/keymaps/jm60_default.json
rename to public/keymaps/jm60/jm60_default.json
diff --git a/public/keymaps/jnao_default.json b/public/keymaps/jnao/jnao_default.json
similarity index 100%
rename from public/keymaps/jnao_default.json
rename to public/keymaps/jnao/jnao_default.json
diff --git a/public/keymaps/just60_default.json b/public/keymaps/just60/just60_default.json
similarity index 100%
rename from public/keymaps/just60_default.json
rename to public/keymaps/just60/just60_default.json
diff --git a/public/keymaps/k_type_default.json b/public/keymaps/k_type/k_type_default.json
similarity index 100%
rename from public/keymaps/k_type_default.json
rename to public/keymaps/k_type/k_type_default.json
diff --git a/public/keymaps/kagamidget_default.json b/public/keymaps/kagamidget/kagamidget_default.json
similarity index 100%
rename from public/keymaps/kagamidget_default.json
rename to public/keymaps/kagamidget/kagamidget_default.json
diff --git a/public/keymaps/katana60_default.json b/public/keymaps/katana60/katana60_default.json
similarity index 100%
rename from public/keymaps/katana60_default.json
rename to public/keymaps/katana60/katana60_default.json
diff --git a/public/keymaps/kbdfans_kbd19x_default.json b/public/keymaps/kbdfans/kbd19x/kbdfans_kbd19x_default.json
similarity index 100%
rename from public/keymaps/kbdfans_kbd19x_default.json
rename to public/keymaps/kbdfans/kbd19x/kbdfans_kbd19x_default.json
diff --git a/public/keymaps/kbdfans_kbd4x_default.json b/public/keymaps/kbdfans/kbd4x/kbdfans_kbd4x_default.json
similarity index 100%
rename from public/keymaps/kbdfans_kbd4x_default.json
rename to public/keymaps/kbdfans/kbd4x/kbdfans_kbd4x_default.json
diff --git a/public/keymaps/kbdfans_kbd66_default.json b/public/keymaps/kbdfans/kbd66/kbdfans_kbd66_default.json
similarity index 100%
rename from public/keymaps/kbdfans_kbd66_default.json
rename to public/keymaps/kbdfans/kbd66/kbdfans_kbd66_default.json
diff --git a/public/keymaps/kbdfans_kbd67_hotswap_default.json b/public/keymaps/kbdfans/kbd67/hotswap/kbdfans_kbd67_hotswap_default.json
similarity index 100%
rename from public/keymaps/kbdfans_kbd67_hotswap_default.json
rename to public/keymaps/kbdfans/kbd67/hotswap/kbdfans_kbd67_hotswap_default.json
diff --git a/public/keymaps/kbdfans_kbd67_mkii_soldered_default.json b/public/keymaps/kbdfans/kbd67/mkii_soldered/kbdfans_kbd67_mkii_soldered_default.json
similarity index 100%
rename from public/keymaps/kbdfans_kbd67_mkii_soldered_default.json
rename to public/keymaps/kbdfans/kbd67/mkii_soldered/kbdfans_kbd67_mkii_soldered_default.json
diff --git a/public/keymaps/kbdfans_kbd67_mkiirgb_v1_default.json b/public/keymaps/kbdfans/kbd67/mkiirgb/v1/kbdfans_kbd67_mkiirgb_v1_default.json
similarity index 100%
rename from public/keymaps/kbdfans_kbd67_mkiirgb_v1_default.json
rename to public/keymaps/kbdfans/kbd67/mkiirgb/v1/kbdfans_kbd67_mkiirgb_v1_default.json
diff --git a/public/keymaps/kbdfans_kbd67_mkiirgb_v2_default.json b/public/keymaps/kbdfans/kbd67/mkiirgb/v2/kbdfans_kbd67_mkiirgb_v2_default.json
similarity index 100%
rename from public/keymaps/kbdfans_kbd67_mkiirgb_v2_default.json
rename to public/keymaps/kbdfans/kbd67/mkiirgb/v2/kbdfans_kbd67_mkiirgb_v2_default.json
diff --git a/public/keymaps/kbdfans_kbd67_rev1_default.json b/public/keymaps/kbdfans/kbd67/rev1/kbdfans_kbd67_rev1_default.json
similarity index 100%
rename from public/keymaps/kbdfans_kbd67_rev1_default.json
rename to public/keymaps/kbdfans/kbd67/rev1/kbdfans_kbd67_rev1_default.json
diff --git a/public/keymaps/kbdfans_kbd67_rev2_default.json b/public/keymaps/kbdfans/kbd67/rev2/kbdfans_kbd67_rev2_default.json
similarity index 100%
rename from public/keymaps/kbdfans_kbd67_rev2_default.json
rename to public/keymaps/kbdfans/kbd67/rev2/kbdfans_kbd67_rev2_default.json
diff --git a/public/keymaps/kbdfans_kbd6x_default.json b/public/keymaps/kbdfans/kbd6x/kbdfans_kbd6x_default.json
similarity index 100%
rename from public/keymaps/kbdfans_kbd6x_default.json
rename to public/keymaps/kbdfans/kbd6x/kbdfans_kbd6x_default.json
diff --git a/public/keymaps/kbdfans_kbd75_rev1_default.json b/public/keymaps/kbdfans/kbd75/rev1/kbdfans_kbd75_rev1_default.json
similarity index 100%
rename from public/keymaps/kbdfans_kbd75_rev1_default.json
rename to public/keymaps/kbdfans/kbd75/rev1/kbdfans_kbd75_rev1_default.json
diff --git a/public/keymaps/kbdfans_kbd75_rev2_default.json b/public/keymaps/kbdfans/kbd75/rev2/kbdfans_kbd75_rev2_default.json
similarity index 100%
rename from public/keymaps/kbdfans_kbd75_rev2_default.json
rename to public/keymaps/kbdfans/kbd75/rev2/kbdfans_kbd75_rev2_default.json
diff --git a/public/keymaps/kbdfans_kbd8x_default.json b/public/keymaps/kbdfans/kbd8x/kbdfans_kbd8x_default.json
similarity index 100%
rename from public/keymaps/kbdfans_kbd8x_default.json
rename to public/keymaps/kbdfans/kbd8x/kbdfans_kbd8x_default.json
diff --git a/public/keymaps/kbdfans_kbd8x_mk2_default.json b/public/keymaps/kbdfans/kbd8x_mk2/kbdfans_kbd8x_mk2_default.json
similarity index 100%
rename from public/keymaps/kbdfans_kbd8x_mk2_default.json
rename to public/keymaps/kbdfans/kbd8x_mk2/kbdfans_kbd8x_mk2_default.json
diff --git a/public/keymaps/kbdfans_kbdmini_default.json b/public/keymaps/kbdfans/kbdmini/kbdfans_kbdmini_default.json
similarity index 100%
rename from public/keymaps/kbdfans_kbdmini_default.json
rename to public/keymaps/kbdfans/kbdmini/kbdfans_kbdmini_default.json
diff --git a/public/keymaps/kbdfans_kbdpad_mk1_default.json b/public/keymaps/kbdfans/kbdpad/mk1/kbdfans_kbdpad_mk1_default.json
similarity index 100%
rename from public/keymaps/kbdfans_kbdpad_mk1_default.json
rename to public/keymaps/kbdfans/kbdpad/mk1/kbdfans_kbdpad_mk1_default.json
diff --git a/public/keymaps/kbdfans_kbdpad_mk2_default.json b/public/keymaps/kbdfans/kbdpad_mk2/kbdfans_kbdpad_mk2_default.json
similarity index 100%
rename from public/keymaps/kbdfans_kbdpad_mk2_default.json
rename to public/keymaps/kbdfans/kbdpad_mk2/kbdfans_kbdpad_mk2_default.json
diff --git a/public/keymaps/kc60se_default.json b/public/keymaps/kc60se/kc60se_default.json
similarity index 100%
rename from public/keymaps/kc60se_default.json
rename to public/keymaps/kc60se/kc60se_default.json
diff --git a/public/keymaps/keebio_bdn9_default.json b/public/keymaps/keebio/bdn9/keebio_bdn9_default.json
similarity index 100%
rename from public/keymaps/keebio_bdn9_default.json
rename to public/keymaps/keebio/bdn9/keebio_bdn9_default.json
diff --git a/public/keymaps/keebio_bfo9000_default.json b/public/keymaps/keebio/bfo9000/keebio_bfo9000_default.json
similarity index 100%
rename from public/keymaps/keebio_bfo9000_default.json
rename to public/keymaps/keebio/bfo9000/keebio_bfo9000_default.json
diff --git a/public/keymaps/keebio_chocopad_default.json b/public/keymaps/keebio/chocopad/keebio_chocopad_default.json
similarity index 100%
rename from public/keymaps/keebio_chocopad_default.json
rename to public/keymaps/keebio/chocopad/keebio_chocopad_default.json
diff --git a/public/keymaps/keebio_dilly_default.json b/public/keymaps/keebio/dilly/keebio_dilly_default.json
similarity index 100%
rename from public/keymaps/keebio_dilly_default.json
rename to public/keymaps/keebio/dilly/keebio_dilly_default.json
diff --git a/public/keymaps/keebio_ergodicity_default.json b/public/keymaps/keebio/ergodicity/keebio_ergodicity_default.json
similarity index 100%
rename from public/keymaps/keebio_ergodicity_default.json
rename to public/keymaps/keebio/ergodicity/keebio_ergodicity_default.json
diff --git a/public/keymaps/keebio_fourier_default.json b/public/keymaps/keebio/fourier/keebio_fourier_default.json
similarity index 100%
rename from public/keymaps/keebio_fourier_default.json
rename to public/keymaps/keebio/fourier/keebio_fourier_default.json
diff --git a/public/keymaps/keebio_iris_rev1_default.json b/public/keymaps/keebio/iris/rev1/keebio_iris_rev1_default.json
similarity index 100%
rename from public/keymaps/keebio_iris_rev1_default.json
rename to public/keymaps/keebio/iris/rev1/keebio_iris_rev1_default.json
diff --git a/public/keymaps/keebio_iris_rev1_led_default.json b/public/keymaps/keebio/iris/rev1_led/keebio_iris_rev1_led_default.json
similarity index 100%
rename from public/keymaps/keebio_iris_rev1_led_default.json
rename to public/keymaps/keebio/iris/rev1_led/keebio_iris_rev1_led_default.json
diff --git a/public/keymaps/keebio_iris_rev2_default.json b/public/keymaps/keebio/iris/rev2/keebio_iris_rev2_default.json
similarity index 100%
rename from public/keymaps/keebio_iris_rev2_default.json
rename to public/keymaps/keebio/iris/rev2/keebio_iris_rev2_default.json
diff --git a/public/keymaps/keebio_iris_rev3_default.json b/public/keymaps/keebio/iris/rev3/keebio_iris_rev3_default.json
similarity index 100%
rename from public/keymaps/keebio_iris_rev3_default.json
rename to public/keymaps/keebio/iris/rev3/keebio_iris_rev3_default.json
diff --git a/public/keymaps/keebio_iris_rev4_default.json b/public/keymaps/keebio/iris/rev4/keebio_iris_rev4_default.json
similarity index 100%
rename from public/keymaps/keebio_iris_rev4_default.json
rename to public/keymaps/keebio/iris/rev4/keebio_iris_rev4_default.json
diff --git a/public/keymaps/keebio_laplace_default.json b/public/keymaps/keebio/laplace/keebio_laplace_default.json
similarity index 100%
rename from public/keymaps/keebio_laplace_default.json
rename to public/keymaps/keebio/laplace/keebio_laplace_default.json
diff --git a/public/keymaps/keebio_levinson_rev1_default.json b/public/keymaps/keebio/levinson/rev1/keebio_levinson_rev1_default.json
similarity index 100%
rename from public/keymaps/keebio_levinson_rev1_default.json
rename to public/keymaps/keebio/levinson/rev1/keebio_levinson_rev1_default.json
diff --git a/public/keymaps/keebio_levinson_rev2_default.json b/public/keymaps/keebio/levinson/rev2/keebio_levinson_rev2_default.json
similarity index 100%
rename from public/keymaps/keebio_levinson_rev2_default.json
rename to public/keymaps/keebio/levinson/rev2/keebio_levinson_rev2_default.json
diff --git a/public/keymaps/keebio_levinson_rev3_default.json b/public/keymaps/keebio/levinson/rev3/keebio_levinson_rev3_default.json
similarity index 100%
rename from public/keymaps/keebio_levinson_rev3_default.json
rename to public/keymaps/keebio/levinson/rev3/keebio_levinson_rev3_default.json
diff --git a/public/keymaps/keebio_nyquist_rev1_default.json b/public/keymaps/keebio/nyquist/rev1/keebio_nyquist_rev1_default.json
similarity index 100%
rename from public/keymaps/keebio_nyquist_rev1_default.json
rename to public/keymaps/keebio/nyquist/rev1/keebio_nyquist_rev1_default.json
diff --git a/public/keymaps/keebio_nyquist_rev2_default.json b/public/keymaps/keebio/nyquist/rev2/keebio_nyquist_rev2_default.json
similarity index 100%
rename from public/keymaps/keebio_nyquist_rev2_default.json
rename to public/keymaps/keebio/nyquist/rev2/keebio_nyquist_rev2_default.json
diff --git a/public/keymaps/keebio_nyquist_rev3_default.json b/public/keymaps/keebio/nyquist/rev3/keebio_nyquist_rev3_default.json
similarity index 100%
rename from public/keymaps/keebio_nyquist_rev3_default.json
rename to public/keymaps/keebio/nyquist/rev3/keebio_nyquist_rev3_default.json
diff --git a/public/keymaps/keebio_quefrency_rev1_default.json b/public/keymaps/keebio/quefrency/rev1/keebio_quefrency_rev1_default.json
similarity index 100%
rename from public/keymaps/keebio_quefrency_rev1_default.json
rename to public/keymaps/keebio/quefrency/rev1/keebio_quefrency_rev1_default.json
diff --git a/public/keymaps/keebio_rorschach_rev1_default.json b/public/keymaps/keebio/rorschach/rev1/keebio_rorschach_rev1_default.json
similarity index 100%
rename from public/keymaps/keebio_rorschach_rev1_default.json
rename to public/keymaps/keebio/rorschach/rev1/keebio_rorschach_rev1_default.json
diff --git a/public/keymaps/keebio_tragicforce68_default.json b/public/keymaps/keebio/tragicforce68/keebio_tragicforce68_default.json
similarity index 100%
rename from public/keymaps/keebio_tragicforce68_default.json
rename to public/keymaps/keebio/tragicforce68/keebio_tragicforce68_default.json
diff --git a/public/keymaps/keebio_tukey_default.json b/public/keymaps/keebio/tukey/keebio_tukey_default.json
similarity index 100%
rename from public/keymaps/keebio_tukey_default.json
rename to public/keymaps/keebio/tukey/keebio_tukey_default.json
diff --git a/public/keymaps/keebio_viterbi_rev1_default.json b/public/keymaps/keebio/viterbi/rev1/keebio_viterbi_rev1_default.json
similarity index 100%
rename from public/keymaps/keebio_viterbi_rev1_default.json
rename to public/keymaps/keebio/viterbi/rev1/keebio_viterbi_rev1_default.json
diff --git a/public/keymaps/keebio_viterbi_rev2_default.json b/public/keymaps/keebio/viterbi/rev2/keebio_viterbi_rev2_default.json
similarity index 100%
rename from public/keymaps/keebio_viterbi_rev2_default.json
rename to public/keymaps/keebio/viterbi/rev2/keebio_viterbi_rev2_default.json
diff --git a/public/keymaps/keebio_wavelet_default.json b/public/keymaps/keebio/wavelet/keebio_wavelet_default.json
similarity index 100%
rename from public/keymaps/keebio_wavelet_default.json
rename to public/keymaps/keebio/wavelet/keebio_wavelet_default.json
diff --git a/public/keymaps/keycapsss_o4l_5x12_default.json b/public/keymaps/keycapsss/o4l_5x12/keycapsss_o4l_5x12_default.json
similarity index 100%
rename from public/keymaps/keycapsss_o4l_5x12_default.json
rename to public/keymaps/keycapsss/o4l_5x12/keycapsss_o4l_5x12_default.json
diff --git a/public/keymaps/keyhive_maypad_default.json b/public/keymaps/keyhive/maypad/keyhive_maypad_default.json
similarity index 100%
rename from public/keymaps/keyhive_maypad_default.json
rename to public/keymaps/keyhive/maypad/keyhive_maypad_default.json
diff --git a/public/keymaps/kinesis_alvicstep_default.json b/public/keymaps/kinesis/alvicstep/kinesis_alvicstep_default.json
similarity index 100%
rename from public/keymaps/kinesis_alvicstep_default.json
rename to public/keymaps/kinesis/alvicstep/kinesis_alvicstep_default.json
diff --git a/public/keymaps/kinesis_stapelberg_default.json b/public/keymaps/kinesis/stapelberg/kinesis_stapelberg_default.json
similarity index 100%
rename from public/keymaps/kinesis_stapelberg_default.json
rename to public/keymaps/kinesis/stapelberg/kinesis_stapelberg_default.json
diff --git a/public/keymaps/kingly_keys_little_foot_default.json b/public/keymaps/kingly_keys/little_foot/kingly_keys_little_foot_default.json
similarity index 100%
rename from public/keymaps/kingly_keys_little_foot_default.json
rename to public/keymaps/kingly_keys/little_foot/kingly_keys_little_foot_default.json
diff --git a/public/keymaps/kingly_keys_romac_default.json b/public/keymaps/kingly_keys/romac/kingly_keys_romac_default.json
similarity index 100%
rename from public/keymaps/kingly_keys_romac_default.json
rename to public/keymaps/kingly_keys/romac/kingly_keys_romac_default.json
diff --git a/public/keymaps/kingly_keys_romac_plus_default.json b/public/keymaps/kingly_keys/romac_plus/kingly_keys_romac_plus_default.json
similarity index 100%
rename from public/keymaps/kingly_keys_romac_plus_default.json
rename to public/keymaps/kingly_keys/romac_plus/kingly_keys_romac_plus_default.json
diff --git a/public/keymaps/kingly_keys_ropro_default.json b/public/keymaps/kingly_keys/ropro/kingly_keys_ropro_default.json
similarity index 100%
rename from public/keymaps/kingly_keys_ropro_default.json
rename to public/keymaps/kingly_keys/ropro/kingly_keys_ropro_default.json
diff --git a/public/keymaps/kingly_keys_smd_milk_default.json b/public/keymaps/kingly_keys/smd_milk/kingly_keys_smd_milk_default.json
similarity index 100%
rename from public/keymaps/kingly_keys_smd_milk_default.json
rename to public/keymaps/kingly_keys/smd_milk/kingly_keys_smd_milk_default.json
diff --git a/public/keymaps/kingly_keys_soap_default.json b/public/keymaps/kingly_keys/soap/kingly_keys_soap_default.json
similarity index 100%
rename from public/keymaps/kingly_keys_soap_default.json
rename to public/keymaps/kingly_keys/soap/kingly_keys_soap_default.json
diff --git a/public/keymaps/kira75_default.json b/public/keymaps/kira75/kira75_default.json
similarity index 100%
rename from public/keymaps/kira75_default.json
rename to public/keymaps/kira75/kira75_default.json
diff --git a/public/keymaps/kmac_default.json b/public/keymaps/kmac/kmac_default.json
similarity index 100%
rename from public/keymaps/kmac_default.json
rename to public/keymaps/kmac/kmac_default.json
diff --git a/public/keymaps/kmini_default.json b/public/keymaps/kmini/kmini_default.json
similarity index 100%
rename from public/keymaps/kmini_default.json
rename to public/keymaps/kmini/kmini_default.json
diff --git a/public/keymaps/knops_mini_default.json b/public/keymaps/knops/mini/knops_mini_default.json
similarity index 100%
rename from public/keymaps/knops_mini_default.json
rename to public/keymaps/knops/mini/knops_mini_default.json
diff --git a/public/keymaps/kona_classic_default.json b/public/keymaps/kona_classic/kona_classic_default.json
similarity index 100%
rename from public/keymaps/kona_classic_default.json
rename to public/keymaps/kona_classic/kona_classic_default.json
diff --git a/public/keymaps/kudox_rev1_default.json b/public/keymaps/kudox/rev1/kudox_rev1_default.json
similarity index 100%
rename from public/keymaps/kudox_rev1_default.json
rename to public/keymaps/kudox/rev1/kudox_rev1_default.json
diff --git a/public/keymaps/kudox_rev2_default.json b/public/keymaps/kudox/rev2/kudox_rev2_default.json
similarity index 100%
rename from public/keymaps/kudox_rev2_default.json
rename to public/keymaps/kudox/rev2/kudox_rev2_default.json
diff --git a/public/keymaps/kudox_game_rev1_default.json b/public/keymaps/kudox_game/rev1/kudox_game_rev1_default.json
similarity index 100%
rename from public/keymaps/kudox_game_rev1_default.json
rename to public/keymaps/kudox_game/rev1/kudox_game_rev1_default.json
diff --git a/public/keymaps/kyria_rev1_default.json b/public/keymaps/kyria/rev1/kyria_rev1_default.json
similarity index 100%
rename from public/keymaps/kyria_rev1_default.json
rename to public/keymaps/kyria/rev1/kyria_rev1_default.json
diff --git a/public/keymaps/laptreus_default.json b/public/keymaps/laptreus/laptreus_default.json
similarity index 100%
rename from public/keymaps/laptreus_default.json
rename to public/keymaps/laptreus/laptreus_default.json
diff --git a/public/keymaps/launchpad_rev1_default.json b/public/keymaps/launchpad/rev1/launchpad_rev1_default.json
similarity index 100%
rename from public/keymaps/launchpad_rev1_default.json
rename to public/keymaps/launchpad/rev1/launchpad_rev1_default.json
diff --git a/public/keymaps/lazydesigners_dimple_default.json b/public/keymaps/lazydesigners/dimple/lazydesigners_dimple_default.json
similarity index 100%
rename from public/keymaps/lazydesigners_dimple_default.json
rename to public/keymaps/lazydesigners/dimple/lazydesigners_dimple_default.json
diff --git a/public/keymaps/lazydesigners_the50_default.json b/public/keymaps/lazydesigners/the50/lazydesigners_the50_default.json
similarity index 100%
rename from public/keymaps/lazydesigners_the50_default.json
rename to public/keymaps/lazydesigners/the50/lazydesigners_the50_default.json
diff --git a/public/keymaps/lazydesigners_the60_default.json b/public/keymaps/lazydesigners/the60/lazydesigners_the60_default.json
similarity index 100%
rename from public/keymaps/lazydesigners_the60_default.json
rename to public/keymaps/lazydesigners/the60/lazydesigners_the60_default.json
diff --git a/public/keymaps/leeku_finger65_default.json b/public/keymaps/leeku/finger65/leeku_finger65_default.json
similarity index 100%
rename from public/keymaps/leeku_finger65_default.json
rename to public/keymaps/leeku/finger65/leeku_finger65_default.json
diff --git a/public/keymaps/lets_split_rev1_default.json b/public/keymaps/lets_split/rev1/lets_split_rev1_default.json
similarity index 100%
rename from public/keymaps/lets_split_rev1_default.json
rename to public/keymaps/lets_split/rev1/lets_split_rev1_default.json
diff --git a/public/keymaps/lets_split_rev2_default.json b/public/keymaps/lets_split/rev2/lets_split_rev2_default.json
similarity index 100%
rename from public/keymaps/lets_split_rev2_default.json
rename to public/keymaps/lets_split/rev2/lets_split_rev2_default.json
diff --git a/public/keymaps/lets_split_sockets_default.json b/public/keymaps/lets_split/sockets/lets_split_sockets_default.json
similarity index 100%
rename from public/keymaps/lets_split_sockets_default.json
rename to public/keymaps/lets_split/sockets/lets_split_sockets_default.json
diff --git a/public/keymaps/lets_split_eh_eh_default.json b/public/keymaps/lets_split_eh/eh/lets_split_eh_eh_default.json
similarity index 100%
rename from public/keymaps/lets_split_eh_eh_default.json
rename to public/keymaps/lets_split_eh/eh/lets_split_eh_eh_default.json
diff --git a/public/keymaps/lfkeyboards_lfk65_hs_default.json b/public/keymaps/lfkeyboards/lfk65_hs/lfkeyboards_lfk65_hs_default.json
similarity index 100%
rename from public/keymaps/lfkeyboards_lfk65_hs_default.json
rename to public/keymaps/lfkeyboards/lfk65_hs/lfkeyboards_lfk65_hs_default.json
diff --git a/public/keymaps/lfkeyboards_lfk78_default.json b/public/keymaps/lfkeyboards/lfk78/lfkeyboards_lfk78_default.json
similarity index 100%
rename from public/keymaps/lfkeyboards_lfk78_default.json
rename to public/keymaps/lfkeyboards/lfk78/lfkeyboards_lfk78_default.json
diff --git a/public/keymaps/lfkeyboards_lfk87_default.json b/public/keymaps/lfkeyboards/lfk87/lfkeyboards_lfk87_default.json
similarity index 100%
rename from public/keymaps/lfkeyboards_lfk87_default.json
rename to public/keymaps/lfkeyboards/lfk87/lfkeyboards_lfk87_default.json
diff --git a/public/keymaps/lfkeyboards_lfkpad_default.json b/public/keymaps/lfkeyboards/lfkpad/lfkeyboards_lfkpad_default.json
similarity index 100%
rename from public/keymaps/lfkeyboards_lfkpad_default.json
rename to public/keymaps/lfkeyboards/lfkpad/lfkeyboards_lfkpad_default.json
diff --git a/public/keymaps/lfkeyboards_smk65_default.json b/public/keymaps/lfkeyboards/smk65/lfkeyboards_smk65_default.json
similarity index 100%
rename from public/keymaps/lfkeyboards_smk65_default.json
rename to public/keymaps/lfkeyboards/smk65/lfkeyboards_smk65_default.json
diff --git a/public/keymaps/lily58_rev1_default.json b/public/keymaps/lily58/rev1/lily58_rev1_default.json
similarity index 100%
rename from public/keymaps/lily58_rev1_default.json
rename to public/keymaps/lily58/rev1/lily58_rev1_default.json
diff --git a/public/keymaps/m0lly_default.json b/public/keymaps/m0lly/m0lly_default.json
similarity index 100%
rename from public/keymaps/m0lly_default.json
rename to public/keymaps/m0lly/m0lly_default.json
diff --git a/public/keymaps/m10a_default.json b/public/keymaps/m10a/m10a_default.json
similarity index 100%
rename from public/keymaps/m10a_default.json
rename to public/keymaps/m10a/m10a_default.json
diff --git a/public/keymaps/maartenwut_atom47_rev2_default.json b/public/keymaps/maartenwut/atom47/rev2/maartenwut_atom47_rev2_default.json
similarity index 100%
rename from public/keymaps/maartenwut_atom47_rev2_default.json
rename to public/keymaps/maartenwut/atom47/rev2/maartenwut_atom47_rev2_default.json
diff --git a/public/keymaps/maartenwut_atom47_rev3_default.json b/public/keymaps/maartenwut/atom47/rev3/maartenwut_atom47_rev3_default.json
similarity index 100%
rename from public/keymaps/maartenwut_atom47_rev3_default.json
rename to public/keymaps/maartenwut/atom47/rev3/maartenwut_atom47_rev3_default.json
diff --git a/public/keymaps/maartenwut_plain60_default.json b/public/keymaps/maartenwut/plain60/maartenwut_plain60_default.json
similarity index 100%
rename from public/keymaps/maartenwut_plain60_default.json
rename to public/keymaps/maartenwut/plain60/maartenwut_plain60_default.json
diff --git a/public/keymaps/maartenwut_ta65_default.json b/public/keymaps/maartenwut/ta65/maartenwut_ta65_default.json
similarity index 100%
rename from public/keymaps/maartenwut_ta65_default.json
rename to public/keymaps/maartenwut/ta65/maartenwut_ta65_default.json
diff --git a/public/keymaps/maartenwut_wasdat_default.json b/public/keymaps/maartenwut/wasdat/maartenwut_wasdat_default.json
similarity index 100%
rename from public/keymaps/maartenwut_wasdat_default.json
rename to public/keymaps/maartenwut/wasdat/maartenwut_wasdat_default.json
diff --git a/public/keymaps/maartenwut_wonderland_default.json b/public/keymaps/maartenwut/wonderland/maartenwut_wonderland_default.json
similarity index 100%
rename from public/keymaps/maartenwut_wonderland_default.json
rename to public/keymaps/maartenwut/wonderland/maartenwut_wonderland_default.json
diff --git a/public/keymaps/massdrop_alt_default.json b/public/keymaps/massdrop/alt/massdrop_alt_default.json
similarity index 100%
rename from public/keymaps/massdrop_alt_default.json
rename to public/keymaps/massdrop/alt/massdrop_alt_default.json
diff --git a/public/keymaps/massdrop_ctrl_default.json b/public/keymaps/massdrop/ctrl/massdrop_ctrl_default.json
similarity index 100%
rename from public/keymaps/massdrop_ctrl_default.json
rename to public/keymaps/massdrop/ctrl/massdrop_ctrl_default.json
diff --git a/public/keymaps/matrix_m12og_default.json b/public/keymaps/matrix/m12og/matrix_m12og_default.json
similarity index 100%
rename from public/keymaps/matrix_m12og_default.json
rename to public/keymaps/matrix/m12og/matrix_m12og_default.json
diff --git a/public/keymaps/maxipad_promicro_default.json b/public/keymaps/maxipad/promicro/maxipad_promicro_default.json
similarity index 100%
rename from public/keymaps/maxipad_promicro_default.json
rename to public/keymaps/maxipad/promicro/maxipad_promicro_default.json
diff --git a/public/keymaps/maxipad_teensy2_default.json b/public/keymaps/maxipad/teensy2/maxipad_teensy2_default.json
similarity index 100%
rename from public/keymaps/maxipad_teensy2_default.json
rename to public/keymaps/maxipad/teensy2/maxipad_teensy2_default.json
diff --git a/public/keymaps/maxr1998_phoebe_default.json b/public/keymaps/maxr1998/phoebe/maxr1998_phoebe_default.json
similarity index 100%
rename from public/keymaps/maxr1998_phoebe_default.json
rename to public/keymaps/maxr1998/phoebe/maxr1998_phoebe_default.json
diff --git a/public/keymaps/maxr1998_pulse4k_default.json b/public/keymaps/maxr1998/pulse4k/maxr1998_pulse4k_default.json
similarity index 100%
rename from public/keymaps/maxr1998_pulse4k_default.json
rename to public/keymaps/maxr1998/pulse4k/maxr1998_pulse4k_default.json
diff --git a/public/keymaps/mechkeys_mk60_default.json b/public/keymaps/mechkeys/mk60/mechkeys_mk60_default.json
similarity index 100%
rename from public/keymaps/mechkeys_mk60_default.json
rename to public/keymaps/mechkeys/mk60/mechkeys_mk60_default.json
diff --git a/public/keymaps/mechllama_g35_v1_default.json b/public/keymaps/mechllama/g35/v1/mechllama_g35_v1_default.json
similarity index 100%
rename from public/keymaps/mechllama_g35_v1_default.json
rename to public/keymaps/mechllama/g35/v1/mechllama_g35_v1_default.json
diff --git a/public/keymaps/mechllama_g35_v2_default.json b/public/keymaps/mechllama/g35/v2/mechllama_g35_v2_default.json
similarity index 100%
rename from public/keymaps/mechllama_g35_v2_default.json
rename to public/keymaps/mechllama/g35/v2/mechllama_g35_v2_default.json
diff --git a/public/keymaps/mechlovin_hannah910_default.json b/public/keymaps/mechlovin/hannah910/mechlovin_hannah910_default.json
similarity index 100%
rename from public/keymaps/mechlovin_hannah910_default.json
rename to public/keymaps/mechlovin/hannah910/mechlovin_hannah910_default.json
diff --git a/public/keymaps/mechmini_v1_default.json b/public/keymaps/mechmini/v1/mechmini_v1_default.json
similarity index 100%
rename from public/keymaps/mechmini_v1_default.json
rename to public/keymaps/mechmini/v1/mechmini_v1_default.json
diff --git a/public/keymaps/mechmini_v2_default.json b/public/keymaps/mechmini/v2/mechmini_v2_default.json
similarity index 100%
rename from public/keymaps/mechmini_v2_default.json
rename to public/keymaps/mechmini/v2/mechmini_v2_default.json
diff --git a/public/keymaps/mehkee96_default.json b/public/keymaps/mehkee96/mehkee96_default.json
similarity index 100%
rename from public/keymaps/mehkee96_default.json
rename to public/keymaps/mehkee96/mehkee96_default.json
diff --git a/public/keymaps/meira_featherble_default.json b/public/keymaps/meira/featherble/meira_featherble_default.json
similarity index 100%
rename from public/keymaps/meira_featherble_default.json
rename to public/keymaps/meira/featherble/meira_featherble_default.json
diff --git a/public/keymaps/meira_promicro_default.json b/public/keymaps/meira/promicro/meira_promicro_default.json
similarity index 100%
rename from public/keymaps/meira_promicro_default.json
rename to public/keymaps/meira/promicro/meira_promicro_default.json
diff --git a/public/keymaps/meishi_default.json b/public/keymaps/meishi/meishi_default.json
similarity index 100%
rename from public/keymaps/meishi_default.json
rename to public/keymaps/meishi/meishi_default.json
diff --git a/public/keymaps/meishi2_default.json b/public/keymaps/meishi2/meishi2_default.json
similarity index 100%
rename from public/keymaps/meishi2_default.json
rename to public/keymaps/meishi2/meishi2_default.json
diff --git a/public/keymaps/melody96_default.json b/public/keymaps/melody96/melody96_default.json
similarity index 100%
rename from public/keymaps/melody96_default.json
rename to public/keymaps/melody96/melody96_default.json
diff --git a/public/keymaps/meme_default.json b/public/keymaps/meme/meme_default.json
similarity index 100%
rename from public/keymaps/meme_default.json
rename to public/keymaps/meme/meme_default.json
diff --git a/public/keymaps/meson_default.json b/public/keymaps/meson/meson_default.json
similarity index 100%
rename from public/keymaps/meson_default.json
rename to public/keymaps/meson/meson_default.json
diff --git a/public/keymaps/miniaxe_default.json b/public/keymaps/miniaxe/miniaxe_default.json
similarity index 100%
rename from public/keymaps/miniaxe_default.json
rename to public/keymaps/miniaxe/miniaxe_default.json
diff --git a/public/keymaps/minidox_rev1_default.json b/public/keymaps/minidox/rev1/minidox_rev1_default.json
similarity index 100%
rename from public/keymaps/minidox_rev1_default.json
rename to public/keymaps/minidox/rev1/minidox_rev1_default.json
diff --git a/public/keymaps/mint60_default.json b/public/keymaps/mint60/mint60_default.json
similarity index 100%
rename from public/keymaps/mint60_default.json
rename to public/keymaps/mint60/mint60_default.json
diff --git a/public/keymaps/mitosis_default.json b/public/keymaps/mitosis/mitosis_default.json
similarity index 100%
rename from public/keymaps/mitosis_default.json
rename to public/keymaps/mitosis/mitosis_default.json
diff --git a/public/keymaps/miuni32_default.json b/public/keymaps/miuni32/miuni32_default.json
similarity index 100%
rename from public/keymaps/miuni32_default.json
rename to public/keymaps/miuni32/miuni32_default.json
diff --git a/public/keymaps/model01_default.json b/public/keymaps/model01/model01_default.json
similarity index 100%
rename from public/keymaps/model01_default.json
rename to public/keymaps/model01/model01_default.json
diff --git a/public/keymaps/moon_default.json b/public/keymaps/moon/moon_default.json
similarity index 100%
rename from public/keymaps/moon_default.json
rename to public/keymaps/moon/moon_default.json
diff --git a/public/keymaps/mt40_default.json b/public/keymaps/mt40/mt40_default.json
similarity index 100%
rename from public/keymaps/mt40_default.json
rename to public/keymaps/mt40/mt40_default.json
diff --git a/public/keymaps/mt980_default.json b/public/keymaps/mt980/mt980_default.json
similarity index 100%
rename from public/keymaps/mt980_default.json
rename to public/keymaps/mt980/mt980_default.json
diff --git a/public/keymaps/mxss_default.json b/public/keymaps/mxss/mxss_default.json
similarity index 100%
rename from public/keymaps/mxss_default.json
rename to public/keymaps/mxss/mxss_default.json
diff --git a/public/keymaps/nafuda_default.json b/public/keymaps/nafuda/nafuda_default.json
similarity index 100%
rename from public/keymaps/nafuda_default.json
rename to public/keymaps/nafuda/nafuda_default.json
diff --git a/public/keymaps/naked48_rev1_default.json b/public/keymaps/naked48/rev1/naked48_rev1_default.json
similarity index 100%
rename from public/keymaps/naked48_rev1_default.json
rename to public/keymaps/naked48/rev1/naked48_rev1_default.json
diff --git a/public/keymaps/naked60_rev1_default.json b/public/keymaps/naked60/rev1/naked60_rev1_default.json
similarity index 100%
rename from public/keymaps/naked60_rev1_default.json
rename to public/keymaps/naked60/rev1/naked60_rev1_default.json
diff --git a/public/keymaps/naked64_rev1_default.json b/public/keymaps/naked64/rev1/naked64_rev1_default.json
similarity index 100%
rename from public/keymaps/naked64_rev1_default.json
rename to public/keymaps/naked64/rev1/naked64_rev1_default.json
diff --git a/public/keymaps/namecard2x4_rev1_default.json b/public/keymaps/namecard2x4/rev1/namecard2x4_rev1_default.json
similarity index 100%
rename from public/keymaps/namecard2x4_rev1_default.json
rename to public/keymaps/namecard2x4/rev1/namecard2x4_rev1_default.json
diff --git a/public/keymaps/namecard2x4_rev2_default.json b/public/keymaps/namecard2x4/rev2/namecard2x4_rev2_default.json
similarity index 100%
rename from public/keymaps/namecard2x4_rev2_default.json
rename to public/keymaps/namecard2x4/rev2/namecard2x4_rev2_default.json
diff --git a/public/keymaps/nek_type_a_default.json b/public/keymaps/nek_type_a/nek_type_a_default.json
similarity index 100%
rename from public/keymaps/nek_type_a_default.json
rename to public/keymaps/nek_type_a/nek_type_a_default.json
diff --git a/public/keymaps/newgame40_default.json b/public/keymaps/newgame40/newgame40_default.json
similarity index 100%
rename from public/keymaps/newgame40_default.json
rename to public/keymaps/newgame40/newgame40_default.json
diff --git a/public/keymaps/nightmare_default.json b/public/keymaps/nightmare/nightmare_default.json
similarity index 100%
rename from public/keymaps/nightmare_default.json
rename to public/keymaps/nightmare/nightmare_default.json
diff --git a/public/keymaps/niu_mini_default.json b/public/keymaps/niu_mini/niu_mini_default.json
similarity index 100%
rename from public/keymaps/niu_mini_default.json
rename to public/keymaps/niu_mini/niu_mini_default.json
diff --git a/public/keymaps/nk65_default.json b/public/keymaps/nk65/nk65_default.json
similarity index 100%
rename from public/keymaps/nk65_default.json
rename to public/keymaps/nk65/nk65_default.json
diff --git a/public/keymaps/nomu30_default.json b/public/keymaps/nomu30/nomu30_default.json
similarity index 100%
rename from public/keymaps/nomu30_default.json
rename to public/keymaps/nomu30/nomu30_default.json
diff --git a/public/keymaps/novelpad_default.json b/public/keymaps/novelpad/novelpad_default.json
similarity index 100%
rename from public/keymaps/novelpad_default.json
rename to public/keymaps/novelpad/novelpad_default.json
diff --git a/public/keymaps/noxary_220_default.json b/public/keymaps/noxary/220/noxary_220_default.json
similarity index 100%
rename from public/keymaps/noxary_220_default.json
rename to public/keymaps/noxary/220/noxary_220_default.json
diff --git a/public/keymaps/noxary_260_default.json b/public/keymaps/noxary/260/noxary_260_default.json
similarity index 100%
rename from public/keymaps/noxary_260_default.json
rename to public/keymaps/noxary/260/noxary_260_default.json
diff --git a/public/keymaps/noxary_268_default.json b/public/keymaps/noxary/268/noxary_268_default.json
similarity index 100%
rename from public/keymaps/noxary_268_default.json
rename to public/keymaps/noxary/268/noxary_268_default.json
diff --git a/public/keymaps/noxary_268_2_default.json b/public/keymaps/noxary/268_2/noxary_268_2_default.json
similarity index 100%
rename from public/keymaps/noxary_268_2_default.json
rename to public/keymaps/noxary/268_2/noxary_268_2_default.json
diff --git a/public/keymaps/noxary_280_default.json b/public/keymaps/noxary/280/noxary_280_default.json
similarity index 100%
rename from public/keymaps/noxary_280_default.json
rename to public/keymaps/noxary/280/noxary_280_default.json
diff --git a/public/keymaps/noxary_x268_default.json b/public/keymaps/noxary/x268/noxary_x268_default.json
similarity index 100%
rename from public/keymaps/noxary_x268_default.json
rename to public/keymaps/noxary/x268/noxary_x268_default.json
diff --git a/public/keymaps/ok60_default.json b/public/keymaps/ok60/ok60_default.json
similarity index 100%
rename from public/keymaps/ok60_default.json
rename to public/keymaps/ok60/ok60_default.json
diff --git a/public/keymaps/omnikey_blackheart_default.json b/public/keymaps/omnikey_blackheart/omnikey_blackheart_default.json
similarity index 100%
rename from public/keymaps/omnikey_blackheart_default.json
rename to public/keymaps/omnikey_blackheart/omnikey_blackheart_default.json
diff --git a/public/keymaps/omnikeyish_default.json b/public/keymaps/omnikeyish/omnikeyish_default.json
similarity index 100%
rename from public/keymaps/omnikeyish_default.json
rename to public/keymaps/omnikeyish/omnikeyish_default.json
diff --git a/public/keymaps/orange75_default.json b/public/keymaps/orange75/orange75_default.json
similarity index 100%
rename from public/keymaps/orange75_default.json
rename to public/keymaps/orange75/orange75_default.json
diff --git a/public/keymaps/org60_default.json b/public/keymaps/org60/org60_default.json
similarity index 100%
rename from public/keymaps/org60_default.json
rename to public/keymaps/org60/org60_default.json
diff --git a/public/keymaps/orthodox_rev1_default.json b/public/keymaps/orthodox/rev1/orthodox_rev1_default.json
similarity index 100%
rename from public/keymaps/orthodox_rev1_default.json
rename to public/keymaps/orthodox/rev1/orthodox_rev1_default.json
diff --git a/public/keymaps/orthodox_rev3_default.json b/public/keymaps/orthodox/rev3/orthodox_rev3_default.json
similarity index 100%
rename from public/keymaps/orthodox_rev3_default.json
rename to public/keymaps/orthodox/rev3/orthodox_rev3_default.json
diff --git a/public/keymaps/orthodox_rev3_teensy_default.json b/public/keymaps/orthodox/rev3_teensy/orthodox_rev3_teensy_default.json
similarity index 100%
rename from public/keymaps/orthodox_rev3_teensy_default.json
rename to public/keymaps/orthodox/rev3_teensy/orthodox_rev3_teensy_default.json
diff --git a/public/keymaps/otaku_split_rev0_default.json b/public/keymaps/otaku_split/rev0/otaku_split_rev0_default.json
similarity index 100%
rename from public/keymaps/otaku_split_rev0_default.json
rename to public/keymaps/otaku_split/rev0/otaku_split_rev0_default.json
diff --git a/public/keymaps/otaku_split_rev1_default.json b/public/keymaps/otaku_split/rev1/otaku_split_rev1_default.json
similarity index 100%
rename from public/keymaps/otaku_split_rev1_default.json
rename to public/keymaps/otaku_split/rev1/otaku_split_rev1_default.json
diff --git a/public/keymaps/paladin64_default.json b/public/keymaps/paladin64/paladin64_default.json
similarity index 100%
rename from public/keymaps/paladin64_default.json
rename to public/keymaps/paladin64/paladin64_default.json
diff --git a/public/keymaps/panc60_default.json b/public/keymaps/panc60/panc60_default.json
similarity index 100%
rename from public/keymaps/panc60_default.json
rename to public/keymaps/panc60/panc60_default.json
diff --git a/public/keymaps/pancake_feather_default.json b/public/keymaps/pancake/feather/pancake_feather_default.json
similarity index 100%
rename from public/keymaps/pancake_feather_default.json
rename to public/keymaps/pancake/feather/pancake_feather_default.json
diff --git a/public/keymaps/pancake_promicro_default.json b/public/keymaps/pancake/promicro/pancake_promicro_default.json
similarity index 100%
rename from public/keymaps/pancake_promicro_default.json
rename to public/keymaps/pancake/promicro/pancake_promicro_default.json
diff --git a/public/keymaps/pearl_default.json b/public/keymaps/pearl/pearl_default.json
similarity index 100%
rename from public/keymaps/pearl_default.json
rename to public/keymaps/pearl/pearl_default.json
diff --git a/public/keymaps/peiorisboards_ixora_default.json b/public/keymaps/peiorisboards/ixora/peiorisboards_ixora_default.json
similarity index 100%
rename from public/keymaps/peiorisboards_ixora_default.json
rename to public/keymaps/peiorisboards/ixora/peiorisboards_ixora_default.json
diff --git a/public/keymaps/percent_booster_default.json b/public/keymaps/percent/booster/percent_booster_default.json
similarity index 100%
rename from public/keymaps/percent_booster_default.json
rename to public/keymaps/percent/booster/percent_booster_default.json
diff --git a/public/keymaps/percent_canoe_default.json b/public/keymaps/percent/canoe/percent_canoe_default.json
similarity index 100%
rename from public/keymaps/percent_canoe_default.json
rename to public/keymaps/percent/canoe/percent_canoe_default.json
diff --git a/public/keymaps/percent_skog_default.json b/public/keymaps/percent/skog/percent_skog_default.json
similarity index 100%
rename from public/keymaps/percent_skog_default.json
rename to public/keymaps/percent/skog/percent_skog_default.json
diff --git a/public/keymaps/percent_skog_lite_default.json b/public/keymaps/percent/skog_lite/percent_skog_lite_default.json
similarity index 100%
rename from public/keymaps/percent_skog_lite_default.json
rename to public/keymaps/percent/skog_lite/percent_skog_lite_default.json
diff --git a/public/keymaps/phantom_default.json b/public/keymaps/phantom/phantom_default.json
similarity index 100%
rename from public/keymaps/phantom_default.json
rename to public/keymaps/phantom/phantom_default.json
diff --git a/public/keymaps/pinky_3_default.json b/public/keymaps/pinky/3/pinky_3_default.json
similarity index 100%
rename from public/keymaps/pinky_3_default.json
rename to public/keymaps/pinky/3/pinky_3_default.json
diff --git a/public/keymaps/pinky_4_default.json b/public/keymaps/pinky/4/pinky_4_default.json
similarity index 100%
rename from public/keymaps/pinky_4_default.json
rename to public/keymaps/pinky/4/pinky_4_default.json
diff --git a/public/keymaps/plaid_default.json b/public/keymaps/plaid/plaid_default.json
similarity index 100%
rename from public/keymaps/plaid_default.json
rename to public/keymaps/plaid/plaid_default.json
diff --git a/public/keymaps/planck_ez_default.json b/public/keymaps/planck/ez/planck_ez_default.json
similarity index 100%
rename from public/keymaps/planck_ez_default.json
rename to public/keymaps/planck/ez/planck_ez_default.json
diff --git a/public/keymaps/planck_light_default.json b/public/keymaps/planck/light/planck_light_default.json
similarity index 100%
rename from public/keymaps/planck_light_default.json
rename to public/keymaps/planck/light/planck_light_default.json
diff --git a/public/keymaps/planck_rev1_default.json b/public/keymaps/planck/rev1/planck_rev1_default.json
similarity index 100%
rename from public/keymaps/planck_rev1_default.json
rename to public/keymaps/planck/rev1/planck_rev1_default.json
diff --git a/public/keymaps/planck_rev2_default.json b/public/keymaps/planck/rev2/planck_rev2_default.json
similarity index 100%
rename from public/keymaps/planck_rev2_default.json
rename to public/keymaps/planck/rev2/planck_rev2_default.json
diff --git a/public/keymaps/planck_rev3_default.json b/public/keymaps/planck/rev3/planck_rev3_default.json
similarity index 100%
rename from public/keymaps/planck_rev3_default.json
rename to public/keymaps/planck/rev3/planck_rev3_default.json
diff --git a/public/keymaps/planck_rev4_default.json b/public/keymaps/planck/rev4/planck_rev4_default.json
similarity index 100%
rename from public/keymaps/planck_rev4_default.json
rename to public/keymaps/planck/rev4/planck_rev4_default.json
diff --git a/public/keymaps/planck_rev5_default.json b/public/keymaps/planck/rev5/planck_rev5_default.json
similarity index 100%
rename from public/keymaps/planck_rev5_default.json
rename to public/keymaps/planck/rev5/planck_rev5_default.json
diff --git a/public/keymaps/planck_rev6_default.json b/public/keymaps/planck/rev6/planck_rev6_default.json
similarity index 100%
rename from public/keymaps/planck_rev6_default.json
rename to public/keymaps/planck/rev6/planck_rev6_default.json
diff --git a/public/keymaps/playkbtw_ca66_default.json b/public/keymaps/playkbtw/ca66/playkbtw_ca66_default.json
similarity index 100%
rename from public/keymaps/playkbtw_ca66_default.json
rename to public/keymaps/playkbtw/ca66/playkbtw_ca66_default.json
diff --git a/public/keymaps/playkbtw_pk60_default.json b/public/keymaps/playkbtw/pk60/playkbtw_pk60_default.json
similarity index 100%
rename from public/keymaps/playkbtw_pk60_default.json
rename to public/keymaps/playkbtw/pk60/playkbtw_pk60_default.json
diff --git a/public/keymaps/preonic_rev1_default.json b/public/keymaps/preonic/rev1/preonic_rev1_default.json
similarity index 100%
rename from public/keymaps/preonic_rev1_default.json
rename to public/keymaps/preonic/rev1/preonic_rev1_default.json
diff --git a/public/keymaps/preonic_rev2_default.json b/public/keymaps/preonic/rev2/preonic_rev2_default.json
similarity index 100%
rename from public/keymaps/preonic_rev2_default.json
rename to public/keymaps/preonic/rev2/preonic_rev2_default.json
diff --git a/public/keymaps/preonic_rev3_default.json b/public/keymaps/preonic/rev3/preonic_rev3_default.json
similarity index 100%
rename from public/keymaps/preonic_rev3_default.json
rename to public/keymaps/preonic/rev3/preonic_rev3_default.json
diff --git a/public/keymaps/primekb_prime_e_default.json b/public/keymaps/primekb/prime_e/primekb_prime_e_default.json
similarity index 100%
rename from public/keymaps/primekb_prime_e_default.json
rename to public/keymaps/primekb/prime_e/primekb_prime_e_default.json
diff --git a/public/keymaps/primekb_prime_l_default.json b/public/keymaps/primekb/prime_l/primekb_prime_l_default.json
similarity index 100%
rename from public/keymaps/primekb_prime_l_default.json
rename to public/keymaps/primekb/prime_l/primekb_prime_l_default.json
diff --git a/public/keymaps/primekb_prime_m_default.json b/public/keymaps/primekb/prime_m/primekb_prime_m_default.json
similarity index 100%
rename from public/keymaps/primekb_prime_m_default.json
rename to public/keymaps/primekb/prime_m/primekb_prime_m_default.json
diff --git a/public/keymaps/primekb_prime_o_default.json b/public/keymaps/primekb/prime_o/primekb_prime_o_default.json
similarity index 100%
rename from public/keymaps/primekb_prime_o_default.json
rename to public/keymaps/primekb/prime_o/primekb_prime_o_default.json
diff --git a/public/keymaps/primekb_prime_r_default.json b/public/keymaps/primekb/prime_r/primekb_prime_r_default.json
similarity index 100%
rename from public/keymaps/primekb_prime_r_default.json
rename to public/keymaps/primekb/prime_r/primekb_prime_r_default.json
diff --git a/public/keymaps/projectkb_alice_default.json b/public/keymaps/projectkb/alice/projectkb_alice_default.json
similarity index 100%
rename from public/keymaps/projectkb_alice_default.json
rename to public/keymaps/projectkb/alice/projectkb_alice_default.json
diff --git a/public/keymaps/puck_default.json b/public/keymaps/puck/puck_default.json
similarity index 100%
rename from public/keymaps/puck_default.json
rename to public/keymaps/puck/puck_default.json
diff --git a/public/keymaps/quantrik_kyuu_default.json b/public/keymaps/quantrik/kyuu/quantrik_kyuu_default.json
similarity index 100%
rename from public/keymaps/quantrik_kyuu_default.json
rename to public/keymaps/quantrik/kyuu/quantrik_kyuu_default.json
diff --git a/public/keymaps/qwertyydox_rev1_default.json b/public/keymaps/qwertyydox/rev1/qwertyydox_rev1_default.json
similarity index 100%
rename from public/keymaps/qwertyydox_rev1_default.json
rename to public/keymaps/qwertyydox/rev1/qwertyydox_rev1_default.json
diff --git a/public/keymaps/rabbit_rabbit68_default.json b/public/keymaps/rabbit/rabbit68/rabbit_rabbit68_default.json
similarity index 100%
rename from public/keymaps/rabbit_rabbit68_default.json
rename to public/keymaps/rabbit/rabbit68/rabbit_rabbit68_default.json
diff --git a/public/keymaps/redox_rev1_default.json b/public/keymaps/redox/rev1/redox_rev1_default.json
similarity index 100%
rename from public/keymaps/redox_rev1_default.json
rename to public/keymaps/redox/rev1/redox_rev1_default.json
diff --git a/public/keymaps/redox_w_default.json b/public/keymaps/redox_w/redox_w_default.json
similarity index 100%
rename from public/keymaps/redox_w_default.json
rename to public/keymaps/redox_w/redox_w_default.json
diff --git a/public/keymaps/redscarf_iiplus_verb_default.json b/public/keymaps/redscarf_iiplus/verb/redscarf_iiplus_verb_default.json
similarity index 100%
rename from public/keymaps/redscarf_iiplus_verb_default.json
rename to public/keymaps/redscarf_iiplus/verb/redscarf_iiplus_verb_default.json
diff --git a/public/keymaps/redscarf_iiplus_verc_default.json b/public/keymaps/redscarf_iiplus/verc/redscarf_iiplus_verc_default.json
similarity index 100%
rename from public/keymaps/redscarf_iiplus_verc_default.json
rename to public/keymaps/redscarf_iiplus/verc/redscarf_iiplus_verc_default.json
diff --git a/public/keymaps/redscarf_iiplus_verd_default.json b/public/keymaps/redscarf_iiplus/verd/redscarf_iiplus_verd_default.json
similarity index 100%
rename from public/keymaps/redscarf_iiplus_verd_default.json
rename to public/keymaps/redscarf_iiplus/verd/redscarf_iiplus_verd_default.json
diff --git a/public/keymaps/retro_75_default.json b/public/keymaps/retro_75/retro_75_default.json
similarity index 100%
rename from public/keymaps/retro_75_default.json
rename to public/keymaps/retro_75/retro_75_default.json
diff --git a/public/keymaps/reviung34_default.json b/public/keymaps/reviung34/reviung34_default.json
similarity index 100%
rename from public/keymaps/reviung34_default.json
rename to public/keymaps/reviung34/reviung34_default.json
diff --git a/public/keymaps/reviung39_default.json b/public/keymaps/reviung39/reviung39_default.json
similarity index 100%
rename from public/keymaps/reviung39_default.json
rename to public/keymaps/reviung39/reviung39_default.json
diff --git a/public/keymaps/rgbkb_sol_rev1_default.json b/public/keymaps/rgbkb/sol/rev1/rgbkb_sol_rev1_default.json
similarity index 100%
rename from public/keymaps/rgbkb_sol_rev1_default.json
rename to public/keymaps/rgbkb/sol/rev1/rgbkb_sol_rev1_default.json
diff --git a/public/keymaps/rgbkb_sol_rev2_default.json b/public/keymaps/rgbkb/sol/rev2/rgbkb_sol_rev2_default.json
similarity index 100%
rename from public/keymaps/rgbkb_sol_rev2_default.json
rename to public/keymaps/rgbkb/sol/rev2/rgbkb_sol_rev2_default.json
diff --git a/public/keymaps/rgbkb_zen_rev1_default.json b/public/keymaps/rgbkb/zen/rev1/rgbkb_zen_rev1_default.json
similarity index 100%
rename from public/keymaps/rgbkb_zen_rev1_default.json
rename to public/keymaps/rgbkb/zen/rev1/rgbkb_zen_rev1_default.json
diff --git a/public/keymaps/rgbkb_zen_rev2_default.json b/public/keymaps/rgbkb/zen/rev2/rgbkb_zen_rev2_default.json
similarity index 100%
rename from public/keymaps/rgbkb_zen_rev2_default.json
rename to public/keymaps/rgbkb/zen/rev2/rgbkb_zen_rev2_default.json
diff --git a/public/keymaps/rgbkb_zygomorph_rev1_default.json b/public/keymaps/rgbkb/zygomorph/rev1/rgbkb_zygomorph_rev1_default.json
similarity index 100%
rename from public/keymaps/rgbkb_zygomorph_rev1_default.json
rename to public/keymaps/rgbkb/zygomorph/rev1/rgbkb_zygomorph_rev1_default.json
diff --git a/public/keymaps/runner3680_3x6_default.json b/public/keymaps/runner3680/3x6/runner3680_3x6_default.json
similarity index 100%
rename from public/keymaps/runner3680_3x6_default.json
rename to public/keymaps/runner3680/3x6/runner3680_3x6_default.json
diff --git a/public/keymaps/runner3680_3x7_default.json b/public/keymaps/runner3680/3x7/runner3680_3x7_default.json
similarity index 100%
rename from public/keymaps/runner3680_3x7_default.json
rename to public/keymaps/runner3680/3x7/runner3680_3x7_default.json
diff --git a/public/keymaps/runner3680_3x8_default.json b/public/keymaps/runner3680/3x8/runner3680_3x8_default.json
similarity index 100%
rename from public/keymaps/runner3680_3x8_default.json
rename to public/keymaps/runner3680/3x8/runner3680_3x8_default.json
diff --git a/public/keymaps/runner3680_4x6_default.json b/public/keymaps/runner3680/4x6/runner3680_4x6_default.json
similarity index 100%
rename from public/keymaps/runner3680_4x6_default.json
rename to public/keymaps/runner3680/4x6/runner3680_4x6_default.json
diff --git a/public/keymaps/runner3680_4x7_default.json b/public/keymaps/runner3680/4x7/runner3680_4x7_default.json
similarity index 100%
rename from public/keymaps/runner3680_4x7_default.json
rename to public/keymaps/runner3680/4x7/runner3680_4x7_default.json
diff --git a/public/keymaps/runner3680_4x8_default.json b/public/keymaps/runner3680/4x8/runner3680_4x8_default.json
similarity index 100%
rename from public/keymaps/runner3680_4x8_default.json
rename to public/keymaps/runner3680/4x8/runner3680_4x8_default.json
diff --git a/public/keymaps/runner3680_5x6_default.json b/public/keymaps/runner3680/5x6/runner3680_5x6_default.json
similarity index 100%
rename from public/keymaps/runner3680_5x6_default.json
rename to public/keymaps/runner3680/5x6/runner3680_5x6_default.json
diff --git a/public/keymaps/runner3680_5x7_default.json b/public/keymaps/runner3680/5x7/runner3680_5x7_default.json
similarity index 100%
rename from public/keymaps/runner3680_5x7_default.json
rename to public/keymaps/runner3680/5x7/runner3680_5x7_default.json
diff --git a/public/keymaps/runner3680_5x8_default.json b/public/keymaps/runner3680/5x8/runner3680_5x8_default.json
similarity index 100%
rename from public/keymaps/runner3680_5x8_default.json
rename to public/keymaps/runner3680/5x8/runner3680_5x8_default.json
diff --git a/public/keymaps/s7_elephant_default.json b/public/keymaps/s7_elephant/s7_elephant_default.json
similarity index 100%
rename from public/keymaps/s7_elephant_default.json
rename to public/keymaps/s7_elephant/s7_elephant_default.json
diff --git a/public/keymaps/scarletbandana_default.json b/public/keymaps/scarletbandana/scarletbandana_default.json
similarity index 100%
rename from public/keymaps/scarletbandana_default.json
rename to public/keymaps/scarletbandana/scarletbandana_default.json
diff --git a/public/keymaps/sck_gtm_default.json b/public/keymaps/sck/gtm/sck_gtm_default.json
similarity index 100%
rename from public/keymaps/sck_gtm_default.json
rename to public/keymaps/sck/gtm/sck_gtm_default.json
diff --git a/public/keymaps/sck_m0116b_default.json b/public/keymaps/sck/m0116b/sck_m0116b_default.json
similarity index 100%
rename from public/keymaps/sck_m0116b_default.json
rename to public/keymaps/sck/m0116b/sck_m0116b_default.json
diff --git a/public/keymaps/sck_neiso_default.json b/public/keymaps/sck/neiso/sck_neiso_default.json
similarity index 100%
rename from public/keymaps/sck_neiso_default.json
rename to public/keymaps/sck/neiso/sck_neiso_default.json
diff --git a/public/keymaps/sck_osa_default.json b/public/keymaps/sck/osa/sck_osa_default.json
similarity index 100%
rename from public/keymaps/sck_osa_default.json
rename to public/keymaps/sck/osa/sck_osa_default.json
diff --git a/public/keymaps/scythe_default.json b/public/keymaps/scythe/scythe_default.json
similarity index 100%
rename from public/keymaps/scythe_default.json
rename to public/keymaps/scythe/scythe_default.json
diff --git a/public/keymaps/sentraq_number_pad_default.json b/public/keymaps/sentraq/number_pad/sentraq_number_pad_default.json
similarity index 100%
rename from public/keymaps/sentraq_number_pad_default.json
rename to public/keymaps/sentraq/number_pad/sentraq_number_pad_default.json
diff --git a/public/keymaps/sentraq_s60_x_default_default.json b/public/keymaps/sentraq/s60_x/default/sentraq_s60_x_default_default.json
similarity index 100%
rename from public/keymaps/sentraq_s60_x_default_default.json
rename to public/keymaps/sentraq/s60_x/default/sentraq_s60_x_default_default.json
diff --git a/public/keymaps/sentraq_s60_x_rgb_default.json b/public/keymaps/sentraq/s60_x/rgb/sentraq_s60_x_rgb_default.json
similarity index 100%
rename from public/keymaps/sentraq_s60_x_rgb_default.json
rename to public/keymaps/sentraq/s60_x/rgb/sentraq_s60_x_rgb_default.json
diff --git a/public/keymaps/sentraq_s65_plus_default.json b/public/keymaps/sentraq/s65_plus/sentraq_s65_plus_default.json
similarity index 100%
rename from public/keymaps/sentraq_s65_plus_default.json
rename to public/keymaps/sentraq/s65_plus/sentraq_s65_plus_default.json
diff --git a/public/keymaps/sentraq_s65_x_default.json b/public/keymaps/sentraq/s65_x/sentraq_s65_x_default.json
similarity index 100%
rename from public/keymaps/sentraq_s65_x_default.json
rename to public/keymaps/sentraq/s65_x/sentraq_s65_x_default.json
diff --git a/public/keymaps/setta21_rev1_default.json b/public/keymaps/setta21/rev1/setta21_rev1_default.json
similarity index 100%
rename from public/keymaps/setta21_rev1_default.json
rename to public/keymaps/setta21/rev1/setta21_rev1_default.json
diff --git a/public/keymaps/shiro_default.json b/public/keymaps/shiro/shiro_default.json
similarity index 100%
rename from public/keymaps/shiro_default.json
rename to public/keymaps/shiro/shiro_default.json
diff --git a/public/keymaps/signum_3_0_elitec_default.json b/public/keymaps/signum/3_0/elitec/signum_3_0_elitec_default.json
similarity index 100%
rename from public/keymaps/signum_3_0_elitec_default.json
rename to public/keymaps/signum/3_0/elitec/signum_3_0_elitec_default.json
diff --git a/public/keymaps/singa_default.json b/public/keymaps/singa/singa_default.json
similarity index 100%
rename from public/keymaps/singa_default.json
rename to public/keymaps/singa/singa_default.json
diff --git a/public/keymaps/sirius_unigo66_default.json b/public/keymaps/sirius/unigo66/sirius_unigo66_default.json
similarity index 100%
rename from public/keymaps/sirius_unigo66_default.json
rename to public/keymaps/sirius/unigo66/sirius_unigo66_default.json
diff --git a/public/keymaps/sixkeyboard_default.json b/public/keymaps/sixkeyboard/sixkeyboard_default.json
similarity index 100%
rename from public/keymaps/sixkeyboard_default.json
rename to public/keymaps/sixkeyboard/sixkeyboard_default.json
diff --git a/public/keymaps/smk60_default.json b/public/keymaps/smk60/smk60_default.json
similarity index 100%
rename from public/keymaps/smk60_default.json
rename to public/keymaps/smk60/smk60_default.json
diff --git a/public/keymaps/snagpad_default.json b/public/keymaps/snagpad/snagpad_default.json
similarity index 100%
rename from public/keymaps/snagpad_default.json
rename to public/keymaps/snagpad/snagpad_default.json
diff --git a/public/keymaps/snampad_default.json b/public/keymaps/snampad/snampad_default.json
similarity index 100%
rename from public/keymaps/snampad_default.json
rename to public/keymaps/snampad/snampad_default.json
diff --git a/public/keymaps/southpole_default.json b/public/keymaps/southpole/southpole_default.json
similarity index 100%
rename from public/keymaps/southpole_default.json
rename to public/keymaps/southpole/southpole_default.json
diff --git a/public/keymaps/spacetime_rev1_default.json b/public/keymaps/spacetime/rev1/spacetime_rev1_default.json
similarity index 100%
rename from public/keymaps/spacetime_rev1_default.json
rename to public/keymaps/spacetime/rev1/spacetime_rev1_default.json
diff --git a/public/keymaps/spacetime_rev2_default.json b/public/keymaps/spacetime/rev2/spacetime_rev2_default.json
similarity index 100%
rename from public/keymaps/spacetime_rev2_default.json
rename to public/keymaps/spacetime/rev2/spacetime_rev2_default.json
diff --git a/public/keymaps/speedo_default.json b/public/keymaps/speedo/speedo_default.json
similarity index 100%
rename from public/keymaps/speedo_default.json
rename to public/keymaps/speedo/speedo_default.json
diff --git a/public/keymaps/standaside_default.json b/public/keymaps/standaside/standaside_default.json
similarity index 100%
rename from public/keymaps/standaside_default.json
rename to public/keymaps/standaside/standaside_default.json
diff --git a/public/keymaps/staryu_default.json b/public/keymaps/staryu/staryu_default.json
similarity index 100%
rename from public/keymaps/staryu_default.json
rename to public/keymaps/staryu/staryu_default.json
diff --git a/public/keymaps/stella_default.json b/public/keymaps/stella/stella_default.json
similarity index 100%
rename from public/keymaps/stella_default.json
rename to public/keymaps/stella/stella_default.json
diff --git a/public/keymaps/suihankey_alpha_default.json b/public/keymaps/suihankey/alpha/suihankey_alpha_default.json
similarity index 100%
rename from public/keymaps/suihankey_alpha_default.json
rename to public/keymaps/suihankey/alpha/suihankey_alpha_default.json
diff --git a/public/keymaps/suihankey_rev1_default.json b/public/keymaps/suihankey/rev1/suihankey_rev1_default.json
similarity index 100%
rename from public/keymaps/suihankey_rev1_default.json
rename to public/keymaps/suihankey/rev1/suihankey_rev1_default.json
diff --git a/public/keymaps/suihankey_split_alpha_default.json b/public/keymaps/suihankey/split/alpha/suihankey_split_alpha_default.json
similarity index 100%
rename from public/keymaps/suihankey_split_alpha_default.json
rename to public/keymaps/suihankey/split/alpha/suihankey_split_alpha_default.json
diff --git a/public/keymaps/suihankey_split_rev1_default.json b/public/keymaps/suihankey/split/rev1/suihankey_split_rev1_default.json
similarity index 100%
rename from public/keymaps/suihankey_split_rev1_default.json
rename to public/keymaps/suihankey/split/rev1/suihankey_split_rev1_default.json
diff --git a/public/keymaps/sx60_default.json b/public/keymaps/sx60/sx60_default.json
similarity index 100%
rename from public/keymaps/sx60_default.json
rename to public/keymaps/sx60/sx60_default.json
diff --git a/public/keymaps/tada68_default.json b/public/keymaps/tada68/tada68_default.json
similarity index 100%
rename from public/keymaps/tada68_default.json
rename to public/keymaps/tada68/tada68_default.json
diff --git a/public/keymaps/tanuki_default.json b/public/keymaps/tanuki/tanuki_default.json
similarity index 100%
rename from public/keymaps/tanuki_default.json
rename to public/keymaps/tanuki/tanuki_default.json
diff --git a/public/keymaps/telophase_default.json b/public/keymaps/telophase/telophase_default.json
similarity index 100%
rename from public/keymaps/telophase_default.json
rename to public/keymaps/telophase/telophase_default.json
diff --git a/public/keymaps/tetris_default.json b/public/keymaps/tetris/tetris_default.json
similarity index 100%
rename from public/keymaps/tetris_default.json
rename to public/keymaps/tetris/tetris_default.json
diff --git a/public/keymaps/tg4x_default.json b/public/keymaps/tg4x/tg4x_default.json
similarity index 100%
rename from public/keymaps/tg4x_default.json
rename to public/keymaps/tg4x/tg4x_default.json
diff --git a/public/keymaps/tgr_alice_default.json b/public/keymaps/tgr/alice/tgr_alice_default.json
similarity index 100%
rename from public/keymaps/tgr_alice_default.json
rename to public/keymaps/tgr/alice/tgr_alice_default.json
diff --git a/public/keymaps/tgr_jane_default.json b/public/keymaps/tgr/jane/tgr_jane_default.json
similarity index 100%
rename from public/keymaps/tgr_jane_default.json
rename to public/keymaps/tgr/jane/tgr_jane_default.json
diff --git a/public/keymaps/the_ruler_default.json b/public/keymaps/the_ruler/the_ruler_default.json
similarity index 100%
rename from public/keymaps/the_ruler_default.json
rename to public/keymaps/the_ruler/the_ruler_default.json
diff --git a/public/keymaps/thevankeyboards_bananasplit_default.json b/public/keymaps/thevankeyboards/bananasplit/thevankeyboards_bananasplit_default.json
similarity index 100%
rename from public/keymaps/thevankeyboards_bananasplit_default.json
rename to public/keymaps/thevankeyboards/bananasplit/thevankeyboards_bananasplit_default.json
diff --git a/public/keymaps/thevankeyboards_caravan_default.json b/public/keymaps/thevankeyboards/caravan/thevankeyboards_caravan_default.json
similarity index 100%
rename from public/keymaps/thevankeyboards_caravan_default.json
rename to public/keymaps/thevankeyboards/caravan/thevankeyboards_caravan_default.json
diff --git a/public/keymaps/thevankeyboards_minivan_default.json b/public/keymaps/thevankeyboards/minivan/thevankeyboards_minivan_default.json
similarity index 100%
rename from public/keymaps/thevankeyboards_minivan_default.json
rename to public/keymaps/thevankeyboards/minivan/thevankeyboards_minivan_default.json
diff --git a/public/keymaps/thevankeyboards_roadkit_default.json b/public/keymaps/thevankeyboards/roadkit/thevankeyboards_roadkit_default.json
similarity index 100%
rename from public/keymaps/thevankeyboards_roadkit_default.json
rename to public/keymaps/thevankeyboards/roadkit/thevankeyboards_roadkit_default.json
diff --git a/public/keymaps/tkc1800_default.json b/public/keymaps/tkc1800/tkc1800_default.json
similarity index 100%
rename from public/keymaps/tkc1800_default.json
rename to public/keymaps/tkc1800/tkc1800_default.json
diff --git a/public/keymaps/tmo50_default.json b/public/keymaps/tmo50/tmo50_default.json
similarity index 100%
rename from public/keymaps/tmo50_default.json
rename to public/keymaps/tmo50/tmo50_default.json
diff --git a/public/keymaps/toad_default.json b/public/keymaps/toad/toad_default.json
similarity index 100%
rename from public/keymaps/toad_default.json
rename to public/keymaps/toad/toad_default.json
diff --git a/public/keymaps/tokyo60_default.json b/public/keymaps/tokyo60/tokyo60_default.json
similarity index 100%
rename from public/keymaps/tokyo60_default.json
rename to public/keymaps/tokyo60/tokyo60_default.json
diff --git a/public/keymaps/touchpad_default.json b/public/keymaps/touchpad/touchpad_default.json
similarity index 100%
rename from public/keymaps/touchpad_default.json
rename to public/keymaps/touchpad/touchpad_default.json
diff --git a/public/keymaps/treadstone32_default.json b/public/keymaps/treadstone32/treadstone32_default.json
similarity index 100%
rename from public/keymaps/treadstone32_default.json
rename to public/keymaps/treadstone32/treadstone32_default.json
diff --git a/public/keymaps/treadstone48_rev1_default.json b/public/keymaps/treadstone48/rev1/treadstone48_rev1_default.json
similarity index 100%
rename from public/keymaps/treadstone48_rev1_default.json
rename to public/keymaps/treadstone48/rev1/treadstone48_rev1_default.json
diff --git a/public/keymaps/treasure_type9_default.json b/public/keymaps/treasure/type9/treasure_type9_default.json
similarity index 100%
rename from public/keymaps/treasure_type9_default.json
rename to public/keymaps/treasure/type9/treasure_type9_default.json
diff --git a/public/keymaps/ua62_default.json b/public/keymaps/ua62/ua62_default.json
similarity index 100%
rename from public/keymaps/ua62_default.json
rename to public/keymaps/ua62/ua62_default.json
diff --git a/public/keymaps/uk78_default.json b/public/keymaps/uk78/uk78_default.json
similarity index 100%
rename from public/keymaps/uk78_default.json
rename to public/keymaps/uk78/uk78_default.json
diff --git a/public/keymaps/unikorn_default.json b/public/keymaps/unikorn/unikorn_default.json
similarity index 100%
rename from public/keymaps/unikorn_default.json
rename to public/keymaps/unikorn/unikorn_default.json
diff --git a/public/keymaps/ut472_default.json b/public/keymaps/ut472/ut472_default.json
similarity index 100%
rename from public/keymaps/ut472_default.json
rename to public/keymaps/ut472/ut472_default.json
diff --git a/public/keymaps/uzu42_rev1_default.json b/public/keymaps/uzu42/rev1/uzu42_rev1_default.json
similarity index 100%
rename from public/keymaps/uzu42_rev1_default.json
rename to public/keymaps/uzu42/rev1/uzu42_rev1_default.json
diff --git a/public/keymaps/v60_type_r_default.json b/public/keymaps/v60_type_r/v60_type_r_default.json
similarity index 100%
rename from public/keymaps/v60_type_r_default.json
rename to public/keymaps/v60_type_r/v60_type_r_default.json
diff --git a/public/keymaps/vinta_default.json b/public/keymaps/vinta/vinta_default.json
similarity index 100%
rename from public/keymaps/vinta_default.json
rename to public/keymaps/vinta/vinta_default.json
diff --git a/public/keymaps/vitamins_included_rev1_default.json b/public/keymaps/vitamins_included/rev1/vitamins_included_rev1_default.json
similarity index 100%
rename from public/keymaps/vitamins_included_rev1_default.json
rename to public/keymaps/vitamins_included/rev1/vitamins_included_rev1_default.json
diff --git a/public/keymaps/vitamins_included_rev2_default.json b/public/keymaps/vitamins_included/rev2/vitamins_included_rev2_default.json
similarity index 100%
rename from public/keymaps/vitamins_included_rev2_default.json
rename to public/keymaps/vitamins_included/rev2/vitamins_included_rev2_default.json
diff --git a/public/keymaps/vn66_default.json b/public/keymaps/vn66/vn66_default.json
similarity index 100%
rename from public/keymaps/vn66_default.json
rename to public/keymaps/vn66/vn66_default.json
diff --git a/public/keymaps/waldo_default.json b/public/keymaps/waldo/waldo_default.json
similarity index 100%
rename from public/keymaps/waldo_default.json
rename to public/keymaps/waldo/waldo_default.json
diff --git a/public/keymaps/westfoxtrot_aanzee_default.json b/public/keymaps/westfoxtrot/aanzee/westfoxtrot_aanzee_default.json
similarity index 100%
rename from public/keymaps/westfoxtrot_aanzee_default.json
rename to public/keymaps/westfoxtrot/aanzee/westfoxtrot_aanzee_default.json
diff --git a/public/keymaps/westfoxtrot_cypher_default.json b/public/keymaps/westfoxtrot/cypher/rev1/westfoxtrot_cypher_rev1_default.json
similarity index 98%
rename from public/keymaps/westfoxtrot_cypher_default.json
rename to public/keymaps/westfoxtrot/cypher/rev1/westfoxtrot_cypher_rev1_default.json
index 6ce3d6e618..30b96684f8 100644
--- a/public/keymaps/westfoxtrot_cypher_default.json
+++ b/public/keymaps/westfoxtrot/cypher/rev1/westfoxtrot_cypher_rev1_default.json
@@ -1,5 +1,5 @@
 {
-  "keyboard": "westfoxtrot/cypher",
+  "keyboard": "westfoxtrot/cypher/rev1",
   "keymap": "default_2308680",
   "commit": "23086808a78c9234232e2ddbf0c977d1fb2cb6ae",
   "layout": "LAYOUT_ansi",
diff --git a/public/keymaps/wilba_tech_rama_works_koyu_default.json b/public/keymaps/wilba_tech/rama_works_koyu/wilba_tech_rama_works_koyu_default.json
similarity index 100%
rename from public/keymaps/wilba_tech_rama_works_koyu_default.json
rename to public/keymaps/wilba_tech/rama_works_koyu/wilba_tech_rama_works_koyu_default.json
diff --git a/public/keymaps/wilba_tech_rama_works_m10_b_default.json b/public/keymaps/wilba_tech/rama_works_m10_b/wilba_tech_rama_works_m10_b_default.json
similarity index 100%
rename from public/keymaps/wilba_tech_rama_works_m10_b_default.json
rename to public/keymaps/wilba_tech/rama_works_m10_b/wilba_tech_rama_works_m10_b_default.json
diff --git a/public/keymaps/wilba_tech_rama_works_m60_a_default.json b/public/keymaps/wilba_tech/rama_works_m60_a/wilba_tech_rama_works_m60_a_default.json
similarity index 100%
rename from public/keymaps/wilba_tech_rama_works_m60_a_default.json
rename to public/keymaps/wilba_tech/rama_works_m60_a/wilba_tech_rama_works_m60_a_default.json
diff --git a/public/keymaps/wilba_tech_rama_works_m6_a_default.json b/public/keymaps/wilba_tech/rama_works_m6_a/wilba_tech_rama_works_m6_a_default.json
similarity index 100%
rename from public/keymaps/wilba_tech_rama_works_m6_a_default.json
rename to public/keymaps/wilba_tech/rama_works_m6_a/wilba_tech_rama_works_m6_a_default.json
diff --git a/public/keymaps/wilba_tech_rama_works_m6_b_default.json b/public/keymaps/wilba_tech/rama_works_m6_b/wilba_tech_rama_works_m6_b_default.json
similarity index 100%
rename from public/keymaps/wilba_tech_rama_works_m6_b_default.json
rename to public/keymaps/wilba_tech/rama_works_m6_b/wilba_tech_rama_works_m6_b_default.json
diff --git a/public/keymaps/wilba_tech_rama_works_u80_a_default.json b/public/keymaps/wilba_tech/rama_works_u80_a/wilba_tech_rama_works_u80_a_default.json
similarity index 100%
rename from public/keymaps/wilba_tech_rama_works_u80_a_default.json
rename to public/keymaps/wilba_tech/rama_works_u80_a/wilba_tech_rama_works_u80_a_default.json
diff --git a/public/keymaps/wilba_tech_wt60_a_default.json b/public/keymaps/wilba_tech/wt60_a/wilba_tech_wt60_a_default.json
similarity index 100%
rename from public/keymaps/wilba_tech_wt60_a_default.json
rename to public/keymaps/wilba_tech/wt60_a/wilba_tech_wt60_a_default.json
diff --git a/public/keymaps/wilba_tech_wt60_d_default.json b/public/keymaps/wilba_tech/wt60_d/wilba_tech_wt60_d_default.json
similarity index 100%
rename from public/keymaps/wilba_tech_wt60_d_default.json
rename to public/keymaps/wilba_tech/wt60_d/wilba_tech_wt60_d_default.json
diff --git a/public/keymaps/wilba_tech_wt65_a_default.json b/public/keymaps/wilba_tech/wt65_a/wilba_tech_wt65_a_default.json
similarity index 100%
rename from public/keymaps/wilba_tech_wt65_a_default.json
rename to public/keymaps/wilba_tech/wt65_a/wilba_tech_wt65_a_default.json
diff --git a/public/keymaps/wilba_tech_wt65_b_default.json b/public/keymaps/wilba_tech/wt65_b/wilba_tech_wt65_b_default.json
similarity index 100%
rename from public/keymaps/wilba_tech_wt65_b_default.json
rename to public/keymaps/wilba_tech/wt65_b/wilba_tech_wt65_b_default.json
diff --git a/public/keymaps/wilba_tech_wt69_a_default.json b/public/keymaps/wilba_tech/wt69_a/wilba_tech_wt69_a_default.json
similarity index 100%
rename from public/keymaps/wilba_tech_wt69_a_default.json
rename to public/keymaps/wilba_tech/wt69_a/wilba_tech_wt69_a_default.json
diff --git a/public/keymaps/wilba_tech_wt75_a_default.json b/public/keymaps/wilba_tech/wt75_a/wilba_tech_wt75_a_default.json
similarity index 100%
rename from public/keymaps/wilba_tech_wt75_a_default.json
rename to public/keymaps/wilba_tech/wt75_a/wilba_tech_wt75_a_default.json
diff --git a/public/keymaps/wilba_tech_wt75_b_default.json b/public/keymaps/wilba_tech/wt75_b/wilba_tech_wt75_b_default.json
similarity index 100%
rename from public/keymaps/wilba_tech_wt75_b_default.json
rename to public/keymaps/wilba_tech/wt75_b/wilba_tech_wt75_b_default.json
diff --git a/public/keymaps/wilba_tech_wt75_c_default.json b/public/keymaps/wilba_tech/wt75_c/wilba_tech_wt75_c_default.json
similarity index 100%
rename from public/keymaps/wilba_tech_wt75_c_default.json
rename to public/keymaps/wilba_tech/wt75_c/wilba_tech_wt75_c_default.json
diff --git a/public/keymaps/wilba_tech_wt80_a_default.json b/public/keymaps/wilba_tech/wt80_a/wilba_tech_wt80_a_default.json
similarity index 100%
rename from public/keymaps/wilba_tech_wt80_a_default.json
rename to public/keymaps/wilba_tech/wt80_a/wilba_tech_wt80_a_default.json
diff --git a/public/keymaps/wilba_tech_wt8_a_default.json b/public/keymaps/wilba_tech/wt8_a/wilba_tech_wt8_a_default.json
similarity index 100%
rename from public/keymaps/wilba_tech_wt8_a_default.json
rename to public/keymaps/wilba_tech/wt8_a/wilba_tech_wt8_a_default.json
diff --git a/public/keymaps/wilba_tech_zeal60_default.json b/public/keymaps/wilba_tech/zeal60/wilba_tech_zeal60_default.json
similarity index 100%
rename from public/keymaps/wilba_tech_zeal60_default.json
rename to public/keymaps/wilba_tech/zeal60/wilba_tech_zeal60_default.json
diff --git a/public/keymaps/wilba_tech_zeal65_default.json b/public/keymaps/wilba_tech/zeal65/wilba_tech_zeal65_default.json
similarity index 100%
rename from public/keymaps/wilba_tech_zeal65_default.json
rename to public/keymaps/wilba_tech/zeal65/wilba_tech_zeal65_default.json
diff --git a/public/keymaps/winkeyless_bface_default.json b/public/keymaps/winkeyless/bface/winkeyless_bface_default.json
similarity index 100%
rename from public/keymaps/winkeyless_bface_default.json
rename to public/keymaps/winkeyless/bface/winkeyless_bface_default.json
diff --git a/public/keymaps/winkeyless_bmini_default.json b/public/keymaps/winkeyless/bmini/winkeyless_bmini_default.json
similarity index 100%
rename from public/keymaps/winkeyless_bmini_default.json
rename to public/keymaps/winkeyless/bmini/winkeyless_bmini_default.json
diff --git a/public/keymaps/winkeyless_bminiex_default.json b/public/keymaps/winkeyless/bminiex/winkeyless_bminiex_default.json
similarity index 100%
rename from public/keymaps/winkeyless_bminiex_default.json
rename to public/keymaps/winkeyless/bminiex/winkeyless_bminiex_default.json
diff --git a/public/keymaps/xbows_knight_default.json b/public/keymaps/xbows/knight/xbows_knight_default.json
similarity index 100%
rename from public/keymaps/xbows_knight_default.json
rename to public/keymaps/xbows/knight/xbows_knight_default.json
diff --git a/public/keymaps/xbows_woody_default.json b/public/keymaps/xbows/woody/xbows_woody_default.json
similarity index 100%
rename from public/keymaps/xbows_woody_default.json
rename to public/keymaps/xbows/woody/xbows_woody_default.json
diff --git a/public/keymaps/xd004_v1_default.json b/public/keymaps/xd004/v1/xd004_v1_default.json
similarity index 100%
rename from public/keymaps/xd004_v1_default.json
rename to public/keymaps/xd004/v1/xd004_v1_default.json
diff --git a/public/keymaps/xd60_rev2_default.json b/public/keymaps/xd60/rev2/xd60_rev2_default.json
similarity index 100%
rename from public/keymaps/xd60_rev2_default.json
rename to public/keymaps/xd60/rev2/xd60_rev2_default.json
diff --git a/public/keymaps/xd60_rev3_default.json b/public/keymaps/xd60/rev3/xd60_rev3_default.json
similarity index 100%
rename from public/keymaps/xd60_rev3_default.json
rename to public/keymaps/xd60/rev3/xd60_rev3_default.json
diff --git a/public/keymaps/xd68_default.json b/public/keymaps/xd68/xd68_default.json
similarity index 100%
rename from public/keymaps/xd68_default.json
rename to public/keymaps/xd68/xd68_default.json
diff --git a/public/keymaps/xd75_default.json b/public/keymaps/xd75/xd75_default.json
similarity index 100%
rename from public/keymaps/xd75_default.json
rename to public/keymaps/xd75/xd75_default.json
diff --git a/public/keymaps/xd84_default.json b/public/keymaps/xd84/xd84_default.json
similarity index 100%
rename from public/keymaps/xd84_default.json
rename to public/keymaps/xd84/xd84_default.json
diff --git a/public/keymaps/xd87_default.json b/public/keymaps/xd87/xd87_default.json
similarity index 100%
rename from public/keymaps/xd87_default.json
rename to public/keymaps/xd87/xd87_default.json
diff --git a/public/keymaps/xd96_default.json b/public/keymaps/xd96/xd96_default.json
similarity index 100%
rename from public/keymaps/xd96_default.json
rename to public/keymaps/xd96/xd96_default.json
diff --git a/public/keymaps/xelus_dawn60_default.json b/public/keymaps/xelus/dawn60/xelus_dawn60_default.json
similarity index 100%
rename from public/keymaps/xelus_dawn60_default.json
rename to public/keymaps/xelus/dawn60/xelus_dawn60_default.json
diff --git a/public/keymaps/xiaomi_mk02_default.json b/public/keymaps/xiaomi/mk02/xiaomi_mk02_default.json
similarity index 100%
rename from public/keymaps/xiaomi_mk02_default.json
rename to public/keymaps/xiaomi/mk02/xiaomi_mk02_default.json
diff --git a/public/keymaps/xmmx_default.json b/public/keymaps/xmmx/xmmx_default.json
similarity index 100%
rename from public/keymaps/xmmx_default.json
rename to public/keymaps/xmmx/xmmx_default.json
diff --git a/public/keymaps/xw60_default.json b/public/keymaps/xw60/xw60_default.json
similarity index 100%
rename from public/keymaps/xw60_default.json
rename to public/keymaps/xw60/xw60_default.json
diff --git a/public/keymaps/yatara_drink_me_default.json b/public/keymaps/yatara/drink_me/yatara_drink_me_default.json
similarity index 100%
rename from public/keymaps/yatara_drink_me_default.json
rename to public/keymaps/yatara/drink_me/yatara_drink_me_default.json
diff --git a/public/keymaps/yd60mq_default.json b/public/keymaps/yd60mq/yd60mq_default.json
similarity index 100%
rename from public/keymaps/yd60mq_default.json
rename to public/keymaps/yd60mq/yd60mq_default.json
diff --git a/public/keymaps/yd68_default.json b/public/keymaps/yd68/yd68_default.json
similarity index 100%
rename from public/keymaps/yd68_default.json
rename to public/keymaps/yd68/yd68_default.json
diff --git a/public/keymaps/ymd75_default.json b/public/keymaps/ymd75/ymd75_default.json
similarity index 100%
rename from public/keymaps/ymd75_default.json
rename to public/keymaps/ymd75/ymd75_default.json
diff --git a/public/keymaps/ymd96_default.json b/public/keymaps/ymd96/ymd96_default.json
similarity index 100%
rename from public/keymaps/ymd96_default.json
rename to public/keymaps/ymd96/ymd96_default.json
diff --git a/public/keymaps/ymdk_bface_default.json b/public/keymaps/ymdk/bface/ymdk_bface_default.json
similarity index 100%
rename from public/keymaps/ymdk_bface_default.json
rename to public/keymaps/ymdk/bface/ymdk_bface_default.json
diff --git a/public/keymaps/ymdk_ymd09_default.json b/public/keymaps/ymdk/ymd09/ymdk_ymd09_default.json
similarity index 100%
rename from public/keymaps/ymdk_ymd09_default.json
rename to public/keymaps/ymdk/ymd09/ymdk_ymd09_default.json
diff --git a/public/keymaps/ymdk_ymd67_default.json b/public/keymaps/ymdk/ymd67/ymdk_ymd67_default.json
similarity index 100%
rename from public/keymaps/ymdk_ymd67_default.json
rename to public/keymaps/ymdk/ymd67/ymdk_ymd67_default.json
diff --git a/public/keymaps/yosino58_rev1_default.json b/public/keymaps/yosino58/rev1/yosino58_rev1_default.json
similarity index 100%
rename from public/keymaps/yosino58_rev1_default.json
rename to public/keymaps/yosino58/rev1/yosino58_rev1_default.json
diff --git a/public/keymaps/yurei_default.json b/public/keymaps/yurei/yurei_default.json
similarity index 100%
rename from public/keymaps/yurei_default.json
rename to public/keymaps/yurei/yurei_default.json
diff --git a/public/keymaps/z150_blackheart_default.json b/public/keymaps/z150_blackheart/z150_blackheart_default.json
similarity index 100%
rename from public/keymaps/z150_blackheart_default.json
rename to public/keymaps/z150_blackheart/z150_blackheart_default.json
diff --git a/public/keymaps/zinc_rev1_default.json b/public/keymaps/zinc/rev1/zinc_rev1_default.json
similarity index 100%
rename from public/keymaps/zinc_rev1_default.json
rename to public/keymaps/zinc/rev1/zinc_rev1_default.json
diff --git a/public/keymaps/zinc_reva_default.json b/public/keymaps/zinc/reva/zinc_reva_default.json
similarity index 100%
rename from public/keymaps/zinc_reva_default.json
rename to public/keymaps/zinc/reva/zinc_reva_default.json
diff --git a/public/keymaps/zj68_default.json b/public/keymaps/zj68/zj68_default.json
similarity index 100%
rename from public/keymaps/zj68_default.json
rename to public/keymaps/zj68/zj68_default.json
diff --git a/public/keymaps/zlant_default.json b/public/keymaps/zlant/zlant_default.json
similarity index 100%
rename from public/keymaps/zlant_default.json
rename to public/keymaps/zlant/zlant_default.json