diff --git a/lib/cartodb/utils/style/turbo-carto-adapter.js b/lib/cartodb/models/mapconfig/adapter/turbo-carto-adapter.js
similarity index 96%
rename from lib/cartodb/utils/style/turbo-carto-adapter.js
rename to lib/cartodb/models/mapconfig/adapter/turbo-carto-adapter.js
index d1c0c81f..94ce3fc8 100644
--- a/lib/cartodb/utils/style/turbo-carto-adapter.js
+++ b/lib/cartodb/models/mapconfig/adapter/turbo-carto-adapter.js
@@ -1,7 +1,7 @@
 'use strict';
 
 var queue = require('queue-async');
-var SubstitutionTokens = require('../substitution-tokens');
+var SubstitutionTokens = require('../../../utils/substitution-tokens');
 
 function TurboCartoAdapter(turboCartoParser) {
     this.turboCartoParser = turboCartoParser;
diff --git a/lib/cartodb/server.js b/lib/cartodb/server.js
index 88cf61b6..cb8cc452 100644
--- a/lib/cartodb/server.js
+++ b/lib/cartodb/server.js
@@ -37,7 +37,7 @@ var timeoutErrorTile = require('fs').readFileSync(timeoutErrorTilePath, {encodin
 var MapConfigOverviewsAdapter = require('./models/mapconfig/adapter/mapconfig-overviews-adapter');
 
 var TurboCartoParser = require('./utils/style/turbo-carto-parser');
-var TurboCartoAdapter = require('./utils/style/turbo-carto-adapter');
+var TurboCartoAdapter = require('./models/mapconfig/adapter/turbo-carto-adapter');
 
 module.exports = function(serverOptions) {
     // Make stats client globally accessible