diff --git a/data/by-territory/by-continent/Africa/by-territory/Algeria.json b/data/by-territory/by-continent/Africa/Algeria.json
similarity index 100%
rename from data/by-territory/by-continent/Africa/by-territory/Algeria.json
rename to data/by-territory/by-continent/Africa/Algeria.json
diff --git a/data/by-territory/by-continent/Africa/by-territory/Angola.json b/data/by-territory/by-continent/Africa/Angola.json
similarity index 100%
rename from data/by-territory/by-continent/Africa/by-territory/Angola.json
rename to data/by-territory/by-continent/Africa/Angola.json
diff --git a/data/by-territory/by-continent/Africa/by-territory/Benin.json b/data/by-territory/by-continent/Africa/Benin.json
similarity index 100%
rename from data/by-territory/by-continent/Africa/by-territory/Benin.json
rename to data/by-territory/by-continent/Africa/Benin.json
diff --git a/data/by-territory/by-continent/Africa/by-territory/Botswana.json b/data/by-territory/by-continent/Africa/Botswana.json
similarity index 100%
rename from data/by-territory/by-continent/Africa/by-territory/Botswana.json
rename to data/by-territory/by-continent/Africa/Botswana.json
diff --git a/data/by-territory/by-continent/Africa/by-territory/Burkina Faso.json b/data/by-territory/by-continent/Africa/Burkina Faso.json
similarity index 100%
rename from data/by-territory/by-continent/Africa/by-territory/Burkina Faso.json
rename to data/by-territory/by-continent/Africa/Burkina Faso.json
diff --git a/data/by-territory/by-continent/Africa/by-territory/Burundi.json b/data/by-territory/by-continent/Africa/Burundi.json
similarity index 100%
rename from data/by-territory/by-continent/Africa/by-territory/Burundi.json
rename to data/by-territory/by-continent/Africa/Burundi.json
diff --git a/data/by-territory/by-continent/Africa/by-territory/Cabo Verde.json b/data/by-territory/by-continent/Africa/Cabo Verde.json
similarity index 100%
rename from data/by-territory/by-continent/Africa/by-territory/Cabo Verde.json
rename to data/by-territory/by-continent/Africa/Cabo Verde.json
diff --git a/data/by-territory/by-continent/Africa/by-territory/Cameroon.json b/data/by-territory/by-continent/Africa/Cameroon.json
similarity index 100%
rename from data/by-territory/by-continent/Africa/by-territory/Cameroon.json
rename to data/by-territory/by-continent/Africa/Cameroon.json
diff --git a/data/by-territory/by-continent/Africa/by-territory/Central African Republic.json b/data/by-territory/by-continent/Africa/Central African Republic.json
similarity index 100%
rename from data/by-territory/by-continent/Africa/by-territory/Central African Republic.json
rename to data/by-territory/by-continent/Africa/Central African Republic.json
diff --git a/data/by-territory/by-continent/Africa/by-territory/Chad.json b/data/by-territory/by-continent/Africa/Chad.json
similarity index 100%
rename from data/by-territory/by-continent/Africa/by-territory/Chad.json
rename to data/by-territory/by-continent/Africa/Chad.json
diff --git a/data/by-territory/by-continent/Africa/by-territory/Comoros.json b/data/by-territory/by-continent/Africa/Comoros.json
similarity index 100%
rename from data/by-territory/by-continent/Africa/by-territory/Comoros.json
rename to data/by-territory/by-continent/Africa/Comoros.json
diff --git a/data/by-territory/by-continent/Africa/by-territory/Democratic Republic of the Congo.json b/data/by-territory/by-continent/Africa/Democratic Republic of the Congo.json
similarity index 100%
rename from data/by-territory/by-continent/Africa/by-territory/Democratic Republic of the Congo.json
rename to data/by-territory/by-continent/Africa/Democratic Republic of the Congo.json
diff --git a/data/by-territory/by-continent/Africa/by-territory/Djibouti.json b/data/by-territory/by-continent/Africa/Djibouti.json
similarity index 100%
rename from data/by-territory/by-continent/Africa/by-territory/Djibouti.json
rename to data/by-territory/by-continent/Africa/Djibouti.json
diff --git a/data/by-territory/by-continent/Africa/by-territory/Egypt.json b/data/by-territory/by-continent/Africa/Egypt.json
similarity index 100%
rename from data/by-territory/by-continent/Africa/by-territory/Egypt.json
rename to data/by-territory/by-continent/Africa/Egypt.json
diff --git a/data/by-territory/by-continent/Africa/by-territory/Equatorial Guinea.json b/data/by-territory/by-continent/Africa/Equatorial Guinea.json
similarity index 100%
rename from data/by-territory/by-continent/Africa/by-territory/Equatorial Guinea.json
rename to data/by-territory/by-continent/Africa/Equatorial Guinea.json
diff --git a/data/by-territory/by-continent/Africa/by-territory/Eritrea.json b/data/by-territory/by-continent/Africa/Eritrea.json
similarity index 100%
rename from data/by-territory/by-continent/Africa/by-territory/Eritrea.json
rename to data/by-territory/by-continent/Africa/Eritrea.json
diff --git a/data/by-territory/by-continent/Africa/by-territory/Eswatini.json b/data/by-territory/by-continent/Africa/Eswatini.json
similarity index 100%
rename from data/by-territory/by-continent/Africa/by-territory/Eswatini.json
rename to data/by-territory/by-continent/Africa/Eswatini.json
diff --git a/data/by-territory/by-continent/Africa/by-territory/Ethiopia.json b/data/by-territory/by-continent/Africa/Ethiopia.json
similarity index 100%
rename from data/by-territory/by-continent/Africa/by-territory/Ethiopia.json
rename to data/by-territory/by-continent/Africa/Ethiopia.json
diff --git a/data/by-territory/by-continent/Africa/by-territory/Gabon.json b/data/by-territory/by-continent/Africa/Gabon.json
similarity index 100%
rename from data/by-territory/by-continent/Africa/by-territory/Gabon.json
rename to data/by-territory/by-continent/Africa/Gabon.json
diff --git a/data/by-territory/by-continent/Africa/by-territory/Gambia.json b/data/by-territory/by-continent/Africa/Gambia.json
similarity index 100%
rename from data/by-territory/by-continent/Africa/by-territory/Gambia.json
rename to data/by-territory/by-continent/Africa/Gambia.json
diff --git a/data/by-territory/by-continent/Africa/by-territory/Ghana.json b/data/by-territory/by-continent/Africa/Ghana.json
similarity index 100%
rename from data/by-territory/by-continent/Africa/by-territory/Ghana.json
rename to data/by-territory/by-continent/Africa/Ghana.json
diff --git a/data/by-territory/by-continent/Africa/by-territory/Guinea-Bissau.json b/data/by-territory/by-continent/Africa/Guinea-Bissau.json
similarity index 100%
rename from data/by-territory/by-continent/Africa/by-territory/Guinea-Bissau.json
rename to data/by-territory/by-continent/Africa/Guinea-Bissau.json
diff --git a/data/by-territory/by-continent/Africa/by-territory/Guinea.json b/data/by-territory/by-continent/Africa/Guinea.json
similarity index 100%
rename from data/by-territory/by-continent/Africa/by-territory/Guinea.json
rename to data/by-territory/by-continent/Africa/Guinea.json
diff --git a/data/by-territory/by-continent/Africa/by-territory/Kenya.json b/data/by-territory/by-continent/Africa/Kenya.json
similarity index 100%
rename from data/by-territory/by-continent/Africa/by-territory/Kenya.json
rename to data/by-territory/by-continent/Africa/Kenya.json
diff --git a/data/by-territory/by-continent/Africa/by-territory/Lesotho.json b/data/by-territory/by-continent/Africa/Lesotho.json
similarity index 100%
rename from data/by-territory/by-continent/Africa/by-territory/Lesotho.json
rename to data/by-territory/by-continent/Africa/Lesotho.json
diff --git a/data/by-territory/by-continent/Africa/by-territory/Liberia.json b/data/by-territory/by-continent/Africa/Liberia.json
similarity index 100%
rename from data/by-territory/by-continent/Africa/by-territory/Liberia.json
rename to data/by-territory/by-continent/Africa/Liberia.json
diff --git a/data/by-territory/by-continent/Africa/by-territory/Libya.json b/data/by-territory/by-continent/Africa/Libya.json
similarity index 100%
rename from data/by-territory/by-continent/Africa/by-territory/Libya.json
rename to data/by-territory/by-continent/Africa/Libya.json
diff --git a/data/by-territory/by-continent/Africa/by-territory/Madagascar.json b/data/by-territory/by-continent/Africa/Madagascar.json
similarity index 100%
rename from data/by-territory/by-continent/Africa/by-territory/Madagascar.json
rename to data/by-territory/by-continent/Africa/Madagascar.json
diff --git a/data/by-territory/by-continent/Africa/by-territory/Malawi.json b/data/by-territory/by-continent/Africa/Malawi.json
similarity index 100%
rename from data/by-territory/by-continent/Africa/by-territory/Malawi.json
rename to data/by-territory/by-continent/Africa/Malawi.json
diff --git a/data/by-territory/by-continent/Africa/by-territory/Mali.json b/data/by-territory/by-continent/Africa/Mali.json
similarity index 100%
rename from data/by-territory/by-continent/Africa/by-territory/Mali.json
rename to data/by-territory/by-continent/Africa/Mali.json
diff --git a/data/by-territory/by-continent/Africa/by-territory/Mauritania.json b/data/by-territory/by-continent/Africa/Mauritania.json
similarity index 100%
rename from data/by-territory/by-continent/Africa/by-territory/Mauritania.json
rename to data/by-territory/by-continent/Africa/Mauritania.json
diff --git a/data/by-territory/by-continent/Africa/by-territory/Mauritius.json b/data/by-territory/by-continent/Africa/Mauritius.json
similarity index 100%
rename from data/by-territory/by-continent/Africa/by-territory/Mauritius.json
rename to data/by-territory/by-continent/Africa/Mauritius.json
diff --git a/data/by-territory/by-continent/Africa/by-territory/Morocco.json b/data/by-territory/by-continent/Africa/Morocco.json
similarity index 100%
rename from data/by-territory/by-continent/Africa/by-territory/Morocco.json
rename to data/by-territory/by-continent/Africa/Morocco.json
diff --git a/data/by-territory/by-continent/Africa/by-territory/Mozambique.json b/data/by-territory/by-continent/Africa/Mozambique.json
similarity index 100%
rename from data/by-territory/by-continent/Africa/by-territory/Mozambique.json
rename to data/by-territory/by-continent/Africa/Mozambique.json
diff --git a/data/by-territory/by-continent/Africa/by-territory/Namibia.json b/data/by-territory/by-continent/Africa/Namibia.json
similarity index 100%
rename from data/by-territory/by-continent/Africa/by-territory/Namibia.json
rename to data/by-territory/by-continent/Africa/Namibia.json
diff --git a/data/by-territory/by-continent/Africa/by-territory/Niger.json b/data/by-territory/by-continent/Africa/Niger.json
similarity index 100%
rename from data/by-territory/by-continent/Africa/by-territory/Niger.json
rename to data/by-territory/by-continent/Africa/Niger.json
diff --git a/data/by-territory/by-continent/Africa/by-territory/Nigeria.json b/data/by-territory/by-continent/Africa/Nigeria.json
similarity index 100%
rename from data/by-territory/by-continent/Africa/by-territory/Nigeria.json
rename to data/by-territory/by-continent/Africa/Nigeria.json
diff --git a/data/by-territory/by-continent/Africa/by-territory/Republic of the Congo.json b/data/by-territory/by-continent/Africa/Republic of the Congo.json
similarity index 100%
rename from data/by-territory/by-continent/Africa/by-territory/Republic of the Congo.json
rename to data/by-territory/by-continent/Africa/Republic of the Congo.json
diff --git a/data/by-territory/by-continent/Africa/by-territory/Rwanda.json b/data/by-territory/by-continent/Africa/Rwanda.json
similarity index 100%
rename from data/by-territory/by-continent/Africa/by-territory/Rwanda.json
rename to data/by-territory/by-continent/Africa/Rwanda.json
diff --git a/data/by-territory/by-continent/Africa/by-territory/Sao Tome and Principe.json b/data/by-territory/by-continent/Africa/Sao Tome and Principe.json
similarity index 100%
rename from data/by-territory/by-continent/Africa/by-territory/Sao Tome and Principe.json
rename to data/by-territory/by-continent/Africa/Sao Tome and Principe.json
diff --git a/data/by-territory/by-continent/Africa/by-territory/Senegal.json b/data/by-territory/by-continent/Africa/Senegal.json
similarity index 100%
rename from data/by-territory/by-continent/Africa/by-territory/Senegal.json
rename to data/by-territory/by-continent/Africa/Senegal.json
diff --git a/data/by-territory/by-continent/Africa/by-territory/Seychelles.json b/data/by-territory/by-continent/Africa/Seychelles.json
similarity index 100%
rename from data/by-territory/by-continent/Africa/by-territory/Seychelles.json
rename to data/by-territory/by-continent/Africa/Seychelles.json
diff --git a/data/by-territory/by-continent/Africa/by-territory/Sierra Leone.json b/data/by-territory/by-continent/Africa/Sierra Leone.json
similarity index 100%
rename from data/by-territory/by-continent/Africa/by-territory/Sierra Leone.json
rename to data/by-territory/by-continent/Africa/Sierra Leone.json
diff --git a/data/by-territory/by-continent/Africa/by-territory/Somalia.json b/data/by-territory/by-continent/Africa/Somalia.json
similarity index 100%
rename from data/by-territory/by-continent/Africa/by-territory/Somalia.json
rename to data/by-territory/by-continent/Africa/Somalia.json
diff --git a/data/by-territory/by-continent/Africa/by-territory/South Africa.json b/data/by-territory/by-continent/Africa/South Africa.json
similarity index 100%
rename from data/by-territory/by-continent/Africa/by-territory/South Africa.json
rename to data/by-territory/by-continent/Africa/South Africa.json
diff --git a/data/by-territory/by-continent/Africa/by-territory/South Sudan.json b/data/by-territory/by-continent/Africa/South Sudan.json
similarity index 100%
rename from data/by-territory/by-continent/Africa/by-territory/South Sudan.json
rename to data/by-territory/by-continent/Africa/South Sudan.json
diff --git a/data/by-territory/by-continent/Africa/by-territory/Sudan.json b/data/by-territory/by-continent/Africa/Sudan.json
similarity index 100%
rename from data/by-territory/by-continent/Africa/by-territory/Sudan.json
rename to data/by-territory/by-continent/Africa/Sudan.json
diff --git a/data/by-territory/by-continent/Africa/by-territory/Tanzania.json b/data/by-territory/by-continent/Africa/Tanzania.json
similarity index 100%
rename from data/by-territory/by-continent/Africa/by-territory/Tanzania.json
rename to data/by-territory/by-continent/Africa/Tanzania.json
diff --git a/data/by-territory/by-continent/Africa/by-territory/Togo.json b/data/by-territory/by-continent/Africa/Togo.json
similarity index 100%
rename from data/by-territory/by-continent/Africa/by-territory/Togo.json
rename to data/by-territory/by-continent/Africa/Togo.json
diff --git a/data/by-territory/by-continent/Africa/by-territory/Tunisia.json b/data/by-territory/by-continent/Africa/Tunisia.json
similarity index 100%
rename from data/by-territory/by-continent/Africa/by-territory/Tunisia.json
rename to data/by-territory/by-continent/Africa/Tunisia.json
diff --git a/data/by-territory/by-continent/Africa/by-territory/Uganda.json b/data/by-territory/by-continent/Africa/Uganda.json
similarity index 100%
rename from data/by-territory/by-continent/Africa/by-territory/Uganda.json
rename to data/by-territory/by-continent/Africa/Uganda.json
diff --git a/data/by-territory/by-continent/Africa/by-territory/Zambia.json b/data/by-territory/by-continent/Africa/Zambia.json
similarity index 100%
rename from data/by-territory/by-continent/Africa/by-territory/Zambia.json
rename to data/by-territory/by-continent/Africa/Zambia.json
diff --git a/data/by-territory/by-continent/Africa/by-territory/Zimbabwe.json b/data/by-territory/by-continent/Africa/Zimbabwe.json
similarity index 100%
rename from data/by-territory/by-continent/Africa/by-territory/Zimbabwe.json
rename to data/by-territory/by-continent/Africa/Zimbabwe.json
diff --git a/data/by-territory/by-continent/Africa/by-territory/cote-divoire.json b/data/by-territory/by-continent/Africa/cote-divoire.json
similarity index 100%
rename from data/by-territory/by-continent/Africa/by-territory/cote-divoire.json
rename to data/by-territory/by-continent/Africa/cote-divoire.json
diff --git a/data/by-territory/by-continent/Asia/by-territory/Afghanistan.json b/data/by-territory/by-continent/Asia/Afghanistan.json
similarity index 100%
rename from data/by-territory/by-continent/Asia/by-territory/Afghanistan.json
rename to data/by-territory/by-continent/Asia/Afghanistan.json
diff --git a/data/by-territory/by-continent/Asia/by-territory/Armenia.json b/data/by-territory/by-continent/Asia/Armenia.json
similarity index 100%
rename from data/by-territory/by-continent/Asia/by-territory/Armenia.json
rename to data/by-territory/by-continent/Asia/Armenia.json
diff --git a/data/by-territory/by-continent/Asia/by-territory/Azerbaijan.json b/data/by-territory/by-continent/Asia/Azerbaijan.json
similarity index 100%
rename from data/by-territory/by-continent/Asia/by-territory/Azerbaijan.json
rename to data/by-territory/by-continent/Asia/Azerbaijan.json
diff --git a/data/by-territory/by-continent/Asia/by-territory/Bahrain.json b/data/by-territory/by-continent/Asia/Bahrain.json
similarity index 100%
rename from data/by-territory/by-continent/Asia/by-territory/Bahrain.json
rename to data/by-territory/by-continent/Asia/Bahrain.json
diff --git a/data/by-territory/by-continent/Asia/by-territory/Bangladesh.json b/data/by-territory/by-continent/Asia/Bangladesh.json
similarity index 100%
rename from data/by-territory/by-continent/Asia/by-territory/Bangladesh.json
rename to data/by-territory/by-continent/Asia/Bangladesh.json
diff --git a/data/by-territory/by-continent/Asia/by-territory/Bhutan.json b/data/by-territory/by-continent/Asia/Bhutan.json
similarity index 100%
rename from data/by-territory/by-continent/Asia/by-territory/Bhutan.json
rename to data/by-territory/by-continent/Asia/Bhutan.json
diff --git a/data/by-territory/by-continent/Asia/by-territory/Brunei Darussalam.json b/data/by-territory/by-continent/Asia/Brunei Darussalam.json
similarity index 100%
rename from data/by-territory/by-continent/Asia/by-territory/Brunei Darussalam.json
rename to data/by-territory/by-continent/Asia/Brunei Darussalam.json
diff --git a/data/by-territory/by-continent/Asia/by-territory/Cambodia.json b/data/by-territory/by-continent/Asia/Cambodia.json
similarity index 100%
rename from data/by-territory/by-continent/Asia/by-territory/Cambodia.json
rename to data/by-territory/by-continent/Asia/Cambodia.json
diff --git a/data/by-territory/by-continent/Asia/by-territory/China.json b/data/by-territory/by-continent/Asia/China.json
similarity index 100%
rename from data/by-territory/by-continent/Asia/by-territory/China.json
rename to data/by-territory/by-continent/Asia/China.json
diff --git a/data/by-territory/by-continent/Asia/by-territory/Cyprus.json b/data/by-territory/by-continent/Asia/Cyprus.json
similarity index 100%
rename from data/by-territory/by-continent/Asia/by-territory/Cyprus.json
rename to data/by-territory/by-continent/Asia/Cyprus.json
diff --git a/data/by-territory/by-continent/Asia/by-territory/Georgia.json b/data/by-territory/by-continent/Asia/Georgia.json
similarity index 100%
rename from data/by-territory/by-continent/Asia/by-territory/Georgia.json
rename to data/by-territory/by-continent/Asia/Georgia.json
diff --git a/data/by-territory/by-continent/Asia/by-territory/Hong Kong SAR.json b/data/by-territory/by-continent/Asia/Hong Kong SAR.json
similarity index 100%
rename from data/by-territory/by-continent/Asia/by-territory/Hong Kong SAR.json
rename to data/by-territory/by-continent/Asia/Hong Kong SAR.json
diff --git a/data/by-territory/by-continent/Asia/by-territory/India.json b/data/by-territory/by-continent/Asia/India.json
similarity index 100%
rename from data/by-territory/by-continent/Asia/by-territory/India.json
rename to data/by-territory/by-continent/Asia/India.json
diff --git a/data/by-territory/by-continent/Asia/by-territory/Indonesia.json b/data/by-territory/by-continent/Asia/Indonesia.json
similarity index 100%
rename from data/by-territory/by-continent/Asia/by-territory/Indonesia.json
rename to data/by-territory/by-continent/Asia/Indonesia.json
diff --git a/data/by-territory/by-continent/Asia/by-territory/Iran.json b/data/by-territory/by-continent/Asia/Iran.json
similarity index 100%
rename from data/by-territory/by-continent/Asia/by-territory/Iran.json
rename to data/by-territory/by-continent/Asia/Iran.json
diff --git a/data/by-territory/by-continent/Asia/by-territory/Iraq.json b/data/by-territory/by-continent/Asia/Iraq.json
similarity index 100%
rename from data/by-territory/by-continent/Asia/by-territory/Iraq.json
rename to data/by-territory/by-continent/Asia/Iraq.json
diff --git a/data/by-territory/by-continent/Asia/by-territory/Israel.json b/data/by-territory/by-continent/Asia/Israel.json
similarity index 100%
rename from data/by-territory/by-continent/Asia/by-territory/Israel.json
rename to data/by-territory/by-continent/Asia/Israel.json
diff --git a/data/by-territory/by-continent/Asia/by-territory/Japan.json b/data/by-territory/by-continent/Asia/Japan.json
similarity index 100%
rename from data/by-territory/by-continent/Asia/by-territory/Japan.json
rename to data/by-territory/by-continent/Asia/Japan.json
diff --git a/data/by-territory/by-continent/Asia/by-territory/Jordan.json b/data/by-territory/by-continent/Asia/Jordan.json
similarity index 100%
rename from data/by-territory/by-continent/Asia/by-territory/Jordan.json
rename to data/by-territory/by-continent/Asia/Jordan.json
diff --git a/data/by-territory/by-continent/Asia/by-territory/Kazakhstan.json b/data/by-territory/by-continent/Asia/Kazakhstan.json
similarity index 100%
rename from data/by-territory/by-continent/Asia/by-territory/Kazakhstan.json
rename to data/by-territory/by-continent/Asia/Kazakhstan.json
diff --git a/data/by-territory/by-continent/Asia/by-territory/Kuwait.json b/data/by-territory/by-continent/Asia/Kuwait.json
similarity index 100%
rename from data/by-territory/by-continent/Asia/by-territory/Kuwait.json
rename to data/by-territory/by-continent/Asia/Kuwait.json
diff --git a/data/by-territory/by-continent/Asia/by-territory/Kyrgyz Republic.json b/data/by-territory/by-continent/Asia/Kyrgyz Republic.json
similarity index 100%
rename from data/by-territory/by-continent/Asia/by-territory/Kyrgyz Republic.json
rename to data/by-territory/by-continent/Asia/Kyrgyz Republic.json
diff --git a/data/by-territory/by-continent/Asia/by-territory/Lao.json b/data/by-territory/by-continent/Asia/Lao.json
similarity index 100%
rename from data/by-territory/by-continent/Asia/by-territory/Lao.json
rename to data/by-territory/by-continent/Asia/Lao.json
diff --git a/data/by-territory/by-continent/Asia/by-territory/Lebanon.json b/data/by-territory/by-continent/Asia/Lebanon.json
similarity index 100%
rename from data/by-territory/by-continent/Asia/by-territory/Lebanon.json
rename to data/by-territory/by-continent/Asia/Lebanon.json
diff --git a/data/by-territory/by-continent/Asia/by-territory/Macao.json b/data/by-territory/by-continent/Asia/Macao.json
similarity index 100%
rename from data/by-territory/by-continent/Asia/by-territory/Macao.json
rename to data/by-territory/by-continent/Asia/Macao.json
diff --git a/data/by-territory/by-continent/Asia/by-territory/Malaysia.json b/data/by-territory/by-continent/Asia/Malaysia.json
similarity index 100%
rename from data/by-territory/by-continent/Asia/by-territory/Malaysia.json
rename to data/by-territory/by-continent/Asia/Malaysia.json
diff --git a/data/by-territory/by-continent/Asia/by-territory/Maldives.json b/data/by-territory/by-continent/Asia/Maldives.json
similarity index 100%
rename from data/by-territory/by-continent/Asia/by-territory/Maldives.json
rename to data/by-territory/by-continent/Asia/Maldives.json
diff --git a/data/by-territory/by-continent/Asia/by-territory/Mongolia.json b/data/by-territory/by-continent/Asia/Mongolia.json
similarity index 100%
rename from data/by-territory/by-continent/Asia/by-territory/Mongolia.json
rename to data/by-territory/by-continent/Asia/Mongolia.json
diff --git a/data/by-territory/by-continent/Asia/by-territory/Myanmar.json b/data/by-territory/by-continent/Asia/Myanmar.json
similarity index 100%
rename from data/by-territory/by-continent/Asia/by-territory/Myanmar.json
rename to data/by-territory/by-continent/Asia/Myanmar.json
diff --git a/data/by-territory/by-continent/Asia/by-territory/Nepal.json b/data/by-territory/by-continent/Asia/Nepal.json
similarity index 100%
rename from data/by-territory/by-continent/Asia/by-territory/Nepal.json
rename to data/by-territory/by-continent/Asia/Nepal.json
diff --git a/data/by-territory/by-continent/Asia/by-territory/North Korea.json b/data/by-territory/by-continent/Asia/North Korea.json
similarity index 100%
rename from data/by-territory/by-continent/Asia/by-territory/North Korea.json
rename to data/by-territory/by-continent/Asia/North Korea.json
diff --git a/data/by-territory/by-continent/Asia/by-territory/Oman.json b/data/by-territory/by-continent/Asia/Oman.json
similarity index 100%
rename from data/by-territory/by-continent/Asia/by-territory/Oman.json
rename to data/by-territory/by-continent/Asia/Oman.json
diff --git a/data/by-territory/by-continent/Asia/by-territory/Pakistan.json b/data/by-territory/by-continent/Asia/Pakistan.json
similarity index 100%
rename from data/by-territory/by-continent/Asia/by-territory/Pakistan.json
rename to data/by-territory/by-continent/Asia/Pakistan.json
diff --git a/data/by-territory/by-continent/Asia/by-territory/Philippines.json b/data/by-territory/by-continent/Asia/Philippines.json
similarity index 100%
rename from data/by-territory/by-continent/Asia/by-territory/Philippines.json
rename to data/by-territory/by-continent/Asia/Philippines.json
diff --git a/data/by-territory/by-continent/Asia/by-territory/Qatar.json b/data/by-territory/by-continent/Asia/Qatar.json
similarity index 100%
rename from data/by-territory/by-continent/Asia/by-territory/Qatar.json
rename to data/by-territory/by-continent/Asia/Qatar.json
diff --git a/data/by-territory/by-continent/Asia/by-territory/Saudi Arabia.json b/data/by-territory/by-continent/Asia/Saudi Arabia.json
similarity index 100%
rename from data/by-territory/by-continent/Asia/by-territory/Saudi Arabia.json
rename to data/by-territory/by-continent/Asia/Saudi Arabia.json
diff --git a/data/by-territory/by-continent/Asia/by-territory/Singapore.json b/data/by-territory/by-continent/Asia/Singapore.json
similarity index 100%
rename from data/by-territory/by-continent/Asia/by-territory/Singapore.json
rename to data/by-territory/by-continent/Asia/Singapore.json
diff --git a/data/by-territory/by-continent/Asia/by-territory/South Korea.json b/data/by-territory/by-continent/Asia/South Korea.json
similarity index 100%
rename from data/by-territory/by-continent/Asia/by-territory/South Korea.json
rename to data/by-territory/by-continent/Asia/South Korea.json
diff --git a/data/by-territory/by-continent/Asia/by-territory/Sri Lanka.json b/data/by-territory/by-continent/Asia/Sri Lanka.json
similarity index 100%
rename from data/by-territory/by-continent/Asia/by-territory/Sri Lanka.json
rename to data/by-territory/by-continent/Asia/Sri Lanka.json
diff --git a/data/by-territory/by-continent/Asia/by-territory/Syria.json b/data/by-territory/by-continent/Asia/Syria.json
similarity index 100%
rename from data/by-territory/by-continent/Asia/by-territory/Syria.json
rename to data/by-territory/by-continent/Asia/Syria.json
diff --git a/data/by-territory/by-continent/Asia/by-territory/Taiwan.json b/data/by-territory/by-continent/Asia/Taiwan.json
similarity index 100%
rename from data/by-territory/by-continent/Asia/by-territory/Taiwan.json
rename to data/by-territory/by-continent/Asia/Taiwan.json
diff --git a/data/by-territory/by-continent/Asia/by-territory/Tajikistan.json b/data/by-territory/by-continent/Asia/Tajikistan.json
similarity index 100%
rename from data/by-territory/by-continent/Asia/by-territory/Tajikistan.json
rename to data/by-territory/by-continent/Asia/Tajikistan.json
diff --git a/data/by-territory/by-continent/Asia/by-territory/Thailand.json b/data/by-territory/by-continent/Asia/Thailand.json
similarity index 100%
rename from data/by-territory/by-continent/Asia/by-territory/Thailand.json
rename to data/by-territory/by-continent/Asia/Thailand.json
diff --git a/data/by-territory/by-continent/Asia/by-territory/Timor-Leste.json b/data/by-territory/by-continent/Asia/Timor-Leste.json
similarity index 100%
rename from data/by-territory/by-continent/Asia/by-territory/Timor-Leste.json
rename to data/by-territory/by-continent/Asia/Timor-Leste.json
diff --git a/data/by-territory/by-continent/Asia/by-territory/Turkiye.json b/data/by-territory/by-continent/Asia/Turkiye.json
similarity index 100%
rename from data/by-territory/by-continent/Asia/by-territory/Turkiye.json
rename to data/by-territory/by-continent/Asia/Turkiye.json
diff --git a/data/by-territory/by-continent/Asia/by-territory/Turkmenistan.json b/data/by-territory/by-continent/Asia/Turkmenistan.json
similarity index 100%
rename from data/by-territory/by-continent/Asia/by-territory/Turkmenistan.json
rename to data/by-territory/by-continent/Asia/Turkmenistan.json
diff --git a/data/by-territory/by-continent/Asia/by-territory/United Arab Emirates.json b/data/by-territory/by-continent/Asia/United Arab Emirates.json
similarity index 100%
rename from data/by-territory/by-continent/Asia/by-territory/United Arab Emirates.json
rename to data/by-territory/by-continent/Asia/United Arab Emirates.json
diff --git a/data/by-territory/by-continent/Asia/by-territory/Uzbekistan.json b/data/by-territory/by-continent/Asia/Uzbekistan.json
similarity index 100%
rename from data/by-territory/by-continent/Asia/by-territory/Uzbekistan.json
rename to data/by-territory/by-continent/Asia/Uzbekistan.json
diff --git a/data/by-territory/by-continent/Asia/by-territory/Vietnam.json b/data/by-territory/by-continent/Asia/Vietnam.json
similarity index 100%
rename from data/by-territory/by-continent/Asia/by-territory/Vietnam.json
rename to data/by-territory/by-continent/Asia/Vietnam.json
diff --git a/data/by-territory/by-continent/Asia/by-territory/West Bank and Gaza.json b/data/by-territory/by-continent/Asia/West Bank and Gaza.json
similarity index 100%
rename from data/by-territory/by-continent/Asia/by-territory/West Bank and Gaza.json
rename to data/by-territory/by-continent/Asia/West Bank and Gaza.json
diff --git a/data/by-territory/by-continent/Asia/by-territory/Yemen.json b/data/by-territory/by-continent/Asia/Yemen.json
similarity index 100%
rename from data/by-territory/by-continent/Asia/by-territory/Yemen.json
rename to data/by-territory/by-continent/Asia/Yemen.json
diff --git a/data/by-territory/by-continent/Europe/by-territory/Albania.json b/data/by-territory/by-continent/Europe/Albania.json
similarity index 100%
rename from data/by-territory/by-continent/Europe/by-territory/Albania.json
rename to data/by-territory/by-continent/Europe/Albania.json
diff --git a/data/by-territory/by-continent/Europe/by-territory/Andorra.json b/data/by-territory/by-continent/Europe/Andorra.json
similarity index 100%
rename from data/by-territory/by-continent/Europe/by-territory/Andorra.json
rename to data/by-territory/by-continent/Europe/Andorra.json
diff --git a/data/by-territory/by-continent/Europe/by-territory/Austria.json b/data/by-territory/by-continent/Europe/Austria.json
similarity index 100%
rename from data/by-territory/by-continent/Europe/by-territory/Austria.json
rename to data/by-territory/by-continent/Europe/Austria.json
diff --git a/data/by-territory/by-continent/Europe/by-territory/Belarus.json b/data/by-territory/by-continent/Europe/Belarus.json
similarity index 100%
rename from data/by-territory/by-continent/Europe/by-territory/Belarus.json
rename to data/by-territory/by-continent/Europe/Belarus.json
diff --git a/data/by-territory/by-continent/Europe/by-territory/Belgium.json b/data/by-territory/by-continent/Europe/Belgium.json
similarity index 100%
rename from data/by-territory/by-continent/Europe/by-territory/Belgium.json
rename to data/by-territory/by-continent/Europe/Belgium.json
diff --git a/data/by-territory/by-continent/Europe/by-territory/Bosnia and Herzegovina.json b/data/by-territory/by-continent/Europe/Bosnia and Herzegovina.json
similarity index 100%
rename from data/by-territory/by-continent/Europe/by-territory/Bosnia and Herzegovina.json
rename to data/by-territory/by-continent/Europe/Bosnia and Herzegovina.json
diff --git a/data/by-territory/by-continent/Europe/by-territory/Bulgaria.json b/data/by-territory/by-continent/Europe/Bulgaria.json
similarity index 100%
rename from data/by-territory/by-continent/Europe/by-territory/Bulgaria.json
rename to data/by-territory/by-continent/Europe/Bulgaria.json
diff --git a/data/by-territory/by-continent/Europe/by-territory/Channel Islands.json b/data/by-territory/by-continent/Europe/Channel Islands.json
similarity index 100%
rename from data/by-territory/by-continent/Europe/by-territory/Channel Islands.json
rename to data/by-territory/by-continent/Europe/Channel Islands.json
diff --git a/data/by-territory/by-continent/Europe/by-territory/Croatia.json b/data/by-territory/by-continent/Europe/Croatia.json
similarity index 100%
rename from data/by-territory/by-continent/Europe/by-territory/Croatia.json
rename to data/by-territory/by-continent/Europe/Croatia.json
diff --git a/data/by-territory/by-continent/Europe/by-territory/Czechia.json b/data/by-territory/by-continent/Europe/Czechia.json
similarity index 100%
rename from data/by-territory/by-continent/Europe/by-territory/Czechia.json
rename to data/by-territory/by-continent/Europe/Czechia.json
diff --git a/data/by-territory/by-continent/Europe/by-territory/Denmark.json b/data/by-territory/by-continent/Europe/Denmark.json
similarity index 100%
rename from data/by-territory/by-continent/Europe/by-territory/Denmark.json
rename to data/by-territory/by-continent/Europe/Denmark.json
diff --git a/data/by-territory/by-continent/Europe/by-territory/Estonia.json b/data/by-territory/by-continent/Europe/Estonia.json
similarity index 100%
rename from data/by-territory/by-continent/Europe/by-territory/Estonia.json
rename to data/by-territory/by-continent/Europe/Estonia.json
diff --git a/data/by-territory/by-continent/Europe/by-territory/Faroe Islands.json b/data/by-territory/by-continent/Europe/Faroe Islands.json
similarity index 100%
rename from data/by-territory/by-continent/Europe/by-territory/Faroe Islands.json
rename to data/by-territory/by-continent/Europe/Faroe Islands.json
diff --git a/data/by-territory/by-continent/Europe/by-territory/Finland.json b/data/by-territory/by-continent/Europe/Finland.json
similarity index 100%
rename from data/by-territory/by-continent/Europe/by-territory/Finland.json
rename to data/by-territory/by-continent/Europe/Finland.json
diff --git a/data/by-territory/by-continent/Europe/by-territory/France.json b/data/by-territory/by-continent/Europe/France.json
similarity index 100%
rename from data/by-territory/by-continent/Europe/by-territory/France.json
rename to data/by-territory/by-continent/Europe/France.json
diff --git a/data/by-territory/by-continent/Europe/by-territory/Germany.json b/data/by-territory/by-continent/Europe/Germany.json
similarity index 100%
rename from data/by-territory/by-continent/Europe/by-territory/Germany.json
rename to data/by-territory/by-continent/Europe/Germany.json
diff --git a/data/by-territory/by-continent/Europe/by-territory/Gibraltar.json b/data/by-territory/by-continent/Europe/Gibraltar.json
similarity index 100%
rename from data/by-territory/by-continent/Europe/by-territory/Gibraltar.json
rename to data/by-territory/by-continent/Europe/Gibraltar.json
diff --git a/data/by-territory/by-continent/Europe/by-territory/Greece.json b/data/by-territory/by-continent/Europe/Greece.json
similarity index 100%
rename from data/by-territory/by-continent/Europe/by-territory/Greece.json
rename to data/by-territory/by-continent/Europe/Greece.json
diff --git a/data/by-territory/by-continent/Europe/by-territory/Greenland.json b/data/by-territory/by-continent/Europe/Greenland.json
similarity index 100%
rename from data/by-territory/by-continent/Europe/by-territory/Greenland.json
rename to data/by-territory/by-continent/Europe/Greenland.json
diff --git a/data/by-territory/by-continent/Europe/by-territory/Hungary.json b/data/by-territory/by-continent/Europe/Hungary.json
similarity index 100%
rename from data/by-territory/by-continent/Europe/by-territory/Hungary.json
rename to data/by-territory/by-continent/Europe/Hungary.json
diff --git a/data/by-territory/by-continent/Europe/by-territory/Iceland.json b/data/by-territory/by-continent/Europe/Iceland.json
similarity index 100%
rename from data/by-territory/by-continent/Europe/by-territory/Iceland.json
rename to data/by-territory/by-continent/Europe/Iceland.json
diff --git a/data/by-territory/by-continent/Europe/by-territory/Ireland.json b/data/by-territory/by-continent/Europe/Ireland.json
similarity index 100%
rename from data/by-territory/by-continent/Europe/by-territory/Ireland.json
rename to data/by-territory/by-continent/Europe/Ireland.json
diff --git a/data/by-territory/by-continent/Europe/by-territory/Isle of Man.json b/data/by-territory/by-continent/Europe/Isle of Man.json
similarity index 100%
rename from data/by-territory/by-continent/Europe/by-territory/Isle of Man.json
rename to data/by-territory/by-continent/Europe/Isle of Man.json
diff --git a/data/by-territory/by-continent/Europe/by-territory/Italy.json b/data/by-territory/by-continent/Europe/Italy.json
similarity index 100%
rename from data/by-territory/by-continent/Europe/by-territory/Italy.json
rename to data/by-territory/by-continent/Europe/Italy.json
diff --git a/data/by-territory/by-continent/Europe/by-territory/Kosovo.json b/data/by-territory/by-continent/Europe/Kosovo.json
similarity index 100%
rename from data/by-territory/by-continent/Europe/by-territory/Kosovo.json
rename to data/by-territory/by-continent/Europe/Kosovo.json
diff --git a/data/by-territory/by-continent/Europe/by-territory/Latvia.json b/data/by-territory/by-continent/Europe/Latvia.json
similarity index 100%
rename from data/by-territory/by-continent/Europe/by-territory/Latvia.json
rename to data/by-territory/by-continent/Europe/Latvia.json
diff --git a/data/by-territory/by-continent/Europe/by-territory/Liechtenstein.json b/data/by-territory/by-continent/Europe/Liechtenstein.json
similarity index 100%
rename from data/by-territory/by-continent/Europe/by-territory/Liechtenstein.json
rename to data/by-territory/by-continent/Europe/Liechtenstein.json
diff --git a/data/by-territory/by-continent/Europe/by-territory/Lithuania.json b/data/by-territory/by-continent/Europe/Lithuania.json
similarity index 100%
rename from data/by-territory/by-continent/Europe/by-territory/Lithuania.json
rename to data/by-territory/by-continent/Europe/Lithuania.json
diff --git a/data/by-territory/by-continent/Europe/by-territory/Luxembourg.json b/data/by-territory/by-continent/Europe/Luxembourg.json
similarity index 100%
rename from data/by-territory/by-continent/Europe/by-territory/Luxembourg.json
rename to data/by-territory/by-continent/Europe/Luxembourg.json
diff --git a/data/by-territory/by-continent/Europe/by-territory/Malta.json b/data/by-territory/by-continent/Europe/Malta.json
similarity index 100%
rename from data/by-territory/by-continent/Europe/by-territory/Malta.json
rename to data/by-territory/by-continent/Europe/Malta.json
diff --git a/data/by-territory/by-continent/Europe/by-territory/Moldova.json b/data/by-territory/by-continent/Europe/Moldova.json
similarity index 100%
rename from data/by-territory/by-continent/Europe/by-territory/Moldova.json
rename to data/by-territory/by-continent/Europe/Moldova.json
diff --git a/data/by-territory/by-continent/Europe/by-territory/Monaco.json b/data/by-territory/by-continent/Europe/Monaco.json
similarity index 100%
rename from data/by-territory/by-continent/Europe/by-territory/Monaco.json
rename to data/by-territory/by-continent/Europe/Monaco.json
diff --git a/data/by-territory/by-continent/Europe/by-territory/Montenegro.json b/data/by-territory/by-continent/Europe/Montenegro.json
similarity index 100%
rename from data/by-territory/by-continent/Europe/by-territory/Montenegro.json
rename to data/by-territory/by-continent/Europe/Montenegro.json
diff --git a/data/by-territory/by-continent/Europe/by-territory/Netherlands.json b/data/by-territory/by-continent/Europe/Netherlands.json
similarity index 100%
rename from data/by-territory/by-continent/Europe/by-territory/Netherlands.json
rename to data/by-territory/by-continent/Europe/Netherlands.json
diff --git a/data/by-territory/by-continent/Europe/by-territory/North Macedonia.json b/data/by-territory/by-continent/Europe/North Macedonia.json
similarity index 100%
rename from data/by-territory/by-continent/Europe/by-territory/North Macedonia.json
rename to data/by-territory/by-continent/Europe/North Macedonia.json
diff --git a/data/by-territory/by-continent/Europe/by-territory/Norway.json b/data/by-territory/by-continent/Europe/Norway.json
similarity index 100%
rename from data/by-territory/by-continent/Europe/by-territory/Norway.json
rename to data/by-territory/by-continent/Europe/Norway.json
diff --git a/data/by-territory/by-continent/Europe/by-territory/Poland.json b/data/by-territory/by-continent/Europe/Poland.json
similarity index 100%
rename from data/by-territory/by-continent/Europe/by-territory/Poland.json
rename to data/by-territory/by-continent/Europe/Poland.json
diff --git a/data/by-territory/by-continent/Europe/by-territory/Portugal.json b/data/by-territory/by-continent/Europe/Portugal.json
similarity index 100%
rename from data/by-territory/by-continent/Europe/by-territory/Portugal.json
rename to data/by-territory/by-continent/Europe/Portugal.json
diff --git a/data/by-territory/by-continent/Europe/by-territory/Romania.json b/data/by-territory/by-continent/Europe/Romania.json
similarity index 100%
rename from data/by-territory/by-continent/Europe/by-territory/Romania.json
rename to data/by-territory/by-continent/Europe/Romania.json
diff --git a/data/by-territory/by-continent/Europe/by-territory/Russian Federation.json b/data/by-territory/by-continent/Europe/Russian Federation.json
similarity index 100%
rename from data/by-territory/by-continent/Europe/by-territory/Russian Federation.json
rename to data/by-territory/by-continent/Europe/Russian Federation.json
diff --git a/data/by-territory/by-continent/Europe/by-territory/San Marino.json b/data/by-territory/by-continent/Europe/San Marino.json
similarity index 100%
rename from data/by-territory/by-continent/Europe/by-territory/San Marino.json
rename to data/by-territory/by-continent/Europe/San Marino.json
diff --git a/data/by-territory/by-continent/Europe/by-territory/Serbia.json b/data/by-territory/by-continent/Europe/Serbia.json
similarity index 100%
rename from data/by-territory/by-continent/Europe/by-territory/Serbia.json
rename to data/by-territory/by-continent/Europe/Serbia.json
diff --git a/data/by-territory/by-continent/Europe/by-territory/Slovak Republic.json b/data/by-territory/by-continent/Europe/Slovak Republic.json
similarity index 100%
rename from data/by-territory/by-continent/Europe/by-territory/Slovak Republic.json
rename to data/by-territory/by-continent/Europe/Slovak Republic.json
diff --git a/data/by-territory/by-continent/Europe/by-territory/Slovenia.json b/data/by-territory/by-continent/Europe/Slovenia.json
similarity index 100%
rename from data/by-territory/by-continent/Europe/by-territory/Slovenia.json
rename to data/by-territory/by-continent/Europe/Slovenia.json
diff --git a/data/by-territory/by-continent/Europe/by-territory/Spain.json b/data/by-territory/by-continent/Europe/Spain.json
similarity index 100%
rename from data/by-territory/by-continent/Europe/by-territory/Spain.json
rename to data/by-territory/by-continent/Europe/Spain.json
diff --git a/data/by-territory/by-continent/Europe/by-territory/Sweden.json b/data/by-territory/by-continent/Europe/Sweden.json
similarity index 100%
rename from data/by-territory/by-continent/Europe/by-territory/Sweden.json
rename to data/by-territory/by-continent/Europe/Sweden.json
diff --git a/data/by-territory/by-continent/Europe/by-territory/Switzerland.json b/data/by-territory/by-continent/Europe/Switzerland.json
similarity index 100%
rename from data/by-territory/by-continent/Europe/by-territory/Switzerland.json
rename to data/by-territory/by-continent/Europe/Switzerland.json
diff --git a/data/by-territory/by-continent/Europe/by-territory/Ukraine.json b/data/by-territory/by-continent/Europe/Ukraine.json
similarity index 100%
rename from data/by-territory/by-continent/Europe/by-territory/Ukraine.json
rename to data/by-territory/by-continent/Europe/Ukraine.json
diff --git a/data/by-territory/by-continent/Europe/by-territory/United Kingdom.json b/data/by-territory/by-continent/Europe/United Kingdom.json
similarity index 100%
rename from data/by-territory/by-continent/Europe/by-territory/United Kingdom.json
rename to data/by-territory/by-continent/Europe/United Kingdom.json
diff --git a/data/by-territory/by-continent/North America/by-territory/Antigua and Barbuda.json b/data/by-territory/by-continent/North America/Antigua and Barbuda.json
similarity index 100%
rename from data/by-territory/by-continent/North America/by-territory/Antigua and Barbuda.json
rename to data/by-territory/by-continent/North America/Antigua and Barbuda.json
diff --git a/data/by-territory/by-continent/North America/by-territory/Aruba.json b/data/by-territory/by-continent/North America/Aruba.json
similarity index 100%
rename from data/by-territory/by-continent/North America/by-territory/Aruba.json
rename to data/by-territory/by-continent/North America/Aruba.json
diff --git a/data/by-territory/by-continent/North America/by-territory/Bahamas.json b/data/by-territory/by-continent/North America/Bahamas.json
similarity index 100%
rename from data/by-territory/by-continent/North America/by-territory/Bahamas.json
rename to data/by-territory/by-continent/North America/Bahamas.json
diff --git a/data/by-territory/by-continent/North America/by-territory/Barbados.json b/data/by-territory/by-continent/North America/Barbados.json
similarity index 100%
rename from data/by-territory/by-continent/North America/by-territory/Barbados.json
rename to data/by-territory/by-continent/North America/Barbados.json
diff --git a/data/by-territory/by-continent/North America/by-territory/Belize.json b/data/by-territory/by-continent/North America/Belize.json
similarity index 100%
rename from data/by-territory/by-continent/North America/by-territory/Belize.json
rename to data/by-territory/by-continent/North America/Belize.json
diff --git a/data/by-territory/by-continent/North America/by-territory/Bermuda.json b/data/by-territory/by-continent/North America/Bermuda.json
similarity index 100%
rename from data/by-territory/by-continent/North America/by-territory/Bermuda.json
rename to data/by-territory/by-continent/North America/Bermuda.json
diff --git a/data/by-territory/by-continent/North America/by-territory/British Virgin Islands.json b/data/by-territory/by-continent/North America/British Virgin Islands.json
similarity index 100%
rename from data/by-territory/by-continent/North America/by-territory/British Virgin Islands.json
rename to data/by-territory/by-continent/North America/British Virgin Islands.json
diff --git a/data/by-territory/by-continent/North America/by-territory/Canada.json b/data/by-territory/by-continent/North America/Canada.json
similarity index 100%
rename from data/by-territory/by-continent/North America/by-territory/Canada.json
rename to data/by-territory/by-continent/North America/Canada.json
diff --git a/data/by-territory/by-continent/North America/by-territory/Cayman Islands.json b/data/by-territory/by-continent/North America/Cayman Islands.json
similarity index 100%
rename from data/by-territory/by-continent/North America/by-territory/Cayman Islands.json
rename to data/by-territory/by-continent/North America/Cayman Islands.json
diff --git a/data/by-territory/by-continent/North America/by-territory/Costa Rica.json b/data/by-territory/by-continent/North America/Costa Rica.json
similarity index 100%
rename from data/by-territory/by-continent/North America/by-territory/Costa Rica.json
rename to data/by-territory/by-continent/North America/Costa Rica.json
diff --git a/data/by-territory/by-continent/North America/by-territory/Cuba.json b/data/by-territory/by-continent/North America/Cuba.json
similarity index 100%
rename from data/by-territory/by-continent/North America/by-territory/Cuba.json
rename to data/by-territory/by-continent/North America/Cuba.json
diff --git a/data/by-territory/by-continent/North America/by-territory/Curacao.json b/data/by-territory/by-continent/North America/Curacao.json
similarity index 100%
rename from data/by-territory/by-continent/North America/by-territory/Curacao.json
rename to data/by-territory/by-continent/North America/Curacao.json
diff --git a/data/by-territory/by-continent/North America/by-territory/Dominica.json b/data/by-territory/by-continent/North America/Dominica.json
similarity index 100%
rename from data/by-territory/by-continent/North America/by-territory/Dominica.json
rename to data/by-territory/by-continent/North America/Dominica.json
diff --git a/data/by-territory/by-continent/North America/by-territory/Dominican Republic.json b/data/by-territory/by-continent/North America/Dominican Republic.json
similarity index 100%
rename from data/by-territory/by-continent/North America/by-territory/Dominican Republic.json
rename to data/by-territory/by-continent/North America/Dominican Republic.json
diff --git a/data/by-territory/by-continent/North America/by-territory/El Salvador.json b/data/by-territory/by-continent/North America/El Salvador.json
similarity index 100%
rename from data/by-territory/by-continent/North America/by-territory/El Salvador.json
rename to data/by-territory/by-continent/North America/El Salvador.json
diff --git a/data/by-territory/by-continent/North America/by-territory/Grenada.json b/data/by-territory/by-continent/North America/Grenada.json
similarity index 100%
rename from data/by-territory/by-continent/North America/by-territory/Grenada.json
rename to data/by-territory/by-continent/North America/Grenada.json
diff --git a/data/by-territory/by-continent/North America/by-territory/Guatemala.json b/data/by-territory/by-continent/North America/Guatemala.json
similarity index 100%
rename from data/by-territory/by-continent/North America/by-territory/Guatemala.json
rename to data/by-territory/by-continent/North America/Guatemala.json
diff --git a/data/by-territory/by-continent/North America/by-territory/Haiti.json b/data/by-territory/by-continent/North America/Haiti.json
similarity index 100%
rename from data/by-territory/by-continent/North America/by-territory/Haiti.json
rename to data/by-territory/by-continent/North America/Haiti.json
diff --git a/data/by-territory/by-continent/North America/by-territory/Honduras.json b/data/by-territory/by-continent/North America/Honduras.json
similarity index 100%
rename from data/by-territory/by-continent/North America/by-territory/Honduras.json
rename to data/by-territory/by-continent/North America/Honduras.json
diff --git a/data/by-territory/by-continent/North America/by-territory/Jamaica.json b/data/by-territory/by-continent/North America/Jamaica.json
similarity index 100%
rename from data/by-territory/by-continent/North America/by-territory/Jamaica.json
rename to data/by-territory/by-continent/North America/Jamaica.json
diff --git a/data/by-territory/by-continent/North America/by-territory/Mexico.json b/data/by-territory/by-continent/North America/Mexico.json
similarity index 100%
rename from data/by-territory/by-continent/North America/by-territory/Mexico.json
rename to data/by-territory/by-continent/North America/Mexico.json
diff --git a/data/by-territory/by-continent/North America/by-territory/Nicaragua.json b/data/by-territory/by-continent/North America/Nicaragua.json
similarity index 100%
rename from data/by-territory/by-continent/North America/by-territory/Nicaragua.json
rename to data/by-territory/by-continent/North America/Nicaragua.json
diff --git a/data/by-territory/by-continent/North America/by-territory/Panama.json b/data/by-territory/by-continent/North America/Panama.json
similarity index 100%
rename from data/by-territory/by-continent/North America/by-territory/Panama.json
rename to data/by-territory/by-continent/North America/Panama.json
diff --git a/data/by-territory/by-continent/North America/by-territory/Puerto Rico.json b/data/by-territory/by-continent/North America/Puerto Rico.json
similarity index 100%
rename from data/by-territory/by-continent/North America/by-territory/Puerto Rico.json
rename to data/by-territory/by-continent/North America/Puerto Rico.json
diff --git a/data/by-territory/by-continent/North America/by-territory/St. Kitts and Nevis.json b/data/by-territory/by-continent/North America/St. Kitts and Nevis.json
similarity index 100%
rename from data/by-territory/by-continent/North America/by-territory/St. Kitts and Nevis.json
rename to data/by-territory/by-continent/North America/St. Kitts and Nevis.json
diff --git a/data/by-territory/by-continent/North America/by-territory/St. Lucia.json b/data/by-territory/by-continent/North America/St. Lucia.json
similarity index 100%
rename from data/by-territory/by-continent/North America/by-territory/St. Lucia.json
rename to data/by-territory/by-continent/North America/St. Lucia.json
diff --git a/data/by-territory/by-continent/North America/by-territory/St. Maarten (Dutch part).json b/data/by-territory/by-continent/North America/St. Maarten (Dutch part).json
similarity index 100%
rename from data/by-territory/by-continent/North America/by-territory/St. Maarten (Dutch part).json
rename to data/by-territory/by-continent/North America/St. Maarten (Dutch part).json
diff --git a/data/by-territory/by-continent/North America/by-territory/St. Martin (French part).json b/data/by-territory/by-continent/North America/St. Martin (French part).json
similarity index 100%
rename from data/by-territory/by-continent/North America/by-territory/St. Martin (French part).json
rename to data/by-territory/by-continent/North America/St. Martin (French part).json
diff --git a/data/by-territory/by-continent/North America/by-territory/St. Vincent and the Grenadines.json b/data/by-territory/by-continent/North America/St. Vincent and the Grenadines.json
similarity index 100%
rename from data/by-territory/by-continent/North America/by-territory/St. Vincent and the Grenadines.json
rename to data/by-territory/by-continent/North America/St. Vincent and the Grenadines.json
diff --git a/data/by-territory/by-continent/North America/by-territory/Trinidad and Tobago.json b/data/by-territory/by-continent/North America/Trinidad and Tobago.json
similarity index 100%
rename from data/by-territory/by-continent/North America/by-territory/Trinidad and Tobago.json
rename to data/by-territory/by-continent/North America/Trinidad and Tobago.json
diff --git a/data/by-territory/by-continent/North America/by-territory/Turks and Caicos Islands.json b/data/by-territory/by-continent/North America/Turks and Caicos Islands.json
similarity index 100%
rename from data/by-territory/by-continent/North America/by-territory/Turks and Caicos Islands.json
rename to data/by-territory/by-continent/North America/Turks and Caicos Islands.json
diff --git a/data/by-territory/by-continent/North America/by-territory/United States.json b/data/by-territory/by-continent/North America/United States.json
similarity index 100%
rename from data/by-territory/by-continent/North America/by-territory/United States.json
rename to data/by-territory/by-continent/North America/United States.json
diff --git a/data/by-territory/by-continent/North America/by-territory/Virgin Islands (U.S.).json b/data/by-territory/by-continent/North America/Virgin Islands (U.S.).json
similarity index 100%
rename from data/by-territory/by-continent/North America/by-territory/Virgin Islands (U.S.).json
rename to data/by-territory/by-continent/North America/Virgin Islands (U.S.).json
diff --git a/data/by-territory/by-continent/Oceania/by-territory/American Samoa.json b/data/by-territory/by-continent/Oceania/American Samoa.json
similarity index 100%
rename from data/by-territory/by-continent/Oceania/by-territory/American Samoa.json
rename to data/by-territory/by-continent/Oceania/American Samoa.json
diff --git a/data/by-territory/by-continent/Oceania/by-territory/Australia.json b/data/by-territory/by-continent/Oceania/Australia.json
similarity index 100%
rename from data/by-territory/by-continent/Oceania/by-territory/Australia.json
rename to data/by-territory/by-continent/Oceania/Australia.json
diff --git a/data/by-territory/by-continent/Oceania/by-territory/Fiji.json b/data/by-territory/by-continent/Oceania/Fiji.json
similarity index 100%
rename from data/by-territory/by-continent/Oceania/by-territory/Fiji.json
rename to data/by-territory/by-continent/Oceania/Fiji.json
diff --git a/data/by-territory/by-continent/Oceania/by-territory/French Polynesia.json b/data/by-territory/by-continent/Oceania/French Polynesia.json
similarity index 100%
rename from data/by-territory/by-continent/Oceania/by-territory/French Polynesia.json
rename to data/by-territory/by-continent/Oceania/French Polynesia.json
diff --git a/data/by-territory/by-continent/Oceania/by-territory/Guam.json b/data/by-territory/by-continent/Oceania/Guam.json
similarity index 100%
rename from data/by-territory/by-continent/Oceania/by-territory/Guam.json
rename to data/by-territory/by-continent/Oceania/Guam.json
diff --git a/data/by-territory/by-continent/Oceania/by-territory/Kiribati.json b/data/by-territory/by-continent/Oceania/Kiribati.json
similarity index 100%
rename from data/by-territory/by-continent/Oceania/by-territory/Kiribati.json
rename to data/by-territory/by-continent/Oceania/Kiribati.json
diff --git a/data/by-territory/by-continent/Oceania/by-territory/Marshall Islands.json b/data/by-territory/by-continent/Oceania/Marshall Islands.json
similarity index 100%
rename from data/by-territory/by-continent/Oceania/by-territory/Marshall Islands.json
rename to data/by-territory/by-continent/Oceania/Marshall Islands.json
diff --git a/data/by-territory/by-continent/Oceania/by-territory/Micronesia.json b/data/by-territory/by-continent/Oceania/Micronesia.json
similarity index 100%
rename from data/by-territory/by-continent/Oceania/by-territory/Micronesia.json
rename to data/by-territory/by-continent/Oceania/Micronesia.json
diff --git a/data/by-territory/by-continent/Oceania/by-territory/Nauru.json b/data/by-territory/by-continent/Oceania/Nauru.json
similarity index 100%
rename from data/by-territory/by-continent/Oceania/by-territory/Nauru.json
rename to data/by-territory/by-continent/Oceania/Nauru.json
diff --git a/data/by-territory/by-continent/Oceania/by-territory/New Caledonia.json b/data/by-territory/by-continent/Oceania/New Caledonia.json
similarity index 100%
rename from data/by-territory/by-continent/Oceania/by-territory/New Caledonia.json
rename to data/by-territory/by-continent/Oceania/New Caledonia.json
diff --git a/data/by-territory/by-continent/Oceania/by-territory/New Zealand.json b/data/by-territory/by-continent/Oceania/New Zealand.json
similarity index 100%
rename from data/by-territory/by-continent/Oceania/by-territory/New Zealand.json
rename to data/by-territory/by-continent/Oceania/New Zealand.json
diff --git a/data/by-territory/by-continent/Oceania/by-territory/Northern Mariana Islands.json b/data/by-territory/by-continent/Oceania/Northern Mariana Islands.json
similarity index 100%
rename from data/by-territory/by-continent/Oceania/by-territory/Northern Mariana Islands.json
rename to data/by-territory/by-continent/Oceania/Northern Mariana Islands.json
diff --git a/data/by-territory/by-continent/Oceania/by-territory/Palau.json b/data/by-territory/by-continent/Oceania/Palau.json
similarity index 100%
rename from data/by-territory/by-continent/Oceania/by-territory/Palau.json
rename to data/by-territory/by-continent/Oceania/Palau.json
diff --git a/data/by-territory/by-continent/Oceania/by-territory/Papua New Guinea.json b/data/by-territory/by-continent/Oceania/Papua New Guinea.json
similarity index 100%
rename from data/by-territory/by-continent/Oceania/by-territory/Papua New Guinea.json
rename to data/by-territory/by-continent/Oceania/Papua New Guinea.json
diff --git a/data/by-territory/by-continent/Oceania/by-territory/Samoa.json b/data/by-territory/by-continent/Oceania/Samoa.json
similarity index 100%
rename from data/by-territory/by-continent/Oceania/by-territory/Samoa.json
rename to data/by-territory/by-continent/Oceania/Samoa.json
diff --git a/data/by-territory/by-continent/Oceania/by-territory/Solomon Islands.json b/data/by-territory/by-continent/Oceania/Solomon Islands.json
similarity index 100%
rename from data/by-territory/by-continent/Oceania/by-territory/Solomon Islands.json
rename to data/by-territory/by-continent/Oceania/Solomon Islands.json
diff --git a/data/by-territory/by-continent/Oceania/by-territory/Tonga.json b/data/by-territory/by-continent/Oceania/Tonga.json
similarity index 100%
rename from data/by-territory/by-continent/Oceania/by-territory/Tonga.json
rename to data/by-territory/by-continent/Oceania/Tonga.json
diff --git a/data/by-territory/by-continent/Oceania/by-territory/Tuvalu.json b/data/by-territory/by-continent/Oceania/Tuvalu.json
similarity index 100%
rename from data/by-territory/by-continent/Oceania/by-territory/Tuvalu.json
rename to data/by-territory/by-continent/Oceania/Tuvalu.json
diff --git a/data/by-territory/by-continent/Oceania/by-territory/Vanuatu.json b/data/by-territory/by-continent/Oceania/Vanuatu.json
similarity index 100%
rename from data/by-territory/by-continent/Oceania/by-territory/Vanuatu.json
rename to data/by-territory/by-continent/Oceania/Vanuatu.json
diff --git a/data/by-territory/by-continent/South America/by-territory/Argentina.json b/data/by-territory/by-continent/South America/Argentina.json
similarity index 100%
rename from data/by-territory/by-continent/South America/by-territory/Argentina.json
rename to data/by-territory/by-continent/South America/Argentina.json
diff --git a/data/by-territory/by-continent/South America/by-territory/Bolivia.json b/data/by-territory/by-continent/South America/Bolivia.json
similarity index 100%
rename from data/by-territory/by-continent/South America/by-territory/Bolivia.json
rename to data/by-territory/by-continent/South America/Bolivia.json
diff --git a/data/by-territory/by-continent/South America/by-territory/Brazil.json b/data/by-territory/by-continent/South America/Brazil.json
similarity index 100%
rename from data/by-territory/by-continent/South America/by-territory/Brazil.json
rename to data/by-territory/by-continent/South America/Brazil.json
diff --git a/data/by-territory/by-continent/South America/by-territory/Chile.json b/data/by-territory/by-continent/South America/Chile.json
similarity index 100%
rename from data/by-territory/by-continent/South America/by-territory/Chile.json
rename to data/by-territory/by-continent/South America/Chile.json
diff --git a/data/by-territory/by-continent/South America/by-territory/Colombia.json b/data/by-territory/by-continent/South America/Colombia.json
similarity index 100%
rename from data/by-territory/by-continent/South America/by-territory/Colombia.json
rename to data/by-territory/by-continent/South America/Colombia.json
diff --git a/data/by-territory/by-continent/South America/by-territory/Ecuador.json b/data/by-territory/by-continent/South America/Ecuador.json
similarity index 100%
rename from data/by-territory/by-continent/South America/by-territory/Ecuador.json
rename to data/by-territory/by-continent/South America/Ecuador.json
diff --git a/data/by-territory/by-continent/South America/by-territory/Guyana.json b/data/by-territory/by-continent/South America/Guyana.json
similarity index 100%
rename from data/by-territory/by-continent/South America/by-territory/Guyana.json
rename to data/by-territory/by-continent/South America/Guyana.json
diff --git a/data/by-territory/by-continent/South America/by-territory/Paraguay.json b/data/by-territory/by-continent/South America/Paraguay.json
similarity index 100%
rename from data/by-territory/by-continent/South America/by-territory/Paraguay.json
rename to data/by-territory/by-continent/South America/Paraguay.json
diff --git a/data/by-territory/by-continent/South America/by-territory/Peru.json b/data/by-territory/by-continent/South America/Peru.json
similarity index 100%
rename from data/by-territory/by-continent/South America/by-territory/Peru.json
rename to data/by-territory/by-continent/South America/Peru.json
diff --git a/data/by-territory/by-continent/South America/by-territory/Suriname.json b/data/by-territory/by-continent/South America/Suriname.json
similarity index 100%
rename from data/by-territory/by-continent/South America/by-territory/Suriname.json
rename to data/by-territory/by-continent/South America/Suriname.json
diff --git a/data/by-territory/by-continent/South America/by-territory/Uruguay.json b/data/by-territory/by-continent/South America/Uruguay.json
similarity index 100%
rename from data/by-territory/by-continent/South America/by-territory/Uruguay.json
rename to data/by-territory/by-continent/South America/Uruguay.json
diff --git a/data/by-territory/by-continent/South America/by-territory/Venezuela.json b/data/by-territory/by-continent/South America/Venezuela.json
similarity index 100%
rename from data/by-territory/by-continent/South America/by-territory/Venezuela.json
rename to data/by-territory/by-continent/South America/Venezuela.json