diff --git a/Gruntfile.js b/Gruntfile.js
index 33e598b2..dbc18dd5 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -6,29 +6,14 @@ module.exports = function(grunt) {
 			},
 			js: {
 				files: {
-					"client/js/components.min.js": "client/components/**/*.js"
+					"client/js/libs.min.js": "client/js/libs/**/*.js"
 				}
 			}
-		},
-		nodewebkit: {
-			src: "./**/*",
-			options: {
-				build_dir: "./build",
-				mac: false
-			}
 		}
 	});
 	grunt.loadNpmTasks("grunt-contrib-uglify");
-	grunt.loadNpmTasks("grunt-node-webkit-builder");
-	grunt.registerTask(
-		"build",
-		function() {
-			require("child_process").exec("rm -rf ./build");
-			grunt.task.run("nodewebkit");
-		}
-	);
 	grunt.registerTask(
 		"default",
-		"uglify"
+		["uglify"]
 	);
 };
diff --git a/client/index.html b/client/index.html
index b47e1bb2..930ee996 100644
--- a/client/index.html
+++ b/client/index.html
@@ -253,7 +253,7 @@
 		</script>
 	</div>
 
-	<script src="js/components.min.js"></script>
+	<script src="js/libs.min.js"></script>
 	<script src="js/chat.js"></script>
 
 	</body>
diff --git a/client/js/components.min.js b/client/js/libs.min.js
similarity index 100%
rename from client/js/components.min.js
rename to client/js/libs.min.js
diff --git a/client/components/favico.js b/client/js/libs/favico.js
similarity index 100%
rename from client/components/favico.js
rename to client/js/libs/favico.js
diff --git a/client/components/handlebars.js b/client/js/libs/handlebars.js
similarity index 100%
rename from client/components/handlebars.js
rename to client/js/libs/handlebars.js
diff --git a/client/components/handlebars/equal.js b/client/js/libs/handlebars/equal.js
similarity index 100%
rename from client/components/handlebars/equal.js
rename to client/js/libs/handlebars/equal.js
diff --git a/client/components/handlebars/uri.js b/client/js/libs/handlebars/uri.js
similarity index 100%
rename from client/components/handlebars/uri.js
rename to client/js/libs/handlebars/uri.js
diff --git a/client/components/jquery.js b/client/js/libs/jquery.js
similarity index 100%
rename from client/components/jquery.js
rename to client/js/libs/jquery.js
diff --git a/client/components/jquery/bootstrap.js b/client/js/libs/jquery/bootstrap.js
similarity index 100%
rename from client/components/jquery/bootstrap.js
rename to client/js/libs/jquery/bootstrap.js
diff --git a/client/components/jquery/cookie.js b/client/js/libs/jquery/cookie.js
similarity index 100%
rename from client/components/jquery/cookie.js
rename to client/js/libs/jquery/cookie.js
diff --git a/client/components/jquery/inputhistory.js b/client/js/libs/jquery/inputhistory.js
similarity index 100%
rename from client/components/jquery/inputhistory.js
rename to client/js/libs/jquery/inputhistory.js
diff --git a/client/components/jquery/stickyscroll.js b/client/js/libs/jquery/stickyscroll.js
similarity index 100%
rename from client/components/jquery/stickyscroll.js
rename to client/js/libs/jquery/stickyscroll.js
diff --git a/client/components/jquery/tabcomplete.js b/client/js/libs/jquery/tabcomplete.js
similarity index 100%
rename from client/components/jquery/tabcomplete.js
rename to client/js/libs/jquery/tabcomplete.js
diff --git a/client/components/socket.io.js b/client/js/libs/socket.io.js
similarity index 100%
rename from client/components/socket.io.js
rename to client/js/libs/socket.io.js
diff --git a/client/components/string.contains.js b/client/js/libs/string.contains.js
similarity index 100%
rename from client/components/string.contains.js
rename to client/js/libs/string.contains.js
diff --git a/client/components/uri.js b/client/js/libs/uri.js
similarity index 100%
rename from client/components/uri.js
rename to client/js/libs/uri.js
diff --git a/package.json b/package.json
index b6fc2fe3..b1385b31 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "shout",
   "description": "The modern IRC client",
-  "version": "0.8.1",
+  "version": "0.8.2",
   "homepage": "http://github.com/erming/shout",
   "author": {
     "name": "Mattias Erming",