60 files changed, 13 insertions, 86 deletions

diff --git a/Gruntfile.js b/Gruntfile.js
index 6df0c023a..5aaa13dff 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -2,13 +2,11 @@
 
 module.exports = function (grunt) {
   var paths = {
-    dist: 'dist',
-    jade: 'views/**/**/*.jade',
     css: 'public/stylesheets/*.css',
     scss: 'public/stylesheets/application.scss',
     vendor: 'public/stylesheets/vendor',
     js: 'public/javascripts/*.js',
-    routes: 'controllers/**/*.js',
+    routes: './server/controllers/**/*.js',
     main: './server.js',
     browserified: 'public/javascripts/bundle.js',
     img: 'public/images/*.{png,jpg,jpeg,gif,webp,svg}',
diff --git a/public/images/favicon.png b/client/app/images/favicon.png
index bb57ee6b0..bb57ee6b0 100644
--- a/public/images/favicon.png
+++ b/client/app/images/favicon.png
diff --git a/public/images/loading.gif b/client/app/images/loading.gif
index f2a1bc0c6..f2a1bc0c6 100644
--- a/public/images/loading.gif
+++ b/client/app/images/loading.gif
diff --git a/public/javascripts/index.js b/client/app/javascripts/index.js
index 4910e4540..4910e4540 100644
--- a/public/javascripts/index.js
+++ b/client/app/javascripts/index.js
diff --git a/public/stylesheets/application.scss b/client/app/stylesheets/application.scss
index bf9ec90ab..bf9ec90ab 100644
--- a/public/stylesheets/application.scss
+++ b/client/app/stylesheets/application.scss
diff --git a/public/stylesheets/base.scss b/client/app/stylesheets/base.scss
index 37bdade1e..37bdade1e 100644
--- a/public/stylesheets/base.scss
+++ b/client/app/stylesheets/base.scss
diff --git a/public/stylesheets/bootstrap-variables.scss b/client/app/stylesheets/bootstrap-variables.scss
index 5a49649f9..5a49649f9 100644
--- a/public/stylesheets/bootstrap-variables.scss
+++ b/client/app/stylesheets/bootstrap-variables.scss
diff --git a/public/stylesheets/index.scss b/client/app/stylesheets/index.scss
index d13dcfa90..d13dcfa90 100644
--- a/public/stylesheets/index.scss
+++ b/client/app/stylesheets/index.scss
diff --git a/server.js b/server.js
index c971982b3..5f474a196 100644
--- a/server.js
+++ b/server.js
@@ -14,7 +14,7 @@ var WebSocketServer = require('ws').Server
 var app = express()
 
 // ----------- Checker -----------
-var checker = require('./initializers/checker')
+var checker = require('./server/initializers/checker')
 
 var miss = checker.checkConfig()
 if (miss.length !== 0) {
@@ -25,16 +25,16 @@ checker.createDirectoriesIfNotExist()
 
 // ----------- PeerTube modules -----------
 var config = require('config')
-var constants = require('./initializers/constants')
-var customValidators = require('./helpers/customValidators')
-var database = require('./initializers/database')
-var logger = require('./helpers/logger')
-var peertubeCrypto = require('./helpers/peertubeCrypto')
-var poolRequests = require('./lib/poolRequests')
-var routes = require('./controllers')
-var utils = require('./helpers/utils')
-var videos = require('./lib/videos')
-var webtorrent = require('./lib/webtorrent')
+var constants = require('./server/initializers/constants')
+var customValidators = require('./server/helpers/customValidators')
+var database = require('./server/initializers/database')
+var logger = require('./server/helpers/logger')
+var peertubeCrypto = require('./server/helpers/peertubeCrypto')
+var poolRequests = require('./server/lib/poolRequests')
+var routes = require('./server/controllers')
+var utils = require('./server/helpers/utils')
+var videos = require('./server/lib/videos')
+var webtorrent = require('./server/lib/webtorrent')
 
 // Get configurations
 var port = config.get('listen.port')
@@ -67,11 +67,7 @@ app.use(require('connect-livereload')({
 require('segfault-handler').registerHandler()
 
 // Static files
-app.use(express.static(path.join(__dirname, '/public'), { maxAge: 0 }))
-
-// Jade template from ./views directory
-app.set('views', path.join(__dirname, '/views'))
-app.set('view engine', 'jade')
+app.use(express.static(path.join(__dirname, '/app'), { maxAge: 0 }))
 
 // API routes
 var api_route = '/api/' + constants.API_VERSION
diff --git a/controllers/api/v1/index.js b/server/controllers/api/v1/index.js
index 07a68ed9d..07a68ed9d 100644
--- a/controllers/api/v1/index.js
+++ b/server/controllers/api/v1/index.js
diff --git a/controllers/api/v1/pods.js b/server/controllers/api/v1/pods.js
index c93a86ee8..c93a86ee8 100644
--- a/controllers/api/v1/pods.js
+++ b/server/controllers/api/v1/pods.js
diff --git a/controllers/api/v1/remoteVideos.js b/server/controllers/api/v1/remoteVideos.js
index 475a874cf..475a874cf 100644
--- a/controllers/api/v1/remoteVideos.js
+++ b/server/controllers/api/v1/remoteVideos.js
diff --git a/controllers/api/v1/videos.js b/server/controllers/api/v1/videos.js
index 620711925..620711925 100644
--- a/controllers/api/v1/videos.js
+++ b/server/controllers/api/v1/videos.js
diff --git a/controllers/index.js b/server/controllers/index.js
index 858f493da..858f493da 100644
--- a/controllers/index.js
+++ b/server/controllers/index.js
diff --git a/controllers/views.js b/server/controllers/views.js
index aa9718079..aa9718079 100644
--- a/controllers/views.js
+++ b/server/controllers/views.js
diff --git a/helpers/customValidators.js b/server/helpers/customValidators.js
index 20c41f5da..20c41f5da 100644
--- a/helpers/customValidators.js
+++ b/server/helpers/customValidators.js
diff --git a/helpers/logger.js b/server/helpers/logger.js
index 67f69a875..67f69a875 100644
--- a/helpers/logger.js
+++ b/server/helpers/logger.js
diff --git a/helpers/peertubeCrypto.js b/server/helpers/peertubeCrypto.js
index 29b9d79c9..29b9d79c9 100644
--- a/helpers/peertubeCrypto.js
+++ b/server/helpers/peertubeCrypto.js
diff --git a/helpers/requests.js b/server/helpers/requests.js
index e19afa5ca..e19afa5ca 100644
--- a/helpers/requests.js
+++ b/server/helpers/requests.js
diff --git a/helpers/utils.js b/server/helpers/utils.js
index d2c9ad8b2..d2c9ad8b2 100644
--- a/helpers/utils.js
+++ b/server/helpers/utils.js
diff --git a/initializers/checker.js b/server/initializers/checker.js
index ec7bc0ad2..ec7bc0ad2 100644
--- a/initializers/checker.js
+++ b/server/initializers/checker.js
diff --git a/initializers/constants.js b/server/initializers/constants.js
index 16e50443b..16e50443b 100644
--- a/initializers/constants.js
+++ b/server/initializers/constants.js
diff --git a/initializers/database.js b/server/initializers/database.js
index a917442ec..a917442ec 100644
--- a/initializers/database.js
+++ b/server/initializers/database.js
diff --git a/lib/friends.js b/server/lib/friends.js
index 006a64404..006a64404 100644
--- a/lib/friends.js
+++ b/server/lib/friends.js
diff --git a/lib/poolRequests.js b/server/lib/poolRequests.js
index f786c3c7a..f786c3c7a 100644
--- a/lib/poolRequests.js
+++ b/server/lib/poolRequests.js
diff --git a/lib/videos.js b/server/lib/videos.js
index 2d7d9500d..2d7d9500d 100644
--- a/lib/videos.js
+++ b/server/lib/videos.js
diff --git a/lib/webtorrent.js b/server/lib/webtorrent.js
index cb641fead..cb641fead 100644
--- a/lib/webtorrent.js
+++ b/server/lib/webtorrent.js
diff --git a/lib/webtorrentProcess.js b/server/lib/webtorrentProcess.js
index 7da52523a..7da52523a 100644
--- a/lib/webtorrentProcess.js
+++ b/server/lib/webtorrentProcess.js
diff --git a/middlewares/cache.js b/server/middlewares/cache.js
index 0d3da0075..0d3da0075 100644
--- a/middlewares/cache.js
+++ b/server/middlewares/cache.js
diff --git a/middlewares/index.js b/server/middlewares/index.js
index c85899b0c..c85899b0c 100644
--- a/middlewares/index.js
+++ b/server/middlewares/index.js
diff --git a/middlewares/reqValidators/index.js b/server/middlewares/reqValidators/index.js
index 345dbd0e2..345dbd0e2 100644
--- a/middlewares/reqValidators/index.js
+++ b/server/middlewares/reqValidators/index.js
diff --git a/middlewares/reqValidators/pods.js b/server/middlewares/reqValidators/pods.js
index ef09d51cf..ef09d51cf 100644
--- a/middlewares/reqValidators/pods.js
+++ b/server/middlewares/reqValidators/pods.js
diff --git a/middlewares/reqValidators/remote.js b/server/middlewares/reqValidators/remote.js
index 88de16b49..88de16b49 100644
--- a/middlewares/reqValidators/remote.js
+++ b/server/middlewares/reqValidators/remote.js
diff --git a/middlewares/reqValidators/utils.js b/server/middlewares/reqValidators/utils.js
index 46c982571..46c982571 100644
--- a/middlewares/reqValidators/utils.js
+++ b/server/middlewares/reqValidators/utils.js
diff --git a/middlewares/reqValidators/videos.js b/server/middlewares/reqValidators/videos.js
index 4e5f4391f..4e5f4391f 100644
--- a/middlewares/reqValidators/videos.js
+++ b/server/middlewares/reqValidators/videos.js
diff --git a/middlewares/secure.js b/server/middlewares/secure.js
index bfd28316a..bfd28316a 100644
--- a/middlewares/secure.js
+++ b/server/middlewares/secure.js
diff --git a/models/pods.js b/server/models/pods.js
index 57ed20292..57ed20292 100644
--- a/models/pods.js
+++ b/server/models/pods.js
diff --git a/models/poolRequests.js b/server/models/poolRequests.js
index 970315597..970315597 100644
--- a/models/poolRequests.js
+++ b/server/models/poolRequests.js
diff --git a/models/videos.js b/server/models/videos.js
index 5e2eeae07..5e2eeae07 100644
--- a/models/videos.js
+++ b/server/models/videos.js
diff --git a/tests/api/checkParams.js b/server/tests/api/checkParams.js
index 1c1ec71b3..1c1ec71b3 100644
--- a/tests/api/checkParams.js
+++ b/server/tests/api/checkParams.js
diff --git a/tests/api/fixtures/video_short.mp4 b/server/tests/api/fixtures/video_short.mp4
index 35678362b..35678362b 100644
--- a/tests/api/fixtures/video_short.mp4
+++ b/server/tests/api/fixtures/video_short.mp4
diff --git a/tests/api/fixtures/video_short.ogv b/server/tests/api/fixtures/video_short.ogv
index 9e253da82..9e253da82 100644
--- a/tests/api/fixtures/video_short.ogv
+++ b/server/tests/api/fixtures/video_short.ogv
diff --git a/tests/api/fixtures/video_short.webm b/server/tests/api/fixtures/video_short.webm
index bf4b0ab6c..bf4b0ab6c 100644
--- a/tests/api/fixtures/video_short.webm
+++ b/server/tests/api/fixtures/video_short.webm
diff --git a/tests/api/fixtures/video_short1.webm b/server/tests/api/fixtures/video_short1.webm
index 70ac0c644..70ac0c644 100644
--- a/tests/api/fixtures/video_short1.webm
+++ b/server/tests/api/fixtures/video_short1.webm
diff --git a/tests/api/fixtures/video_short2.webm b/server/tests/api/fixtures/video_short2.webm
index 13d72dff7..13d72dff7 100644
--- a/tests/api/fixtures/video_short2.webm
+++ b/server/tests/api/fixtures/video_short2.webm
diff --git a/tests/api/fixtures/video_short3.webm b/server/tests/api/fixtures/video_short3.webm
index cde5dcd58..cde5dcd58 100644
--- a/tests/api/fixtures/video_short3.webm
+++ b/server/tests/api/fixtures/video_short3.webm
diff --git a/tests/api/fixtures/video_short_fake.webm b/server/tests/api/fixtures/video_short_fake.webm
index d85290ae5..d85290ae5 100644
--- a/tests/api/fixtures/video_short_fake.webm
+++ b/server/tests/api/fixtures/video_short_fake.webm
diff --git a/tests/api/friendsAdvanced.js b/server/tests/api/friendsAdvanced.js
index 9838d890f..9838d890f 100644
--- a/tests/api/friendsAdvanced.js
+++ b/server/tests/api/friendsAdvanced.js
diff --git a/tests/api/friendsBasic.js b/server/tests/api/friendsBasic.js
index 328724936..328724936 100644
--- a/tests/api/friendsBasic.js
+++ b/server/tests/api/friendsBasic.js
diff --git a/tests/api/index.js b/server/tests/api/index.js
index 9c4fdd48a..9c4fdd48a 100644
--- a/tests/api/index.js
+++ b/server/tests/api/index.js
diff --git a/tests/api/multiplePods.js b/server/tests/api/multiplePods.js
index 9fdd0f308..9fdd0f308 100644
--- a/tests/api/multiplePods.js
+++ b/server/tests/api/multiplePods.js
diff --git a/tests/api/singlePod.js b/server/tests/api/singlePod.js
index 3dd72c01b..3dd72c01b 100644
--- a/tests/api/singlePod.js
+++ b/server/tests/api/singlePod.js
diff --git a/tests/api/utils.js b/server/tests/api/utils.js
index 47b706294..47b706294 100644
--- a/tests/api/utils.js
+++ b/server/tests/api/utils.js
diff --git a/tests/index.js b/server/tests/index.js
index ccebbfe51..ccebbfe51 100644
--- a/tests/index.js
+++ b/server/tests/index.js
diff --git a/views/error.jade b/views/error.jade
deleted file mode 100644
index d9e8a7893..000000000
--- a/views/error.jade
+++ /dev/null
@@ -1,8 +0,0 @@
-extends layout
-
-block content
-  h1= message
-  if error
-    h2= error.status
-    pre #{error.stack}
-    
diff --git a/views/footer.jade b/views/footer.jade
deleted file mode 100644
index c7754f584..000000000
--- a/views/footer.jade
+++ /dev/null
@@ -1,3 +0,0 @@
-footer
-
-  | PeerTube, CopyLeft 2015
diff --git a/views/header.jade b/views/header.jade
deleted file mode 100644
index 6b84333f9..000000000
--- a/views/header.jade
+++ /dev/null
@@ -1,9 +0,0 @@
-.navbar.navbar-default
-  .container-fluid
-    .navbar-header
-      a.navbar-brand(href='/') PeerTube
-    .navbar-header
-      form.navbar-form(role='search')
-        .form-group.search-group
-          input.form-control#search-video(type='text' name='search_video' placeholder='Search a video...')
-          a.search-btn.btn.btn-link.glyphicon.glyphicon-search(type='submit')
\ No newline at end of file
diff --git a/views/index.jade b/views/index.jade
deleted file mode 100644
index a49758fc0..000000000
--- a/views/index.jade
+++ /dev/null
@@ -1,15 +0,0 @@
-extends layout
-
-block content
-  div(class='container')
-    div(class='row')
-      include panel
-
-      div(id='ajax_load' class='col-md-9')
-
-
-    include footer
-
-  // build:js /javascripts/global.min.js
-  script(src='/javascripts/bundle.js')
-  // endbuild
diff --git a/views/layout.jade b/views/layout.jade
deleted file mode 100644
index 43c28cd4f..000000000
--- a/views/layout.jade
+++ /dev/null
@@ -1,15 +0,0 @@
-doctype html
-html
-  head
-    link(rel='icon' type='image/png' href='/images/favicon.png')
-    meta(name='viewport' content='width=device-width, initial-scale=1')
-    title= title
-
-    // build:css /stylesheets/global.min.css
-    each file in [ 'global' ]
-      link(rel='stylesheet', href='/stylesheets/' + file + '.css')
-    // endbuild
-
-  body
-    include header
-    block content
diff --git a/views/panel.jade b/views/panel.jade
deleted file mode 100644
index 0d124fb7e..000000000
--- a/views/panel.jade
+++ /dev/null
@@ -1,17 +0,0 @@
-menu(class='col-md-2')
-
-  div(id='panel_get_videos' class='panel_button')
-    span(class='glyphicon glyphicon-list')
-    | Get videos
-
-  div(id='panel_upload_video' class='panel_button')
-    span(class='glyphicon glyphicon-cloud-upload')
-    | Upload a video
-
-  div(id='panel_make_friends' class='panel_button')
-    span(class='glyphicon glyphicon-user')
-    | Make friends
-
-  div(id='panel_quit_friends' class='panel_button')
-    span(class='glyphicon glyphicon-plane')
-    | Quit friends