diff --git a/src/index.js b/src/index.js
index 3bba1e5..7a598e6 100644
--- a/src/index.js
+++ b/src/index.js
@@ -4,44 +4,13 @@ if (!process.env.DEBUG) {
   process.env.DEBUG = 'peer-calls:*';
 }
 
-const express = require('express');
-const app = express();
+const app = require('./server/app.js');
 const http = require('http').Server(app);
-const io = require('socket.io')(http);
-const path = require('path');
 const os = require('os');
 
-const handleSocket = require('./server/socket.js');
-
-app.set('view engine', 'jade');
-app.set('views', path.join(__dirname, 'views'));
-
-app.use('/res', express.static(path.join(__dirname, 'res')));
-
-if (path.basename(__dirname) === 'dist') {
-  app.use('/js', express.static(path.join(__dirname, 'js')));
-  app.use('/less', express.static(path.join(__dirname, 'less')));
-} else {
-  const browserify = require('browserify-middleware');
-  const less = require('less-middleware');
-  browserify.settings({
-    transform: ['babelify']
-  });
-
-  const tempDir = path.join(os.tmpDir(), 'node-mpv-css-cache');
-  app.use('/js', browserify(path.join(__dirname, './js')));
-  app.use('/less', less(path.join(__dirname, './less'), { dest: tempDir}));
-  app.use('/less', express.static(tempDir));
-  app.use('/less/fonts', express.static(
-    path.join(__dirname, './less/fonts')));
-}
-
-app.get('/', (req, res) => res.render('index'));
-
-io.on('connection', socket => handleSocket(socket, io));
-
 let port = process.env.PORT || 3000;
 let ifaces = os.networkInterfaces();
+
 http.listen(port, function() {
   Object.keys(ifaces).forEach(ifname =>
     ifaces[ifname].forEach(iface =>
diff --git a/src/server/app.js b/src/server/app.js
new file mode 100644
index 0000000..f4e934c
--- /dev/null
+++ b/src/server/app.js
@@ -0,0 +1,43 @@
+#!/usr/bin/env node
+'use strict';
+if (!process.env.DEBUG) {
+  process.env.DEBUG = 'peer-calls:*';
+}
+
+const express = require('express');
+const app = express();
+const http = require('http').Server(app);
+const io = require('socket.io')(http);
+const path = require('path');
+const os = require('os');
+
+const handleSocket = require('./socket.js');
+
+app.set('view engine', 'jade');
+app.set('views', path.join(__dirname, '../views'));
+
+app.use('/res', express.static(path.join(__dirname, '../res')));
+
+if (__dirname.indexOf('/dist/') >= 0 || __dirname.indexOf('\\dist\\') >= 0) {
+  app.use('/js', express.static(path.join(__dirname, '../js')));
+  app.use('/less', express.static(path.join(__dirname, '../less')));
+} else {
+  const browserify = require('browserify-middleware');
+  const less = require('less-middleware');
+  browserify.settings({
+    transform: ['babelify']
+  });
+
+  const tempDir = path.join(os.tmpDir(), 'node-peer-calls-cache');
+  app.use('/js', browserify(path.join(__dirname, '../js')));
+  app.use('/less', less(path.join(__dirname, '../less'), { dest: tempDir}));
+  app.use('/less', express.static(tempDir));
+  app.use('/less/fonts', express.static(
+    path.join(__dirname, '../less/fonts')));
+}
+
+app.get('/', (req, res) => res.render('index'));
+
+io.on('connection', socket => handleSocket(socket, io));
+
+module.exports = app;