diff --git a/docs/js/app.js b/docs/js/app.js
index bb7ec43cf..bd1e2de7c 100644
--- a/docs/js/app.js
+++ b/docs/js/app.js
@@ -5,7 +5,7 @@ const db = new loki('csc.db', {
   autosaveInterval: 4000
 });
 
-const API_BASE = 'https://raw.githubusercontent.com/dr5hn/countries-states-cities-database/master/';
+const API_BASE = 'https://raw.githubusercontent.com/dr5hn/countries-states-cities-database/master/json/';
 const COLLECTIONS = ['regions', 'subregions', 'countries', 'states', 'cities'];
 
 async function initializeData() {
diff --git a/cities.json b/json/cities.json
similarity index 100%
rename from cities.json
rename to json/cities.json
diff --git a/countries+cities.json b/json/countries+cities.json
similarity index 100%
rename from countries+cities.json
rename to json/countries+cities.json
diff --git a/countries+states+cities.json b/json/countries+states+cities.json
similarity index 100%
rename from countries+states+cities.json
rename to json/countries+states+cities.json
diff --git a/countries+states.json b/json/countries+states.json
similarity index 100%
rename from countries+states.json
rename to json/countries+states.json
diff --git a/countries.json b/json/countries.json
similarity index 100%
rename from countries.json
rename to json/countries.json
diff --git a/regions.json b/json/regions.json
similarity index 100%
rename from regions.json
rename to json/regions.json
diff --git a/states+cities.json b/json/states+cities.json
similarity index 100%
rename from states+cities.json
rename to json/states+cities.json
diff --git a/states.json b/json/states.json
similarity index 100%
rename from states.json
rename to json/states.json
diff --git a/subregions.json b/json/subregions.json
similarity index 100%
rename from subregions.json
rename to json/subregions.json
diff --git a/scripts/export.php b/scripts/export.php
index 04e6f2845..2619a152f 100644
--- a/scripts/export.php
+++ b/scripts/export.php
@@ -21,7 +21,7 @@
 $stateNamesArray = array();
 $cityNamesArray = array();
 
-$rootDir = dirname(dirname(__FILE__));
+$rootDir = dirname(dirname(__FILE__)).'/json';
 
 // Fetching All Countries
 $sql = "SELECT * FROM countries ORDER BY name";