diff --git a/admin/lib/bootstrap/style.css b/admin/lib/bootstrap/style.css
index 86bdb3c8..50f19811 100644
--- a/admin/lib/bootstrap/style.css
+++ b/admin/lib/bootstrap/style.css
@@ -630,6 +630,9 @@ max-height: 0;
 .console {
     margin: 10px 0 0 0;
 }
+.console .button {
+    margin: 0 5px 0 0;
+}
 .content-view form input[type="submit"]{
     margin: 20px 0 20px 10px;
 }
diff --git a/admin/lib/config.ts b/admin/lib/config.ts
index 4674b55f..87fef9a8 100644
--- a/admin/lib/config.ts
+++ b/admin/lib/config.ts
@@ -58,7 +58,7 @@
                 .state("default", <CustomState>{
                     views: {
                         "main-view": {
-                            templateUrl: "templates/dashboard.html",
+                            templateUrl: "states/default/dashboard.html",
                             "controller": ["$scope", function ($scope)
                             {
                                 var dashLinks = [];
@@ -73,25 +73,25 @@
                     authenticate: true
                 })
                 .state('default.seo', <CustomState>{
-                    templateUrl: 'templates/dash-seo.html',
+                    templateUrl: 'states/seo/dash-seo.html',
                     authenticate: true,
                     controller: "seoCtrl",
                     controllerAs: "controller"
                 })
                 .state('default.media', <CustomState>{
-                    templateUrl: 'templates/dash-media.html',
+                    templateUrl: 'states/media/dash-media.html',
                     authenticate: true,
                     controller: "mediaCtrl",
                     controllerAs: "mediaController"
                 })
                 .state('default.users', <CustomState>{
-                    templateUrl: 'templates/dash-users.html',
+                    templateUrl: 'states/users/dash-users.html',
                     authenticate: true,
                     controller: "usersCtrl",
                     controllerAs: "controller"
                 })
                 .state('default.posts', <CustomState>{
-                    templateUrl: 'templates/dash-posts.html',
+                    templateUrl: 'states/posts/dash-posts.html',
                     authenticate: true,
                     controller: "postsCtrl",
                     controllerAs: "controller",
@@ -112,7 +112,7 @@
                 .state("login", <CustomState>{
 					views: {
 						"main-view": {
-                            templateUrl: "templates/log-in.html",
+                            templateUrl: "states/login/log-in.html",
 							controller: "loginCtrl",
 							controllerAs: "controller"
 						}
@@ -123,7 +123,7 @@
 				.state("register", <CustomState>{
 					views: {
 						"main-view": {
-                            templateUrl: "templates/register.html",
+                            templateUrl: "states/register/register.html",
                             controller: "registerCtrl",
 							controllerAs: "controller"
 						}
@@ -138,7 +138,7 @@
 				.state("message", <CustomState> {
 					views: {
 						"main-view": {
-                            templateUrl: "templates/message.html",
+                            templateUrl: "states/message/message.html",
                             controller: ["$scope", "$stateParams", function ($scope, $stateParams )
 							{
 								// Decodes the html
@@ -158,7 +158,7 @@
                 .state("password-rest", <CustomState> {
                         views: {
                             "main-view": {
-                                templateUrl: "templates/password-reset.html",
+                                templateUrl: "states/password-reset/password-reset.html",
                                 controllerAs: "controller",
                                 controller: "passwordCtrl"
                                 //controller: ["$scope", "$stateParams", function ($scope, $stateParams)
diff --git a/admin/lib/templates/directives/pager.html b/admin/lib/directives/pager/pager.html
similarity index 100%
rename from admin/lib/templates/directives/pager.html
rename to admin/lib/directives/pager/pager.html
diff --git a/admin/lib/directives/pager.ts b/admin/lib/directives/pager/pager.ts
similarity index 98%
rename from admin/lib/directives/pager.ts
rename to admin/lib/directives/pager/pager.ts
index ed1449e1..27425ec4 100644
--- a/admin/lib/directives/pager.ts
+++ b/admin/lib/directives/pager/pager.ts
@@ -17,7 +17,7 @@ module clientAdmin
 	{
         restrict = 'A';
         transclude = true;
-        templateUrl = 'templates/directives/pager.html';
+        templateUrl = 'directives/pager/pager.html';
         scope = {
             interface: '=', // must be IPagerRemote
             index: '=?',
diff --git a/admin/lib/templates/dashboard.html b/admin/lib/states/default/dashboard.html
similarity index 100%
rename from admin/lib/templates/dashboard.html
rename to admin/lib/states/default/dashboard.html
diff --git a/admin/lib/templates/log-in.html b/admin/lib/states/login/log-in.html
similarity index 100%
rename from admin/lib/templates/log-in.html
rename to admin/lib/states/login/log-in.html
diff --git a/admin/lib/controllers/login-ctrl.ts b/admin/lib/states/login/login-ctrl.ts
similarity index 100%
rename from admin/lib/controllers/login-ctrl.ts
rename to admin/lib/states/login/login-ctrl.ts
diff --git a/admin/lib/templates/dash-media.html b/admin/lib/states/media/dash-media.html
similarity index 100%
rename from admin/lib/templates/dash-media.html
rename to admin/lib/states/media/dash-media.html
diff --git a/admin/lib/controllers/media-ctrl.ts b/admin/lib/states/media/media-ctrl.ts
similarity index 100%
rename from admin/lib/controllers/media-ctrl.ts
rename to admin/lib/states/media/media-ctrl.ts
diff --git a/admin/lib/templates/message.html b/admin/lib/states/message/message.html
similarity index 100%
rename from admin/lib/templates/message.html
rename to admin/lib/states/message/message.html
diff --git a/admin/lib/controllers/paged-content-ctrl.ts b/admin/lib/states/paged-content-ctrl.ts
similarity index 100%
rename from admin/lib/controllers/paged-content-ctrl.ts
rename to admin/lib/states/paged-content-ctrl.ts
diff --git a/admin/lib/controllers/password-ctrl.ts b/admin/lib/states/password-reset/password-ctrl.ts
similarity index 100%
rename from admin/lib/controllers/password-ctrl.ts
rename to admin/lib/states/password-reset/password-ctrl.ts
diff --git a/admin/lib/templates/password-reset.html b/admin/lib/states/password-reset/password-reset.html
similarity index 100%
rename from admin/lib/templates/password-reset.html
rename to admin/lib/states/password-reset/password-reset.html
diff --git a/admin/lib/templates/dash-posts.html b/admin/lib/states/posts/dash-posts.html
similarity index 99%
rename from admin/lib/templates/dash-posts.html
rename to admin/lib/states/posts/dash-posts.html
index 6e699fd6..6cb51a6e 100644
--- a/admin/lib/templates/dash-posts.html
+++ b/admin/lib/states/posts/dash-posts.html
@@ -6,7 +6,7 @@
 </div>
 <div class="dialog-modal" ng-if="controller.showMediaBrowser">
 	<div class="big-dialog-box">
-		<ng-include ng-controller="mediaCtrl as mediaController" src="'/templates/dash-media.html'" ng-init="mediaController.multiSelect= false"></ng-include>
+		<ng-include ng-controller="mediaCtrl as mediaController" src="'states/media/dash-media.html'" ng-init="mediaController.multiSelect= false"></ng-include>
 	</div>
 </div>
 
diff --git a/admin/lib/controllers/posts-ctrl.ts b/admin/lib/states/posts/posts-ctrl.ts
similarity index 100%
rename from admin/lib/controllers/posts-ctrl.ts
rename to admin/lib/states/posts/posts-ctrl.ts
diff --git a/admin/lib/controllers/register-ctrl.ts b/admin/lib/states/register/register-ctrl.ts
similarity index 100%
rename from admin/lib/controllers/register-ctrl.ts
rename to admin/lib/states/register/register-ctrl.ts
diff --git a/admin/lib/templates/register.html b/admin/lib/states/register/register.html
similarity index 100%
rename from admin/lib/templates/register.html
rename to admin/lib/states/register/register.html
diff --git a/admin/lib/templates/dash-seo.html b/admin/lib/states/seo/dash-seo.html
similarity index 100%
rename from admin/lib/templates/dash-seo.html
rename to admin/lib/states/seo/dash-seo.html
diff --git a/admin/lib/controllers/seo-ctrl.ts b/admin/lib/states/seo/seo-ctrl.ts
similarity index 100%
rename from admin/lib/controllers/seo-ctrl.ts
rename to admin/lib/states/seo/seo-ctrl.ts
diff --git a/admin/lib/templates/dash-users.html b/admin/lib/states/users/dash-users.html
similarity index 100%
rename from admin/lib/templates/dash-users.html
rename to admin/lib/states/users/dash-users.html
diff --git a/admin/lib/controllers/users-ctrl.ts b/admin/lib/states/users/users-ctrl.ts
similarity index 100%
rename from admin/lib/controllers/users-ctrl.ts
rename to admin/lib/states/users/users-ctrl.ts
diff --git a/admin/lib/templates/nav.html b/admin/lib/templates/nav.html
deleted file mode 100644
index 8a865add..00000000
--- a/admin/lib/templates/nav.html
+++ /dev/null
@@ -1,8 +0,0 @@
-<div class="nav-items">
-	<a ui-sref="dashboard" ui-sref-active="active"><div class="nav-item">Dashboard</div></a>
-	<a ui-sref="about" ui-sref-active="active"><div class="nav-item">About</div></a>
-	<a ui-sref="projects" ui-sref-active="active"><div class="nav-item">Projects</div></a>
-	<a ui-sref="blog" ui-sref-active="active"><div class="nav-item">Blog</div></a>
-	<a ui-sref="contact" ui-sref-active="active"><div class="nav-item">Contact Us</div></a>
-</div>
-<div class="fix"></div>
\ No newline at end of file
diff --git a/admin/tsconfig.json b/admin/tsconfig.json
index 7fec30e3..90e2cdb2 100644
--- a/admin/tsconfig.json
+++ b/admin/tsconfig.json
@@ -21,15 +21,15 @@
         "lib/definitions/required/webinate-users.d.ts",
         "lib/definitions/custom/tinymce.d.ts",
         "lib/definitions/custom/modepress-client.d.ts",
-        "lib/controllers/paged-content-ctrl.ts",
-        "lib/controllers/seo-ctrl.ts",
-        "lib/controllers/login-ctrl.ts",
-        "lib/controllers/register-ctrl.ts",
-        "lib/controllers/password-ctrl.ts",
-        "lib/controllers/media-ctrl.ts",
-        "lib/controllers/users-ctrl.ts",
-        "lib/controllers/posts-ctrl.ts",
-        "lib/directives/pager.ts",
+        "lib/states/paged-content-ctrl.ts",
+        "lib/states/seo/seo-ctrl.ts",
+        "lib/states/login/login-ctrl.ts",
+        "lib/states/register/register-ctrl.ts",
+        "lib/states/password-reset/password-ctrl.ts",
+        "lib/states/media/media-ctrl.ts",
+        "lib/states/users/users-ctrl.ts",
+        "lib/states/posts/posts-ctrl.ts",
+        "lib/directives/pager/pager.ts",
         "lib/authenticator.ts",
         "lib/config.ts",
         "lib/application.ts"