diff --git a/csv/combined/combined.csv b/refactored/csv/combined/combined.csv
similarity index 100%
rename from csv/combined/combined.csv
rename to refactored/csv/combined/combined.csv
diff --git a/csv/value-factors-separate/air-pollution.csv b/refactored/csv/value-factors-separate/air-pollution.csv
similarity index 100%
rename from csv/value-factors-separate/air-pollution.csv
rename to refactored/csv/value-factors-separate/air-pollution.csv
diff --git a/csv/value-factors-separate/land-use-and-conversion.csv b/refactored/csv/value-factors-separate/land-use-and-conversion.csv
similarity index 100%
rename from csv/value-factors-separate/land-use-and-conversion.csv
rename to refactored/csv/value-factors-separate/land-use-and-conversion.csv
diff --git a/csv/value-factors-separate/waste.csv b/refactored/csv/value-factors-separate/waste.csv
similarity index 100%
rename from csv/value-factors-separate/waste.csv
rename to refactored/csv/value-factors-separate/waste.csv
diff --git a/csv/value-factors-separate/water-consumption.csv b/refactored/csv/value-factors-separate/water-consumption.csv
similarity index 100%
rename from csv/value-factors-separate/water-consumption.csv
rename to refactored/csv/value-factors-separate/water-consumption.csv
diff --git a/csv/value-factors-separate/water-pollution.csv b/refactored/csv/value-factors-separate/water-pollution.csv
similarity index 100%
rename from csv/value-factors-separate/water-pollution.csv
rename to refactored/csv/value-factors-separate/water-pollution.csv
diff --git a/json/individual-vfs/air-pollution.json b/refactored/json/individual-vfs/air-pollution.json
similarity index 100%
rename from json/individual-vfs/air-pollution.json
rename to refactored/json/individual-vfs/air-pollution.json
diff --git a/json/individual-vfs/land-use-and-conversion.json b/refactored/json/individual-vfs/land-use-and-conversion.json
similarity index 100%
rename from json/individual-vfs/land-use-and-conversion.json
rename to refactored/json/individual-vfs/land-use-and-conversion.json
diff --git a/json/individual-vfs/waste.json b/refactored/json/individual-vfs/waste.json
similarity index 100%
rename from json/individual-vfs/waste.json
rename to refactored/json/individual-vfs/waste.json
diff --git a/json/individual-vfs/water-consumption.json b/refactored/json/individual-vfs/water-consumption.json
similarity index 100%
rename from json/individual-vfs/water-consumption.json
rename to refactored/json/individual-vfs/water-consumption.json
diff --git a/json/individual-vfs/water-pollution.json b/refactored/json/individual-vfs/water-pollution.json
similarity index 100%
rename from json/individual-vfs/water-pollution.json
rename to refactored/json/individual-vfs/water-pollution.json
diff --git a/refactored/json/original-format/ifvi_environmental_data.json b/refactored/json/original-format/ifvi_environmental_data.json
new file mode 100644
index 0000000000000000000000000000000000000000..fe3d4f84aa9131f4af10b2f8e97283bc9d368500
--- /dev/null
+++ b/refactored/json/original-format/ifvi_environmental_data.json
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:40377792ccf6bf6396f838caa5bd4942bbfd4117e70098fbb2b045465e42abb8
+size 33152136
diff --git a/json/per-country/afghanistan_afg.json b/refactored/json/per-country/afghanistan_afg.json
similarity index 100%
rename from json/per-country/afghanistan_afg.json
rename to refactored/json/per-country/afghanistan_afg.json
diff --git a/json/per-country/albania_alb.json b/refactored/json/per-country/albania_alb.json
similarity index 100%
rename from json/per-country/albania_alb.json
rename to refactored/json/per-country/albania_alb.json
diff --git a/json/per-country/algeria_dza.json b/refactored/json/per-country/algeria_dza.json
similarity index 100%
rename from json/per-country/algeria_dza.json
rename to refactored/json/per-country/algeria_dza.json
diff --git a/json/per-country/american_samoa_asm.json b/refactored/json/per-country/american_samoa_asm.json
similarity index 100%
rename from json/per-country/american_samoa_asm.json
rename to refactored/json/per-country/american_samoa_asm.json
diff --git a/json/per-country/andorra_and.json b/refactored/json/per-country/andorra_and.json
similarity index 100%
rename from json/per-country/andorra_and.json
rename to refactored/json/per-country/andorra_and.json
diff --git a/json/per-country/angola_ago.json b/refactored/json/per-country/angola_ago.json
similarity index 100%
rename from json/per-country/angola_ago.json
rename to refactored/json/per-country/angola_ago.json
diff --git a/json/per-country/antigua_and_barbuda_atg.json b/refactored/json/per-country/antigua_and_barbuda_atg.json
similarity index 100%
rename from json/per-country/antigua_and_barbuda_atg.json
rename to refactored/json/per-country/antigua_and_barbuda_atg.json
diff --git a/json/per-country/argentina_arg.json b/refactored/json/per-country/argentina_arg.json
similarity index 100%
rename from json/per-country/argentina_arg.json
rename to refactored/json/per-country/argentina_arg.json
diff --git a/json/per-country/armenia_arm.json b/refactored/json/per-country/armenia_arm.json
similarity index 100%
rename from json/per-country/armenia_arm.json
rename to refactored/json/per-country/armenia_arm.json
diff --git a/json/per-country/aruba_abw.json b/refactored/json/per-country/aruba_abw.json
similarity index 100%
rename from json/per-country/aruba_abw.json
rename to refactored/json/per-country/aruba_abw.json
diff --git a/json/per-country/australia_aus.json b/refactored/json/per-country/australia_aus.json
similarity index 100%
rename from json/per-country/australia_aus.json
rename to refactored/json/per-country/australia_aus.json
diff --git a/json/per-country/austria_aut.json b/refactored/json/per-country/austria_aut.json
similarity index 100%
rename from json/per-country/austria_aut.json
rename to refactored/json/per-country/austria_aut.json
diff --git a/json/per-country/azerbaijan_aze.json b/refactored/json/per-country/azerbaijan_aze.json
similarity index 100%
rename from json/per-country/azerbaijan_aze.json
rename to refactored/json/per-country/azerbaijan_aze.json
diff --git a/json/per-country/bahamas_bhs.json b/refactored/json/per-country/bahamas_bhs.json
similarity index 100%
rename from json/per-country/bahamas_bhs.json
rename to refactored/json/per-country/bahamas_bhs.json
diff --git a/json/per-country/bahrain_bhr.json b/refactored/json/per-country/bahrain_bhr.json
similarity index 100%
rename from json/per-country/bahrain_bhr.json
rename to refactored/json/per-country/bahrain_bhr.json
diff --git a/json/per-country/bangladesh_bgd.json b/refactored/json/per-country/bangladesh_bgd.json
similarity index 100%
rename from json/per-country/bangladesh_bgd.json
rename to refactored/json/per-country/bangladesh_bgd.json
diff --git a/json/per-country/barbados_brb.json b/refactored/json/per-country/barbados_brb.json
similarity index 100%
rename from json/per-country/barbados_brb.json
rename to refactored/json/per-country/barbados_brb.json
diff --git a/json/per-country/belarus_blr.json b/refactored/json/per-country/belarus_blr.json
similarity index 100%
rename from json/per-country/belarus_blr.json
rename to refactored/json/per-country/belarus_blr.json
diff --git a/json/per-country/belgium_bel.json b/refactored/json/per-country/belgium_bel.json
similarity index 100%
rename from json/per-country/belgium_bel.json
rename to refactored/json/per-country/belgium_bel.json
diff --git a/json/per-country/belize_blz.json b/refactored/json/per-country/belize_blz.json
similarity index 100%
rename from json/per-country/belize_blz.json
rename to refactored/json/per-country/belize_blz.json
diff --git a/json/per-country/benin_ben.json b/refactored/json/per-country/benin_ben.json
similarity index 100%
rename from json/per-country/benin_ben.json
rename to refactored/json/per-country/benin_ben.json
diff --git a/json/per-country/bermuda_bmu.json b/refactored/json/per-country/bermuda_bmu.json
similarity index 100%
rename from json/per-country/bermuda_bmu.json
rename to refactored/json/per-country/bermuda_bmu.json
diff --git a/json/per-country/bhutan_btn.json b/refactored/json/per-country/bhutan_btn.json
similarity index 100%
rename from json/per-country/bhutan_btn.json
rename to refactored/json/per-country/bhutan_btn.json
diff --git a/json/per-country/bolivia_bol.json b/refactored/json/per-country/bolivia_bol.json
similarity index 100%
rename from json/per-country/bolivia_bol.json
rename to refactored/json/per-country/bolivia_bol.json
diff --git a/json/per-country/bosnia_and_herzegovina_bih.json b/refactored/json/per-country/bosnia_and_herzegovina_bih.json
similarity index 100%
rename from json/per-country/bosnia_and_herzegovina_bih.json
rename to refactored/json/per-country/bosnia_and_herzegovina_bih.json
diff --git a/json/per-country/botswana_bwa.json b/refactored/json/per-country/botswana_bwa.json
similarity index 100%
rename from json/per-country/botswana_bwa.json
rename to refactored/json/per-country/botswana_bwa.json
diff --git a/json/per-country/brazil_bra.json b/refactored/json/per-country/brazil_bra.json
similarity index 100%
rename from json/per-country/brazil_bra.json
rename to refactored/json/per-country/brazil_bra.json
diff --git a/json/per-country/british_virgin_islands_vgb.json b/refactored/json/per-country/british_virgin_islands_vgb.json
similarity index 100%
rename from json/per-country/british_virgin_islands_vgb.json
rename to refactored/json/per-country/british_virgin_islands_vgb.json
diff --git a/json/per-country/brunei_darussalam_brn.json b/refactored/json/per-country/brunei_darussalam_brn.json
similarity index 100%
rename from json/per-country/brunei_darussalam_brn.json
rename to refactored/json/per-country/brunei_darussalam_brn.json
diff --git a/json/per-country/bulgaria_bgr.json b/refactored/json/per-country/bulgaria_bgr.json
similarity index 100%
rename from json/per-country/bulgaria_bgr.json
rename to refactored/json/per-country/bulgaria_bgr.json
diff --git a/json/per-country/burkina_faso_bfa.json b/refactored/json/per-country/burkina_faso_bfa.json
similarity index 100%
rename from json/per-country/burkina_faso_bfa.json
rename to refactored/json/per-country/burkina_faso_bfa.json
diff --git a/json/per-country/burundi_bdi.json b/refactored/json/per-country/burundi_bdi.json
similarity index 100%
rename from json/per-country/burundi_bdi.json
rename to refactored/json/per-country/burundi_bdi.json
diff --git a/json/per-country/cabo_verde_cpv.json b/refactored/json/per-country/cabo_verde_cpv.json
similarity index 100%
rename from json/per-country/cabo_verde_cpv.json
rename to refactored/json/per-country/cabo_verde_cpv.json
diff --git a/json/per-country/cambodia_khm.json b/refactored/json/per-country/cambodia_khm.json
similarity index 100%
rename from json/per-country/cambodia_khm.json
rename to refactored/json/per-country/cambodia_khm.json
diff --git a/json/per-country/cameroon_cmr.json b/refactored/json/per-country/cameroon_cmr.json
similarity index 100%
rename from json/per-country/cameroon_cmr.json
rename to refactored/json/per-country/cameroon_cmr.json
diff --git a/json/per-country/canada_can.json b/refactored/json/per-country/canada_can.json
similarity index 100%
rename from json/per-country/canada_can.json
rename to refactored/json/per-country/canada_can.json
diff --git a/json/per-country/cayman_islands_cym.json b/refactored/json/per-country/cayman_islands_cym.json
similarity index 100%
rename from json/per-country/cayman_islands_cym.json
rename to refactored/json/per-country/cayman_islands_cym.json
diff --git a/json/per-country/central_african_republic_caf.json b/refactored/json/per-country/central_african_republic_caf.json
similarity index 100%
rename from json/per-country/central_african_republic_caf.json
rename to refactored/json/per-country/central_african_republic_caf.json
diff --git a/json/per-country/chad_tcd.json b/refactored/json/per-country/chad_tcd.json
similarity index 100%
rename from json/per-country/chad_tcd.json
rename to refactored/json/per-country/chad_tcd.json
diff --git a/json/per-country/channel_islands_ggy.json b/refactored/json/per-country/channel_islands_ggy.json
similarity index 100%
rename from json/per-country/channel_islands_ggy.json
rename to refactored/json/per-country/channel_islands_ggy.json
diff --git a/json/per-country/chile_chl.json b/refactored/json/per-country/chile_chl.json
similarity index 100%
rename from json/per-country/chile_chl.json
rename to refactored/json/per-country/chile_chl.json
diff --git a/json/per-country/china_chn.json b/refactored/json/per-country/china_chn.json
similarity index 100%
rename from json/per-country/china_chn.json
rename to refactored/json/per-country/china_chn.json
diff --git a/json/per-country/colombia_col.json b/refactored/json/per-country/colombia_col.json
similarity index 100%
rename from json/per-country/colombia_col.json
rename to refactored/json/per-country/colombia_col.json
diff --git a/json/per-country/comoros_com.json b/refactored/json/per-country/comoros_com.json
similarity index 100%
rename from json/per-country/comoros_com.json
rename to refactored/json/per-country/comoros_com.json
diff --git a/json/per-country/costa_rica_cri.json b/refactored/json/per-country/costa_rica_cri.json
similarity index 100%
rename from json/per-country/costa_rica_cri.json
rename to refactored/json/per-country/costa_rica_cri.json
diff --git a/refactored/json/per-country/countries_aggregated.json b/refactored/json/per-country/countries_aggregated.json
new file mode 100644
index 0000000000000000000000000000000000000000..f480c7494021e00da4db5736bc17cbfcc8c16865
--- /dev/null
+++ b/refactored/json/per-country/countries_aggregated.json
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:cd1fe956bfc9e0233e8c0c8ff176983dbac26867b266c6c868a66f5793764ed1
+size 36282455
diff --git a/json/per-country/croatia_hrv.json b/refactored/json/per-country/croatia_hrv.json
similarity index 100%
rename from json/per-country/croatia_hrv.json
rename to refactored/json/per-country/croatia_hrv.json
diff --git a/json/per-country/cuba_cub.json b/refactored/json/per-country/cuba_cub.json
similarity index 100%
rename from json/per-country/cuba_cub.json
rename to refactored/json/per-country/cuba_cub.json
diff --git a/json/per-country/curacao_cuw.json b/refactored/json/per-country/curacao_cuw.json
similarity index 100%
rename from json/per-country/curacao_cuw.json
rename to refactored/json/per-country/curacao_cuw.json
diff --git a/json/per-country/cyprus_cyp.json b/refactored/json/per-country/cyprus_cyp.json
similarity index 100%
rename from json/per-country/cyprus_cyp.json
rename to refactored/json/per-country/cyprus_cyp.json
diff --git a/json/per-country/czechia_cze.json b/refactored/json/per-country/czechia_cze.json
similarity index 100%
rename from json/per-country/czechia_cze.json
rename to refactored/json/per-country/czechia_cze.json
diff --git a/json/per-country/democratic_republic_of_the_congo_.json b/refactored/json/per-country/democratic_republic_of_the_congo_.json
similarity index 100%
rename from json/per-country/democratic_republic_of_the_congo_.json
rename to refactored/json/per-country/democratic_republic_of_the_congo_.json
diff --git a/json/per-country/democratic_republic_of_the_congo_no_iso.json b/refactored/json/per-country/democratic_republic_of_the_congo_no_iso.json
similarity index 100%
rename from json/per-country/democratic_republic_of_the_congo_no_iso.json
rename to refactored/json/per-country/democratic_republic_of_the_congo_no_iso.json
diff --git a/json/per-country/denmark_dnk.json b/refactored/json/per-country/denmark_dnk.json
similarity index 100%
rename from json/per-country/denmark_dnk.json
rename to refactored/json/per-country/denmark_dnk.json
diff --git a/json/per-country/djibouti_dji.json b/refactored/json/per-country/djibouti_dji.json
similarity index 100%
rename from json/per-country/djibouti_dji.json
rename to refactored/json/per-country/djibouti_dji.json
diff --git a/json/per-country/dominica_dma.json b/refactored/json/per-country/dominica_dma.json
similarity index 100%
rename from json/per-country/dominica_dma.json
rename to refactored/json/per-country/dominica_dma.json
diff --git a/json/per-country/dominican_republic_dom.json b/refactored/json/per-country/dominican_republic_dom.json
similarity index 100%
rename from json/per-country/dominican_republic_dom.json
rename to refactored/json/per-country/dominican_republic_dom.json
diff --git a/json/per-country/east_asia_and_pacific_.json b/refactored/json/per-country/east_asia_and_pacific_.json
similarity index 100%
rename from json/per-country/east_asia_and_pacific_.json
rename to refactored/json/per-country/east_asia_and_pacific_.json
diff --git a/json/per-country/east_asia_pacific_no_iso.json b/refactored/json/per-country/east_asia_pacific_no_iso.json
similarity index 100%
rename from json/per-country/east_asia_pacific_no_iso.json
rename to refactored/json/per-country/east_asia_pacific_no_iso.json
diff --git a/json/per-country/ecuador_ecu.json b/refactored/json/per-country/ecuador_ecu.json
similarity index 100%
rename from json/per-country/ecuador_ecu.json
rename to refactored/json/per-country/ecuador_ecu.json
diff --git a/json/per-country/egypt_egy.json b/refactored/json/per-country/egypt_egy.json
similarity index 100%
rename from json/per-country/egypt_egy.json
rename to refactored/json/per-country/egypt_egy.json
diff --git a/json/per-country/el_salvador_slv.json b/refactored/json/per-country/el_salvador_slv.json
similarity index 100%
rename from json/per-country/el_salvador_slv.json
rename to refactored/json/per-country/el_salvador_slv.json
diff --git a/json/per-country/equatorial_guinea_gnq.json b/refactored/json/per-country/equatorial_guinea_gnq.json
similarity index 100%
rename from json/per-country/equatorial_guinea_gnq.json
rename to refactored/json/per-country/equatorial_guinea_gnq.json
diff --git a/json/per-country/eritrea_eri.json b/refactored/json/per-country/eritrea_eri.json
similarity index 100%
rename from json/per-country/eritrea_eri.json
rename to refactored/json/per-country/eritrea_eri.json
diff --git a/json/per-country/estonia_est.json b/refactored/json/per-country/estonia_est.json
similarity index 100%
rename from json/per-country/estonia_est.json
rename to refactored/json/per-country/estonia_est.json
diff --git a/json/per-country/eswatini_swz.json b/refactored/json/per-country/eswatini_swz.json
similarity index 100%
rename from json/per-country/eswatini_swz.json
rename to refactored/json/per-country/eswatini_swz.json
diff --git a/json/per-country/ethiopia_eth.json b/refactored/json/per-country/ethiopia_eth.json
similarity index 100%
rename from json/per-country/ethiopia_eth.json
rename to refactored/json/per-country/ethiopia_eth.json
diff --git a/json/per-country/europe_and_central_asia_.json b/refactored/json/per-country/europe_and_central_asia_.json
similarity index 100%
rename from json/per-country/europe_and_central_asia_.json
rename to refactored/json/per-country/europe_and_central_asia_.json
diff --git a/json/per-country/europe_central_asia_no_iso.json b/refactored/json/per-country/europe_central_asia_no_iso.json
similarity index 100%
rename from json/per-country/europe_central_asia_no_iso.json
rename to refactored/json/per-country/europe_central_asia_no_iso.json
diff --git a/json/per-country/faroe_islands_fro.json b/refactored/json/per-country/faroe_islands_fro.json
similarity index 100%
rename from json/per-country/faroe_islands_fro.json
rename to refactored/json/per-country/faroe_islands_fro.json
diff --git a/json/per-country/fiji_fji.json b/refactored/json/per-country/fiji_fji.json
similarity index 100%
rename from json/per-country/fiji_fji.json
rename to refactored/json/per-country/fiji_fji.json
diff --git a/json/per-country/finland_fin.json b/refactored/json/per-country/finland_fin.json
similarity index 100%
rename from json/per-country/finland_fin.json
rename to refactored/json/per-country/finland_fin.json
diff --git a/json/per-country/france_fra.json b/refactored/json/per-country/france_fra.json
similarity index 100%
rename from json/per-country/france_fra.json
rename to refactored/json/per-country/france_fra.json
diff --git a/json/per-country/french_polynesia_pyf.json b/refactored/json/per-country/french_polynesia_pyf.json
similarity index 100%
rename from json/per-country/french_polynesia_pyf.json
rename to refactored/json/per-country/french_polynesia_pyf.json
diff --git a/json/per-country/gabon_gab.json b/refactored/json/per-country/gabon_gab.json
similarity index 100%
rename from json/per-country/gabon_gab.json
rename to refactored/json/per-country/gabon_gab.json
diff --git a/json/per-country/gambia_gmb.json b/refactored/json/per-country/gambia_gmb.json
similarity index 100%
rename from json/per-country/gambia_gmb.json
rename to refactored/json/per-country/gambia_gmb.json
diff --git a/json/per-country/georgia_us_.json b/refactored/json/per-country/georgia_us_.json
similarity index 100%
rename from json/per-country/georgia_us_.json
rename to refactored/json/per-country/georgia_us_.json
diff --git a/json/per-country/georgia_us_no_iso.json b/refactored/json/per-country/georgia_us_no_iso.json
similarity index 100%
rename from json/per-country/georgia_us_no_iso.json
rename to refactored/json/per-country/georgia_us_no_iso.json
diff --git a/json/per-country/germany_deu.json b/refactored/json/per-country/germany_deu.json
similarity index 100%
rename from json/per-country/germany_deu.json
rename to refactored/json/per-country/germany_deu.json
diff --git a/json/per-country/ghana_gha.json b/refactored/json/per-country/ghana_gha.json
similarity index 100%
rename from json/per-country/ghana_gha.json
rename to refactored/json/per-country/ghana_gha.json
diff --git a/json/per-country/gibraltar_gib.json b/refactored/json/per-country/gibraltar_gib.json
similarity index 100%
rename from json/per-country/gibraltar_gib.json
rename to refactored/json/per-country/gibraltar_gib.json
diff --git a/json/per-country/greece_grc.json b/refactored/json/per-country/greece_grc.json
similarity index 100%
rename from json/per-country/greece_grc.json
rename to refactored/json/per-country/greece_grc.json
diff --git a/json/per-country/greenland_grl.json b/refactored/json/per-country/greenland_grl.json
similarity index 100%
rename from json/per-country/greenland_grl.json
rename to refactored/json/per-country/greenland_grl.json
diff --git a/json/per-country/grenada_grd.json b/refactored/json/per-country/grenada_grd.json
similarity index 100%
rename from json/per-country/grenada_grd.json
rename to refactored/json/per-country/grenada_grd.json
diff --git a/json/per-country/guam_gum.json b/refactored/json/per-country/guam_gum.json
similarity index 100%
rename from json/per-country/guam_gum.json
rename to refactored/json/per-country/guam_gum.json
diff --git a/json/per-country/guatemala_gtm.json b/refactored/json/per-country/guatemala_gtm.json
similarity index 100%
rename from json/per-country/guatemala_gtm.json
rename to refactored/json/per-country/guatemala_gtm.json
diff --git a/json/per-country/guinea-bissau_.json b/refactored/json/per-country/guinea-bissau_.json
similarity index 100%
rename from json/per-country/guinea-bissau_.json
rename to refactored/json/per-country/guinea-bissau_.json
diff --git a/json/per-country/guinea_bissau_no_iso.json b/refactored/json/per-country/guinea_bissau_no_iso.json
similarity index 100%
rename from json/per-country/guinea_bissau_no_iso.json
rename to refactored/json/per-country/guinea_bissau_no_iso.json
diff --git a/json/per-country/guinea_gin.json b/refactored/json/per-country/guinea_gin.json
similarity index 100%
rename from json/per-country/guinea_gin.json
rename to refactored/json/per-country/guinea_gin.json
diff --git a/json/per-country/guyana_guy.json b/refactored/json/per-country/guyana_guy.json
similarity index 100%
rename from json/per-country/guyana_guy.json
rename to refactored/json/per-country/guyana_guy.json
diff --git a/json/per-country/haiti_hti.json b/refactored/json/per-country/haiti_hti.json
similarity index 100%
rename from json/per-country/haiti_hti.json
rename to refactored/json/per-country/haiti_hti.json
diff --git a/json/per-country/honduras_hnd.json b/refactored/json/per-country/honduras_hnd.json
similarity index 100%
rename from json/per-country/honduras_hnd.json
rename to refactored/json/per-country/honduras_hnd.json
diff --git a/json/per-country/hong_kong_hkg.json b/refactored/json/per-country/hong_kong_hkg.json
similarity index 100%
rename from json/per-country/hong_kong_hkg.json
rename to refactored/json/per-country/hong_kong_hkg.json
diff --git a/json/per-country/hungary_hun.json b/refactored/json/per-country/hungary_hun.json
similarity index 100%
rename from json/per-country/hungary_hun.json
rename to refactored/json/per-country/hungary_hun.json
diff --git a/json/per-country/iceland_isl.json b/refactored/json/per-country/iceland_isl.json
similarity index 100%
rename from json/per-country/iceland_isl.json
rename to refactored/json/per-country/iceland_isl.json
diff --git a/json/per-country/impact_.json b/refactored/json/per-country/impact_.json
similarity index 100%
rename from json/per-country/impact_.json
rename to refactored/json/per-country/impact_.json
diff --git a/json/per-country/impact_no_iso.json b/refactored/json/per-country/impact_no_iso.json
similarity index 100%
rename from json/per-country/impact_no_iso.json
rename to refactored/json/per-country/impact_no_iso.json
diff --git a/json/per-country/india_ind.json b/refactored/json/per-country/india_ind.json
similarity index 100%
rename from json/per-country/india_ind.json
rename to refactored/json/per-country/india_ind.json
diff --git a/json/per-country/indonesia_idn.json b/refactored/json/per-country/indonesia_idn.json
similarity index 100%
rename from json/per-country/indonesia_idn.json
rename to refactored/json/per-country/indonesia_idn.json
diff --git a/json/per-country/iran_irn.json b/refactored/json/per-country/iran_irn.json
similarity index 100%
rename from json/per-country/iran_irn.json
rename to refactored/json/per-country/iran_irn.json
diff --git a/json/per-country/iraq_irq.json b/refactored/json/per-country/iraq_irq.json
similarity index 100%
rename from json/per-country/iraq_irq.json
rename to refactored/json/per-country/iraq_irq.json
diff --git a/json/per-country/ireland_irl.json b/refactored/json/per-country/ireland_irl.json
similarity index 100%
rename from json/per-country/ireland_irl.json
rename to refactored/json/per-country/ireland_irl.json
diff --git a/json/per-country/isle_of_man_imn.json b/refactored/json/per-country/isle_of_man_imn.json
similarity index 100%
rename from json/per-country/isle_of_man_imn.json
rename to refactored/json/per-country/isle_of_man_imn.json
diff --git a/json/per-country/israel_isr.json b/refactored/json/per-country/israel_isr.json
similarity index 100%
rename from json/per-country/israel_isr.json
rename to refactored/json/per-country/israel_isr.json
diff --git a/json/per-country/italy_ita.json b/refactored/json/per-country/italy_ita.json
similarity index 100%
rename from json/per-country/italy_ita.json
rename to refactored/json/per-country/italy_ita.json
diff --git a/json/per-country/ivory_coast_civ.json b/refactored/json/per-country/ivory_coast_civ.json
similarity index 100%
rename from json/per-country/ivory_coast_civ.json
rename to refactored/json/per-country/ivory_coast_civ.json
diff --git a/json/per-country/jamaica_jam.json b/refactored/json/per-country/jamaica_jam.json
similarity index 100%
rename from json/per-country/jamaica_jam.json
rename to refactored/json/per-country/jamaica_jam.json
diff --git a/json/per-country/japan_jpn.json b/refactored/json/per-country/japan_jpn.json
similarity index 100%
rename from json/per-country/japan_jpn.json
rename to refactored/json/per-country/japan_jpn.json
diff --git a/json/per-country/jordan_jor.json b/refactored/json/per-country/jordan_jor.json
similarity index 100%
rename from json/per-country/jordan_jor.json
rename to refactored/json/per-country/jordan_jor.json
diff --git a/json/per-country/kazakhstan_kaz.json b/refactored/json/per-country/kazakhstan_kaz.json
similarity index 100%
rename from json/per-country/kazakhstan_kaz.json
rename to refactored/json/per-country/kazakhstan_kaz.json
diff --git a/json/per-country/kenya_ken.json b/refactored/json/per-country/kenya_ken.json
similarity index 100%
rename from json/per-country/kenya_ken.json
rename to refactored/json/per-country/kenya_ken.json
diff --git a/json/per-country/kiribati_kir.json b/refactored/json/per-country/kiribati_kir.json
similarity index 100%
rename from json/per-country/kiribati_kir.json
rename to refactored/json/per-country/kiribati_kir.json
diff --git a/json/per-country/kosovo_xkx.json b/refactored/json/per-country/kosovo_xkx.json
similarity index 100%
rename from json/per-country/kosovo_xkx.json
rename to refactored/json/per-country/kosovo_xkx.json
diff --git a/json/per-country/kuwait_kwt.json b/refactored/json/per-country/kuwait_kwt.json
similarity index 100%
rename from json/per-country/kuwait_kwt.json
rename to refactored/json/per-country/kuwait_kwt.json
diff --git a/json/per-country/kyrgyzstan_kgz.json b/refactored/json/per-country/kyrgyzstan_kgz.json
similarity index 100%
rename from json/per-country/kyrgyzstan_kgz.json
rename to refactored/json/per-country/kyrgyzstan_kgz.json
diff --git a/json/per-country/laos_lao.json b/refactored/json/per-country/laos_lao.json
similarity index 100%
rename from json/per-country/laos_lao.json
rename to refactored/json/per-country/laos_lao.json
diff --git a/json/per-country/latin_america_and_caribbean_.json b/refactored/json/per-country/latin_america_and_caribbean_.json
similarity index 100%
rename from json/per-country/latin_america_and_caribbean_.json
rename to refactored/json/per-country/latin_america_and_caribbean_.json
diff --git a/json/per-country/latin_america_caribbean_no_iso.json b/refactored/json/per-country/latin_america_caribbean_no_iso.json
similarity index 100%
rename from json/per-country/latin_america_caribbean_no_iso.json
rename to refactored/json/per-country/latin_america_caribbean_no_iso.json
diff --git a/json/per-country/latvia_lva.json b/refactored/json/per-country/latvia_lva.json
similarity index 100%
rename from json/per-country/latvia_lva.json
rename to refactored/json/per-country/latvia_lva.json
diff --git a/json/per-country/lebanon_lbn.json b/refactored/json/per-country/lebanon_lbn.json
similarity index 100%
rename from json/per-country/lebanon_lbn.json
rename to refactored/json/per-country/lebanon_lbn.json
diff --git a/json/per-country/lesotho_lso.json b/refactored/json/per-country/lesotho_lso.json
similarity index 100%
rename from json/per-country/lesotho_lso.json
rename to refactored/json/per-country/lesotho_lso.json
diff --git a/json/per-country/liberia_lbr.json b/refactored/json/per-country/liberia_lbr.json
similarity index 100%
rename from json/per-country/liberia_lbr.json
rename to refactored/json/per-country/liberia_lbr.json
diff --git a/json/per-country/libya_lby.json b/refactored/json/per-country/libya_lby.json
similarity index 100%
rename from json/per-country/libya_lby.json
rename to refactored/json/per-country/libya_lby.json
diff --git a/json/per-country/liechtenstein_lie.json b/refactored/json/per-country/liechtenstein_lie.json
similarity index 100%
rename from json/per-country/liechtenstein_lie.json
rename to refactored/json/per-country/liechtenstein_lie.json
diff --git a/json/per-country/lithuania_ltu.json b/refactored/json/per-country/lithuania_ltu.json
similarity index 100%
rename from json/per-country/lithuania_ltu.json
rename to refactored/json/per-country/lithuania_ltu.json
diff --git a/json/per-country/location_.json b/refactored/json/per-country/location_.json
similarity index 100%
rename from json/per-country/location_.json
rename to refactored/json/per-country/location_.json
diff --git a/json/per-country/location_no_iso.json b/refactored/json/per-country/location_no_iso.json
similarity index 100%
rename from json/per-country/location_no_iso.json
rename to refactored/json/per-country/location_no_iso.json
diff --git a/json/per-country/luxembourg_lux.json b/refactored/json/per-country/luxembourg_lux.json
similarity index 100%
rename from json/per-country/luxembourg_lux.json
rename to refactored/json/per-country/luxembourg_lux.json
diff --git a/json/per-country/macao_mac.json b/refactored/json/per-country/macao_mac.json
similarity index 100%
rename from json/per-country/macao_mac.json
rename to refactored/json/per-country/macao_mac.json
diff --git a/json/per-country/madagascar_mdg.json b/refactored/json/per-country/madagascar_mdg.json
similarity index 100%
rename from json/per-country/madagascar_mdg.json
rename to refactored/json/per-country/madagascar_mdg.json
diff --git a/json/per-country/malawi_mwi.json b/refactored/json/per-country/malawi_mwi.json
similarity index 100%
rename from json/per-country/malawi_mwi.json
rename to refactored/json/per-country/malawi_mwi.json
diff --git a/json/per-country/malaysia_mys.json b/refactored/json/per-country/malaysia_mys.json
similarity index 100%
rename from json/per-country/malaysia_mys.json
rename to refactored/json/per-country/malaysia_mys.json
diff --git a/json/per-country/maldives_mdv.json b/refactored/json/per-country/maldives_mdv.json
similarity index 100%
rename from json/per-country/maldives_mdv.json
rename to refactored/json/per-country/maldives_mdv.json
diff --git a/json/per-country/mali_mli.json b/refactored/json/per-country/mali_mli.json
similarity index 100%
rename from json/per-country/mali_mli.json
rename to refactored/json/per-country/mali_mli.json
diff --git a/json/per-country/malta_mlt.json b/refactored/json/per-country/malta_mlt.json
similarity index 100%
rename from json/per-country/malta_mlt.json
rename to refactored/json/per-country/malta_mlt.json
diff --git a/json/per-country/marshall_islands_mhl.json b/refactored/json/per-country/marshall_islands_mhl.json
similarity index 100%
rename from json/per-country/marshall_islands_mhl.json
rename to refactored/json/per-country/marshall_islands_mhl.json
diff --git a/json/per-country/mauritania_mrt.json b/refactored/json/per-country/mauritania_mrt.json
similarity index 100%
rename from json/per-country/mauritania_mrt.json
rename to refactored/json/per-country/mauritania_mrt.json
diff --git a/json/per-country/mauritius_mus.json b/refactored/json/per-country/mauritius_mus.json
similarity index 100%
rename from json/per-country/mauritius_mus.json
rename to refactored/json/per-country/mauritius_mus.json
diff --git a/json/per-country/mexico_mex.json b/refactored/json/per-country/mexico_mex.json
similarity index 100%
rename from json/per-country/mexico_mex.json
rename to refactored/json/per-country/mexico_mex.json
diff --git a/json/per-country/micronesia_fed_sts_fsm.json b/refactored/json/per-country/micronesia_fed_sts_fsm.json
similarity index 100%
rename from json/per-country/micronesia_fed_sts_fsm.json
rename to refactored/json/per-country/micronesia_fed_sts_fsm.json
diff --git a/json/per-country/middle_east_and_north_africa_.json b/refactored/json/per-country/middle_east_and_north_africa_.json
similarity index 100%
rename from json/per-country/middle_east_and_north_africa_.json
rename to refactored/json/per-country/middle_east_and_north_africa_.json
diff --git a/json/per-country/middle_east_north_africa_no_iso.json b/refactored/json/per-country/middle_east_north_africa_no_iso.json
similarity index 100%
rename from json/per-country/middle_east_north_africa_no_iso.json
rename to refactored/json/per-country/middle_east_north_africa_no_iso.json
diff --git a/json/per-country/moldova_mda.json b/refactored/json/per-country/moldova_mda.json
similarity index 100%
rename from json/per-country/moldova_mda.json
rename to refactored/json/per-country/moldova_mda.json
diff --git a/json/per-country/monaco_mco.json b/refactored/json/per-country/monaco_mco.json
similarity index 100%
rename from json/per-country/monaco_mco.json
rename to refactored/json/per-country/monaco_mco.json
diff --git a/json/per-country/mongolia_mng.json b/refactored/json/per-country/mongolia_mng.json
similarity index 100%
rename from json/per-country/mongolia_mng.json
rename to refactored/json/per-country/mongolia_mng.json
diff --git a/json/per-country/montenegro_mne.json b/refactored/json/per-country/montenegro_mne.json
similarity index 100%
rename from json/per-country/montenegro_mne.json
rename to refactored/json/per-country/montenegro_mne.json
diff --git a/json/per-country/morocco_mar.json b/refactored/json/per-country/morocco_mar.json
similarity index 100%
rename from json/per-country/morocco_mar.json
rename to refactored/json/per-country/morocco_mar.json
diff --git a/json/per-country/mozambique_moz.json b/refactored/json/per-country/mozambique_moz.json
similarity index 100%
rename from json/per-country/mozambique_moz.json
rename to refactored/json/per-country/mozambique_moz.json
diff --git a/json/per-country/myanmar_mmr.json b/refactored/json/per-country/myanmar_mmr.json
similarity index 100%
rename from json/per-country/myanmar_mmr.json
rename to refactored/json/per-country/myanmar_mmr.json
diff --git a/json/per-country/namibia_nam.json b/refactored/json/per-country/namibia_nam.json
similarity index 100%
rename from json/per-country/namibia_nam.json
rename to refactored/json/per-country/namibia_nam.json
diff --git a/json/per-country/nauru_nru.json b/refactored/json/per-country/nauru_nru.json
similarity index 100%
rename from json/per-country/nauru_nru.json
rename to refactored/json/per-country/nauru_nru.json
diff --git a/json/per-country/nepal_npl.json b/refactored/json/per-country/nepal_npl.json
similarity index 100%
rename from json/per-country/nepal_npl.json
rename to refactored/json/per-country/nepal_npl.json
diff --git a/json/per-country/netherlands_nld.json b/refactored/json/per-country/netherlands_nld.json
similarity index 100%
rename from json/per-country/netherlands_nld.json
rename to refactored/json/per-country/netherlands_nld.json
diff --git a/json/per-country/new_caledonia_ncl.json b/refactored/json/per-country/new_caledonia_ncl.json
similarity index 100%
rename from json/per-country/new_caledonia_ncl.json
rename to refactored/json/per-country/new_caledonia_ncl.json
diff --git a/json/per-country/new_zealand_nzl.json b/refactored/json/per-country/new_zealand_nzl.json
similarity index 100%
rename from json/per-country/new_zealand_nzl.json
rename to refactored/json/per-country/new_zealand_nzl.json
diff --git a/json/per-country/nicaragua_nic.json b/refactored/json/per-country/nicaragua_nic.json
similarity index 100%
rename from json/per-country/nicaragua_nic.json
rename to refactored/json/per-country/nicaragua_nic.json
diff --git a/json/per-country/niger_ner.json b/refactored/json/per-country/niger_ner.json
similarity index 100%
rename from json/per-country/niger_ner.json
rename to refactored/json/per-country/niger_ner.json
diff --git a/json/per-country/nigeria_nga.json b/refactored/json/per-country/nigeria_nga.json
similarity index 100%
rename from json/per-country/nigeria_nga.json
rename to refactored/json/per-country/nigeria_nga.json
diff --git a/json/per-country/north_america_.json b/refactored/json/per-country/north_america_.json
similarity index 100%
rename from json/per-country/north_america_.json
rename to refactored/json/per-country/north_america_.json
diff --git a/json/per-country/north_america_no_iso.json b/refactored/json/per-country/north_america_no_iso.json
similarity index 100%
rename from json/per-country/north_america_no_iso.json
rename to refactored/json/per-country/north_america_no_iso.json
diff --git a/json/per-country/north_korea_prk.json b/refactored/json/per-country/north_korea_prk.json
similarity index 100%
rename from json/per-country/north_korea_prk.json
rename to refactored/json/per-country/north_korea_prk.json
diff --git a/json/per-country/north_macedonia_mkd.json b/refactored/json/per-country/north_macedonia_mkd.json
similarity index 100%
rename from json/per-country/north_macedonia_mkd.json
rename to refactored/json/per-country/north_macedonia_mkd.json
diff --git a/json/per-country/northern_mariana_islands_mnp.json b/refactored/json/per-country/northern_mariana_islands_mnp.json
similarity index 100%
rename from json/per-country/northern_mariana_islands_mnp.json
rename to refactored/json/per-country/northern_mariana_islands_mnp.json
diff --git a/json/per-country/norway_nor.json b/refactored/json/per-country/norway_nor.json
similarity index 100%
rename from json/per-country/norway_nor.json
rename to refactored/json/per-country/norway_nor.json
diff --git a/json/per-country/oman_omn.json b/refactored/json/per-country/oman_omn.json
similarity index 100%
rename from json/per-country/oman_omn.json
rename to refactored/json/per-country/oman_omn.json
diff --git a/json/per-country/pakistan_pak.json b/refactored/json/per-country/pakistan_pak.json
similarity index 100%
rename from json/per-country/pakistan_pak.json
rename to refactored/json/per-country/pakistan_pak.json
diff --git a/json/per-country/palau_plw.json b/refactored/json/per-country/palau_plw.json
similarity index 100%
rename from json/per-country/palau_plw.json
rename to refactored/json/per-country/palau_plw.json
diff --git a/json/per-country/panama_pan.json b/refactored/json/per-country/panama_pan.json
similarity index 100%
rename from json/per-country/panama_pan.json
rename to refactored/json/per-country/panama_pan.json
diff --git a/json/per-country/papua_new_guinea_png.json b/refactored/json/per-country/papua_new_guinea_png.json
similarity index 100%
rename from json/per-country/papua_new_guinea_png.json
rename to refactored/json/per-country/papua_new_guinea_png.json
diff --git a/json/per-country/paraguay_pry.json b/refactored/json/per-country/paraguay_pry.json
similarity index 100%
rename from json/per-country/paraguay_pry.json
rename to refactored/json/per-country/paraguay_pry.json
diff --git a/json/per-country/peru_per.json b/refactored/json/per-country/peru_per.json
similarity index 100%
rename from json/per-country/peru_per.json
rename to refactored/json/per-country/peru_per.json
diff --git a/json/per-country/philippines_phl.json b/refactored/json/per-country/philippines_phl.json
similarity index 100%
rename from json/per-country/philippines_phl.json
rename to refactored/json/per-country/philippines_phl.json
diff --git a/json/per-country/poland_pol.json b/refactored/json/per-country/poland_pol.json
similarity index 100%
rename from json/per-country/poland_pol.json
rename to refactored/json/per-country/poland_pol.json
diff --git a/json/per-country/portugal_prt.json b/refactored/json/per-country/portugal_prt.json
similarity index 100%
rename from json/per-country/portugal_prt.json
rename to refactored/json/per-country/portugal_prt.json
diff --git a/json/per-country/puerto_rico_pri.json b/refactored/json/per-country/puerto_rico_pri.json
similarity index 100%
rename from json/per-country/puerto_rico_pri.json
rename to refactored/json/per-country/puerto_rico_pri.json
diff --git a/json/per-country/qatar_qat.json b/refactored/json/per-country/qatar_qat.json
similarity index 100%
rename from json/per-country/qatar_qat.json
rename to refactored/json/per-country/qatar_qat.json
diff --git a/json/per-country/region_-_.json b/refactored/json/per-country/region_-_.json
similarity index 100%
rename from json/per-country/region_-_.json
rename to refactored/json/per-country/region_-_.json
diff --git a/json/per-country/region_no_iso.json b/refactored/json/per-country/region_no_iso.json
similarity index 100%
rename from json/per-country/region_no_iso.json
rename to refactored/json/per-country/region_no_iso.json
diff --git a/json/per-country/republic_of_the_congo_.json b/refactored/json/per-country/republic_of_the_congo_.json
similarity index 100%
rename from json/per-country/republic_of_the_congo_.json
rename to refactored/json/per-country/republic_of_the_congo_.json
diff --git a/json/per-country/republic_of_the_congo_no_iso.json b/refactored/json/per-country/republic_of_the_congo_no_iso.json
similarity index 100%
rename from json/per-country/republic_of_the_congo_no_iso.json
rename to refactored/json/per-country/republic_of_the_congo_no_iso.json
diff --git a/json/per-country/romania_rou.json b/refactored/json/per-country/romania_rou.json
similarity index 100%
rename from json/per-country/romania_rou.json
rename to refactored/json/per-country/romania_rou.json
diff --git a/json/per-country/russia_rus.json b/refactored/json/per-country/russia_rus.json
similarity index 100%
rename from json/per-country/russia_rus.json
rename to refactored/json/per-country/russia_rus.json
diff --git a/json/per-country/rwanda_rwa.json b/refactored/json/per-country/rwanda_rwa.json
similarity index 100%
rename from json/per-country/rwanda_rwa.json
rename to refactored/json/per-country/rwanda_rwa.json
diff --git a/json/per-country/saint_kitts_and_nevis_.json b/refactored/json/per-country/saint_kitts_and_nevis_.json
similarity index 100%
rename from json/per-country/saint_kitts_and_nevis_.json
rename to refactored/json/per-country/saint_kitts_and_nevis_.json
diff --git a/json/per-country/saint_kitts_and_nevis_no_iso.json b/refactored/json/per-country/saint_kitts_and_nevis_no_iso.json
similarity index 100%
rename from json/per-country/saint_kitts_and_nevis_no_iso.json
rename to refactored/json/per-country/saint_kitts_and_nevis_no_iso.json
diff --git a/json/per-country/saint_lucia_lca.json b/refactored/json/per-country/saint_lucia_lca.json
similarity index 100%
rename from json/per-country/saint_lucia_lca.json
rename to refactored/json/per-country/saint_lucia_lca.json
diff --git a/json/per-country/saint_vincent_and_the_grenadines_.json b/refactored/json/per-country/saint_vincent_and_the_grenadines_.json
similarity index 100%
rename from json/per-country/saint_vincent_and_the_grenadines_.json
rename to refactored/json/per-country/saint_vincent_and_the_grenadines_.json
diff --git a/json/per-country/saint_vincent_and_the_grenadines_no_iso.json b/refactored/json/per-country/saint_vincent_and_the_grenadines_no_iso.json
similarity index 100%
rename from json/per-country/saint_vincent_and_the_grenadines_no_iso.json
rename to refactored/json/per-country/saint_vincent_and_the_grenadines_no_iso.json
diff --git a/json/per-country/samoa_wsm.json b/refactored/json/per-country/samoa_wsm.json
similarity index 100%
rename from json/per-country/samoa_wsm.json
rename to refactored/json/per-country/samoa_wsm.json
diff --git a/json/per-country/san_marino_smr.json b/refactored/json/per-country/san_marino_smr.json
similarity index 100%
rename from json/per-country/san_marino_smr.json
rename to refactored/json/per-country/san_marino_smr.json
diff --git a/json/per-country/sao_tome_and_principe_stp.json b/refactored/json/per-country/sao_tome_and_principe_stp.json
similarity index 100%
rename from json/per-country/sao_tome_and_principe_stp.json
rename to refactored/json/per-country/sao_tome_and_principe_stp.json
diff --git a/json/per-country/saudi_arabia_sau.json b/refactored/json/per-country/saudi_arabia_sau.json
similarity index 100%
rename from json/per-country/saudi_arabia_sau.json
rename to refactored/json/per-country/saudi_arabia_sau.json
diff --git a/json/per-country/senegal_sen.json b/refactored/json/per-country/senegal_sen.json
similarity index 100%
rename from json/per-country/senegal_sen.json
rename to refactored/json/per-country/senegal_sen.json
diff --git a/json/per-country/serbia_srb.json b/refactored/json/per-country/serbia_srb.json
similarity index 100%
rename from json/per-country/serbia_srb.json
rename to refactored/json/per-country/serbia_srb.json
diff --git a/json/per-country/seychelles_syc.json b/refactored/json/per-country/seychelles_syc.json
similarity index 100%
rename from json/per-country/seychelles_syc.json
rename to refactored/json/per-country/seychelles_syc.json
diff --git a/json/per-country/sierra_leone_sle.json b/refactored/json/per-country/sierra_leone_sle.json
similarity index 100%
rename from json/per-country/sierra_leone_sle.json
rename to refactored/json/per-country/sierra_leone_sle.json
diff --git a/json/per-country/singapore_sgp.json b/refactored/json/per-country/singapore_sgp.json
similarity index 100%
rename from json/per-country/singapore_sgp.json
rename to refactored/json/per-country/singapore_sgp.json
diff --git a/json/per-country/sint_maarten_dutch_part_.json b/refactored/json/per-country/sint_maarten_dutch_part_.json
similarity index 100%
rename from json/per-country/sint_maarten_dutch_part_.json
rename to refactored/json/per-country/sint_maarten_dutch_part_.json
diff --git a/json/per-country/sint_maarten_dutch_part_no_iso.json b/refactored/json/per-country/sint_maarten_dutch_part_no_iso.json
similarity index 100%
rename from json/per-country/sint_maarten_dutch_part_no_iso.json
rename to refactored/json/per-country/sint_maarten_dutch_part_no_iso.json
diff --git a/json/per-country/slovakia_svk.json b/refactored/json/per-country/slovakia_svk.json
similarity index 100%
rename from json/per-country/slovakia_svk.json
rename to refactored/json/per-country/slovakia_svk.json
diff --git a/json/per-country/slovenia_svn.json b/refactored/json/per-country/slovenia_svn.json
similarity index 100%
rename from json/per-country/slovenia_svn.json
rename to refactored/json/per-country/slovenia_svn.json
diff --git a/json/per-country/solomon_islands_slb.json b/refactored/json/per-country/solomon_islands_slb.json
similarity index 100%
rename from json/per-country/solomon_islands_slb.json
rename to refactored/json/per-country/solomon_islands_slb.json
diff --git a/json/per-country/somalia_som.json b/refactored/json/per-country/somalia_som.json
similarity index 100%
rename from json/per-country/somalia_som.json
rename to refactored/json/per-country/somalia_som.json
diff --git a/json/per-country/south_africa_zaf.json b/refactored/json/per-country/south_africa_zaf.json
similarity index 100%
rename from json/per-country/south_africa_zaf.json
rename to refactored/json/per-country/south_africa_zaf.json
diff --git a/json/per-country/south_asia_.json b/refactored/json/per-country/south_asia_.json
similarity index 100%
rename from json/per-country/south_asia_.json
rename to refactored/json/per-country/south_asia_.json
diff --git a/json/per-country/south_asia_no_iso.json b/refactored/json/per-country/south_asia_no_iso.json
similarity index 100%
rename from json/per-country/south_asia_no_iso.json
rename to refactored/json/per-country/south_asia_no_iso.json
diff --git a/json/per-country/south_korea_kor.json b/refactored/json/per-country/south_korea_kor.json
similarity index 100%
rename from json/per-country/south_korea_kor.json
rename to refactored/json/per-country/south_korea_kor.json
diff --git a/json/per-country/south_sudan_ssd.json b/refactored/json/per-country/south_sudan_ssd.json
similarity index 100%
rename from json/per-country/south_sudan_ssd.json
rename to refactored/json/per-country/south_sudan_ssd.json
diff --git a/json/per-country/spain_esp.json b/refactored/json/per-country/spain_esp.json
similarity index 100%
rename from json/per-country/spain_esp.json
rename to refactored/json/per-country/spain_esp.json
diff --git a/json/per-country/sri_lanka_lka.json b/refactored/json/per-country/sri_lanka_lka.json
similarity index 100%
rename from json/per-country/sri_lanka_lka.json
rename to refactored/json/per-country/sri_lanka_lka.json
diff --git a/json/per-country/st_martin_french_part_.json b/refactored/json/per-country/st_martin_french_part_.json
similarity index 100%
rename from json/per-country/st_martin_french_part_.json
rename to refactored/json/per-country/st_martin_french_part_.json
diff --git a/json/per-country/st_martin_french_part_no_iso.json b/refactored/json/per-country/st_martin_french_part_no_iso.json
similarity index 100%
rename from json/per-country/st_martin_french_part_no_iso.json
rename to refactored/json/per-country/st_martin_french_part_no_iso.json
diff --git a/json/per-country/sub-saharan_africa_.json b/refactored/json/per-country/sub-saharan_africa_.json
similarity index 100%
rename from json/per-country/sub-saharan_africa_.json
rename to refactored/json/per-country/sub-saharan_africa_.json
diff --git a/json/per-country/sub_saharan_africa_no_iso.json b/refactored/json/per-country/sub_saharan_africa_no_iso.json
similarity index 100%
rename from json/per-country/sub_saharan_africa_no_iso.json
rename to refactored/json/per-country/sub_saharan_africa_no_iso.json
diff --git a/json/per-country/sudan_sdn.json b/refactored/json/per-country/sudan_sdn.json
similarity index 100%
rename from json/per-country/sudan_sdn.json
rename to refactored/json/per-country/sudan_sdn.json
diff --git a/json/per-country/suriname_sur.json b/refactored/json/per-country/suriname_sur.json
similarity index 100%
rename from json/per-country/suriname_sur.json
rename to refactored/json/per-country/suriname_sur.json
diff --git a/json/per-country/sweden_swe.json b/refactored/json/per-country/sweden_swe.json
similarity index 100%
rename from json/per-country/sweden_swe.json
rename to refactored/json/per-country/sweden_swe.json
diff --git a/json/per-country/switzerland_che.json b/refactored/json/per-country/switzerland_che.json
similarity index 100%
rename from json/per-country/switzerland_che.json
rename to refactored/json/per-country/switzerland_che.json
diff --git a/json/per-country/syria_syr.json b/refactored/json/per-country/syria_syr.json
similarity index 100%
rename from json/per-country/syria_syr.json
rename to refactored/json/per-country/syria_syr.json
diff --git a/json/per-country/taiwan_twn.json b/refactored/json/per-country/taiwan_twn.json
similarity index 100%
rename from json/per-country/taiwan_twn.json
rename to refactored/json/per-country/taiwan_twn.json
diff --git a/json/per-country/tajikistan_tjk.json b/refactored/json/per-country/tajikistan_tjk.json
similarity index 100%
rename from json/per-country/tajikistan_tjk.json
rename to refactored/json/per-country/tajikistan_tjk.json
diff --git a/json/per-country/tanzania_tza.json b/refactored/json/per-country/tanzania_tza.json
similarity index 100%
rename from json/per-country/tanzania_tza.json
rename to refactored/json/per-country/tanzania_tza.json
diff --git a/json/per-country/thailand_tha.json b/refactored/json/per-country/thailand_tha.json
similarity index 100%
rename from json/per-country/thailand_tha.json
rename to refactored/json/per-country/thailand_tha.json
diff --git a/json/per-country/timor-leste_.json b/refactored/json/per-country/timor-leste_.json
similarity index 100%
rename from json/per-country/timor-leste_.json
rename to refactored/json/per-country/timor-leste_.json
diff --git a/json/per-country/timor_leste_no_iso.json b/refactored/json/per-country/timor_leste_no_iso.json
similarity index 100%
rename from json/per-country/timor_leste_no_iso.json
rename to refactored/json/per-country/timor_leste_no_iso.json
diff --git a/json/per-country/togo_tgo.json b/refactored/json/per-country/togo_tgo.json
similarity index 100%
rename from json/per-country/togo_tgo.json
rename to refactored/json/per-country/togo_tgo.json
diff --git a/json/per-country/tonga_ton.json b/refactored/json/per-country/tonga_ton.json
similarity index 100%
rename from json/per-country/tonga_ton.json
rename to refactored/json/per-country/tonga_ton.json
diff --git a/json/per-country/trinidad_and_tobago_tto.json b/refactored/json/per-country/trinidad_and_tobago_tto.json
similarity index 100%
rename from json/per-country/trinidad_and_tobago_tto.json
rename to refactored/json/per-country/trinidad_and_tobago_tto.json
diff --git a/json/per-country/tunisia_tun.json b/refactored/json/per-country/tunisia_tun.json
similarity index 100%
rename from json/per-country/tunisia_tun.json
rename to refactored/json/per-country/tunisia_tun.json
diff --git a/json/per-country/turkiye_.json b/refactored/json/per-country/turkiye_.json
similarity index 100%
rename from json/per-country/turkiye_.json
rename to refactored/json/per-country/turkiye_.json
diff --git a/json/per-country/turkiye_no_iso.json b/refactored/json/per-country/turkiye_no_iso.json
similarity index 100%
rename from json/per-country/turkiye_no_iso.json
rename to refactored/json/per-country/turkiye_no_iso.json
diff --git a/json/per-country/turkmenistan_tkm.json b/refactored/json/per-country/turkmenistan_tkm.json
similarity index 100%
rename from json/per-country/turkmenistan_tkm.json
rename to refactored/json/per-country/turkmenistan_tkm.json
diff --git a/json/per-country/turks_and_caicos_islands_.json b/refactored/json/per-country/turks_and_caicos_islands_.json
similarity index 100%
rename from json/per-country/turks_and_caicos_islands_.json
rename to refactored/json/per-country/turks_and_caicos_islands_.json
diff --git a/json/per-country/turks_and_caicos_islands_no_iso.json b/refactored/json/per-country/turks_and_caicos_islands_no_iso.json
similarity index 100%
rename from json/per-country/turks_and_caicos_islands_no_iso.json
rename to refactored/json/per-country/turks_and_caicos_islands_no_iso.json
diff --git a/json/per-country/tuvalu_tuv.json b/refactored/json/per-country/tuvalu_tuv.json
similarity index 100%
rename from json/per-country/tuvalu_tuv.json
rename to refactored/json/per-country/tuvalu_tuv.json
diff --git a/json/per-country/uganda_uga.json b/refactored/json/per-country/uganda_uga.json
similarity index 100%
rename from json/per-country/uganda_uga.json
rename to refactored/json/per-country/uganda_uga.json
diff --git a/json/per-country/ukraine_ukr.json b/refactored/json/per-country/ukraine_ukr.json
similarity index 100%
rename from json/per-country/ukraine_ukr.json
rename to refactored/json/per-country/ukraine_ukr.json
diff --git a/json/per-country/united_arab_emirates_are.json b/refactored/json/per-country/united_arab_emirates_are.json
similarity index 100%
rename from json/per-country/united_arab_emirates_are.json
rename to refactored/json/per-country/united_arab_emirates_are.json
diff --git a/json/per-country/united_kingdom_gbr.json b/refactored/json/per-country/united_kingdom_gbr.json
similarity index 100%
rename from json/per-country/united_kingdom_gbr.json
rename to refactored/json/per-country/united_kingdom_gbr.json
diff --git a/json/per-country/united_states_usa.json b/refactored/json/per-country/united_states_usa.json
similarity index 100%
rename from json/per-country/united_states_usa.json
rename to refactored/json/per-country/united_states_usa.json
diff --git a/json/per-country/units_.json b/refactored/json/per-country/units_.json
similarity index 100%
rename from json/per-country/units_.json
rename to refactored/json/per-country/units_.json
diff --git a/json/per-country/units_no_iso.json b/refactored/json/per-country/units_no_iso.json
similarity index 100%
rename from json/per-country/units_no_iso.json
rename to refactored/json/per-country/units_no_iso.json
diff --git a/json/per-country/uruguay_ury.json b/refactored/json/per-country/uruguay_ury.json
similarity index 100%
rename from json/per-country/uruguay_ury.json
rename to refactored/json/per-country/uruguay_ury.json
diff --git a/json/per-country/us_virgin_islands_vir.json b/refactored/json/per-country/us_virgin_islands_vir.json
similarity index 100%
rename from json/per-country/us_virgin_islands_vir.json
rename to refactored/json/per-country/us_virgin_islands_vir.json
diff --git a/json/per-country/uzbekistan_uzb.json b/refactored/json/per-country/uzbekistan_uzb.json
similarity index 100%
rename from json/per-country/uzbekistan_uzb.json
rename to refactored/json/per-country/uzbekistan_uzb.json
diff --git a/json/per-country/vanuatu_vut.json b/refactored/json/per-country/vanuatu_vut.json
similarity index 100%
rename from json/per-country/vanuatu_vut.json
rename to refactored/json/per-country/vanuatu_vut.json
diff --git a/json/per-country/venezuela_ven.json b/refactored/json/per-country/venezuela_ven.json
similarity index 100%
rename from json/per-country/venezuela_ven.json
rename to refactored/json/per-country/venezuela_ven.json
diff --git a/json/per-country/viet_nam_.json b/refactored/json/per-country/viet_nam_.json
similarity index 100%
rename from json/per-country/viet_nam_.json
rename to refactored/json/per-country/viet_nam_.json
diff --git a/json/per-country/viet_nam_no_iso.json b/refactored/json/per-country/viet_nam_no_iso.json
similarity index 100%
rename from json/per-country/viet_nam_no_iso.json
rename to refactored/json/per-country/viet_nam_no_iso.json
diff --git a/json/per-country/west_bank_and_gaza_.json b/refactored/json/per-country/west_bank_and_gaza_.json
similarity index 100%
rename from json/per-country/west_bank_and_gaza_.json
rename to refactored/json/per-country/west_bank_and_gaza_.json
diff --git a/json/per-country/west_bank_and_gaza_no_iso.json b/refactored/json/per-country/west_bank_and_gaza_no_iso.json
similarity index 100%
rename from json/per-country/west_bank_and_gaza_no_iso.json
rename to refactored/json/per-country/west_bank_and_gaza_no_iso.json
diff --git a/json/per-country/yemen_yem.json b/refactored/json/per-country/yemen_yem.json
similarity index 100%
rename from json/per-country/yemen_yem.json
rename to refactored/json/per-country/yemen_yem.json
diff --git a/json/per-country/zambia_zmb.json b/refactored/json/per-country/zambia_zmb.json
similarity index 100%
rename from json/per-country/zambia_zmb.json
rename to refactored/json/per-country/zambia_zmb.json
diff --git a/json/per-country/zimbabwe_zwe.json b/refactored/json/per-country/zimbabwe_zwe.json
similarity index 100%
rename from json/per-country/zimbabwe_zwe.json
rename to refactored/json/per-country/zimbabwe_zwe.json
diff --git a/source-data/gvfd_v2_0325/full-datasheet/IFVI GVFD 0325.xlsx b/source-data/gvfd_v2_0325/full-datasheet/ifvi_gvds.xlsx
similarity index 100%
rename from source-data/gvfd_v2_0325/full-datasheet/IFVI GVFD 0325.xlsx
rename to source-data/gvfd_v2_0325/full-datasheet/ifvi_gvds.xlsx
diff --git a/source-data/gvfd_v2_0325/full-datasheet/IFVI GVFD 0325.ods b/source-data/gvfd_v2_0325/full-datasheet/ifvi_gvfd_.ods
similarity index 100%
rename from source-data/gvfd_v2_0325/full-datasheet/IFVI GVFD 0325.ods
rename to source-data/gvfd_v2_0325/full-datasheet/ifvi_gvfd_.ods