diff --git a/.gitignore b/.gitignore
index f1614d1..4a97c06 100644
--- a/.gitignore
+++ b/.gitignore
@@ -22,3 +22,4 @@ builder/wikivoyage/*.sql.gz
 builder/wikivoyage/images
 builder/wikivoyage/articles
 builder/wikivoyage/articles_desktop
+builder/wikivoyage/Countries
\ No newline at end of file
diff --git a/builder/wikivoyage/countries_to_generate.txt b/builder/wikivoyage/countries_to_generate.txt
index 2e8dd45..7ae15b9 100644
--- a/builder/wikivoyage/countries_to_generate.txt
+++ b/builder/wikivoyage/countries_to_generate.txt
@@ -1,217 +1,11 @@
-Abkhazia
-Afghanistan
-Alabama
-Alaska
-Albania
-Andorra
-Argentina
-Arizona
-Arkansas
-Armenia
-Australia
-Austria
-Azerbaijan
-Bahrain
-Bangladesh
-Barcelona
-Belarus
-Belgium
-Belize
-Bhutan
-Bolivia
-Bosnia_and_Herzegovina
-Brazil
-Brunei
-Bulgaria
-California
-Cambodia
-Canada
-Canberra
-Caribbean
-Caucasus
-Central_Africa
-Central_America
-Central_Asia
-Chicago
-Chile
-China
-Colombia
-Colorado
-Connecticut
-Costa_Rica
-Croatia
-Cuba
-Cyprus
-Czech_Republic
-Delaware
-Denmark
-East_Africa
-East_Asia
-East_Timor
-Ecuador
-El_Salvador
-Estonia
-Falkland_Islands
-Faroe_Islands
-Finland
-Florida
 France
-French_Guiana
-Georgia
 Germany
-Gibraltar
-Great_Plains
 Greece
-Greenland
-Guatemala
-Guernsey
-Guyana
-Hawaii
-Honduras
-Hong_Kong
-Hungary
-Iceland
-Idaho
-Illinois
-India
-Indiana
-Indonesia
-Iowa
-Iran
-Iraq
-Ireland
-Isle_of_Man
-Israel
 Italy
 Japan
-Jersey
-Jordan
-Kansas
-Kazakhstan
-Kentucky
-Kosovo
-Kuwait
-Kyrgyzstan
-Laos
-Latvia
-Lebanon
-Liechtenstein
-Lithuania
-London
-Los_Angeles
-Louisiana
-Luxembourg
-Macau
-Madrid
-Maine
-Malaysia
-Maldives
-Malta
-Maryland
-Massachusetts
-Melanesia
-Mexico
-Michigan
-Micronesia
-Middle_East
-Minnesota
-Mississippi
-Missouri
-Moldova
-Monaco
-Mongolia
-Montana
-Montenegro
-Moscow
-Myanmar
-Nebraska
-Nepal
-Netherlands
-Nevada
-New_England
-New_Hampshire
-New_Jersey
-New_Mexico
-New_York
-New_York_City
-New_Zealand
-Nicaragua
-North_Africa
-North_Carolina
-North_Dakota
-North_Korea
-Norway
-Oceania
-Ohio
-Oklahoma
-Oman
-Oregon
-Pacific_Northwest
-Pakistan
-Palestinian_territories
-Panama
-Papua_New_Guinea
-Paraguay
-Paris
-Pennsylvania
-Peru
-Philippines
-Poland
-Polynesia
-Portugal
-Qatar
-Republic_of_Macedonia
-Rhode_Island
-Rio_de_Janeiro
-Romania
-Rome
 Russia
-Sahel
-San_Francisco
-San_Marino
-Saudi_Arabia
-Seattle
-Serbia
-Singapore
-Slovakia
-Slovenia
-South_America
-South_Asia
-South_Carolina
-South_Dakota
-South_Korea
-South_Ossetia
-Southeast_Asia
-Southern_Africa
 Spain
-Sri_Lanka
-Suriname
-Sweden
 Switzerland
-Syria
-Taiwan
-Tajikistan
-Tennessee
-Texas
-Thailand
-Toronto
 Turkey
-Turkmenistan
-Ukraine
-United_Arab_Emirates
 United_Kingdom
 United_States_of_America
-Uruguay
-Utah
-Uzbekistan
-Vatican_City
-Venezuela
-Vermont
-Vietnam
-Virginia
-Washington
-West_Africa
-West_Virginia
-Wisconsin
-Wyoming
-Yemen
diff --git a/builder/wikivoyage/wikivoyage.mk b/builder/wikivoyage/wikivoyage.mk
index c103621..df53817 100644
--- a/builder/wikivoyage/wikivoyage.mk
+++ b/builder/wikivoyage/wikivoyage.mk
@@ -83,17 +83,17 @@ geocodes.txt: geocodes_from_html.txt geocodes_todo.txt
 	cp geocodes_from_html.txt geocodes.txt
 
 process_html: countries.txt
-	cat countries_to_generate.txt | while read country; do mkdir -p $$country/content/data; ../htmlprocessor/processor.sh articles/ images/ $$country.info.txt $$country.redirect.txt geocodes.txt $$country/content/data; done
+	cat countries_to_generate.txt | while read country; do mkdir -p Countries/$$country/content/data; ../htmlprocessor/processor.sh articles/ images/ $$country.info.txt $$country.redirect.txt geocodes.txt Countries/$$country/content/data; done
 	touch process_html
 
 genindex: geocodes.txt countries.txt
-	cat countries_to_generate.txt | while read country; do ../genindex/genindex $$country.info.txt $$country.redirect.txt geocodes.txt $$country/index.dat; done
+	cat countries_to_generate.txt | while read country; do ../genindex/genindex $$country.info.txt $$country.redirect.txt geocodes.txt Countries/$$country/index.dat; done
 	touch genindex
 
 make_obb: process_html
-	cat countries_to_generate.txt | while read country; do ../../tools/jobb -d $$country/content -o $$country/main.1.com.guidewithme.`echo $$country|tr '[:upper:]' '[:lower:]'`.obb -pn com.guidewithme.`echo $$country|tr '[:upper:]' '[:lower:]'` -pv 1; done
+	cat countries_to_generate.txt | while read country; do ../../tools/jobb -d Countries/$$country/content -o$ Countries/$country/main.1.com.guidewithme.`echo $$country|tr '[:upper:]' '[:lower:]'`.obb -pn com.guidewithme.`echo $$country|tr '[:upper:]' '[:lower:]'` -pv 1; done
 	touch make_obb
 
 make_apk: genindex
 	bash makeapk.sh
-	touch make_apk
\ No newline at end of file
+	touch make_apk