diff --git a/lib/cartodb/cartodb_windshaft.js b/lib/cartodb/cartodb_windshaft.js
index 300bd3e1..9379858d 100644
--- a/lib/cartodb/cartodb_windshaft.js
+++ b/lib/cartodb/cartodb_windshaft.js
@@ -133,6 +133,20 @@ var CartodbWindshaft = function(serverOptions) {
       ws_sendError.apply(this, arguments);
     };
 
+    /*******************************************************************************************************************
+     * Routing
+     ******************************************************************************************************************/
+
+    var TemplateMapsController = require('./controllers/template_maps'),
+        templateMapsController = new TemplateMapsController(
+            ws, serverOptions, templateMaps, serverOptions.signedMaps, cartoData, template_baseurl
+        );
+    templateMapsController.register(ws);
+
+    /*******************************************************************************************************************
+     * END Routing
+     ******************************************************************************************************************/
+
     /**
      * Helper to allow access to the layer to be used in the maps infowindow popup.
      */
@@ -198,14 +212,6 @@ var CartodbWindshaft = function(serverOptions) {
         );
     });
 
-
-    var TemplateMapsController = require('./controllers/template_maps'),
-        templateMapsController = new TemplateMapsController(
-            ws, serverOptions, templateMaps, serverOptions.signedMaps, cartoData, template_baseurl
-        );
-    templateMapsController.register(ws);
-
-
     var healthCheck = new HealthCheck(cartoData, Windshaft.tilelive);
     ws.get('/health', function(req, res) {
         var healthConfig = global.environment.health || {};