diff --git a/lib/cartodb/controllers/analyses.js b/lib/cartodb/routers/analyses.js
similarity index 100%
rename from lib/cartodb/controllers/analyses.js
rename to lib/cartodb/routers/analyses.js
diff --git a/lib/cartodb/controllers/api-router.js b/lib/cartodb/routers/api-router.js
similarity index 100%
rename from lib/cartodb/controllers/api-router.js
rename to lib/cartodb/routers/api-router.js
diff --git a/lib/cartodb/controllers/layergroup/analysis.js b/lib/cartodb/routers/layergroup/analysis.js
similarity index 100%
rename from lib/cartodb/controllers/layergroup/analysis.js
rename to lib/cartodb/routers/layergroup/analysis.js
diff --git a/lib/cartodb/controllers/layergroup/attributes.js b/lib/cartodb/routers/layergroup/attributes.js
similarity index 100%
rename from lib/cartodb/controllers/layergroup/attributes.js
rename to lib/cartodb/routers/layergroup/attributes.js
diff --git a/lib/cartodb/controllers/layergroup/dataview.js b/lib/cartodb/routers/layergroup/dataview.js
similarity index 100%
rename from lib/cartodb/controllers/layergroup/dataview.js
rename to lib/cartodb/routers/layergroup/dataview.js
diff --git a/lib/cartodb/controllers/layergroup/middlewares/map-store-map-config-provider.js b/lib/cartodb/routers/layergroup/middlewares/map-store-map-config-provider.js
similarity index 100%
rename from lib/cartodb/controllers/layergroup/middlewares/map-store-map-config-provider.js
rename to lib/cartodb/routers/layergroup/middlewares/map-store-map-config-provider.js
diff --git a/lib/cartodb/controllers/layergroup/preview.js b/lib/cartodb/routers/layergroup/preview.js
similarity index 100%
rename from lib/cartodb/controllers/layergroup/preview.js
rename to lib/cartodb/routers/layergroup/preview.js
diff --git a/lib/cartodb/controllers/layergroup/tile.js b/lib/cartodb/routers/layergroup/tile.js
similarity index 100%
rename from lib/cartodb/controllers/layergroup/tile.js
rename to lib/cartodb/routers/layergroup/tile.js
diff --git a/lib/cartodb/controllers/map-router.js b/lib/cartodb/routers/map-router.js
similarity index 100%
rename from lib/cartodb/controllers/map-router.js
rename to lib/cartodb/routers/map-router.js
diff --git a/lib/cartodb/controllers/map/anonymous.js b/lib/cartodb/routers/map/anonymous.js
similarity index 100%
rename from lib/cartodb/controllers/map/anonymous.js
rename to lib/cartodb/routers/map/anonymous.js
diff --git a/lib/cartodb/controllers/map/middlewares/augment-layergroup-data.js b/lib/cartodb/routers/map/middlewares/augment-layergroup-data.js
similarity index 100%
rename from lib/cartodb/controllers/map/middlewares/augment-layergroup-data.js
rename to lib/cartodb/routers/map/middlewares/augment-layergroup-data.js
diff --git a/lib/cartodb/controllers/map/middlewares/check-json-content-type.js b/lib/cartodb/routers/map/middlewares/check-json-content-type.js
similarity index 100%
rename from lib/cartodb/controllers/map/middlewares/check-json-content-type.js
rename to lib/cartodb/routers/map/middlewares/check-json-content-type.js
diff --git a/lib/cartodb/controllers/map/middlewares/increment-map-view-count.js b/lib/cartodb/routers/map/middlewares/increment-map-view-count.js
similarity index 100%
rename from lib/cartodb/controllers/map/middlewares/increment-map-view-count.js
rename to lib/cartodb/routers/map/middlewares/increment-map-view-count.js
diff --git a/lib/cartodb/controllers/map/middlewares/init-profiler.js b/lib/cartodb/routers/map/middlewares/init-profiler.js
similarity index 100%
rename from lib/cartodb/controllers/map/middlewares/init-profiler.js
rename to lib/cartodb/routers/map/middlewares/init-profiler.js
diff --git a/lib/cartodb/controllers/map/middlewares/last-updated-time-layergroup.js b/lib/cartodb/routers/map/middlewares/last-updated-time-layergroup.js
similarity index 100%
rename from lib/cartodb/controllers/map/middlewares/last-updated-time-layergroup.js
rename to lib/cartodb/routers/map/middlewares/last-updated-time-layergroup.js
diff --git a/lib/cartodb/controllers/map/middlewares/layer-stats.js b/lib/cartodb/routers/map/middlewares/layer-stats.js
similarity index 100%
rename from lib/cartodb/controllers/map/middlewares/layer-stats.js
rename to lib/cartodb/routers/map/middlewares/layer-stats.js
diff --git a/lib/cartodb/controllers/map/middlewares/layergroup-id-header.js b/lib/cartodb/routers/map/middlewares/layergroup-id-header.js
similarity index 100%
rename from lib/cartodb/controllers/map/middlewares/layergroup-id-header.js
rename to lib/cartodb/routers/map/middlewares/layergroup-id-header.js
diff --git a/lib/cartodb/controllers/map/middlewares/layergroup-metadata.js b/lib/cartodb/routers/map/middlewares/layergroup-metadata.js
similarity index 100%
rename from lib/cartodb/controllers/map/middlewares/layergroup-metadata.js
rename to lib/cartodb/routers/map/middlewares/layergroup-metadata.js
diff --git a/lib/cartodb/controllers/map/middlewares/map-error.js b/lib/cartodb/routers/map/middlewares/map-error.js
similarity index 100%
rename from lib/cartodb/controllers/map/middlewares/map-error.js
rename to lib/cartodb/routers/map/middlewares/map-error.js
diff --git a/lib/cartodb/controllers/map/named.js b/lib/cartodb/routers/map/named.js
similarity index 100%
rename from lib/cartodb/controllers/map/named.js
rename to lib/cartodb/routers/map/named.js
diff --git a/lib/cartodb/controllers/server-info.js b/lib/cartodb/routers/server-info.js
similarity index 100%
rename from lib/cartodb/controllers/server-info.js
rename to lib/cartodb/routers/server-info.js
diff --git a/lib/cartodb/controllers/template-router.js b/lib/cartodb/routers/template-router.js
similarity index 100%
rename from lib/cartodb/controllers/template-router.js
rename to lib/cartodb/routers/template-router.js
diff --git a/lib/cartodb/controllers/template/admin.js b/lib/cartodb/routers/template/admin.js
similarity index 100%
rename from lib/cartodb/controllers/template/admin.js
rename to lib/cartodb/routers/template/admin.js
diff --git a/lib/cartodb/controllers/template/middlewares/named-map-provider.js b/lib/cartodb/routers/template/middlewares/named-map-provider.js
similarity index 100%
rename from lib/cartodb/controllers/template/middlewares/named-map-provider.js
rename to lib/cartodb/routers/template/middlewares/named-map-provider.js
diff --git a/lib/cartodb/controllers/template/preview.js b/lib/cartodb/routers/template/preview.js
similarity index 100%
rename from lib/cartodb/controllers/template/preview.js
rename to lib/cartodb/routers/template/preview.js
diff --git a/lib/cartodb/controllers/template/tile.js b/lib/cartodb/routers/template/tile.js
similarity index 100%
rename from lib/cartodb/controllers/template/tile.js
rename to lib/cartodb/routers/template/tile.js
diff --git a/lib/cartodb/server.js b/lib/cartodb/server.js
index ab6fcc62..40f1195c 100644
--- a/lib/cartodb/server.js
+++ b/lib/cartodb/server.js
@@ -5,8 +5,8 @@ const { mapnik } = windshaft;
 
 const jsonReplacer = require('./utils/json-replacer');
 
-const ApiRouter = require('./controllers/api-router');
-const ServerInfoController = require('./controllers/server-info');
+const ApiRouter = require('./routers/api-router');
+const ServerInfoController = require('./routers/server-info');
 
 const StatsClient = require('./stats/client');