diff --git a/.gitignore b/.gitignore
index 5a451dc..bd32c72 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 node_modules/
+public/js/
 *.log
\ No newline at end of file
diff --git a/Gruntfile.js b/Gruntfile.js
new file mode 100644
index 0000000..2267f31
--- /dev/null
+++ b/Gruntfile.js
@@ -0,0 +1,35 @@
+module.exports = function(grunt) {
+
+  grunt.initConfig({
+
+    browserify: {
+      dev: {
+        files: {
+          'public/js/app.js': ['app/client/**/*.js'],
+        },
+        options: {
+          browserifyOptions: {
+            debug: true
+          }
+        }
+      },
+      pro: {
+        files: {
+          'public/js/app.js': ['app/client/**/*.js'],
+        },
+        options: {
+          browserifyOptions: {
+            debug: false
+          }
+        }
+      }
+    }
+
+  });
+
+  grunt.loadNpmTasks('grunt-browserify');
+
+  grunt.registerTask('build', ['browserify:pro']);
+  grunt.registerTask('debug', ['browserify:dev']);
+
+}
\ No newline at end of file
diff --git a/public/js/app.js b/app/client/app.js
similarity index 99%
rename from public/js/app.js
rename to app/client/app.js
index 6a3385a..f64e76e 100755
--- a/public/js/app.js
+++ b/app/client/app.js
@@ -30,12 +30,6 @@ app.factory('buffer', function() {
 
 
 
-
-
-
-
-
-
 /**
  * CONTROLLERS
  */
diff --git a/server/bot.js b/app/server/bot.js
similarity index 100%
rename from server/bot.js
rename to app/server/bot.js
diff --git a/server/index.js b/app/server/index.js
similarity index 73%
rename from server/index.js
rename to app/server/index.js
index 0cf0eaf..7996e1c 100755
--- a/server/index.js
+++ b/app/server/index.js
@@ -19,18 +19,15 @@ var io      = require('socket.io')(server);
 require('./sockets')(io);
 
 
-
-
-// handle root requests
-app.get('/', function(req, res, next) {
-  res.sendFile(path.join(__dirname, '/../views/index.html'));
+// send homepage
+app.get('/', function(req, res) {
+  res.sendFile(path.join(__dirname, '../../public/templates/index.html'));
 });
 
 
 
-
 // public folder serves static content
-app.use('/', express.static('public'));
+app.use('/', express.static(path.join(__dirname, '../../public')));
 
 
 
diff --git a/server/sockets/index.js b/app/server/sockets/index.js
similarity index 100%
rename from server/sockets/index.js
rename to app/server/sockets/index.js
diff --git a/package.json b/package.json
old mode 100755
new mode 100644
index 15d19d3..f2f5ccc
--- a/package.json
+++ b/package.json
@@ -6,6 +6,8 @@
   "dependencies": {
     "debug": "^2.1.3",
     "express": "^4.12.3",
+    "grunt": "^0.4.5",
+    "grunt-browserify": "^3.7.0",
     "mineflayer": "^1.1.0",
     "socket.io": "^1.3.5"
   },
diff --git a/public/js/lib/socket.io.js b/public/lib/socket.io.js
similarity index 100%
rename from public/js/lib/socket.io.js
rename to public/lib/socket.io.js
diff --git a/views/index.html b/public/templates/index.html
similarity index 94%
rename from views/index.html
rename to public/templates/index.html
index fa4e638..c94a985 100755
--- a/views/index.html
+++ b/public/templates/index.html
@@ -22,7 +22,7 @@
   <script src="//ajax.googleapis.com/ajax/libs/angularjs/1.3.15/angular.min.js"></script>
   <script src="//ajax.googleapis.com/ajax/libs/jquery/2.1.3/jquery.min.js"></script>
   <script src="//maxcdn.bootstrapcdn.com/bootstrap/3.3.4/js/bootstrap.min.js"></script>
-  <script src="/js/lib/socket.io.js"></script>
+  <script src="/lib/socket.io.js"></script>
   <script src="/js/app.js"></script>