diff --git a/.travis.yml b/.travis.yml
index 2e9c510..5bd8977 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,6 +1,6 @@
 language: node_js
 node_js:
   - "5.2.0"
-script: make
+script: make lint coverage build
 notifications:
   email: false
diff --git a/Makefile b/Makefile
index 77afa57..482cde5 100644
--- a/Makefile
+++ b/Makefile
@@ -2,29 +2,35 @@ export PATH := node_modules/.bin:$(PATH)
 SHELL=/bin/bash
 
 .PHONY: build
-build: clean
+build:
+
+	mkdir -p dist/client dist/css
+
+	browserify -t babelify ./src/client/index.js -o ./dist/client/index.js
+
+	lessc ./src/less/main.less ./dist/css/main.css
+
+	cp -v ./src/index.js ./dist/index.js
+	cp -rv ./src/server ./dist/
+	cp -rv ./src/less/fonts ./dist/css/
+	cp -rv ./src/views ./dist/
+	cp -rv ./src/res ./dist/
+
+.PHONY: lint
+lint:
 
 	eslint src/
 
-	jest --coverage
-
-	mkdir -p dist/js dist/less
-
-	browserify -t babelify ./src/js/index.js -o ./dist/js/index.js
-
-	lessc ./src/less/main.less ./dist/less/main.css
-
-	cp ./src/index.js ./dist/index.js
-	cp -r ./src/server ./dist/server
-	cp -r ./src/less/fonts ./dist/less/fonts
-	cp -r ./src/views ./dist/views
-	cp -r ./src/res ./dist/res
-
 .PHONY: test
 test:
 
 	jest
 
+.PHONY: coverage
+coverage:
+
+	jest --coverage
+
 .PHONY: run
 run:
 
diff --git a/src/js/action/__tests__/notify-test.js b/src/client/action/__tests__/notify-test.js
similarity index 100%
rename from src/js/action/__tests__/notify-test.js
rename to src/client/action/__tests__/notify-test.js
diff --git a/src/js/action/notify.js b/src/client/action/notify.js
similarity index 100%
rename from src/js/action/notify.js
rename to src/client/action/notify.js
diff --git a/src/js/browser/createObjectURL.js b/src/client/browser/createObjectURL.js
similarity index 100%
rename from src/js/browser/createObjectURL.js
rename to src/client/browser/createObjectURL.js
diff --git a/src/js/browser/getUserMedia.js b/src/client/browser/getUserMedia.js
similarity index 100%
rename from src/js/browser/getUserMedia.js
rename to src/client/browser/getUserMedia.js
diff --git a/src/js/browser/navigator.js b/src/client/browser/navigator.js
similarity index 100%
rename from src/js/browser/navigator.js
rename to src/client/browser/navigator.js
diff --git a/src/js/components/__tests__/alert-test.js b/src/client/components/__tests__/alert-test.js
similarity index 100%
rename from src/js/components/__tests__/alert-test.js
rename to src/client/components/__tests__/alert-test.js
diff --git a/src/js/components/__tests__/app-test.js b/src/client/components/__tests__/app-test.js
similarity index 100%
rename from src/js/components/__tests__/app-test.js
rename to src/client/components/__tests__/app-test.js
diff --git a/src/js/components/__tests__/notifications-test.js b/src/client/components/__tests__/notifications-test.js
similarity index 100%
rename from src/js/components/__tests__/notifications-test.js
rename to src/client/components/__tests__/notifications-test.js
diff --git a/src/js/components/alert.js b/src/client/components/alert.js
similarity index 100%
rename from src/js/components/alert.js
rename to src/client/components/alert.js
diff --git a/src/js/components/app.js b/src/client/components/app.js
similarity index 100%
rename from src/js/components/app.js
rename to src/client/components/app.js
diff --git a/src/js/components/notifications.js b/src/client/components/notifications.js
similarity index 100%
rename from src/js/components/notifications.js
rename to src/client/components/notifications.js
diff --git a/src/js/dispatcher/dispatcher.js b/src/client/dispatcher/dispatcher.js
similarity index 100%
rename from src/js/dispatcher/dispatcher.js
rename to src/client/dispatcher/dispatcher.js
diff --git a/src/js/index.js b/src/client/index.js
similarity index 100%
rename from src/js/index.js
rename to src/client/index.js
diff --git a/src/js/peer/Peer.js b/src/client/peer/Peer.js
similarity index 100%
rename from src/js/peer/Peer.js
rename to src/client/peer/Peer.js
diff --git a/src/js/peer/__tests__/handshake-test.js b/src/client/peer/__tests__/handshake-test.js
similarity index 100%
rename from src/js/peer/__tests__/handshake-test.js
rename to src/client/peer/__tests__/handshake-test.js
diff --git a/src/js/peer/handshake.js b/src/client/peer/handshake.js
similarity index 100%
rename from src/js/peer/handshake.js
rename to src/client/peer/handshake.js
diff --git a/src/js/socket.js b/src/client/socket.js
similarity index 100%
rename from src/js/socket.js
rename to src/client/socket.js
diff --git a/src/js/store/__tests__/activeStore-test.js b/src/client/store/__tests__/activeStore-test.js
similarity index 100%
rename from src/js/store/__tests__/activeStore-test.js
rename to src/client/store/__tests__/activeStore-test.js
diff --git a/src/js/store/__tests__/alertStore-test.js b/src/client/store/__tests__/alertStore-test.js
similarity index 100%
rename from src/js/store/__tests__/alertStore-test.js
rename to src/client/store/__tests__/alertStore-test.js
diff --git a/src/js/store/__tests__/notificationsStore-test.js b/src/client/store/__tests__/notificationsStore-test.js
similarity index 100%
rename from src/js/store/__tests__/notificationsStore-test.js
rename to src/client/store/__tests__/notificationsStore-test.js
diff --git a/src/js/store/__tests__/streamStore-test.js b/src/client/store/__tests__/streamStore-test.js
similarity index 100%
rename from src/js/store/__tests__/streamStore-test.js
rename to src/client/store/__tests__/streamStore-test.js
diff --git a/src/js/store/activeStore.js b/src/client/store/activeStore.js
similarity index 100%
rename from src/js/store/activeStore.js
rename to src/client/store/activeStore.js
diff --git a/src/js/store/alertStore.js b/src/client/store/alertStore.js
similarity index 100%
rename from src/js/store/alertStore.js
rename to src/client/store/alertStore.js
diff --git a/src/js/store/notificationsStore.js b/src/client/store/notificationsStore.js
similarity index 100%
rename from src/js/store/notificationsStore.js
rename to src/client/store/notificationsStore.js
diff --git a/src/js/store/streamStore.js b/src/client/store/streamStore.js
similarity index 100%
rename from src/js/store/streamStore.js
rename to src/client/store/streamStore.js
diff --git a/src/server/app.js b/src/server/app.js
index 5124d51..e2165d6 100644
--- a/src/server/app.js
+++ b/src/server/app.js
@@ -16,8 +16,8 @@ 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')));
+  app.use('/js', express.static(path.join(__dirname, '../client')));
+  app.use('/css', express.static(path.join(__dirname, '../css')));
 } else {
   const browserify = require('browserify-middleware');
   const less = require('less-middleware');
@@ -26,10 +26,10 @@ if (__dirname.indexOf('/dist/') >= 0 || __dirname.indexOf('\\dist\\') >= 0) {
   });
 
   const tempDir = path.join(os.tmpDir(), 'node-peer-calls-cache');
-  app.use('/js', browserify(path.join(__dirname, '../js')));
+  app.use('/js', browserify(path.join(__dirname, '../client')));
   app.use('/less', less(path.join(__dirname, '../less'), { dest: tempDir}));
-  app.use('/less', express.static(tempDir));
-  app.use('/less/fonts', express.static(
+  app.use('/css', express.static(tempDir));
+  app.use('/css/fonts', express.static(
     path.join(__dirname, '../less/fonts')));
 }
 
diff --git a/src/views/call.jade b/src/views/call.jade
index 8dca89d..c9da3a5 100644
--- a/src/views/call.jade
+++ b/src/views/call.jade
@@ -8,7 +8,7 @@ html
     meta(name="apple-mobile-web-app-capable" content="yes")
     link(rel="apple-touch-icon" href="../res/icon.png")
     link(rel="icon" sizes="256x256" href="../res/icon.png")
-    link(rel="stylesheet" type="text/css" href="../less/main.css")
+    link(rel="stylesheet" type="text/css" href="../css/main.css")
 
   body.call
     input#callId(type="hidden" value="#{callId}")
diff --git a/src/views/index.jade b/src/views/index.jade
index 2939d5a..7c23ea0 100644
--- a/src/views/index.jade
+++ b/src/views/index.jade
@@ -9,7 +9,7 @@ html
     meta(name="apple-mobile-web-app-capable" content="yes")
     link(rel="apple-touch-icon" href="res/icon.png")
     link(rel="icon" sizes="256x256" href="res/icon.png")
-    link(rel="stylesheet" type="text/css" href="less/main.css")
+    link(rel="stylesheet" type="text/css" href="css/main.css")
 
   body
     include ./_fork.jade