diff --git a/app/lib/server/index.js b/app/lib/server/index.js
index 31ec748..c1a1f1c 100644
--- a/app/lib/server/index.js
+++ b/app/lib/server/index.js
@@ -9,63 +9,67 @@ let proj
 let light
 
 class Server {
-	constructor (mcopy) {
+	constructor (camera, projector, light) {
 		restify = require('restify')
 		os = require('os')
-		app = express()
+		app = restify.createServer({
+			name: 'mcopy-server',
+			version: '2.0.0'
+		})
 
+		this.ip = this.getIp()
 
-		this.getIp()
-		app.get('/', function (req, res) {
+		/*app.get('/', function (req, res) {
 			mcopy.mobile.log('Device connected');
 			res.send(fs.readFileSync('tmpl/mcopy_index.html', 'utf8'));
+		})
+		app.get('/js/mcopy_mobile.js', function (req, res) {
+			res.send(fs.readFileSync('js/mcopy_mobile.js', 'utf8'));
 		});
-	app.get('/js/mcopy_mobile.js', function (req, res) {
-		res.send(fs.readFileSync('js/mcopy_mobile.js', 'utf8'));
-	});
-	app.get('/js/jquery.js', function (req, res) {
-		res.send(fs.readFileSync('js/jquery.js', 'utf8'));
-	});
-	app.get('/cmd/:cmd', function (req, res) {
-		var cmd,
-			success = function (res) {
-				var obj = {
-					success: true, 
-					cmd : cmd,
-					cam : mcopy.state.camera,
-					proj : mcopy.state.projector
+		app.get('/js/jquery.js', function (req, res) {
+			res.send(fs.readFileSync('js/jquery.js', 'utf8'));
+		});
+		app.get('/cmd/:cmd', function (req, res) {
+			var cmd,
+				success = function (res) {
+					var obj = {
+						success: true, 
+						cmd : cmd,
+						cam : mcopy.state.camera,
+						proj : mcopy.state.projector
+					}
+					res.json(obj);
+				};
+			if (typeof req.params.cmd !== 'undefined') {
+				mcopy.log('Receiving command from mobile: ' + req.params.cmd);
+				cmd = req.params.cmd;
+				if (cmd === 'CF'){
+					mcopy.cmd.cam_forward(success);
+				} else if (cmd === 'CB') {
+					mcopy.cmd.cam_backward(success);
+				} else if (cmd === 'PF') {
+					mcopy.cmd.proj_forward(success);			
+				} else if (cmd === 'PB') {
+					mcopy.cmd.proj_backward(success);			
+				} else {
+					mcopy.mobile.fail(res, 'Command ' + cmd + ' not found');
 				}
-				res.json(obj);
-			};
-		if (typeof req.params.cmd !== 'undefined') {
-			mcopy.log('Receiving command from mobile: ' + req.params.cmd);
-			cmd = req.params.cmd;
-			if (cmd === 'CF'){
-				mcopy.cmd.cam_forward(success);
-			} else if (cmd === 'CB') {
-				mcopy.cmd.cam_backward(success);
-			} else if (cmd === 'PF') {
-				mcopy.cmd.proj_forward(success);			
-			} else if (cmd === 'PB') {
-				mcopy.cmd.proj_backward(success);			
 			} else {
-				mcopy.mobile.fail(res, 'Command ' + cmd + ' not found');
+				mcopy.mobile.fail(res, 'No command provided');
 			}
-		} else {
-			mcopy.mobile.fail(res, 'No command provided');
-		}
-	});
-	app.get('/state', function (req, res) {
-		res.json({
-			cam: mcopy.state.camera,
-			proj: mcopy.state.projector
 		});
-	});
-	var http = require('http');
-	http.createServer(app).listen(mcopy.cfg.ext_port);
+		app.get('/state', function (req, res) {
+			res.json({
+				cam: mcopy.state.camera,
+				proj: mcopy.state.projector
+			});
+		});*/
+
+		
 	}
 	end () {
 		app.close()
+		app = null
 	}
 }