diff --git a/src/index.html b/src/index.html
index af90911..5618d86 100644
--- a/src/index.html
+++ b/src/index.html
@@ -7,31 +7,31 @@
     <title>BitwiseCmd</title>
     <link rel="shortcut icon" href="http://bitwisecmd.com/favicon.ico">
 
-    <script type="text/javascript" src="core/core.js"></script>
-    <script type="text/javascript" src="core/is.js"></script>
-    <script type="text/javascript" src="core/should.js"></script>
-    <script type="text/javascript" src="core/di.js"></script>
-    <script type="text/javascript" src="core/appShell.js"></script>
-    <script type="text/javascript" src="core/htmlBuilder.js"></script>
-    <script type="text/javascript" src="core/observable.js"></script>
+    <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>
+    <script type="text/javascript" src="js/core/di.js"></script>
+    <script type="text/javascript" src="js/core/appShell.js"></script>
+    <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="app/app.js"></script>
+    <script type="text/javascript" src="js/app/app.js"></script>
 
-    <script type="text/javascript" src="components/controllersFeature.js"></script>
-    <script type="text/javascript" src="components/viewsFeature.js"></script>
-    <script type="text/javascript" src="components/templatesFeature.js"></script>
+    <script type="text/javascript" src="js/components/controllersFeature.js"></script>
+    <script type="text/javascript" src="js/components/viewsFeature.js"></script>
+    <script type="text/javascript" src="js/components/templatesFeature.js"></script>
 
-    <script type="text/javascript" src="app/bitwise/calc.js"></script>
-    <script type="text/javascript" src="app/bitwise/expression.js"></script>
-    <script type="text/javascript" src="app/bitwise/formatter.js"></script>
+    <script type="text/javascript" src="js/app/bitwise/calc.js"></script>
+    <script type="text/javascript" src="js/app/bitwise/expression.js"></script>
+    <script type="text/javascript" src="js/app/bitwise/formatter.js"></script>
 
-    <script type="text/javascript" src="app/models.js"></script>
-    <script type="text/javascript" src="app/modelViews.js"></script>
+    <script type="text/javascript" src="js/app/models.js"></script>
+    <script type="text/javascript" src="js/app/modelViews.js"></script>
 
-    <script type="text/javascript" src="app/cmd/cmd.js"></script>
-    <script type="text/javascript" src="app/services.js"></script>
-    <script type="text/javascript" src="app/controllers.js"></script>
-    <script type="text/javascript" src="app/cmd/commands.js"></script>
+    <script type="text/javascript" src="js/app/cmd/cmd.js"></script>
+    <script type="text/javascript" src="js/app/services.js"></script>
+    <script type="text/javascript" src="js/app/controllers.js"></script>
+    <script type="text/javascript" src="js/app/cmd/commands.js"></script>
 
     <link rel="stylesheet" type="text/css" href="css/styles.css" />
 </head>
diff --git a/src/app/analytics.js b/src/js/app/analytics.js
similarity index 100%
rename from src/app/analytics.js
rename to src/js/app/analytics.js
diff --git a/src/app/app.js b/src/js/app/app.js
similarity index 100%
rename from src/app/app.js
rename to src/js/app/app.js
diff --git a/src/app/bitwise/calc.js b/src/js/app/bitwise/calc.js
similarity index 100%
rename from src/app/bitwise/calc.js
rename to src/js/app/bitwise/calc.js
diff --git a/src/app/bitwise/expression.js b/src/js/app/bitwise/expression.js
similarity index 100%
rename from src/app/bitwise/expression.js
rename to src/js/app/bitwise/expression.js
diff --git a/src/app/bitwise/formatter.js b/src/js/app/bitwise/formatter.js
similarity index 100%
rename from src/app/bitwise/formatter.js
rename to src/js/app/bitwise/formatter.js
diff --git a/src/app/cmd/cmd.js b/src/js/app/cmd/cmd.js
similarity index 100%
rename from src/app/cmd/cmd.js
rename to src/js/app/cmd/cmd.js
diff --git a/src/app/cmd/commands.js b/src/js/app/cmd/commands.js
similarity index 100%
rename from src/app/cmd/commands.js
rename to src/js/app/cmd/commands.js
diff --git a/src/app/controllers.js b/src/js/app/controllers.js
similarity index 100%
rename from src/app/controllers.js
rename to src/js/app/controllers.js
diff --git a/src/app/modelViews.js b/src/js/app/modelViews.js
similarity index 100%
rename from src/app/modelViews.js
rename to src/js/app/modelViews.js
diff --git a/src/app/models.js b/src/js/app/models.js
similarity index 100%
rename from src/app/models.js
rename to src/js/app/models.js
diff --git a/src/app/services.js b/src/js/app/services.js
similarity index 100%
rename from src/app/services.js
rename to src/js/app/services.js
diff --git a/src/components/commandsFeature.js b/src/js/components/commandsFeature.js
similarity index 100%
rename from src/components/commandsFeature.js
rename to src/js/components/commandsFeature.js
diff --git a/src/components/controllersFeature.js b/src/js/components/controllersFeature.js
similarity index 100%
rename from src/components/controllersFeature.js
rename to src/js/components/controllersFeature.js
diff --git a/src/components/templatesFeature.js b/src/js/components/templatesFeature.js
similarity index 100%
rename from src/components/templatesFeature.js
rename to src/js/components/templatesFeature.js
diff --git a/src/components/viewsFeature.js b/src/js/components/viewsFeature.js
similarity index 100%
rename from src/components/viewsFeature.js
rename to src/js/components/viewsFeature.js
diff --git a/src/core/appShell.js b/src/js/core/appShell.js
similarity index 100%
rename from src/core/appShell.js
rename to src/js/core/appShell.js
diff --git a/src/core/bindr.js b/src/js/core/bindr.js
similarity index 100%
rename from src/core/bindr.js
rename to src/js/core/bindr.js
diff --git a/src/core/core.js b/src/js/core/core.js
similarity index 100%
rename from src/core/core.js
rename to src/js/core/core.js
diff --git a/src/core/di.js b/src/js/core/di.js
similarity index 100%
rename from src/core/di.js
rename to src/js/core/di.js
diff --git a/src/core/htmlBuilder.js b/src/js/core/htmlBuilder.js
similarity index 100%
rename from src/core/htmlBuilder.js
rename to src/js/core/htmlBuilder.js
diff --git a/src/core/is.js b/src/js/core/is.js
similarity index 100%
rename from src/core/is.js
rename to src/js/core/is.js
diff --git a/src/core/observable.js b/src/js/core/observable.js
similarity index 100%
rename from src/core/observable.js
rename to src/js/core/observable.js
diff --git a/src/core/should.js b/src/js/core/should.js
similarity index 100%
rename from src/core/should.js
rename to src/js/core/should.js