diff --git a/base16_3024.yaml b/base16/base16_3024.yaml
similarity index 100%
rename from base16_3024.yaml
rename to base16/base16_3024.yaml
diff --git a/base16_apathy.yaml b/base16/base16_apathy.yaml
similarity index 100%
rename from base16_apathy.yaml
rename to base16/base16_apathy.yaml
diff --git a/base16_apprentice.yaml b/base16/base16_apprentice.yaml
similarity index 100%
rename from base16_apprentice.yaml
rename to base16/base16_apprentice.yaml
diff --git a/base16_ashes.yaml b/base16/base16_ashes.yaml
similarity index 100%
rename from base16_ashes.yaml
rename to base16/base16_ashes.yaml
diff --git a/base16_atelier_cave.yaml b/base16/base16_atelier_cave.yaml
similarity index 100%
rename from base16_atelier_cave.yaml
rename to base16/base16_atelier_cave.yaml
diff --git a/base16_atelier_cave_light.yaml b/base16/base16_atelier_cave_light.yaml
similarity index 100%
rename from base16_atelier_cave_light.yaml
rename to base16/base16_atelier_cave_light.yaml
diff --git a/base16_atelier_dune.yaml b/base16/base16_atelier_dune.yaml
similarity index 100%
rename from base16_atelier_dune.yaml
rename to base16/base16_atelier_dune.yaml
diff --git a/base16_atelier_dune_light.yaml b/base16/base16_atelier_dune_light.yaml
similarity index 100%
rename from base16_atelier_dune_light.yaml
rename to base16/base16_atelier_dune_light.yaml
diff --git a/base16_atelier_estuary.yaml b/base16/base16_atelier_estuary.yaml
similarity index 100%
rename from base16_atelier_estuary.yaml
rename to base16/base16_atelier_estuary.yaml
diff --git a/base16_atelier_estuary_light.yaml b/base16/base16_atelier_estuary_light.yaml
similarity index 100%
rename from base16_atelier_estuary_light.yaml
rename to base16/base16_atelier_estuary_light.yaml
diff --git a/base16_atelier_forest.yaml b/base16/base16_atelier_forest.yaml
similarity index 100%
rename from base16_atelier_forest.yaml
rename to base16/base16_atelier_forest.yaml
diff --git a/base16_atelier_forest_light.yaml b/base16/base16_atelier_forest_light.yaml
similarity index 100%
rename from base16_atelier_forest_light.yaml
rename to base16/base16_atelier_forest_light.yaml
diff --git a/base16_atelier_heath.yaml b/base16/base16_atelier_heath.yaml
similarity index 100%
rename from base16_atelier_heath.yaml
rename to base16/base16_atelier_heath.yaml
diff --git a/base16_atelier_heath_light.yaml b/base16/base16_atelier_heath_light.yaml
similarity index 100%
rename from base16_atelier_heath_light.yaml
rename to base16/base16_atelier_heath_light.yaml
diff --git a/base16_atelier_lakeside.yaml b/base16/base16_atelier_lakeside.yaml
similarity index 100%
rename from base16_atelier_lakeside.yaml
rename to base16/base16_atelier_lakeside.yaml
diff --git a/base16_atelier_lakeside_light.yaml b/base16/base16_atelier_lakeside_light.yaml
similarity index 100%
rename from base16_atelier_lakeside_light.yaml
rename to base16/base16_atelier_lakeside_light.yaml
diff --git a/base16_atelier_plateau.yaml b/base16/base16_atelier_plateau.yaml
similarity index 100%
rename from base16_atelier_plateau.yaml
rename to base16/base16_atelier_plateau.yaml
diff --git a/base16_atelier_plateau_light.yaml b/base16/base16_atelier_plateau_light.yaml
similarity index 100%
rename from base16_atelier_plateau_light.yaml
rename to base16/base16_atelier_plateau_light.yaml
diff --git a/base16_atelier_savanna.yaml b/base16/base16_atelier_savanna.yaml
similarity index 100%
rename from base16_atelier_savanna.yaml
rename to base16/base16_atelier_savanna.yaml
diff --git a/base16_atelier_savanna_light.yaml b/base16/base16_atelier_savanna_light.yaml
similarity index 100%
rename from base16_atelier_savanna_light.yaml
rename to base16/base16_atelier_savanna_light.yaml
diff --git a/base16_atelier_seaside.yaml b/base16/base16_atelier_seaside.yaml
similarity index 100%
rename from base16_atelier_seaside.yaml
rename to base16/base16_atelier_seaside.yaml
diff --git a/base16_atelier_seaside_light.yaml b/base16/base16_atelier_seaside_light.yaml
similarity index 100%
rename from base16_atelier_seaside_light.yaml
rename to base16/base16_atelier_seaside_light.yaml
diff --git a/base16_atelier_sulphurpool.yaml b/base16/base16_atelier_sulphurpool.yaml
similarity index 100%
rename from base16_atelier_sulphurpool.yaml
rename to base16/base16_atelier_sulphurpool.yaml
diff --git a/base16_atelier_sulphurpool_light.yaml b/base16/base16_atelier_sulphurpool_light.yaml
similarity index 100%
rename from base16_atelier_sulphurpool_light.yaml
rename to base16/base16_atelier_sulphurpool_light.yaml
diff --git a/base16_atlas.yaml b/base16/base16_atlas.yaml
similarity index 100%
rename from base16_atlas.yaml
rename to base16/base16_atlas.yaml
diff --git a/base16_bespin.yaml b/base16/base16_bespin.yaml
similarity index 100%
rename from base16_bespin.yaml
rename to base16/base16_bespin.yaml
diff --git a/base16_black_metal.yaml b/base16/base16_black_metal.yaml
similarity index 100%
rename from base16_black_metal.yaml
rename to base16/base16_black_metal.yaml
diff --git a/base16_black_metal_bathory.yaml b/base16/base16_black_metal_bathory.yaml
similarity index 100%
rename from base16_black_metal_bathory.yaml
rename to base16/base16_black_metal_bathory.yaml
diff --git a/base16_black_metal_burzum.yaml b/base16/base16_black_metal_burzum.yaml
similarity index 100%
rename from base16_black_metal_burzum.yaml
rename to base16/base16_black_metal_burzum.yaml
diff --git a/base16_black_metal_dark_funeral.yaml b/base16/base16_black_metal_dark_funeral.yaml
similarity index 100%
rename from base16_black_metal_dark_funeral.yaml
rename to base16/base16_black_metal_dark_funeral.yaml
diff --git a/base16_black_metal_gorgoroth.yaml b/base16/base16_black_metal_gorgoroth.yaml
similarity index 100%
rename from base16_black_metal_gorgoroth.yaml
rename to base16/base16_black_metal_gorgoroth.yaml
diff --git a/base16_black_metal_immortal.yaml b/base16/base16_black_metal_immortal.yaml
similarity index 100%
rename from base16_black_metal_immortal.yaml
rename to base16/base16_black_metal_immortal.yaml
diff --git a/base16_black_metal_khold.yaml b/base16/base16_black_metal_khold.yaml
similarity index 100%
rename from base16_black_metal_khold.yaml
rename to base16/base16_black_metal_khold.yaml
diff --git a/base16_black_metal_marduk.yaml b/base16/base16_black_metal_marduk.yaml
similarity index 100%
rename from base16_black_metal_marduk.yaml
rename to base16/base16_black_metal_marduk.yaml
diff --git a/base16_black_metal_mayhem.yaml b/base16/base16_black_metal_mayhem.yaml
similarity index 100%
rename from base16_black_metal_mayhem.yaml
rename to base16/base16_black_metal_mayhem.yaml
diff --git a/base16_black_metal_nile.yaml b/base16/base16_black_metal_nile.yaml
similarity index 100%
rename from base16_black_metal_nile.yaml
rename to base16/base16_black_metal_nile.yaml
diff --git a/base16_black_metal_venom.yaml b/base16/base16_black_metal_venom.yaml
similarity index 100%
rename from base16_black_metal_venom.yaml
rename to base16/base16_black_metal_venom.yaml
diff --git a/base16_brewer.yaml b/base16/base16_brewer.yaml
similarity index 100%
rename from base16_brewer.yaml
rename to base16/base16_brewer.yaml
diff --git a/base16_bright.yaml b/base16/base16_bright.yaml
similarity index 100%
rename from base16_bright.yaml
rename to base16/base16_bright.yaml
diff --git a/base16_brogrammer.yaml b/base16/base16_brogrammer.yaml
similarity index 100%
rename from base16_brogrammer.yaml
rename to base16/base16_brogrammer.yaml
diff --git a/base16_brushtrees.yaml b/base16/base16_brushtrees.yaml
similarity index 100%
rename from base16_brushtrees.yaml
rename to base16/base16_brushtrees.yaml
diff --git a/base16_brushtrees_dark.yaml b/base16/base16_brushtrees_dark.yaml
similarity index 100%
rename from base16_brushtrees_dark.yaml
rename to base16/base16_brushtrees_dark.yaml
diff --git a/base16_chalk.yaml b/base16/base16_chalk.yaml
similarity index 100%
rename from base16_chalk.yaml
rename to base16/base16_chalk.yaml
diff --git a/base16_circus.yaml b/base16/base16_circus.yaml
similarity index 100%
rename from base16_circus.yaml
rename to base16/base16_circus.yaml
diff --git a/base16_classic_dark.yaml b/base16/base16_classic_dark.yaml
similarity index 100%
rename from base16_classic_dark.yaml
rename to base16/base16_classic_dark.yaml
diff --git a/base16_classic_light.yaml b/base16/base16_classic_light.yaml
similarity index 100%
rename from base16_classic_light.yaml
rename to base16/base16_classic_light.yaml
diff --git a/base16_codeschool.yaml b/base16/base16_codeschool.yaml
similarity index 100%
rename from base16_codeschool.yaml
rename to base16/base16_codeschool.yaml
diff --git a/base16_cupcake.yaml b/base16/base16_cupcake.yaml
similarity index 100%
rename from base16_cupcake.yaml
rename to base16/base16_cupcake.yaml
diff --git a/base16_cupertino.yaml b/base16/base16_cupertino.yaml
similarity index 100%
rename from base16_cupertino.yaml
rename to base16/base16_cupertino.yaml
diff --git a/base16_danqing.yaml b/base16/base16_danqing.yaml
similarity index 100%
rename from base16_danqing.yaml
rename to base16/base16_danqing.yaml
diff --git a/base16_darcula.yaml b/base16/base16_darcula.yaml
similarity index 100%
rename from base16_darcula.yaml
rename to base16/base16_darcula.yaml
diff --git a/base16_darkmoss.yaml b/base16/base16_darkmoss.yaml
similarity index 100%
rename from base16_darkmoss.yaml
rename to base16/base16_darkmoss.yaml
diff --git a/base16_darktooth.yaml b/base16/base16_darktooth.yaml
similarity index 100%
rename from base16_darktooth.yaml
rename to base16/base16_darktooth.yaml
diff --git a/base16_darkviolet.yaml b/base16/base16_darkviolet.yaml
similarity index 100%
rename from base16_darkviolet.yaml
rename to base16/base16_darkviolet.yaml
diff --git a/base16_decaf.yaml b/base16/base16_decaf.yaml
similarity index 100%
rename from base16_decaf.yaml
rename to base16/base16_decaf.yaml
diff --git a/base16_default_dark.yaml b/base16/base16_default_dark.yaml
similarity index 100%
rename from base16_default_dark.yaml
rename to base16/base16_default_dark.yaml
diff --git a/base16_default_light.yaml b/base16/base16_default_light.yaml
similarity index 100%
rename from base16_default_light.yaml
rename to base16/base16_default_light.yaml
diff --git a/base16_dirtysea.yaml b/base16/base16_dirtysea.yaml
similarity index 100%
rename from base16_dirtysea.yaml
rename to base16/base16_dirtysea.yaml
diff --git a/base16_dracula.yaml b/base16/base16_dracula.yaml
similarity index 100%
rename from base16_dracula.yaml
rename to base16/base16_dracula.yaml
diff --git a/base16_edge_dark.yaml b/base16/base16_edge_dark.yaml
similarity index 100%
rename from base16_edge_dark.yaml
rename to base16/base16_edge_dark.yaml
diff --git a/base16_edge_light.yaml b/base16/base16_edge_light.yaml
similarity index 100%
rename from base16_edge_light.yaml
rename to base16/base16_edge_light.yaml
diff --git a/base16_eighties.yaml b/base16/base16_eighties.yaml
similarity index 100%
rename from base16_eighties.yaml
rename to base16/base16_eighties.yaml
diff --git a/base16_embers.yaml b/base16/base16_embers.yaml
similarity index 100%
rename from base16_embers.yaml
rename to base16/base16_embers.yaml
diff --git a/base16_equilibrium_dark.yaml b/base16/base16_equilibrium_dark.yaml
similarity index 100%
rename from base16_equilibrium_dark.yaml
rename to base16/base16_equilibrium_dark.yaml
diff --git a/base16_equilibrium_gray_dark.yaml b/base16/base16_equilibrium_gray_dark.yaml
similarity index 100%
rename from base16_equilibrium_gray_dark.yaml
rename to base16/base16_equilibrium_gray_dark.yaml
diff --git a/base16_equilibrium_gray_light.yaml b/base16/base16_equilibrium_gray_light.yaml
similarity index 100%
rename from base16_equilibrium_gray_light.yaml
rename to base16/base16_equilibrium_gray_light.yaml
diff --git a/base16_equilibrium_light.yaml b/base16/base16_equilibrium_light.yaml
similarity index 100%
rename from base16_equilibrium_light.yaml
rename to base16/base16_equilibrium_light.yaml
diff --git a/base16_espresso.yaml b/base16/base16_espresso.yaml
similarity index 100%
rename from base16_espresso.yaml
rename to base16/base16_espresso.yaml
diff --git a/base16_eva.yaml b/base16/base16_eva.yaml
similarity index 100%
rename from base16_eva.yaml
rename to base16/base16_eva.yaml
diff --git a/base16_eva_dim.yaml b/base16/base16_eva_dim.yaml
similarity index 100%
rename from base16_eva_dim.yaml
rename to base16/base16_eva_dim.yaml
diff --git a/base16_flat.yaml b/base16/base16_flat.yaml
similarity index 100%
rename from base16_flat.yaml
rename to base16/base16_flat.yaml
diff --git a/base16_framer.yaml b/base16/base16_framer.yaml
similarity index 100%
rename from base16_framer.yaml
rename to base16/base16_framer.yaml
diff --git a/base16_fruit_soda.yaml b/base16/base16_fruit_soda.yaml
similarity index 100%
rename from base16_fruit_soda.yaml
rename to base16/base16_fruit_soda.yaml
diff --git a/base16_gigavolt.yaml b/base16/base16_gigavolt.yaml
similarity index 100%
rename from base16_gigavolt.yaml
rename to base16/base16_gigavolt.yaml
diff --git a/base16_github.yaml b/base16/base16_github.yaml
similarity index 100%
rename from base16_github.yaml
rename to base16/base16_github.yaml
diff --git a/base16_google_dark.yaml b/base16/base16_google_dark.yaml
similarity index 100%
rename from base16_google_dark.yaml
rename to base16/base16_google_dark.yaml
diff --git a/base16_google_light.yaml b/base16/base16_google_light.yaml
similarity index 100%
rename from base16_google_light.yaml
rename to base16/base16_google_light.yaml
diff --git a/base16_grayscale_dark.yaml b/base16/base16_grayscale_dark.yaml
similarity index 100%
rename from base16_grayscale_dark.yaml
rename to base16/base16_grayscale_dark.yaml
diff --git a/base16_grayscale_light.yaml b/base16/base16_grayscale_light.yaml
similarity index 100%
rename from base16_grayscale_light.yaml
rename to base16/base16_grayscale_light.yaml
diff --git a/base16_greenscreen.yaml b/base16/base16_greenscreen.yaml
similarity index 100%
rename from base16_greenscreen.yaml
rename to base16/base16_greenscreen.yaml
diff --git a/base16_gruvbox_dark_hard.yaml b/base16/base16_gruvbox_dark_hard.yaml
similarity index 100%
rename from base16_gruvbox_dark_hard.yaml
rename to base16/base16_gruvbox_dark_hard.yaml
diff --git a/base16_gruvbox_dark_medium.yaml b/base16/base16_gruvbox_dark_medium.yaml
similarity index 100%
rename from base16_gruvbox_dark_medium.yaml
rename to base16/base16_gruvbox_dark_medium.yaml
diff --git a/base16_gruvbox_dark_pale.yaml b/base16/base16_gruvbox_dark_pale.yaml
similarity index 100%
rename from base16_gruvbox_dark_pale.yaml
rename to base16/base16_gruvbox_dark_pale.yaml
diff --git a/base16_gruvbox_dark_soft.yaml b/base16/base16_gruvbox_dark_soft.yaml
similarity index 100%
rename from base16_gruvbox_dark_soft.yaml
rename to base16/base16_gruvbox_dark_soft.yaml
diff --git a/base16_gruvbox_light_hard.yaml b/base16/base16_gruvbox_light_hard.yaml
similarity index 100%
rename from base16_gruvbox_light_hard.yaml
rename to base16/base16_gruvbox_light_hard.yaml
diff --git a/base16_gruvbox_light_medium.yaml b/base16/base16_gruvbox_light_medium.yaml
similarity index 100%
rename from base16_gruvbox_light_medium.yaml
rename to base16/base16_gruvbox_light_medium.yaml
diff --git a/base16_gruvbox_light_soft.yaml b/base16/base16_gruvbox_light_soft.yaml
similarity index 100%
rename from base16_gruvbox_light_soft.yaml
rename to base16/base16_gruvbox_light_soft.yaml
diff --git a/base16_hardcore.yaml b/base16/base16_hardcore.yaml
similarity index 100%
rename from base16_hardcore.yaml
rename to base16/base16_hardcore.yaml
diff --git a/base16_harmonic_dark.yaml b/base16/base16_harmonic_dark.yaml
similarity index 100%
rename from base16_harmonic_dark.yaml
rename to base16/base16_harmonic_dark.yaml
diff --git a/base16_harmonic_light.yaml b/base16/base16_harmonic_light.yaml
similarity index 100%
rename from base16_harmonic_light.yaml
rename to base16/base16_harmonic_light.yaml
diff --git a/base16_heetch.yaml b/base16/base16_heetch.yaml
similarity index 100%
rename from base16_heetch.yaml
rename to base16/base16_heetch.yaml
diff --git a/base16_heetch_light.yaml b/base16/base16_heetch_light.yaml
similarity index 100%
rename from base16_heetch_light.yaml
rename to base16/base16_heetch_light.yaml
diff --git a/base16_helios.yaml b/base16/base16_helios.yaml
similarity index 100%
rename from base16_helios.yaml
rename to base16/base16_helios.yaml
diff --git a/base16_hopscotch.yaml b/base16/base16_hopscotch.yaml
similarity index 100%
rename from base16_hopscotch.yaml
rename to base16/base16_hopscotch.yaml
diff --git a/base16_horizon_dark.yaml b/base16/base16_horizon_dark.yaml
similarity index 100%
rename from base16_horizon_dark.yaml
rename to base16/base16_horizon_dark.yaml
diff --git a/base16_horizon_light.yaml b/base16/base16_horizon_light.yaml
similarity index 100%
rename from base16_horizon_light.yaml
rename to base16/base16_horizon_light.yaml
diff --git a/base16_horizon_terminal_dark.yaml b/base16/base16_horizon_terminal_dark.yaml
similarity index 100%
rename from base16_horizon_terminal_dark.yaml
rename to base16/base16_horizon_terminal_dark.yaml
diff --git a/base16_horizon_terminal_light.yaml b/base16/base16_horizon_terminal_light.yaml
similarity index 100%
rename from base16_horizon_terminal_light.yaml
rename to base16/base16_horizon_terminal_light.yaml
diff --git a/base16_humanoid_dark.yaml b/base16/base16_humanoid_dark.yaml
similarity index 100%
rename from base16_humanoid_dark.yaml
rename to base16/base16_humanoid_dark.yaml
diff --git a/base16_humanoid_light.yaml b/base16/base16_humanoid_light.yaml
similarity index 100%
rename from base16_humanoid_light.yaml
rename to base16/base16_humanoid_light.yaml
diff --git a/base16_ia_dark.yaml b/base16/base16_ia_dark.yaml
similarity index 100%
rename from base16_ia_dark.yaml
rename to base16/base16_ia_dark.yaml
diff --git a/base16_ia_light.yaml b/base16/base16_ia_light.yaml
similarity index 100%
rename from base16_ia_light.yaml
rename to base16/base16_ia_light.yaml
diff --git a/base16_icy.yaml b/base16/base16_icy.yaml
similarity index 100%
rename from base16_icy.yaml
rename to base16/base16_icy.yaml
diff --git a/base16_irblack.yaml b/base16/base16_irblack.yaml
similarity index 100%
rename from base16_irblack.yaml
rename to base16/base16_irblack.yaml
diff --git a/base16_isotope.yaml b/base16/base16_isotope.yaml
similarity index 100%
rename from base16_isotope.yaml
rename to base16/base16_isotope.yaml
diff --git a/base16_kimber.yaml b/base16/base16_kimber.yaml
similarity index 100%
rename from base16_kimber.yaml
rename to base16/base16_kimber.yaml
diff --git a/base16_macintosh.yaml b/base16/base16_macintosh.yaml
similarity index 100%
rename from base16_macintosh.yaml
rename to base16/base16_macintosh.yaml
diff --git a/base16_marrakesh.yaml b/base16/base16_marrakesh.yaml
similarity index 100%
rename from base16_marrakesh.yaml
rename to base16/base16_marrakesh.yaml
diff --git a/base16_materia.yaml b/base16/base16_materia.yaml
similarity index 100%
rename from base16_materia.yaml
rename to base16/base16_materia.yaml
diff --git a/base16_material.yaml b/base16/base16_material.yaml
similarity index 100%
rename from base16_material.yaml
rename to base16/base16_material.yaml
diff --git a/base16_material_darker.yaml b/base16/base16_material_darker.yaml
similarity index 100%
rename from base16_material_darker.yaml
rename to base16/base16_material_darker.yaml
diff --git a/base16_material_lighter.yaml b/base16/base16_material_lighter.yaml
similarity index 100%
rename from base16_material_lighter.yaml
rename to base16/base16_material_lighter.yaml
diff --git a/base16_material_palenight.yaml b/base16/base16_material_palenight.yaml
similarity index 100%
rename from base16_material_palenight.yaml
rename to base16/base16_material_palenight.yaml
diff --git a/base16_material_vivid.yaml b/base16/base16_material_vivid.yaml
similarity index 100%
rename from base16_material_vivid.yaml
rename to base16/base16_material_vivid.yaml
diff --git a/base16_mellow_purple.yaml b/base16/base16_mellow_purple.yaml
similarity index 100%
rename from base16_mellow_purple.yaml
rename to base16/base16_mellow_purple.yaml
diff --git a/base16_mexico_light.yaml b/base16/base16_mexico_light.yaml
similarity index 100%
rename from base16_mexico_light.yaml
rename to base16/base16_mexico_light.yaml
diff --git a/base16_mocha.yaml b/base16/base16_mocha.yaml
similarity index 100%
rename from base16_mocha.yaml
rename to base16/base16_mocha.yaml
diff --git a/base16_monokai.yaml b/base16/base16_monokai.yaml
similarity index 100%
rename from base16_monokai.yaml
rename to base16/base16_monokai.yaml
diff --git a/base16_nebula.yaml b/base16/base16_nebula.yaml
similarity index 100%
rename from base16_nebula.yaml
rename to base16/base16_nebula.yaml
diff --git a/base16_nord.yaml b/base16/base16_nord.yaml
similarity index 100%
rename from base16_nord.yaml
rename to base16/base16_nord.yaml
diff --git a/base16_nova.yaml b/base16/base16_nova.yaml
similarity index 100%
rename from base16_nova.yaml
rename to base16/base16_nova.yaml
diff --git a/base16_ocean.yaml b/base16/base16_ocean.yaml
similarity index 100%
rename from base16_ocean.yaml
rename to base16/base16_ocean.yaml
diff --git a/base16_oceanicnext.yaml b/base16/base16_oceanicnext.yaml
similarity index 100%
rename from base16_oceanicnext.yaml
rename to base16/base16_oceanicnext.yaml
diff --git a/base16_one_light.yaml b/base16/base16_one_light.yaml
similarity index 100%
rename from base16_one_light.yaml
rename to base16/base16_one_light.yaml
diff --git a/base16_onedark.yaml b/base16/base16_onedark.yaml
similarity index 100%
rename from base16_onedark.yaml
rename to base16/base16_onedark.yaml
diff --git a/base16_outrun_dark.yaml b/base16/base16_outrun_dark.yaml
similarity index 100%
rename from base16_outrun_dark.yaml
rename to base16/base16_outrun_dark.yaml
diff --git a/base16_papercolor_dark.yaml b/base16/base16_papercolor_dark.yaml
similarity index 100%
rename from base16_papercolor_dark.yaml
rename to base16/base16_papercolor_dark.yaml
diff --git a/base16_papercolor_light.yaml b/base16/base16_papercolor_light.yaml
similarity index 100%
rename from base16_papercolor_light.yaml
rename to base16/base16_papercolor_light.yaml
diff --git a/base16_paraiso.yaml b/base16/base16_paraiso.yaml
similarity index 100%
rename from base16_paraiso.yaml
rename to base16/base16_paraiso.yaml
diff --git a/base16_pasque.yaml b/base16/base16_pasque.yaml
similarity index 100%
rename from base16_pasque.yaml
rename to base16/base16_pasque.yaml
diff --git a/base16_phd.yaml b/base16/base16_phd.yaml
similarity index 100%
rename from base16_phd.yaml
rename to base16/base16_phd.yaml
diff --git a/base16_pico.yaml b/base16/base16_pico.yaml
similarity index 100%
rename from base16_pico.yaml
rename to base16/base16_pico.yaml
diff --git a/base16_pop.yaml b/base16/base16_pop.yaml
similarity index 100%
rename from base16_pop.yaml
rename to base16/base16_pop.yaml
diff --git a/base16_porple.yaml b/base16/base16_porple.yaml
similarity index 100%
rename from base16_porple.yaml
rename to base16/base16_porple.yaml
diff --git a/base16_railscasts.yaml b/base16/base16_railscasts.yaml
similarity index 100%
rename from base16_railscasts.yaml
rename to base16/base16_railscasts.yaml
diff --git a/base16_rebecca.yaml b/base16/base16_rebecca.yaml
similarity index 100%
rename from base16_rebecca.yaml
rename to base16/base16_rebecca.yaml
diff --git a/base16_rose_pine.yaml b/base16/base16_rose_pine.yaml
similarity index 100%
rename from base16_rose_pine.yaml
rename to base16/base16_rose_pine.yaml
diff --git a/base16_rose_pine_dawn.yaml b/base16/base16_rose_pine_dawn.yaml
similarity index 100%
rename from base16_rose_pine_dawn.yaml
rename to base16/base16_rose_pine_dawn.yaml
diff --git a/base16_rose_pine_moon.yaml b/base16/base16_rose_pine_moon.yaml
similarity index 100%
rename from base16_rose_pine_moon.yaml
rename to base16/base16_rose_pine_moon.yaml
diff --git a/base16_sagelight.yaml b/base16/base16_sagelight.yaml
similarity index 100%
rename from base16_sagelight.yaml
rename to base16/base16_sagelight.yaml
diff --git a/base16_sandcastle.yaml b/base16/base16_sandcastle.yaml
similarity index 100%
rename from base16_sandcastle.yaml
rename to base16/base16_sandcastle.yaml
diff --git a/base16_seti.yaml b/base16/base16_seti.yaml
similarity index 100%
rename from base16_seti.yaml
rename to base16/base16_seti.yaml
diff --git a/base16_shapeshifter.yaml b/base16/base16_shapeshifter.yaml
similarity index 100%
rename from base16_shapeshifter.yaml
rename to base16/base16_shapeshifter.yaml
diff --git a/base16_silk_dark.yaml b/base16/base16_silk_dark.yaml
similarity index 100%
rename from base16_silk_dark.yaml
rename to base16/base16_silk_dark.yaml
diff --git a/base16_silk_light.yaml b/base16/base16_silk_light.yaml
similarity index 100%
rename from base16_silk_light.yaml
rename to base16/base16_silk_light.yaml
diff --git a/base16_snazzy.yaml b/base16/base16_snazzy.yaml
similarity index 100%
rename from base16_snazzy.yaml
rename to base16/base16_snazzy.yaml
diff --git a/base16_solarflare.yaml b/base16/base16_solarflare.yaml
similarity index 100%
rename from base16_solarflare.yaml
rename to base16/base16_solarflare.yaml
diff --git a/base16_solarflare_light.yaml b/base16/base16_solarflare_light.yaml
similarity index 100%
rename from base16_solarflare_light.yaml
rename to base16/base16_solarflare_light.yaml
diff --git a/base16_solarized_dark.yaml b/base16/base16_solarized_dark.yaml
similarity index 100%
rename from base16_solarized_dark.yaml
rename to base16/base16_solarized_dark.yaml
diff --git a/base16_solarized_light.yaml b/base16/base16_solarized_light.yaml
similarity index 100%
rename from base16_solarized_light.yaml
rename to base16/base16_solarized_light.yaml
diff --git a/base16_spacemacs.yaml b/base16/base16_spacemacs.yaml
similarity index 100%
rename from base16_spacemacs.yaml
rename to base16/base16_spacemacs.yaml
diff --git a/base16_summercamp.yaml b/base16/base16_summercamp.yaml
similarity index 100%
rename from base16_summercamp.yaml
rename to base16/base16_summercamp.yaml
diff --git a/base16_summerfruit_dark.yaml b/base16/base16_summerfruit_dark.yaml
similarity index 100%
rename from base16_summerfruit_dark.yaml
rename to base16/base16_summerfruit_dark.yaml
diff --git a/base16_summerfruit_light.yaml b/base16/base16_summerfruit_light.yaml
similarity index 100%
rename from base16_summerfruit_light.yaml
rename to base16/base16_summerfruit_light.yaml
diff --git a/base16_synth_midnight_dark.yaml b/base16/base16_synth_midnight_dark.yaml
similarity index 100%
rename from base16_synth_midnight_dark.yaml
rename to base16/base16_synth_midnight_dark.yaml
diff --git a/base16_synth_midnight_light.yaml b/base16/base16_synth_midnight_light.yaml
similarity index 100%
rename from base16_synth_midnight_light.yaml
rename to base16/base16_synth_midnight_light.yaml
diff --git a/base16_tango.yaml b/base16/base16_tango.yaml
similarity index 100%
rename from base16_tango.yaml
rename to base16/base16_tango.yaml
diff --git a/base16_tender.yaml b/base16/base16_tender.yaml
similarity index 100%
rename from base16_tender.yaml
rename to base16/base16_tender.yaml
diff --git a/base16_tomorrow.yaml b/base16/base16_tomorrow.yaml
similarity index 100%
rename from base16_tomorrow.yaml
rename to base16/base16_tomorrow.yaml
diff --git a/base16_tomorrow_night.yaml b/base16/base16_tomorrow_night.yaml
similarity index 100%
rename from base16_tomorrow_night.yaml
rename to base16/base16_tomorrow_night.yaml
diff --git a/base16_tomorrow_night_eighties.yaml b/base16/base16_tomorrow_night_eighties.yaml
similarity index 100%
rename from base16_tomorrow_night_eighties.yaml
rename to base16/base16_tomorrow_night_eighties.yaml
diff --git a/base16_tube.yaml b/base16/base16_tube.yaml
similarity index 100%
rename from base16_tube.yaml
rename to base16/base16_tube.yaml
diff --git a/base16_twilight.yaml b/base16/base16_twilight.yaml
similarity index 100%
rename from base16_twilight.yaml
rename to base16/base16_twilight.yaml
diff --git a/base16_unikitty_dark.yaml b/base16/base16_unikitty_dark.yaml
similarity index 100%
rename from base16_unikitty_dark.yaml
rename to base16/base16_unikitty_dark.yaml
diff --git a/base16_unikitty_light.yaml b/base16/base16_unikitty_light.yaml
similarity index 100%
rename from base16_unikitty_light.yaml
rename to base16/base16_unikitty_light.yaml
diff --git a/base16_vulcan.yaml b/base16/base16_vulcan.yaml
similarity index 100%
rename from base16_vulcan.yaml
rename to base16/base16_vulcan.yaml
diff --git a/base16_windows_10.yaml b/base16/base16_windows_10.yaml
similarity index 100%
rename from base16_windows_10.yaml
rename to base16/base16_windows_10.yaml
diff --git a/base16_windows_10_light.yaml b/base16/base16_windows_10_light.yaml
similarity index 100%
rename from base16_windows_10_light.yaml
rename to base16/base16_windows_10_light.yaml
diff --git a/base16_windows_95.yaml b/base16/base16_windows_95.yaml
similarity index 100%
rename from base16_windows_95.yaml
rename to base16/base16_windows_95.yaml
diff --git a/base16_windows_95_light.yaml b/base16/base16_windows_95_light.yaml
similarity index 100%
rename from base16_windows_95_light.yaml
rename to base16/base16_windows_95_light.yaml
diff --git a/base16_windows_highcontrast.yaml b/base16/base16_windows_highcontrast.yaml
similarity index 100%
rename from base16_windows_highcontrast.yaml
rename to base16/base16_windows_highcontrast.yaml
diff --git a/base16_windows_highcontrast_light.yaml b/base16/base16_windows_highcontrast_light.yaml
similarity index 100%
rename from base16_windows_highcontrast_light.yaml
rename to base16/base16_windows_highcontrast_light.yaml
diff --git a/base16_windows_nt.yaml b/base16/base16_windows_nt.yaml
similarity index 100%
rename from base16_windows_nt.yaml
rename to base16/base16_windows_nt.yaml
diff --git a/base16_windows_nt_light.yaml b/base16/base16_windows_nt_light.yaml
similarity index 100%
rename from base16_windows_nt_light.yaml
rename to base16/base16_windows_nt_light.yaml
diff --git a/base16_woodland.yaml b/base16/base16_woodland.yaml
similarity index 100%
rename from base16_woodland.yaml
rename to base16/base16_woodland.yaml
diff --git a/base16_xcode_dusk.yaml b/base16/base16_xcode_dusk.yaml
similarity index 100%
rename from base16_xcode_dusk.yaml
rename to base16/base16_xcode_dusk.yaml
diff --git a/base16_zenburn.yaml b/base16/base16_zenburn.yaml
similarity index 100%
rename from base16_zenburn.yaml
rename to base16/base16_zenburn.yaml