diff --git a/support_files/definitions/eu/country_eu.xml b/support_files/definitions/miscellaneous/eu/country_eu.xml
similarity index 100%
rename from support_files/definitions/eu/country_eu.xml
rename to support_files/definitions/miscellaneous/eu/country_eu.xml
diff --git a/support_files/definitions/eu/league_eu.xml b/support_files/definitions/miscellaneous/eu/league_eu.xml
similarity index 100%
rename from support_files/definitions/eu/league_eu.xml
rename to support_files/definitions/miscellaneous/eu/league_eu.xml
diff --git a/support_files/definitions/euro08/country_euro08.xml b/support_files/definitions/miscellaneous/euro08/country_euro08.xml
similarity index 100%
rename from support_files/definitions/euro08/country_euro08.xml
rename to support_files/definitions/miscellaneous/euro08/country_euro08.xml
diff --git a/support_files/definitions/euro08/cup_euro08_cup.xml b/support_files/definitions/miscellaneous/euro08/cup_euro08_cup.xml
similarity index 100%
rename from support_files/definitions/euro08/cup_euro08_cup.xml
rename to support_files/definitions/miscellaneous/euro08/cup_euro08_cup.xml
diff --git a/support_files/definitions/euro08/league_euro08_europe_teams.xml b/support_files/definitions/miscellaneous/euro08/league_euro08_europe_teams.xml
similarity index 100%
rename from support_files/definitions/euro08/league_euro08_europe_teams.xml
rename to support_files/definitions/miscellaneous/euro08/league_euro08_europe_teams.xml
diff --git a/support_files/definitions/europe/cup_europe_champ_league.xml b/support_files/definitions/miscellaneous/europe/cup_europe_champ_league.xml
similarity index 100%
rename from support_files/definitions/europe/cup_europe_champ_league.xml
rename to support_files/definitions/miscellaneous/europe/cup_europe_champ_league.xml
diff --git a/support_files/definitions/europe/cup_europe_cwc.xml b/support_files/definitions/miscellaneous/europe/cup_europe_cwc.xml
similarity index 100%
rename from support_files/definitions/europe/cup_europe_cwc.xml
rename to support_files/definitions/miscellaneous/europe/cup_europe_cwc.xml
diff --git a/support_files/definitions/europe/cup_europe_uefa.xml b/support_files/definitions/miscellaneous/europe/cup_europe_uefa.xml
similarity index 100%
rename from support_files/definitions/europe/cup_europe_uefa.xml
rename to support_files/definitions/miscellaneous/europe/cup_europe_uefa.xml
diff --git a/support_files/definitions/europe/cup_supercup_europe_intercontinental.xml b/support_files/definitions/miscellaneous/europe/cup_supercup_europe_intercontinental.xml
similarity index 100%
rename from support_files/definitions/europe/cup_supercup_europe_intercontinental.xml
rename to support_files/definitions/miscellaneous/europe/cup_supercup_europe_intercontinental.xml
diff --git a/support_files/definitions/europe/cup_supercup_europe_uefa.xml b/support_files/definitions/miscellaneous/europe/cup_supercup_europe_uefa.xml
similarity index 100%
rename from support_files/definitions/europe/cup_supercup_europe_uefa.xml
rename to support_files/definitions/miscellaneous/europe/cup_supercup_europe_uefa.xml
diff --git a/support_files/definitions/wc06/country_wc06.xml b/support_files/definitions/miscellaneous/wc06/country_wc06.xml
similarity index 100%
rename from support_files/definitions/wc06/country_wc06.xml
rename to support_files/definitions/miscellaneous/wc06/country_wc06.xml
diff --git a/support_files/definitions/wc06/cup_wc06_africa.xml b/support_files/definitions/miscellaneous/wc06/cup_wc06_africa.xml
similarity index 100%
rename from support_files/definitions/wc06/cup_wc06_africa.xml
rename to support_files/definitions/miscellaneous/wc06/cup_wc06_africa.xml
diff --git a/support_files/definitions/wc06/cup_wc06_asia.xml b/support_files/definitions/miscellaneous/wc06/cup_wc06_asia.xml
similarity index 100%
rename from support_files/definitions/wc06/cup_wc06_asia.xml
rename to support_files/definitions/miscellaneous/wc06/cup_wc06_asia.xml
diff --git a/support_files/definitions/wc06/cup_wc06_asia_ncamerica.xml b/support_files/definitions/miscellaneous/wc06/cup_wc06_asia_ncamerica.xml
similarity index 100%
rename from support_files/definitions/wc06/cup_wc06_asia_ncamerica.xml
rename to support_files/definitions/miscellaneous/wc06/cup_wc06_asia_ncamerica.xml
diff --git a/support_files/definitions/wc06/cup_wc06_asia_playoff.xml b/support_files/definitions/miscellaneous/wc06/cup_wc06_asia_playoff.xml
similarity index 100%
rename from support_files/definitions/wc06/cup_wc06_asia_playoff.xml
rename to support_files/definitions/miscellaneous/wc06/cup_wc06_asia_playoff.xml
diff --git a/support_files/definitions/wc06/cup_wc06_europe.xml b/support_files/definitions/miscellaneous/wc06/cup_wc06_europe.xml
similarity index 100%
rename from support_files/definitions/wc06/cup_wc06_europe.xml
rename to support_files/definitions/miscellaneous/wc06/cup_wc06_europe.xml
diff --git a/support_files/definitions/wc06/cup_wc06_europe_playoffs.xml b/support_files/definitions/miscellaneous/wc06/cup_wc06_europe_playoffs.xml
similarity index 100%
rename from support_files/definitions/wc06/cup_wc06_europe_playoffs.xml
rename to support_files/definitions/miscellaneous/wc06/cup_wc06_europe_playoffs.xml
diff --git a/support_files/definitions/wc06/cup_wc06_final.xml b/support_files/definitions/miscellaneous/wc06/cup_wc06_final.xml
similarity index 100%
rename from support_files/definitions/wc06/cup_wc06_final.xml
rename to support_files/definitions/miscellaneous/wc06/cup_wc06_final.xml
diff --git a/support_files/definitions/wc06/cup_wc06_ncamerica.xml b/support_files/definitions/miscellaneous/wc06/cup_wc06_ncamerica.xml
similarity index 100%
rename from support_files/definitions/wc06/cup_wc06_ncamerica.xml
rename to support_files/definitions/miscellaneous/wc06/cup_wc06_ncamerica.xml
diff --git a/support_files/definitions/wc06/cup_wc06_oceania.xml b/support_files/definitions/miscellaneous/wc06/cup_wc06_oceania.xml
similarity index 100%
rename from support_files/definitions/wc06/cup_wc06_oceania.xml
rename to support_files/definitions/miscellaneous/wc06/cup_wc06_oceania.xml
diff --git a/support_files/definitions/wc06/cup_wc06_oceania_samerica.xml b/support_files/definitions/miscellaneous/wc06/cup_wc06_oceania_samerica.xml
similarity index 100%
rename from support_files/definitions/wc06/cup_wc06_oceania_samerica.xml
rename to support_files/definitions/miscellaneous/wc06/cup_wc06_oceania_samerica.xml
diff --git a/support_files/definitions/wc06/cup_wc06_samerica.xml b/support_files/definitions/miscellaneous/wc06/cup_wc06_samerica.xml
similarity index 100%
rename from support_files/definitions/wc06/cup_wc06_samerica.xml
rename to support_files/definitions/miscellaneous/wc06/cup_wc06_samerica.xml
diff --git a/support_files/definitions/wc06/league_wc06_africa_teams.xml b/support_files/definitions/miscellaneous/wc06/league_wc06_africa_teams.xml
similarity index 100%
rename from support_files/definitions/wc06/league_wc06_africa_teams.xml
rename to support_files/definitions/miscellaneous/wc06/league_wc06_africa_teams.xml
diff --git a/support_files/definitions/wc06/league_wc06_asia_teams.xml b/support_files/definitions/miscellaneous/wc06/league_wc06_asia_teams.xml
similarity index 100%
rename from support_files/definitions/wc06/league_wc06_asia_teams.xml
rename to support_files/definitions/miscellaneous/wc06/league_wc06_asia_teams.xml
diff --git a/support_files/definitions/wc06/league_wc06_europe_teams.xml b/support_files/definitions/miscellaneous/wc06/league_wc06_europe_teams.xml
similarity index 100%
rename from support_files/definitions/wc06/league_wc06_europe_teams.xml
rename to support_files/definitions/miscellaneous/wc06/league_wc06_europe_teams.xml
diff --git a/support_files/definitions/wc06/league_wc06_ncamerica_teams.xml b/support_files/definitions/miscellaneous/wc06/league_wc06_ncamerica_teams.xml
similarity index 100%
rename from support_files/definitions/wc06/league_wc06_ncamerica_teams.xml
rename to support_files/definitions/miscellaneous/wc06/league_wc06_ncamerica_teams.xml
diff --git a/support_files/definitions/wc06/league_wc06_oceania_teams.xml b/support_files/definitions/miscellaneous/wc06/league_wc06_oceania_teams.xml
similarity index 100%
rename from support_files/definitions/wc06/league_wc06_oceania_teams.xml
rename to support_files/definitions/miscellaneous/wc06/league_wc06_oceania_teams.xml
diff --git a/support_files/definitions/wc06/league_wc06_samerica_teams.xml b/support_files/definitions/miscellaneous/wc06/league_wc06_samerica_teams.xml
similarity index 100%
rename from support_files/definitions/wc06/league_wc06_samerica_teams.xml
rename to support_files/definitions/miscellaneous/wc06/league_wc06_samerica_teams.xml
diff --git a/support_files/definitions/short_leagues_north_and_central_america/league_costa_rica1_short.xml b/support_files/definitions/north_america/short_leagues_north_and_central_america/league_costa_rica1_short.xml
similarity index 100%
rename from support_files/definitions/short_leagues_north_and_central_america/league_costa_rica1_short.xml
rename to support_files/definitions/north_america/short_leagues_north_and_central_america/league_costa_rica1_short.xml
diff --git a/support_files/definitions/short_leagues_north_and_central_america/league_honduras1_short.xml b/support_files/definitions/north_america/short_leagues_north_and_central_america/league_honduras1_short.xml
similarity index 100%
rename from support_files/definitions/short_leagues_north_and_central_america/league_honduras1_short.xml
rename to support_files/definitions/north_america/short_leagues_north_and_central_america/league_honduras1_short.xml
diff --git a/support_files/definitions/short_leagues_north_and_central_america/league_jamaica1_short.xml b/support_files/definitions/north_america/short_leagues_north_and_central_america/league_jamaica1_short.xml
similarity index 100%
rename from support_files/definitions/short_leagues_north_and_central_america/league_jamaica1_short.xml
rename to support_files/definitions/north_america/short_leagues_north_and_central_america/league_jamaica1_short.xml
diff --git a/support_files/definitions/usa/country_usa.xml b/support_files/definitions/north_america/usa/country_usa.xml
similarity index 100%
rename from support_files/definitions/usa/country_usa.xml
rename to support_files/definitions/north_america/usa/country_usa.xml
diff --git a/support_files/definitions/usa/cup_usa_concacaf.xml b/support_files/definitions/north_america/usa/cup_usa_concacaf.xml
similarity index 100%
rename from support_files/definitions/usa/cup_usa_concacaf.xml
rename to support_files/definitions/north_america/usa/cup_usa_concacaf.xml
diff --git a/support_files/definitions/usa/cup_usa_eplayoff.xml b/support_files/definitions/north_america/usa/cup_usa_eplayoff.xml
similarity index 100%
rename from support_files/definitions/usa/cup_usa_eplayoff.xml
rename to support_files/definitions/north_america/usa/cup_usa_eplayoff.xml
diff --git a/support_files/definitions/usa/cup_usa_first_cup.xml b/support_files/definitions/north_america/usa/cup_usa_first_cup.xml
similarity index 100%
rename from support_files/definitions/usa/cup_usa_first_cup.xml
rename to support_files/definitions/north_america/usa/cup_usa_first_cup.xml
diff --git a/support_files/definitions/usa/cup_usa_mls_cup.xml b/support_files/definitions/north_america/usa/cup_usa_mls_cup.xml
similarity index 100%
rename from support_files/definitions/usa/cup_usa_mls_cup.xml
rename to support_files/definitions/north_america/usa/cup_usa_mls_cup.xml
diff --git a/support_files/definitions/usa/cup_usa_open_cup.xml b/support_files/definitions/north_america/usa/cup_usa_open_cup.xml
similarity index 100%
rename from support_files/definitions/usa/cup_usa_open_cup.xml
rename to support_files/definitions/north_america/usa/cup_usa_open_cup.xml
diff --git a/support_files/definitions/usa/cup_usa_pdl_central.xml b/support_files/definitions/north_america/usa/cup_usa_pdl_central.xml
similarity index 100%
rename from support_files/definitions/usa/cup_usa_pdl_central.xml
rename to support_files/definitions/north_america/usa/cup_usa_pdl_central.xml
diff --git a/support_files/definitions/usa/cup_usa_pdl_cup.xml b/support_files/definitions/north_america/usa/cup_usa_pdl_cup.xml
similarity index 100%
rename from support_files/definitions/usa/cup_usa_pdl_cup.xml
rename to support_files/definitions/north_america/usa/cup_usa_pdl_cup.xml
diff --git a/support_files/definitions/usa/cup_usa_pdl_eastern.xml b/support_files/definitions/north_america/usa/cup_usa_pdl_eastern.xml
similarity index 100%
rename from support_files/definitions/usa/cup_usa_pdl_eastern.xml
rename to support_files/definitions/north_america/usa/cup_usa_pdl_eastern.xml
diff --git a/support_files/definitions/usa/cup_usa_pdl_southern.xml b/support_files/definitions/north_america/usa/cup_usa_pdl_southern.xml
similarity index 100%
rename from support_files/definitions/usa/cup_usa_pdl_southern.xml
rename to support_files/definitions/north_america/usa/cup_usa_pdl_southern.xml
diff --git a/support_files/definitions/usa/cup_usa_pdl_western.xml b/support_files/definitions/north_america/usa/cup_usa_pdl_western.xml
similarity index 100%
rename from support_files/definitions/usa/cup_usa_pdl_western.xml
rename to support_files/definitions/north_america/usa/cup_usa_pdl_western.xml
diff --git a/support_files/definitions/usa/cup_usa_second_cup.xml b/support_files/definitions/north_america/usa/cup_usa_second_cup.xml
similarity index 100%
rename from support_files/definitions/usa/cup_usa_second_cup.xml
rename to support_files/definitions/north_america/usa/cup_usa_second_cup.xml
diff --git a/support_files/definitions/usa/cup_usa_superliga.xml b/support_files/definitions/north_america/usa/cup_usa_superliga.xml
similarity index 100%
rename from support_files/definitions/usa/cup_usa_superliga.xml
rename to support_files/definitions/north_america/usa/cup_usa_superliga.xml
diff --git a/support_files/definitions/usa/cup_usa_wplayoff.xml b/support_files/definitions/north_america/usa/cup_usa_wplayoff.xml
similarity index 100%
rename from support_files/definitions/usa/cup_usa_wplayoff.xml
rename to support_files/definitions/north_america/usa/cup_usa_wplayoff.xml
diff --git a/support_files/definitions/usa/league_usa_econf.xml b/support_files/definitions/north_america/usa/league_usa_econf.xml
similarity index 100%
rename from support_files/definitions/usa/league_usa_econf.xml
rename to support_files/definitions/north_america/usa/league_usa_econf.xml
diff --git a/support_files/definitions/usa/league_usa_first.xml b/support_files/definitions/north_america/usa/league_usa_first.xml
similarity index 100%
rename from support_files/definitions/usa/league_usa_first.xml
rename to support_files/definitions/north_america/usa/league_usa_first.xml
diff --git a/support_files/definitions/usa/league_usa_mls.xml b/support_files/definitions/north_america/usa/league_usa_mls.xml
similarity index 100%
rename from support_files/definitions/usa/league_usa_mls.xml
rename to support_files/definitions/north_america/usa/league_usa_mls.xml
diff --git a/support_files/definitions/usa/league_usa_pdl_gl.xml b/support_files/definitions/north_america/usa/league_usa_pdl_gl.xml
similarity index 100%
rename from support_files/definitions/usa/league_usa_pdl_gl.xml
rename to support_files/definitions/north_america/usa/league_usa_pdl_gl.xml
diff --git a/support_files/definitions/usa/league_usa_pdl_hl.xml b/support_files/definitions/north_america/usa/league_usa_pdl_hl.xml
similarity index 100%
rename from support_files/definitions/usa/league_usa_pdl_hl.xml
rename to support_files/definitions/north_america/usa/league_usa_pdl_hl.xml
diff --git a/support_files/definitions/usa/league_usa_pdl_ma.xml b/support_files/definitions/north_america/usa/league_usa_pdl_ma.xml
similarity index 100%
rename from support_files/definitions/usa/league_usa_pdl_ma.xml
rename to support_files/definitions/north_america/usa/league_usa_pdl_ma.xml
diff --git a/support_files/definitions/usa/league_usa_pdl_ms.xml b/support_files/definitions/north_america/usa/league_usa_pdl_ms.xml
similarity index 100%
rename from support_files/definitions/usa/league_usa_pdl_ms.xml
rename to support_files/definitions/north_america/usa/league_usa_pdl_ms.xml
diff --git a/support_files/definitions/usa/league_usa_pdl_ne.xml b/support_files/definitions/north_america/usa/league_usa_pdl_ne.xml
similarity index 100%
rename from support_files/definitions/usa/league_usa_pdl_ne.xml
rename to support_files/definitions/north_america/usa/league_usa_pdl_ne.xml
diff --git a/support_files/definitions/usa/league_usa_pdl_no.xml b/support_files/definitions/north_america/usa/league_usa_pdl_no.xml
similarity index 100%
rename from support_files/definitions/usa/league_usa_pdl_no.xml
rename to support_files/definitions/north_america/usa/league_usa_pdl_no.xml
diff --git a/support_files/definitions/usa/league_usa_pdl_nw.xml b/support_files/definitions/north_america/usa/league_usa_pdl_nw.xml
similarity index 100%
rename from support_files/definitions/usa/league_usa_pdl_nw.xml
rename to support_files/definitions/north_america/usa/league_usa_pdl_nw.xml
diff --git a/support_files/definitions/usa/league_usa_pdl_sa.xml b/support_files/definitions/north_america/usa/league_usa_pdl_sa.xml
similarity index 100%
rename from support_files/definitions/usa/league_usa_pdl_sa.xml
rename to support_files/definitions/north_america/usa/league_usa_pdl_sa.xml
diff --git a/support_files/definitions/usa/league_usa_pdl_se.xml b/support_files/definitions/north_america/usa/league_usa_pdl_se.xml
similarity index 100%
rename from support_files/definitions/usa/league_usa_pdl_se.xml
rename to support_files/definitions/north_america/usa/league_usa_pdl_se.xml
diff --git a/support_files/definitions/usa/league_usa_pdl_sw.xml b/support_files/definitions/north_america/usa/league_usa_pdl_sw.xml
similarity index 100%
rename from support_files/definitions/usa/league_usa_pdl_sw.xml
rename to support_files/definitions/north_america/usa/league_usa_pdl_sw.xml
diff --git a/support_files/definitions/usa/league_usa_second.xml b/support_files/definitions/north_america/usa/league_usa_second.xml
similarity index 100%
rename from support_files/definitions/usa/league_usa_second.xml
rename to support_files/definitions/north_america/usa/league_usa_second.xml
diff --git a/support_files/definitions/usa/league_usa_wconf.xml b/support_files/definitions/north_america/usa/league_usa_wconf.xml
similarity index 100%
rename from support_files/definitions/usa/league_usa_wconf.xml
rename to support_files/definitions/north_america/usa/league_usa_wconf.xml
diff --git a/support_files/definitions/short_leagues_south_america/league_bolivia1_short.xml b/support_files/definitions/south_america/short_leagues_south_america/league_bolivia1_short.xml
similarity index 100%
rename from support_files/definitions/short_leagues_south_america/league_bolivia1_short.xml
rename to support_files/definitions/south_america/short_leagues_south_america/league_bolivia1_short.xml
diff --git a/support_files/definitions/short_leagues_south_america/league_chile1_short.xml b/support_files/definitions/south_america/short_leagues_south_america/league_chile1_short.xml
similarity index 100%
rename from support_files/definitions/short_leagues_south_america/league_chile1_short.xml
rename to support_files/definitions/south_america/short_leagues_south_america/league_chile1_short.xml
diff --git a/support_files/definitions/short_leagues_south_america/league_colombia1_short.xml b/support_files/definitions/south_america/short_leagues_south_america/league_colombia1_short.xml
similarity index 100%
rename from support_files/definitions/short_leagues_south_america/league_colombia1_short.xml
rename to support_files/definitions/south_america/short_leagues_south_america/league_colombia1_short.xml
diff --git a/support_files/definitions/short_leagues_south_america/league_costa_rica1_short.xml b/support_files/definitions/south_america/short_leagues_south_america/league_costa_rica1_short.xml
similarity index 100%
rename from support_files/definitions/short_leagues_south_america/league_costa_rica1_short.xml
rename to support_files/definitions/south_america/short_leagues_south_america/league_costa_rica1_short.xml
diff --git a/support_files/definitions/short_leagues_south_america/league_ecuador1_short.xml b/support_files/definitions/south_america/short_leagues_south_america/league_ecuador1_short.xml
similarity index 100%
rename from support_files/definitions/short_leagues_south_america/league_ecuador1_short.xml
rename to support_files/definitions/south_america/short_leagues_south_america/league_ecuador1_short.xml
diff --git a/support_files/definitions/short_leagues_south_america/league_mexico1_short.xml b/support_files/definitions/south_america/short_leagues_south_america/league_mexico1_short.xml
similarity index 100%
rename from support_files/definitions/short_leagues_south_america/league_mexico1_short.xml
rename to support_files/definitions/south_america/short_leagues_south_america/league_mexico1_short.xml
diff --git a/support_files/definitions/short_leagues_south_america/league_paraguay1_short.xml b/support_files/definitions/south_america/short_leagues_south_america/league_paraguay1_short.xml
similarity index 100%
rename from support_files/definitions/short_leagues_south_america/league_paraguay1_short.xml
rename to support_files/definitions/south_america/short_leagues_south_america/league_paraguay1_short.xml
diff --git a/support_files/definitions/short_leagues_south_america/league_peru1_short.xml b/support_files/definitions/south_america/short_leagues_south_america/league_peru1_short.xml
similarity index 100%
rename from support_files/definitions/short_leagues_south_america/league_peru1_short.xml
rename to support_files/definitions/south_america/short_leagues_south_america/league_peru1_short.xml
diff --git a/support_files/definitions/short_leagues_south_america/league_uruguay1_short.xml b/support_files/definitions/south_america/short_leagues_south_america/league_uruguay1_short.xml
similarity index 100%
rename from support_files/definitions/short_leagues_south_america/league_uruguay1_short.xml
rename to support_files/definitions/south_america/short_leagues_south_america/league_uruguay1_short.xml
diff --git a/support_files/definitions/short_leagues_south_america/league_venezuela1_short.xml b/support_files/definitions/south_america/short_leagues_south_america/league_venezuela1_short.xml
similarity index 100%
rename from support_files/definitions/short_leagues_south_america/league_venezuela1_short.xml
rename to support_files/definitions/south_america/short_leagues_south_america/league_venezuela1_short.xml