diff --git a/resources/variants/goofoo_base_0.4.inst.cfg b/resources/variants/goofoo/goofoo_base_0.4.inst.cfg
similarity index 100%
rename from resources/variants/goofoo_base_0.4.inst.cfg
rename to resources/variants/goofoo/goofoo_base_0.4.inst.cfg
diff --git a/resources/variants/goofoo_cube_0.7.inst.cfg b/resources/variants/goofoo/goofoo_cube_0.7.inst.cfg
similarity index 100%
rename from resources/variants/goofoo_cube_0.7.inst.cfg
rename to resources/variants/goofoo/goofoo_cube_0.7.inst.cfg
diff --git a/resources/variants/goofoo_e-one_0.2.inst.cfg b/resources/variants/goofoo/goofoo_e-one_0.2.inst.cfg
similarity index 100%
rename from resources/variants/goofoo_e-one_0.2.inst.cfg
rename to resources/variants/goofoo/goofoo_e-one_0.2.inst.cfg
diff --git a/resources/variants/goofoo_e-one_0.4.inst.cfg b/resources/variants/goofoo/goofoo_e-one_0.4.inst.cfg
similarity index 100%
rename from resources/variants/goofoo_e-one_0.4.inst.cfg
rename to resources/variants/goofoo/goofoo_e-one_0.4.inst.cfg
diff --git a/resources/variants/goofoo_e-one_0.6.inst.cfg b/resources/variants/goofoo/goofoo_e-one_0.6.inst.cfg
similarity index 100%
rename from resources/variants/goofoo_e-one_0.6.inst.cfg
rename to resources/variants/goofoo/goofoo_e-one_0.6.inst.cfg
diff --git a/resources/variants/goofoo_e-one_0.8.inst.cfg b/resources/variants/goofoo/goofoo_e-one_0.8.inst.cfg
similarity index 100%
rename from resources/variants/goofoo_e-one_0.8.inst.cfg
rename to resources/variants/goofoo/goofoo_e-one_0.8.inst.cfg
diff --git a/resources/variants/goofoo_e-one_1.0.inst.cfg b/resources/variants/goofoo/goofoo_e-one_1.0.inst.cfg
similarity index 100%
rename from resources/variants/goofoo_e-one_1.0.inst.cfg
rename to resources/variants/goofoo/goofoo_e-one_1.0.inst.cfg
diff --git a/resources/variants/goofoo_gemini_0.2.inst.cfg b/resources/variants/goofoo/goofoo_gemini_0.2.inst.cfg
similarity index 100%
rename from resources/variants/goofoo_gemini_0.2.inst.cfg
rename to resources/variants/goofoo/goofoo_gemini_0.2.inst.cfg
diff --git a/resources/variants/goofoo_gemini_0.4.inst.cfg b/resources/variants/goofoo/goofoo_gemini_0.4.inst.cfg
similarity index 100%
rename from resources/variants/goofoo_gemini_0.4.inst.cfg
rename to resources/variants/goofoo/goofoo_gemini_0.4.inst.cfg
diff --git a/resources/variants/goofoo_gemini_0.6.inst.cfg b/resources/variants/goofoo/goofoo_gemini_0.6.inst.cfg
similarity index 100%
rename from resources/variants/goofoo_gemini_0.6.inst.cfg
rename to resources/variants/goofoo/goofoo_gemini_0.6.inst.cfg
diff --git a/resources/variants/goofoo_gemini_0.8.inst.cfg b/resources/variants/goofoo/goofoo_gemini_0.8.inst.cfg
similarity index 100%
rename from resources/variants/goofoo_gemini_0.8.inst.cfg
rename to resources/variants/goofoo/goofoo_gemini_0.8.inst.cfg
diff --git a/resources/variants/goofoo_gemini_1.0.inst.cfg b/resources/variants/goofoo/goofoo_gemini_1.0.inst.cfg
similarity index 100%
rename from resources/variants/goofoo_gemini_1.0.inst.cfg
rename to resources/variants/goofoo/goofoo_gemini_1.0.inst.cfg
diff --git a/resources/variants/goofoo_giant_0.2.inst.cfg b/resources/variants/goofoo/goofoo_giant_0.2.inst.cfg
similarity index 100%
rename from resources/variants/goofoo_giant_0.2.inst.cfg
rename to resources/variants/goofoo/goofoo_giant_0.2.inst.cfg
diff --git a/resources/variants/goofoo_giant_0.4.inst.cfg b/resources/variants/goofoo/goofoo_giant_0.4.inst.cfg
similarity index 100%
rename from resources/variants/goofoo_giant_0.4.inst.cfg
rename to resources/variants/goofoo/goofoo_giant_0.4.inst.cfg
diff --git a/resources/variants/goofoo_giant_0.6.inst.cfg b/resources/variants/goofoo/goofoo_giant_0.6.inst.cfg
similarity index 100%
rename from resources/variants/goofoo_giant_0.6.inst.cfg
rename to resources/variants/goofoo/goofoo_giant_0.6.inst.cfg
diff --git a/resources/variants/goofoo_giant_0.8.inst.cfg b/resources/variants/goofoo/goofoo_giant_0.8.inst.cfg
similarity index 100%
rename from resources/variants/goofoo_giant_0.8.inst.cfg
rename to resources/variants/goofoo/goofoo_giant_0.8.inst.cfg
diff --git a/resources/variants/goofoo_giant_1.0.inst.cfg b/resources/variants/goofoo/goofoo_giant_1.0.inst.cfg
similarity index 100%
rename from resources/variants/goofoo_giant_1.0.inst.cfg
rename to resources/variants/goofoo/goofoo_giant_1.0.inst.cfg
diff --git a/resources/variants/goofoo_max_0.2.inst.cfg b/resources/variants/goofoo/goofoo_max_0.2.inst.cfg
similarity index 100%
rename from resources/variants/goofoo_max_0.2.inst.cfg
rename to resources/variants/goofoo/goofoo_max_0.2.inst.cfg
diff --git a/resources/variants/goofoo_max_0.4.inst.cfg b/resources/variants/goofoo/goofoo_max_0.4.inst.cfg
similarity index 100%
rename from resources/variants/goofoo_max_0.4.inst.cfg
rename to resources/variants/goofoo/goofoo_max_0.4.inst.cfg
diff --git a/resources/variants/goofoo_max_0.6.inst.cfg b/resources/variants/goofoo/goofoo_max_0.6.inst.cfg
similarity index 100%
rename from resources/variants/goofoo_max_0.6.inst.cfg
rename to resources/variants/goofoo/goofoo_max_0.6.inst.cfg
diff --git a/resources/variants/goofoo_max_0.8.inst.cfg b/resources/variants/goofoo/goofoo_max_0.8.inst.cfg
similarity index 100%
rename from resources/variants/goofoo_max_0.8.inst.cfg
rename to resources/variants/goofoo/goofoo_max_0.8.inst.cfg
diff --git a/resources/variants/goofoo_max_1.0.inst.cfg b/resources/variants/goofoo/goofoo_max_1.0.inst.cfg
similarity index 100%
rename from resources/variants/goofoo_max_1.0.inst.cfg
rename to resources/variants/goofoo/goofoo_max_1.0.inst.cfg
diff --git a/resources/variants/goofoo_mido_0.2.inst.cfg b/resources/variants/goofoo/goofoo_mido_0.2.inst.cfg
similarity index 100%
rename from resources/variants/goofoo_mido_0.2.inst.cfg
rename to resources/variants/goofoo/goofoo_mido_0.2.inst.cfg
diff --git a/resources/variants/goofoo_mido_0.4.inst.cfg b/resources/variants/goofoo/goofoo_mido_0.4.inst.cfg
similarity index 100%
rename from resources/variants/goofoo_mido_0.4.inst.cfg
rename to resources/variants/goofoo/goofoo_mido_0.4.inst.cfg
diff --git a/resources/variants/goofoo_mido_0.6.inst.cfg b/resources/variants/goofoo/goofoo_mido_0.6.inst.cfg
similarity index 100%
rename from resources/variants/goofoo_mido_0.6.inst.cfg
rename to resources/variants/goofoo/goofoo_mido_0.6.inst.cfg
diff --git a/resources/variants/goofoo_mido_0.8.inst.cfg b/resources/variants/goofoo/goofoo_mido_0.8.inst.cfg
similarity index 100%
rename from resources/variants/goofoo_mido_0.8.inst.cfg
rename to resources/variants/goofoo/goofoo_mido_0.8.inst.cfg
diff --git a/resources/variants/goofoo_mido_1.0.inst.cfg b/resources/variants/goofoo/goofoo_mido_1.0.inst.cfg
similarity index 100%
rename from resources/variants/goofoo_mido_1.0.inst.cfg
rename to resources/variants/goofoo/goofoo_mido_1.0.inst.cfg
diff --git a/resources/variants/goofoo_miniplus_0.2.inst.cfg b/resources/variants/goofoo/goofoo_miniplus_0.2.inst.cfg
similarity index 100%
rename from resources/variants/goofoo_miniplus_0.2.inst.cfg
rename to resources/variants/goofoo/goofoo_miniplus_0.2.inst.cfg
diff --git a/resources/variants/goofoo_miniplus_0.4.inst.cfg b/resources/variants/goofoo/goofoo_miniplus_0.4.inst.cfg
similarity index 100%
rename from resources/variants/goofoo_miniplus_0.4.inst.cfg
rename to resources/variants/goofoo/goofoo_miniplus_0.4.inst.cfg
diff --git a/resources/variants/goofoo_miniplus_0.6.inst.cfg b/resources/variants/goofoo/goofoo_miniplus_0.6.inst.cfg
similarity index 100%
rename from resources/variants/goofoo_miniplus_0.6.inst.cfg
rename to resources/variants/goofoo/goofoo_miniplus_0.6.inst.cfg
diff --git a/resources/variants/goofoo_miniplus_0.8.inst.cfg b/resources/variants/goofoo/goofoo_miniplus_0.8.inst.cfg
similarity index 100%
rename from resources/variants/goofoo_miniplus_0.8.inst.cfg
rename to resources/variants/goofoo/goofoo_miniplus_0.8.inst.cfg
diff --git a/resources/variants/goofoo_miniplus_1.0.inst.cfg b/resources/variants/goofoo/goofoo_miniplus_1.0.inst.cfg
similarity index 100%
rename from resources/variants/goofoo_miniplus_1.0.inst.cfg
rename to resources/variants/goofoo/goofoo_miniplus_1.0.inst.cfg
diff --git a/resources/variants/goofoo_nova_0.2.inst.cfg b/resources/variants/goofoo/goofoo_nova_0.2.inst.cfg
similarity index 100%
rename from resources/variants/goofoo_nova_0.2.inst.cfg
rename to resources/variants/goofoo/goofoo_nova_0.2.inst.cfg
diff --git a/resources/variants/goofoo_nova_0.4.inst.cfg b/resources/variants/goofoo/goofoo_nova_0.4.inst.cfg
similarity index 100%
rename from resources/variants/goofoo_nova_0.4.inst.cfg
rename to resources/variants/goofoo/goofoo_nova_0.4.inst.cfg
diff --git a/resources/variants/goofoo_nova_0.6.inst.cfg b/resources/variants/goofoo/goofoo_nova_0.6.inst.cfg
similarity index 100%
rename from resources/variants/goofoo_nova_0.6.inst.cfg
rename to resources/variants/goofoo/goofoo_nova_0.6.inst.cfg
diff --git a/resources/variants/goofoo_nova_0.8.inst.cfg b/resources/variants/goofoo/goofoo_nova_0.8.inst.cfg
similarity index 100%
rename from resources/variants/goofoo_nova_0.8.inst.cfg
rename to resources/variants/goofoo/goofoo_nova_0.8.inst.cfg
diff --git a/resources/variants/goofoo_nova_1.0.inst.cfg b/resources/variants/goofoo/goofoo_nova_1.0.inst.cfg
similarity index 100%
rename from resources/variants/goofoo_nova_1.0.inst.cfg
rename to resources/variants/goofoo/goofoo_nova_1.0.inst.cfg
diff --git a/resources/variants/goofoo_plus_0.2.inst.cfg b/resources/variants/goofoo/goofoo_plus_0.2.inst.cfg
similarity index 100%
rename from resources/variants/goofoo_plus_0.2.inst.cfg
rename to resources/variants/goofoo/goofoo_plus_0.2.inst.cfg
diff --git a/resources/variants/goofoo_plus_0.4.inst.cfg b/resources/variants/goofoo/goofoo_plus_0.4.inst.cfg
similarity index 100%
rename from resources/variants/goofoo_plus_0.4.inst.cfg
rename to resources/variants/goofoo/goofoo_plus_0.4.inst.cfg
diff --git a/resources/variants/goofoo_plus_0.6.inst.cfg b/resources/variants/goofoo/goofoo_plus_0.6.inst.cfg
similarity index 100%
rename from resources/variants/goofoo_plus_0.6.inst.cfg
rename to resources/variants/goofoo/goofoo_plus_0.6.inst.cfg
diff --git a/resources/variants/goofoo_plus_0.8.inst.cfg b/resources/variants/goofoo/goofoo_plus_0.8.inst.cfg
similarity index 100%
rename from resources/variants/goofoo_plus_0.8.inst.cfg
rename to resources/variants/goofoo/goofoo_plus_0.8.inst.cfg
diff --git a/resources/variants/goofoo_plus_1.0.inst.cfg b/resources/variants/goofoo/goofoo_plus_1.0.inst.cfg
similarity index 100%
rename from resources/variants/goofoo_plus_1.0.inst.cfg
rename to resources/variants/goofoo/goofoo_plus_1.0.inst.cfg
diff --git a/resources/variants/goofoo_t-one_0.2.inst.cfg b/resources/variants/goofoo/goofoo_t-one_0.2.inst.cfg
similarity index 100%
rename from resources/variants/goofoo_t-one_0.2.inst.cfg
rename to resources/variants/goofoo/goofoo_t-one_0.2.inst.cfg
diff --git a/resources/variants/goofoo_t-one_0.4.inst.cfg b/resources/variants/goofoo/goofoo_t-one_0.4.inst.cfg
similarity index 100%
rename from resources/variants/goofoo_t-one_0.4.inst.cfg
rename to resources/variants/goofoo/goofoo_t-one_0.4.inst.cfg
diff --git a/resources/variants/goofoo_t-one_0.6.inst.cfg b/resources/variants/goofoo/goofoo_t-one_0.6.inst.cfg
similarity index 100%
rename from resources/variants/goofoo_t-one_0.6.inst.cfg
rename to resources/variants/goofoo/goofoo_t-one_0.6.inst.cfg
diff --git a/resources/variants/goofoo_t-one_0.8.inst.cfg b/resources/variants/goofoo/goofoo_t-one_0.8.inst.cfg
similarity index 100%
rename from resources/variants/goofoo_t-one_0.8.inst.cfg
rename to resources/variants/goofoo/goofoo_t-one_0.8.inst.cfg
diff --git a/resources/variants/goofoo_t-one_1.0.inst.cfg b/resources/variants/goofoo/goofoo_t-one_1.0.inst.cfg
similarity index 100%
rename from resources/variants/goofoo_t-one_1.0.inst.cfg
rename to resources/variants/goofoo/goofoo_t-one_1.0.inst.cfg
diff --git a/resources/variants/goofoo_tiny_0.2.inst.cfg b/resources/variants/goofoo/goofoo_tiny_0.2.inst.cfg
similarity index 100%
rename from resources/variants/goofoo_tiny_0.2.inst.cfg
rename to resources/variants/goofoo/goofoo_tiny_0.2.inst.cfg
diff --git a/resources/variants/goofoo_tiny_0.4.inst.cfg b/resources/variants/goofoo/goofoo_tiny_0.4.inst.cfg
similarity index 100%
rename from resources/variants/goofoo_tiny_0.4.inst.cfg
rename to resources/variants/goofoo/goofoo_tiny_0.4.inst.cfg
diff --git a/resources/variants/goofoo_tiny_0.6.inst.cfg b/resources/variants/goofoo/goofoo_tiny_0.6.inst.cfg
similarity index 100%
rename from resources/variants/goofoo_tiny_0.6.inst.cfg
rename to resources/variants/goofoo/goofoo_tiny_0.6.inst.cfg
diff --git a/resources/variants/goofoo_tiny_0.8.inst.cfg b/resources/variants/goofoo/goofoo_tiny_0.8.inst.cfg
similarity index 100%
rename from resources/variants/goofoo_tiny_0.8.inst.cfg
rename to resources/variants/goofoo/goofoo_tiny_0.8.inst.cfg
diff --git a/resources/variants/goofoo_tiny_1.0.inst.cfg b/resources/variants/goofoo/goofoo_tiny_1.0.inst.cfg
similarity index 100%
rename from resources/variants/goofoo_tiny_1.0.inst.cfg
rename to resources/variants/goofoo/goofoo_tiny_1.0.inst.cfg
diff --git a/resources/variants/goofoo_tinyplus_0.2.inst.cfg b/resources/variants/goofoo/goofoo_tinyplus_0.2.inst.cfg
similarity index 100%
rename from resources/variants/goofoo_tinyplus_0.2.inst.cfg
rename to resources/variants/goofoo/goofoo_tinyplus_0.2.inst.cfg
diff --git a/resources/variants/goofoo_tinyplus_0.4.inst.cfg b/resources/variants/goofoo/goofoo_tinyplus_0.4.inst.cfg
similarity index 100%
rename from resources/variants/goofoo_tinyplus_0.4.inst.cfg
rename to resources/variants/goofoo/goofoo_tinyplus_0.4.inst.cfg
diff --git a/resources/variants/goofoo_tinyplus_0.6.inst.cfg b/resources/variants/goofoo/goofoo_tinyplus_0.6.inst.cfg
similarity index 100%
rename from resources/variants/goofoo_tinyplus_0.6.inst.cfg
rename to resources/variants/goofoo/goofoo_tinyplus_0.6.inst.cfg
diff --git a/resources/variants/goofoo_tinyplus_0.8.inst.cfg b/resources/variants/goofoo/goofoo_tinyplus_0.8.inst.cfg
similarity index 100%
rename from resources/variants/goofoo_tinyplus_0.8.inst.cfg
rename to resources/variants/goofoo/goofoo_tinyplus_0.8.inst.cfg
diff --git a/resources/variants/goofoo_tinyplus_1.0.inst.cfg b/resources/variants/goofoo/goofoo_tinyplus_1.0.inst.cfg
similarity index 100%
rename from resources/variants/goofoo_tinyplus_1.0.inst.cfg
rename to resources/variants/goofoo/goofoo_tinyplus_1.0.inst.cfg