diff --git a/resources/variants/cartesio_0.25.inst.cfg b/resources/variants/cartesio/cartesio_0.25.inst.cfg
similarity index 100%
rename from resources/variants/cartesio_0.25.inst.cfg
rename to resources/variants/cartesio/cartesio_0.25.inst.cfg
diff --git a/resources/variants/cartesio_0.4.inst.cfg b/resources/variants/cartesio/cartesio_0.4.inst.cfg
similarity index 100%
rename from resources/variants/cartesio_0.4.inst.cfg
rename to resources/variants/cartesio/cartesio_0.4.inst.cfg
diff --git a/resources/variants/cartesio_0.8.inst.cfg b/resources/variants/cartesio/cartesio_0.8.inst.cfg
similarity index 100%
rename from resources/variants/cartesio_0.8.inst.cfg
rename to resources/variants/cartesio/cartesio_0.8.inst.cfg
diff --git a/resources/variants/crazy3dprint_base_0.40.inst.cfg b/resources/variants/crazy3dprint/crazy3dprint_base_0.40.inst.cfg
similarity index 100%
rename from resources/variants/crazy3dprint_base_0.40.inst.cfg
rename to resources/variants/crazy3dprint/crazy3dprint_base_0.40.inst.cfg
diff --git a/resources/variants/crazy3dprint_cz_300_0.40.inst.cfg b/resources/variants/crazy3dprint/crazy3dprint_cz_300_0.40.inst.cfg
similarity index 100%
rename from resources/variants/crazy3dprint_cz_300_0.40.inst.cfg
rename to resources/variants/crazy3dprint/crazy3dprint_cz_300_0.40.inst.cfg
diff --git a/resources/variants/diy220_0.2.inst.cfg b/resources/variants/diy/diy220_0.2.inst.cfg
similarity index 100%
rename from resources/variants/diy220_0.2.inst.cfg
rename to resources/variants/diy/diy220_0.2.inst.cfg
diff --git a/resources/variants/diy220_0.3.inst.cfg b/resources/variants/diy/diy220_0.3.inst.cfg
similarity index 100%
rename from resources/variants/diy220_0.3.inst.cfg
rename to resources/variants/diy/diy220_0.3.inst.cfg
diff --git a/resources/variants/diy220_0.4.inst.cfg b/resources/variants/diy/diy220_0.4.inst.cfg
similarity index 100%
rename from resources/variants/diy220_0.4.inst.cfg
rename to resources/variants/diy/diy220_0.4.inst.cfg
diff --git a/resources/variants/diy220_0.5.inst.cfg b/resources/variants/diy/diy220_0.5.inst.cfg
similarity index 100%
rename from resources/variants/diy220_0.5.inst.cfg
rename to resources/variants/diy/diy220_0.5.inst.cfg
diff --git a/resources/variants/diy220_0.6.inst.cfg b/resources/variants/diy/diy220_0.6.inst.cfg
similarity index 100%
rename from resources/variants/diy220_0.6.inst.cfg
rename to resources/variants/diy/diy220_0.6.inst.cfg
diff --git a/resources/variants/diy220_0.8.inst.cfg b/resources/variants/diy/diy220_0.8.inst.cfg
similarity index 100%
rename from resources/variants/diy220_0.8.inst.cfg
rename to resources/variants/diy/diy220_0.8.inst.cfg
diff --git a/resources/variants/hms434_0.4tpnozzle.inst.cfg b/resources/variants/hms434/hms434_0.4tpnozzle.inst.cfg
similarity index 100%
rename from resources/variants/hms434_0.4tpnozzle.inst.cfg
rename to resources/variants/hms434/hms434_0.4tpnozzle.inst.cfg
diff --git a/resources/variants/hms434_0.8tpnozzle.inst.cfg b/resources/variants/hms434/hms434_0.8tpnozzle.inst.cfg
similarity index 100%
rename from resources/variants/hms434_0.8tpnozzle.inst.cfg
rename to resources/variants/hms434/hms434_0.8tpnozzle.inst.cfg
diff --git a/resources/variants/imade3d_jellybox_0.4.inst.cfg b/resources/variants/imade3d/imade3d_jellybox_0.4.inst.cfg
similarity index 100%
rename from resources/variants/imade3d_jellybox_0.4.inst.cfg
rename to resources/variants/imade3d/imade3d_jellybox_0.4.inst.cfg
diff --git a/resources/variants/imade3d_jellybox_2_0.4.inst.cfg b/resources/variants/imade3d/imade3d_jellybox_2_0.4.inst.cfg
similarity index 100%
rename from resources/variants/imade3d_jellybox_2_0.4.inst.cfg
rename to resources/variants/imade3d/imade3d_jellybox_2_0.4.inst.cfg
diff --git a/resources/variants/Leapfrog_Bolt_Pro_Brass_0.4.inst.cfg b/resources/variants/leapfrog/Leapfrog_Bolt_Pro_Brass_0.4.inst.cfg
similarity index 100%
rename from resources/variants/Leapfrog_Bolt_Pro_Brass_0.4.inst.cfg
rename to resources/variants/leapfrog/Leapfrog_Bolt_Pro_Brass_0.4.inst.cfg
diff --git a/resources/variants/Leapfrog_Bolt_Pro_NozzleX_0.4.inst.cfg b/resources/variants/leapfrog/Leapfrog_Bolt_Pro_NozzleX_0.4.inst.cfg
similarity index 100%
rename from resources/variants/Leapfrog_Bolt_Pro_NozzleX_0.4.inst.cfg
rename to resources/variants/leapfrog/Leapfrog_Bolt_Pro_NozzleX_0.4.inst.cfg
diff --git a/resources/variants/liquid_vo04.inst.cfg b/resources/variants/liquid/liquid_vo04.inst.cfg
similarity index 100%
rename from resources/variants/liquid_vo04.inst.cfg
rename to resources/variants/liquid/liquid_vo04.inst.cfg
diff --git a/resources/variants/liquid_vo06.inst.cfg b/resources/variants/liquid/liquid_vo06.inst.cfg
similarity index 100%
rename from resources/variants/liquid_vo06.inst.cfg
rename to resources/variants/liquid/liquid_vo06.inst.cfg
diff --git a/resources/variants/liquid_vo08.inst.cfg b/resources/variants/liquid/liquid_vo08.inst.cfg
similarity index 100%
rename from resources/variants/liquid_vo08.inst.cfg
rename to resources/variants/liquid/liquid_vo08.inst.cfg
diff --git a/resources/variants/Mark2_for_Ultimaker2_0.25.inst.cfg b/resources/variants/mark2/Mark2_for_Ultimaker2_0.25.inst.cfg
similarity index 100%
rename from resources/variants/Mark2_for_Ultimaker2_0.25.inst.cfg
rename to resources/variants/mark2/Mark2_for_Ultimaker2_0.25.inst.cfg
diff --git a/resources/variants/Mark2_for_Ultimaker2_0.4.inst.cfg b/resources/variants/mark2/Mark2_for_Ultimaker2_0.4.inst.cfg
similarity index 100%
rename from resources/variants/Mark2_for_Ultimaker2_0.4.inst.cfg
rename to resources/variants/mark2/Mark2_for_Ultimaker2_0.4.inst.cfg
diff --git a/resources/variants/Mark2_for_Ultimaker2_0.6.inst.cfg b/resources/variants/mark2/Mark2_for_Ultimaker2_0.6.inst.cfg
similarity index 100%
rename from resources/variants/Mark2_for_Ultimaker2_0.6.inst.cfg
rename to resources/variants/mark2/Mark2_for_Ultimaker2_0.6.inst.cfg
diff --git a/resources/variants/Mark2_for_Ultimaker2_0.8.inst.cfg b/resources/variants/mark2/Mark2_for_Ultimaker2_0.8.inst.cfg
similarity index 100%
rename from resources/variants/Mark2_for_Ultimaker2_0.8.inst.cfg
rename to resources/variants/mark2/Mark2_for_Ultimaker2_0.8.inst.cfg
diff --git a/resources/variants/nwa3d_a31_04.inst.cfg b/resources/variants/nwa3d/nwa3d_a31_04.inst.cfg
similarity index 100%
rename from resources/variants/nwa3d_a31_04.inst.cfg
rename to resources/variants/nwa3d/nwa3d_a31_04.inst.cfg
diff --git a/resources/variants/nwa3d_a31_06.inst.cfg b/resources/variants/nwa3d/nwa3d_a31_06.inst.cfg
similarity index 100%
rename from resources/variants/nwa3d_a31_06.inst.cfg
rename to resources/variants/nwa3d/nwa3d_a31_06.inst.cfg
diff --git a/resources/variants/weedo_x40_weedo_0.4.inst.cfg b/resources/variants/weedo/weedo_x40_weedo_0.4.inst.cfg
similarity index 100%
rename from resources/variants/weedo_x40_weedo_0.4.inst.cfg
rename to resources/variants/weedo/weedo_x40_weedo_0.4.inst.cfg
diff --git a/resources/variants/weedo_x40_weedo_0.6.inst.cfg b/resources/variants/weedo/weedo_x40_weedo_0.6.inst.cfg
similarity index 100%
rename from resources/variants/weedo_x40_weedo_0.6.inst.cfg
rename to resources/variants/weedo/weedo_x40_weedo_0.6.inst.cfg
diff --git a/resources/variants/weedo_x40_weedo_0.8.inst.cfg b/resources/variants/weedo/weedo_x40_weedo_0.8.inst.cfg
similarity index 100%
rename from resources/variants/weedo_x40_weedo_0.8.inst.cfg
rename to resources/variants/weedo/weedo_x40_weedo_0.8.inst.cfg