diff --git a/Gruntfile.js b/Gruntfile.js
index 7ff8361..f5016a8 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -8,8 +8,23 @@ module.exports = function(grunt) {
         banner: '/*! <%= pkg.name %> <%= grunt.template.today("yyyy-mm-dd") %> */\n'
       },
       build: {
-        src: 'src/**/*.js',
-        dest: 'build/js/bitwisecmd.min.js'
+          files: {
+              'build/js/bitwisecmd.js': [
+                  'src/js/core/core.js',
+                  'src/js/core/is.js',
+                  'src/js/core/should.js',
+                  'src/js/core/di.js',
+                  'src/js/core/appShell.js',
+                  'src/js/core/htmlBuilder.js',
+                  'src/js/core/observable.js',
+
+                  'src/js/app.js',
+
+                  // TODO: Make components to put their extensions to AppShell instead of app
+                  'src/js/components/*.*',
+                  'src/js/app/**/*.*'
+              ]
+          }
       }
     },
     cssmin: {
diff --git a/src/index.html b/src/index.html
index 8a4aa70..2bfd2ae 100644
--- a/src/index.html
+++ b/src/index.html
@@ -7,7 +7,7 @@
     <title>BitwiseCmd</title>
     <link rel="shortcut icon" href="http://bitwisecmd.com/favicon.ico">
 
-    <!-- build:js js/bitwisecmd.min.js -->
+    <!-- build:js js/bitwisecmd.js -->
     <script type="text/javascript" src="js/core/core.js"></script>
     <script type="text/javascript" src="js/core/is.js"></script>
     <script type="text/javascript" src="js/core/should.js"></script>
@@ -16,7 +16,7 @@
     <script type="text/javascript" src="js/core/htmlBuilder.js"></script>
     <script type="text/javascript" src="js/core/observable.js"></script>
 
-    <script type="text/javascript" src="js/app/app.js"></script>
+    <script type="text/javascript" src="js/app.js"></script>
 
     <script type="text/javascript" src="js/components/controllersFeature.js"></script>
     <script type="text/javascript" src="js/components/viewsFeature.js"></script>
diff --git a/src/js/app/app.js b/src/js/app.js
similarity index 100%
rename from src/js/app/app.js
rename to src/js/app.js
diff --git a/src/js/core/bindr.js b/src/js_unused/bindr.js
similarity index 100%
rename from src/js/core/bindr.js
rename to src/js_unused/bindr.js
diff --git a/src/js/components/commandsFeature.js b/src/js_unused/commandsFeature.js
similarity index 100%
rename from src/js/components/commandsFeature.js
rename to src/js_unused/commandsFeature.js