diff --git a/client/client/routes.js b/client/client/routes.json
similarity index 100%
rename from client/client/routes.js
rename to client/client/routes.json
diff --git a/gulpfile.js b/gulpfile.js
index 4213707abf..99d9bcc166 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -40,7 +40,7 @@ gulp.task('clean', function() {
 
 var splitingFiles = './spliting/*';
 
-gulp.task('spliting', function() {
+gulp.task('spliting', function(cb) {
     var importTpl = fs.readFileSync('./spliting/import.tpl.js', 'utf8');
     var requireTpl = fs.readFileSync('./spliting/require.tpl.js', 'utf8');
 
@@ -55,27 +55,28 @@ gulp.task('spliting', function() {
         fs.appendFileSync(splitFile, importTpl);
 
         var i = deps.length;
-        while (i--) {
+        while (i--)
             fs.appendFileSync(splitFile,
 				requireTpl.replace(/\$module/g, deps[i]));
-        }
     }
+
+    cb();
 });
 
 // Webpack
 
-gulp.task('webpack', ['spliting'], function(callback) {
+gulp.task('webpack', ['spliting'], function(cb) {
     var configCopy = Object.create(webpackConfig);
     var compiler = webpack(configCopy);
 
     compiler.run(function(err, stats) {
         if (err) throw new gutil.PluginError('webpack', err);
         gutil.log('[webpack]', stats.toString({colors: true}));
-        callback();
+        cb();
     });
 });
 
-gulp.task('webpack-dev-server', ['spliting'], function(callback) {
+gulp.task('webpack-dev-server', ['spliting'], function() {
     var configCopy = Object.create(webpackConfig);
 
     for (var entry in configCopy.entry) {
@@ -124,23 +125,22 @@ gulp.task('locales', function() {
 
 // Routes
 
-var routeFiles = `./${srcDir}/**/routes.js`;
+var routeFiles = `./${srcDir}/**/routes.json`;
 
 gulp.task('routes', function() {
-    var fileTpl = '\n"<%=dirname%>": <%=contents%>';
-    var globalTpl = 'var routes = {<%=contents%>\n}';
-    var regex = new RegExp('^(.*)/routes\.js$');
-
     function cb(file) {
         var relative = file.relative.replace(/\\/g, '/');
-        var dirname = relative.match(regex)[1];
-        return {dirname: dirname};
+        var dirname = relative.match(/^(.*)\/routes\.json$/)[1];
+        return {
+            dirname: dirname,
+            json: file.contents
+        };
     }
 
     return gulp.src(routeFiles)
-		.pipe(wrap(fileTpl, cb))
+		.pipe(wrap('\n"<%=dirname%>": <%=json%>', cb))
 		.pipe(concat('routes.js', {newLine: ','}))
-		.pipe(wrap(globalTpl))
+		.pipe(wrap('var routes = {<%=contents%>\n};'))
 		.pipe(gulp.dest(buildDir));
 });