Simplify folder structure

app.js

@@ -6,7 +6,7 @@ var path = require('path');
 var fs = require('fs');
 var _ = require('underscore');
 var semver = require('semver');
-const setICUEnvVariable = require('./lib/cartodb/utils/icu_data_env_setter');
+const setICUEnvVariable = require('./lib/utils/icu_data_env_setter');
 
 // jshint undef:false
 var log = console.log.bind(console);
@@ -105,8 +105,8 @@ global.logger = global.log4js.getLogger();
 
 // Include cartodb_windshaft only _after_ the "global" variable is set
 // See https://github.com/Vizzuality/Windshaft-cartodb/issues/28
-var cartodbWindshaft = require('./lib/cartodb/server');
-var serverOptions = require('./lib/cartodb/server_options');
+var cartodbWindshaft = require('./lib/server');
+var serverOptions = require('./lib/server_options');
 
 var server = cartodbWindshaft(serverOptions);
 

lib/api/api-router.js

@@ -282,7 +282,7 @@ function createSurrogateKeysCacheBackends(serverOptions) {
     return cacheBackends;
 }
 
-const timeoutErrorTilePath = __dirname + '/../../../assets/render-timeout-fallback.png';
+const timeoutErrorTilePath = __dirname + '/../../assets/render-timeout-fallback.png';
 const timeoutErrorTile = require('fs').readFileSync(timeoutErrorTilePath, {encoding: null});
 
 function createRendererFactory ({ redisPool, serverOptions, environmentOptions }) {

lib/api/middlewares/vector-error.js

@@ -1,7 +1,7 @@
 'use strict';
 
 const fs = require('fs');
-const timeoutErrorVectorTile = fs.readFileSync(__dirname + '/../../../../assets/render-timeout-fallback.mvt');
+const timeoutErrorVectorTile = fs.readFileSync(__dirname + '/../../../assets/render-timeout-fallback.mvt');
 
 module.exports = function vectorError() {
     return function vectorErrorMiddleware(err, req, res, next) {

lib/models/dataview/factory.js

@@ -1,6 +1,6 @@
 'use strict';
 
-const dataviews = require('./');
+const dataviews = require('.');
 
 module.exports = class DataviewFactory {
     static get dataviews() {

lib/models/dataview/overviews/factory.js

@@ -1,7 +1,7 @@
 'use strict';
 
 var parentFactory = require('../factory');
-var dataviews = require('./');
+var dataviews = require('.');
 
 function OverviewsDataviewFactory(queryRewriter, queryRewriteData, options) {
     this.queryRewriter = queryRewriter;