add more geojson countries, restructure files