diff --git a/public/app/index.html b/public/app/index.html
index 1aea0af1..6238e145 100644
--- a/public/app/index.html
+++ b/public/app/index.html
@@ -54,19 +54,10 @@
 
   <!-- APP -->
   <script src="/js/app.js"></script>
-  <script src="/js/core/services/VersionService.js"></script>
-  <script src="/js/core/filters/VersionFilter.js"></script>
-  <script src="/js/core/directives/VersionDirective.js"></script>
-
-
-  <!-- CORE -->
-  <script src="/js/core/state.js"></script>
-  <script src="/js/core/controllers/AppCtrl.js"></script>
-  <script src="/js/core/controllers/NavbarCtrl.js"></script>
-
-  <!-- MAIN -->
-  <script src="/js/main/state.js"></script>
-  <script src="/js/main/controllers/BalanceCtrl.js"></script>
+  <script src="/js/state.js"></script>
+  <script src="/js/controllers/AppCtrl.js"></script>
+  <script src="/js/controllers/NavbarCtrl.js"></script>
+  <script src="/js/controllers/BalanceCtrl.js"></script>
 
 </body>
 </html>
diff --git a/public/app/js/core/controllers/AppCtrl.js b/public/app/js/controllers/AppCtrl.js
similarity index 100%
rename from public/app/js/core/controllers/AppCtrl.js
rename to public/app/js/controllers/AppCtrl.js
diff --git a/public/app/js/main/controllers/BalanceCtrl.js b/public/app/js/controllers/BalanceCtrl.js
similarity index 100%
rename from public/app/js/main/controllers/BalanceCtrl.js
rename to public/app/js/controllers/BalanceCtrl.js
diff --git a/public/app/js/core/controllers/NavbarCtrl.js b/public/app/js/controllers/NavbarCtrl.js
similarity index 100%
rename from public/app/js/core/controllers/NavbarCtrl.js
rename to public/app/js/controllers/NavbarCtrl.js
diff --git a/public/app/js/core/directives/VersionDirective.js b/public/app/js/core/directives/VersionDirective.js
deleted file mode 100644
index 8161b627..00000000
--- a/public/app/js/core/directives/VersionDirective.js
+++ /dev/null
@@ -1,5 +0,0 @@
-app.directive('appVersion', ['version', function(version) {
-  return function(scope, elm, attrs) {
-    elm.text(version);
-  };
-}]);
\ No newline at end of file
diff --git a/public/app/js/core/filters/VersionFilter.js b/public/app/js/core/filters/VersionFilter.js
deleted file mode 100644
index c3524f91..00000000
--- a/public/app/js/core/filters/VersionFilter.js
+++ /dev/null
@@ -1,5 +0,0 @@
-app.filter('interpolate', ['version', function(version) {
-  return function(text) {
-    return String(text).replace(/\%VERSION\%/mg, version);
-  };
-}]);
\ No newline at end of file
diff --git a/public/app/js/core/services/VersionService.js b/public/app/js/core/services/VersionService.js
deleted file mode 100644
index 2049cfcf..00000000
--- a/public/app/js/core/services/VersionService.js
+++ /dev/null
@@ -1 +0,0 @@
-app.value('version', '0.1');
\ No newline at end of file
diff --git a/public/app/js/core/state.js b/public/app/js/core/state.js
deleted file mode 100644
index 7b4c2ee1..00000000
--- a/public/app/js/core/state.js
+++ /dev/null
@@ -1,27 +0,0 @@
-// Application Level State
-app.config(['$stateProvider', '$urlRouterProvider', function($stateProvider, $urlRouterProvider) {
-
-    $urlRouterProvider.when('', '/balance');
-
-
-  $stateProvider
-    .state('app', {
-      url: '',
-      controller: 'AppCtrl',
-      views: {
-	'navbar': {
-	  templateUrl: 'js/core/templates/navbar.tpl.html',
-	  controller: 'NavbarCtrl'
-	},
-	'main': {
-	  templateUrl: 'js/core/templates/main.tpl.html'
-	}
-      }
-    })
-    .state('404', {
-      url: '/404',
-      templateUrl: 'js/core/templates/404.tpl.html',
-      controller: 'AppCtrl'
-    });
-
-}]);
diff --git a/public/app/js/main/state.js b/public/app/js/main/state.js
deleted file mode 100644
index 6af3f5ad..00000000
--- a/public/app/js/main/state.js
+++ /dev/null
@@ -1,11 +0,0 @@
-// Sub-application/main Level State
-app.config(['$stateProvider', function($stateProvider) {
-
-  $stateProvider
-	.state('app.balance', {
-	    url: '/balance',
-	    templateUrl: 'js/main/templates/balance.tpl.html',
-	    controller: 'BalanceCtrl'
-    });
-
-}]);
diff --git a/public/app/js/state.js b/public/app/js/state.js
new file mode 100644
index 00000000..28f1073e
--- /dev/null
+++ b/public/app/js/state.js
@@ -0,0 +1,29 @@
+// Sub-application/main Level State
+app.config(['$stateProvider', function($stateProvider) {
+
+    $stateProvider
+	.state('app.balance', {
+	    url: '/balance',
+	    templateUrl: 'js/templates/balance.tpl.html',
+	    controller: 'BalanceCtrl'
+	})
+	.state('app', {
+	    url: '',
+	    controller: 'AppCtrl',
+	    views: {
+		'navbar': {
+		    templateUrl: 'js/templates/navbar.tpl.html',
+		    controller: 'NavbarCtrl'
+		},
+		'main': {
+		    templateUrl: 'js/templates/main.tpl.html'
+		}
+	    }
+	})
+	.state('404', {
+	    url: '/404',
+	    templateUrl: 'js/templates/404.tpl.html',
+	    controller: 'AppCtrl'
+	});
+
+}]);
diff --git a/public/app/js/core/templates/404.tpl.html b/public/app/js/templates/404.tpl.html
similarity index 100%
rename from public/app/js/core/templates/404.tpl.html
rename to public/app/js/templates/404.tpl.html
diff --git a/public/app/js/main/templates/balance.tpl.html b/public/app/js/templates/balance.tpl.html
similarity index 100%
rename from public/app/js/main/templates/balance.tpl.html
rename to public/app/js/templates/balance.tpl.html
diff --git a/public/app/js/core/templates/main.tpl.html b/public/app/js/templates/main.tpl.html
similarity index 100%
rename from public/app/js/core/templates/main.tpl.html
rename to public/app/js/templates/main.tpl.html
diff --git a/public/app/js/core/templates/navbar.tpl.html b/public/app/js/templates/navbar.tpl.html
similarity index 100%
rename from public/app/js/core/templates/navbar.tpl.html
rename to public/app/js/templates/navbar.tpl.html