40 files changed, 40 insertions, 41 deletions

diff --git a/Gruntfile.js b/Gruntfile.js
index a8fcbb609..6df0c023a 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -8,8 +8,7 @@ module.exports = function (grunt) {
     scss: 'public/stylesheets/application.scss',
     vendor: 'public/stylesheets/vendor',
     js: 'public/javascripts/*.js',
-    src: 'src/*.js',
-    routes: 'routes/**/*.js',
+    routes: 'controllers/**/*.js',
     main: './server.js',
     browserified: 'public/javascripts/bundle.js',
     img: 'public/images/*.{png,jpg,jpeg,gif,webp,svg}',
diff --git a/routes/api/v1/index.js b/controllers/api/v1/index.js
index f5504ad85..f5504ad85 100644
--- a/routes/api/v1/index.js
+++ b/controllers/api/v1/index.js
diff --git a/routes/api/v1/pods.js b/controllers/api/v1/pods.js
index 2430b0d7e..30385bd5a 100644
--- a/routes/api/v1/pods.js
+++ b/controllers/api/v1/pods.js
@@ -7,7 +7,7 @@
   var miscMiddleware = middleware.misc
   var reqValidator = middleware.reqValidators.pods
   var secureRequest = middleware.reqValidators.remote.secureRequest
-  var pods = require('../../../src/pods')
+  var pods = require('../../../models/pods')
 
   function listPods (req, res, next) {
     pods.list(function (err, pods_list) {
diff --git a/routes/api/v1/remoteVideos.js b/controllers/api/v1/remoteVideos.js
index 6ba6ce17b..d534d6792 100644
--- a/routes/api/v1/remoteVideos.js
+++ b/controllers/api/v1/remoteVideos.js
@@ -8,7 +8,7 @@
   var middleware = require('../../../middlewares')
   var miscMiddleware = middleware.misc
   var reqValidator = middleware.reqValidators.remote
-  var videos = require('../../../src/videos')
+  var videos = require('../../../models/videos')
 
   function addRemoteVideos (req, res, next) {
     videos.addRemotes(req.body.data, function (err, videos) {
diff --git a/routes/api/v1/videos.js b/controllers/api/v1/videos.js
index 95c1dffc7..aa8cb466b 100644
--- a/routes/api/v1/videos.js
+++ b/controllers/api/v1/videos.js
@@ -10,7 +10,7 @@
   var middleware = require('../../../middlewares')
   var miscMiddleware = middleware.misc
   var reqValidator = middleware.reqValidators.videos
-  var videos = require('../../../src/videos')
+  var videos = require('../../../models/videos')
 
   var uploads = config.get('storage.uploads')
 
diff --git a/routes/index.js b/controllers/index.js
index f45aa7ba5..7dca002ff 100644
--- a/routes/index.js
+++ b/controllers/index.js
@@ -1,7 +1,7 @@
 ;(function () {
   'use strict'
 
-  var constants = require('../src/constants')
+  var constants = require('../initializers/constants')
 
   var routes = {
     api: require('./api/' + constants.API_VERSION),
diff --git a/routes/views.js b/controllers/views.js
index ebd97380e..ebd97380e 100644
--- a/routes/views.js
+++ b/controllers/views.js
diff --git a/src/customValidators.js b/helpers/customValidators.js
index 73c2f8461..73c2f8461 100644
--- a/src/customValidators.js
+++ b/helpers/customValidators.js
diff --git a/src/logger.js b/helpers/logger.js
index 850af10cb..850af10cb 100644
--- a/src/logger.js
+++ b/helpers/logger.js
diff --git a/src/utils.js b/helpers/utils.js
index 176648a31..7cdb2600d 100644
--- a/src/utils.js
+++ b/helpers/utils.js
@@ -10,7 +10,7 @@
   var replay = require('request-replay')
   var ursa = require('ursa')
 
-  var constants = require('./constants')
+  var constants = require('../initializers/constants')
   var logger = require('./logger')
 
   var utils = {}
diff --git a/src/checker.js b/initializers/checker.js
index 7a3a53616..7a3a53616 100644
--- a/src/checker.js
+++ b/initializers/checker.js
diff --git a/src/constants.js b/initializers/constants.js
index 00b713961..00b713961 100644
--- a/src/constants.js
+++ b/initializers/constants.js
diff --git a/src/database.js b/initializers/database.js
index e03176b31..4570d3739 100644
--- a/src/database.js
+++ b/initializers/database.js
@@ -5,7 +5,7 @@
   var mongoose = require('mongoose')
 
   var constants = require('./constants')
-  var logger = require('./logger')
+  var logger = require('../helpers/logger')
 
   var dbname = 'peertube' + config.get('database.suffix')
   var host = config.get('database.host')
diff --git a/src/poolRequests.js b/lib/poolRequests.js
index 7f422f372..9c7f3238b 100644
--- a/src/poolRequests.js
+++ b/lib/poolRequests.js
@@ -3,13 +3,13 @@
 
   var async = require('async')
 
-  var constants = require('./constants')
-  var logger = require('./logger')
-  var database = require('./database')
+  var constants = require('../initializers/constants')
+  var logger = require('../helpers/logger')
+  var database = require('../initializers/database')
   var pluck = require('lodash-node/compat/collection/pluck')
   var PoolRequestsDB = database.PoolRequestsDB
   var PodsDB = database.PodsDB
-  var utils = require('./utils')
+  var utils = require('../helpers/utils')
   var VideosDB = database.VideosDB
 
   var poolRequests = {}
diff --git a/src/webTorrentNode.js b/lib/webTorrentNode.js
index d6801d0fb..8827c68c5 100644
--- a/src/webTorrentNode.js
+++ b/lib/webTorrentNode.js
@@ -6,7 +6,7 @@
   var pathUtils = require('path')
   var spawn = require('electron-spawn')
 
-  var logger = require('./logger')
+  var logger = require('../helpers/logger')
 
   var host = config.get('webserver.host')
   var port = config.get('webserver.port')
diff --git a/src/webtorrent.js b/lib/webtorrent.js
index b72bc500d..b72bc500d 100644
--- a/src/webtorrent.js
+++ b/lib/webtorrent.js
diff --git a/middlewares/misc.js b/middlewares/misc.js
index c10b0792a..f814acd9f 100644
--- a/middlewares/misc.js
+++ b/middlewares/misc.js
@@ -4,9 +4,9 @@
   var ursa = require('ursa')
   var fs = require('fs')
 
-  var logger = require('../src/logger')
-  var utils = require('../src/utils')
-  var PodsDB = require('../src/database').PodsDB
+  var logger = require('../helpers/logger')
+  var utils = require('../helpers/utils')
+  var PodsDB = require('../initializers/database').PodsDB
 
   var misc = {}
 
diff --git a/middlewares/reqValidators/pods.js b/middlewares/reqValidators/pods.js
index 31eaf8449..0d023842d 100644
--- a/middlewares/reqValidators/pods.js
+++ b/middlewares/reqValidators/pods.js
@@ -2,7 +2,7 @@
   'use strict'
 
   var checkErrors = require('./utils').checkErrors
-  var logger = require('../../src/logger')
+  var logger = require('../../helpers/logger')
 
   var pods = {}
 
diff --git a/middlewares/reqValidators/remote.js b/middlewares/reqValidators/remote.js
index a9d2cdf20..4b161e292 100644
--- a/middlewares/reqValidators/remote.js
+++ b/middlewares/reqValidators/remote.js
@@ -2,7 +2,7 @@
   'use strict'
 
   var checkErrors = require('./utils').checkErrors
-  var logger = require('../../src/logger')
+  var logger = require('../../helpers/logger')
 
   var remote = {}
 
diff --git a/middlewares/reqValidators/utils.js b/middlewares/reqValidators/utils.js
index 91ead27a5..5bc9f4f0b 100644
--- a/middlewares/reqValidators/utils.js
+++ b/middlewares/reqValidators/utils.js
@@ -2,7 +2,7 @@
   'use strict'
 
   var util = require('util')
-  var logger = require('../../src/logger')
+  var logger = require('../../helpers/logger')
 
   var utils = {}
 
diff --git a/middlewares/reqValidators/videos.js b/middlewares/reqValidators/videos.js
index 8c4e23b6b..a34445f7a 100644
--- a/middlewares/reqValidators/videos.js
+++ b/middlewares/reqValidators/videos.js
@@ -2,8 +2,8 @@
   'use strict'
 
   var checkErrors = require('./utils').checkErrors
-  var VideosDB = require('../../src/database').VideosDB
-  var logger = require('../../src/logger')
+  var VideosDB = require('../../initializers/database').VideosDB
+  var logger = require('../../helpers/logger')
 
   var videos = {}
 
diff --git a/src/pods.js b/models/pods.js
index defa9b1c1..c8d08b26f 100644
--- a/src/pods.js
+++ b/models/pods.js
@@ -6,11 +6,11 @@
   var fs = require('fs')
   var request = require('request')
 
-  var constants = require('./constants')
-  var logger = require('./logger')
-  var PodsDB = require('./database').PodsDB
-  var poolRequests = require('./poolRequests')
-  var utils = require('./utils')
+  var constants = require('../initializers/constants')
+  var logger = require('../helpers/logger')
+  var PodsDB = require('../initializers/database').PodsDB
+  var poolRequests = require('../lib/poolRequests')
+  var utils = require('../helpers/utils')
 
   var pods = {}
 
diff --git a/src/videos.js b/models/videos.js
index 90821fdf6..626c55819 100644
--- a/src/videos.js
+++ b/models/videos.js
@@ -5,11 +5,11 @@
   var config = require('config')
   var dz = require('dezalgo')
   var fs = require('fs')
-  var webtorrent = require('./webTorrentNode')
+  var webtorrent = require('../lib/webTorrentNode')
 
-  var logger = require('./logger')
+  var logger = require('../helpers/logger')
   var pods = require('./pods')
-  var VideosDB = require('./database').VideosDB
+  var VideosDB = require('../initializers/database').VideosDB
 
   var videos = {}
 
diff --git a/package.json b/package.json
index f04d97423..cd6e36369 100644
--- a/package.json
+++ b/package.json
@@ -18,7 +18,7 @@
   },
   "scripts": {
     "start": "grunt dev",
-    "test": "grunt build && standard && mocha test"
+    "test": "grunt build && standard && mocha tests"
   },
   "dependencies": {
     "async": "^1.2.1",
diff --git a/server.js b/server.js
index ad57649b2..1e0222f4f 100644
--- a/server.js
+++ b/server.js
@@ -15,7 +15,7 @@
   var app = express()
 
   // ----------- Checker -----------
-  var checker = require('./src/checker')
+  var checker = require('./initializers/checker')
 
   var miss = checker.checkConfig()
   if (miss.length !== 0) {
@@ -28,14 +28,14 @@
 
   // ----------- PeerTube modules -----------
   var config = require('config')
-  var constants = require('./src/constants')
-  var customValidators = require('./src/customValidators')
-  var logger = require('./src/logger')
-  var poolRequests = require('./src/poolRequests')
-  var routes = require('./routes')
-  var utils = require('./src/utils')
-  var videos = require('./src/videos')
-  var webtorrent = require('./src/webTorrentNode')
+  var constants = require('./initializers/constants')
+  var customValidators = require('./helpers/customValidators')
+  var logger = require('./helpers/logger')
+  var poolRequests = require('./lib/poolRequests')
+  var routes = require('./controllers')
+  var utils = require('./helpers/utils')
+  var videos = require('./models/videos')
+  var webtorrent = require('./lib/webTorrentNode')
 
   // Get configurations
   var port = config.get('listen.port')
diff --git a/test/api/checkParams.js b/tests/api/checkParams.js
index 11fc68ff9..11fc68ff9 100644
--- a/test/api/checkParams.js
+++ b/tests/api/checkParams.js
diff --git a/test/api/fixtures/video_short.mp4 b/tests/api/fixtures/video_short.mp4
index 35678362b..35678362b 100644
--- a/test/api/fixtures/video_short.mp4
+++ b/tests/api/fixtures/video_short.mp4
diff --git a/test/api/fixtures/video_short.ogv b/tests/api/fixtures/video_short.ogv
index 9e253da82..9e253da82 100644
--- a/test/api/fixtures/video_short.ogv
+++ b/tests/api/fixtures/video_short.ogv
diff --git a/test/api/fixtures/video_short.webm b/tests/api/fixtures/video_short.webm
index bf4b0ab6c..bf4b0ab6c 100644
--- a/test/api/fixtures/video_short.webm
+++ b/tests/api/fixtures/video_short.webm
diff --git a/test/api/fixtures/video_short1.webm b/tests/api/fixtures/video_short1.webm
index 70ac0c644..70ac0c644 100644
--- a/test/api/fixtures/video_short1.webm
+++ b/tests/api/fixtures/video_short1.webm
diff --git a/test/api/fixtures/video_short2.webm b/tests/api/fixtures/video_short2.webm
index 13d72dff7..13d72dff7 100644
--- a/test/api/fixtures/video_short2.webm
+++ b/tests/api/fixtures/video_short2.webm
diff --git a/test/api/fixtures/video_short3.webm b/tests/api/fixtures/video_short3.webm
index cde5dcd58..cde5dcd58 100644
--- a/test/api/fixtures/video_short3.webm
+++ b/tests/api/fixtures/video_short3.webm
diff --git a/test/api/fixtures/video_short_fake.webm b/tests/api/fixtures/video_short_fake.webm
index d85290ae5..d85290ae5 100644
--- a/test/api/fixtures/video_short_fake.webm
+++ b/tests/api/fixtures/video_short_fake.webm
diff --git a/test/api/friendsAdvanced.js b/tests/api/friendsAdvanced.js
index 61483bee6..61483bee6 100644
--- a/test/api/friendsAdvanced.js
+++ b/tests/api/friendsAdvanced.js
diff --git a/test/api/friendsBasic.js b/tests/api/friendsBasic.js
index dbc918383..dbc918383 100644
--- a/test/api/friendsBasic.js
+++ b/tests/api/friendsBasic.js
diff --git a/test/api/index.js b/tests/api/index.js
index 3bdcdae2d..3bdcdae2d 100644
--- a/test/api/index.js
+++ b/tests/api/index.js
diff --git a/test/api/multiplePods.js b/tests/api/multiplePods.js
index b579e5e32..c27f7121e 100644
--- a/test/api/multiplePods.js
+++ b/tests/api/multiplePods.js
@@ -6,7 +6,7 @@
   var expect = chai.expect
 
   var utils = require('./utils')
-  var webtorrent = require(__dirname + '/../../src/webTorrentNode')
+  var webtorrent = require(__dirname + '/../../lib/webTorrentNode')
   webtorrent.silent = true
 
   describe('Test multiple pods', function () {
diff --git a/test/api/singlePod.js b/tests/api/singlePod.js
index a8ae43aee..ce3ca80f2 100644
--- a/test/api/singlePod.js
+++ b/tests/api/singlePod.js
@@ -6,7 +6,7 @@
   var fs = require('fs')
   var expect = chai.expect
 
-  var webtorrent = require(__dirname + '/../../src/webTorrentNode')
+  var webtorrent = require(__dirname + '/../../lib/webTorrentNode')
   webtorrent.silent = true
 
   var utils = require('./utils')
diff --git a/test/api/utils.js b/tests/api/utils.js
index afb0abb33..afb0abb33 100644
--- a/test/api/utils.js
+++ b/tests/api/utils.js
diff --git a/test/index.js b/tests/index.js
index ccebbfe51..ccebbfe51 100644
--- a/test/index.js
+++ b/tests/index.js