diff --git a/build/gisida.js b/build/gisida.js
deleted file mode 100644
index e69de29b..00000000
diff --git a/build/gisida.js.map b/build/gisida.js.map
index b40aa9ea..6ce85044 100644
--- a/build/gisida.js.map
+++ b/build/gisida.js.map
@@ -1 +1 @@
-{"version":3,"file":"gisida.js","sources":["webpack:///gisida.js"],"mappings":"AAAA;;;;AAg0SA;;;;;;AA8vJA","sourceRoot":""}
\ No newline at end of file
+{"version":3,"file":"gisida.js","sources":["webpack:///gisida.js"],"mappings":"AAAA;;;;AA2ySA;;;;;;AAyzIA","sourceRoot":""}
\ No newline at end of file
diff --git a/src/index.js b/src/index.js
index c82904bf..a1d71714 100644
--- a/src/index.js
+++ b/src/index.js
@@ -6,7 +6,7 @@ import locationsReducer from './store/reducers/locations';
 import regions from './store/reducers/regions';
 import styles from './store/reducers/styles';
 import supersetConfig from './store/reducers/superset-config';
-import MAP from './store/reducers/createMapReducer/createMapReducer';
+import MAP, { createMapReducer } from './store/reducers/map';
 
 // eslint-disable-next-line no-underscore-dangle, global-require
 if (!global._babelPolyfill) require('babel-polyfill');
@@ -17,8 +17,8 @@ gisida.version = require('../package.json').version;
 gisida.initStore = require('./store/initStore').default;
 gisida.loadLayers = require('./store/initStore').loadLayers;
 gisida.reducerRegistry = require('./store/reducerRegistry').default;
-gisida.createMapReducer = require('./store/reducers/createMapReducer/createMapReducer').createMapReducer;
 
+gisida.createMapReducer = createMapReducer
 gisida.defaultReducers = {
   APP,
   filter,
diff --git a/src/store/reducers/createMapReducer/index.js b/src/store/reducers/createMapReducer/index.js
deleted file mode 100644
index b251fee1..00000000
--- a/src/store/reducers/createMapReducer/index.js
+++ /dev/null
@@ -1 +0,0 @@
-export default './createMapReducer';
diff --git a/src/store/reducers/index.js b/src/store/reducers/index.js
index 3b60bb42..12276720 100644
--- a/src/store/reducers/index.js
+++ b/src/store/reducers/index.js
@@ -6,5 +6,5 @@ export { default as LOCATIONS } from './locations';
 export { default as REGIONS } from './regions';
 export { default as STYLES } from './styles';
 export { default as SUPERSET_CONFIGS } from './superset-config';
-export { default as MAP } from './createMapReducer/createMapReducer';
+export { default as MAP } from './map/';
 export { default as AUTH } from './auth';
diff --git a/src/store/reducers/createMapReducer/activeLayerIdReducer.js b/src/store/reducers/map/activeLayerIdReducer.js
similarity index 100%
rename from src/store/reducers/createMapReducer/activeLayerIdReducer.js
rename to src/store/reducers/map/activeLayerIdReducer.js
diff --git a/src/store/reducers/createMapReducer/activeLayerIdsReducer.js b/src/store/reducers/map/activeLayerIdsReducer.js
similarity index 100%
rename from src/store/reducers/createMapReducer/activeLayerIdsReducer.js
rename to src/store/reducers/map/activeLayerIdsReducer.js
diff --git a/src/store/reducers/createMapReducer/createMapReducer.js b/src/store/reducers/map/createMapReducer.js
similarity index 100%
rename from src/store/reducers/createMapReducer/createMapReducer.js
rename to src/store/reducers/map/createMapReducer.js
diff --git a/src/store/reducers/createMapReducer/currentRegionReducer.js b/src/store/reducers/map/currentRegionReducer.js
similarity index 100%
rename from src/store/reducers/createMapReducer/currentRegionReducer.js
rename to src/store/reducers/map/currentRegionReducer.js
diff --git a/src/store/reducers/createMapReducer/currentStyleReducer.js b/src/store/reducers/map/currentStyleReducer.js
similarity index 100%
rename from src/store/reducers/createMapReducer/currentStyleReducer.js
rename to src/store/reducers/map/currentStyleReducer.js
diff --git a/src/store/reducers/createMapReducer/defaultLayersReducer.js b/src/store/reducers/map/defaultLayersReducer.js
similarity index 100%
rename from src/store/reducers/createMapReducer/defaultLayersReducer.js
rename to src/store/reducers/map/defaultLayersReducer.js
diff --git a/src/store/reducers/createMapReducer/detailViewReducer.js b/src/store/reducers/map/detailViewReducer.js
similarity index 100%
rename from src/store/reducers/createMapReducer/detailViewReducer.js
rename to src/store/reducers/map/detailViewReducer.js
diff --git a/src/store/reducers/createMapReducer/filterReducer.js b/src/store/reducers/map/filterReducer.js
similarity index 100%
rename from src/store/reducers/createMapReducer/filterReducer.js
rename to src/store/reducers/map/filterReducer.js
diff --git a/src/store/reducers/map/index.js b/src/store/reducers/map/index.js
new file mode 100644
index 00000000..50f8a70c
--- /dev/null
+++ b/src/store/reducers/map/index.js
@@ -0,0 +1,4 @@
+import MAP, { createMapReducer } from './createMapReducer';
+
+export { createMapReducer }; // exports the function to create a Map reducer
+export default MAP; // exports the default Map reducer as the default export
\ No newline at end of file
diff --git a/src/store/reducers/createMapReducer/lastLayerSelectedReducer.js b/src/store/reducers/map/lastLayerSelectedReducer.js
similarity index 100%
rename from src/store/reducers/createMapReducer/lastLayerSelectedReducer.js
rename to src/store/reducers/map/lastLayerSelectedReducer.js
diff --git a/src/store/reducers/createMapReducer/layerVisibilityReducer.js b/src/store/reducers/map/layerVisibilityReducer.js
similarity index 100%
rename from src/store/reducers/createMapReducer/layerVisibilityReducer.js
rename to src/store/reducers/map/layerVisibilityReducer.js
diff --git a/src/store/reducers/createMapReducer/layersReducer.js b/src/store/reducers/map/layersReducer.js
similarity index 100%
rename from src/store/reducers/createMapReducer/layersReducer.js
rename to src/store/reducers/map/layersReducer.js
diff --git a/src/store/reducers/createMapReducer/mapLoadedReducer.js b/src/store/reducers/map/mapLoadedReducer.js
similarity index 100%
rename from src/store/reducers/createMapReducer/mapLoadedReducer.js
rename to src/store/reducers/map/mapLoadedReducer.js
diff --git a/src/store/reducers/createMapReducer/mapRenderedReducer.js b/src/store/reducers/map/mapRenderedReducer.js
similarity index 100%
rename from src/store/reducers/createMapReducer/mapRenderedReducer.js
rename to src/store/reducers/map/mapRenderedReducer.js
diff --git a/src/store/reducers/createMapReducer/menuIsOpenReducer.js b/src/store/reducers/map/menuIsOpenReducer.js
similarity index 100%
rename from src/store/reducers/createMapReducer/menuIsOpenReducer.js
rename to src/store/reducers/map/menuIsOpenReducer.js
diff --git a/src/store/reducers/createMapReducer/menuScrollReducer.js b/src/store/reducers/map/menuScrollReducer.js
similarity index 100%
rename from src/store/reducers/createMapReducer/menuScrollReducer.js
rename to src/store/reducers/map/menuScrollReducer.js
diff --git a/src/store/reducers/createMapReducer/oldLayerObjsReducer.js b/src/store/reducers/map/oldLayerObjsReducer.js
similarity index 100%
rename from src/store/reducers/createMapReducer/oldLayerObjsReducer.js
rename to src/store/reducers/map/oldLayerObjsReducer.js
diff --git a/src/store/reducers/createMapReducer/openMenuLevelsReducer.js b/src/store/reducers/map/openMenuLevelsReducer.js
similarity index 100%
rename from src/store/reducers/createMapReducer/openMenuLevelsReducer.js
rename to src/store/reducers/map/openMenuLevelsReducer.js
diff --git a/src/store/reducers/createMapReducer/primaryLayerReducer.js b/src/store/reducers/map/primaryLayerReducer.js
similarity index 100%
rename from src/store/reducers/createMapReducer/primaryLayerReducer.js
rename to src/store/reducers/map/primaryLayerReducer.js
diff --git a/src/store/reducers/createMapReducer/primarySubLayerReducer.js b/src/store/reducers/map/primarySubLayerReducer.js
similarity index 100%
rename from src/store/reducers/createMapReducer/primarySubLayerReducer.js
rename to src/store/reducers/map/primarySubLayerReducer.js
diff --git a/src/store/reducers/createMapReducer/reloadLayerIdReducer.js b/src/store/reducers/map/reloadLayerIdReducer.js
similarity index 100%
rename from src/store/reducers/createMapReducer/reloadLayerIdReducer.js
rename to src/store/reducers/map/reloadLayerIdReducer.js
diff --git a/src/store/reducers/createMapReducer/reloadLayersReducer.js b/src/store/reducers/map/reloadLayersReducer.js
similarity index 100%
rename from src/store/reducers/createMapReducer/reloadLayersReducer.js
rename to src/store/reducers/map/reloadLayersReducer.js
diff --git a/src/store/reducers/createMapReducer/showFilterPanelReducer.js b/src/store/reducers/map/showFilterPanelReducer.js
similarity index 100%
rename from src/store/reducers/createMapReducer/showFilterPanelReducer.js
rename to src/store/reducers/map/showFilterPanelReducer.js
diff --git a/src/store/reducers/createMapReducer/showSpinnerReducer.js b/src/store/reducers/map/showSpinnerReducer.js
similarity index 100%
rename from src/store/reducers/createMapReducer/showSpinnerReducer.js
rename to src/store/reducers/map/showSpinnerReducer.js
diff --git a/src/store/reducers/createMapReducer/tests/activeLayerIdReducer.test.js b/src/store/reducers/map/tests/activeLayerIdReducer.test.js
similarity index 100%
rename from src/store/reducers/createMapReducer/tests/activeLayerIdReducer.test.js
rename to src/store/reducers/map/tests/activeLayerIdReducer.test.js
diff --git a/src/store/reducers/createMapReducer/tests/activeLayerIdsReducer.test.js b/src/store/reducers/map/tests/activeLayerIdsReducer.test.js
similarity index 100%
rename from src/store/reducers/createMapReducer/tests/activeLayerIdsReducer.test.js
rename to src/store/reducers/map/tests/activeLayerIdsReducer.test.js
diff --git a/src/store/reducers/createMapReducer/tests/common.js b/src/store/reducers/map/tests/common.js
similarity index 100%
rename from src/store/reducers/createMapReducer/tests/common.js
rename to src/store/reducers/map/tests/common.js
diff --git a/src/store/reducers/createMapReducer/tests/currentRegionReducer.test.js b/src/store/reducers/map/tests/currentRegionReducer.test.js
similarity index 100%
rename from src/store/reducers/createMapReducer/tests/currentRegionReducer.test.js
rename to src/store/reducers/map/tests/currentRegionReducer.test.js
diff --git a/src/store/reducers/createMapReducer/tests/currentStyleReducer.test.js b/src/store/reducers/map/tests/currentStyleReducer.test.js
similarity index 100%
rename from src/store/reducers/createMapReducer/tests/currentStyleReducer.test.js
rename to src/store/reducers/map/tests/currentStyleReducer.test.js
diff --git a/src/store/reducers/createMapReducer/tests/defaultLayersReducer.test.js b/src/store/reducers/map/tests/defaultLayersReducer.test.js
similarity index 100%
rename from src/store/reducers/createMapReducer/tests/defaultLayersReducer.test.js
rename to src/store/reducers/map/tests/defaultLayersReducer.test.js
diff --git a/src/store/reducers/createMapReducer/tests/detailViewReducer.test.js b/src/store/reducers/map/tests/detailViewReducer.test.js
similarity index 100%
rename from src/store/reducers/createMapReducer/tests/detailViewReducer.test.js
rename to src/store/reducers/map/tests/detailViewReducer.test.js
diff --git a/src/store/reducers/createMapReducer/tests/filterReducer.test.js b/src/store/reducers/map/tests/filterReducer.test.js
similarity index 100%
rename from src/store/reducers/createMapReducer/tests/filterReducer.test.js
rename to src/store/reducers/map/tests/filterReducer.test.js
diff --git a/src/store/reducers/createMapReducer/tests/lastLayerSelectedReducer.test.js b/src/store/reducers/map/tests/lastLayerSelectedReducer.test.js
similarity index 100%
rename from src/store/reducers/createMapReducer/tests/lastLayerSelectedReducer.test.js
rename to src/store/reducers/map/tests/lastLayerSelectedReducer.test.js
diff --git a/src/store/reducers/createMapReducer/tests/layerVisibilityReducer.test.js b/src/store/reducers/map/tests/layerVisibilityReducer.test.js
similarity index 100%
rename from src/store/reducers/createMapReducer/tests/layerVisibilityReducer.test.js
rename to src/store/reducers/map/tests/layerVisibilityReducer.test.js
diff --git a/src/store/reducers/createMapReducer/tests/layersReducer.test.js b/src/store/reducers/map/tests/layersReducer.test.js
similarity index 100%
rename from src/store/reducers/createMapReducer/tests/layersReducer.test.js
rename to src/store/reducers/map/tests/layersReducer.test.js
diff --git a/src/store/reducers/createMapReducer/tests/mapLoadedReducer.test.js b/src/store/reducers/map/tests/mapLoadedReducer.test.js
similarity index 100%
rename from src/store/reducers/createMapReducer/tests/mapLoadedReducer.test.js
rename to src/store/reducers/map/tests/mapLoadedReducer.test.js
diff --git a/src/store/reducers/createMapReducer/tests/mapRenderedReducer.test.js b/src/store/reducers/map/tests/mapRenderedReducer.test.js
similarity index 100%
rename from src/store/reducers/createMapReducer/tests/mapRenderedReducer.test.js
rename to src/store/reducers/map/tests/mapRenderedReducer.test.js
diff --git a/src/store/reducers/createMapReducer/tests/menuIsOpenReducer.test.js b/src/store/reducers/map/tests/menuIsOpenReducer.test.js
similarity index 100%
rename from src/store/reducers/createMapReducer/tests/menuIsOpenReducer.test.js
rename to src/store/reducers/map/tests/menuIsOpenReducer.test.js
diff --git a/src/store/reducers/createMapReducer/tests/menuScrollReducer.test.js b/src/store/reducers/map/tests/menuScrollReducer.test.js
similarity index 100%
rename from src/store/reducers/createMapReducer/tests/menuScrollReducer.test.js
rename to src/store/reducers/map/tests/menuScrollReducer.test.js
diff --git a/src/store/reducers/createMapReducer/tests/oldLayerObjsReducer.test.js b/src/store/reducers/map/tests/oldLayerObjsReducer.test.js
similarity index 100%
rename from src/store/reducers/createMapReducer/tests/oldLayerObjsReducer.test.js
rename to src/store/reducers/map/tests/oldLayerObjsReducer.test.js
diff --git a/src/store/reducers/createMapReducer/tests/openMenuLevelsReducer.test.js b/src/store/reducers/map/tests/openMenuLevelsReducer.test.js
similarity index 100%
rename from src/store/reducers/createMapReducer/tests/openMenuLevelsReducer.test.js
rename to src/store/reducers/map/tests/openMenuLevelsReducer.test.js
diff --git a/src/store/reducers/createMapReducer/tests/primaryLayerReducer.test.js b/src/store/reducers/map/tests/primaryLayerReducer.test.js
similarity index 100%
rename from src/store/reducers/createMapReducer/tests/primaryLayerReducer.test.js
rename to src/store/reducers/map/tests/primaryLayerReducer.test.js
diff --git a/src/store/reducers/createMapReducer/tests/primarySubLayerReducer.test.js b/src/store/reducers/map/tests/primarySubLayerReducer.test.js
similarity index 100%
rename from src/store/reducers/createMapReducer/tests/primarySubLayerReducer.test.js
rename to src/store/reducers/map/tests/primarySubLayerReducer.test.js
diff --git a/src/store/reducers/createMapReducer/tests/reloadLayerIdReducer.test.js b/src/store/reducers/map/tests/reloadLayerIdReducer.test.js
similarity index 100%
rename from src/store/reducers/createMapReducer/tests/reloadLayerIdReducer.test.js
rename to src/store/reducers/map/tests/reloadLayerIdReducer.test.js
diff --git a/src/store/reducers/createMapReducer/tests/reloadLayersReducer.test.js b/src/store/reducers/map/tests/reloadLayersReducer.test.js
similarity index 100%
rename from src/store/reducers/createMapReducer/tests/reloadLayersReducer.test.js
rename to src/store/reducers/map/tests/reloadLayersReducer.test.js
diff --git a/src/store/reducers/createMapReducer/tests/showFilterPanelReducer.test.js b/src/store/reducers/map/tests/showFilterPanelReducer.test.js
similarity index 100%
rename from src/store/reducers/createMapReducer/tests/showFilterPanelReducer.test.js
rename to src/store/reducers/map/tests/showFilterPanelReducer.test.js
diff --git a/src/store/reducers/createMapReducer/tests/showSpinnerReducer.test.js b/src/store/reducers/map/tests/showSpinnerReducer.test.js
similarity index 100%
rename from src/store/reducers/createMapReducer/tests/showSpinnerReducer.test.js
rename to src/store/reducers/map/tests/showSpinnerReducer.test.js
diff --git a/src/store/reducers/createMapReducer/tests/timeSeriesReducer.test.js b/src/store/reducers/map/tests/timeSeriesReducer.test.js
similarity index 100%
rename from src/store/reducers/createMapReducer/tests/timeSeriesReducer.test.js
rename to src/store/reducers/map/tests/timeSeriesReducer.test.js
diff --git a/src/store/reducers/createMapReducer/timeSeriesReducer.js b/src/store/reducers/map/timeSeriesReducer.js
similarity index 100%
rename from src/store/reducers/createMapReducer/timeSeriesReducer.js
rename to src/store/reducers/map/timeSeriesReducer.js