diff --git a/.gitignore b/.gitignore
index e47a9df7cb..087dba5265 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,6 +13,7 @@ awx/public/static
 awx/ui/tests/test-results.xml
 awx/ui/static/js/awx.min.js
 awx/ui/static/js/local_settings.json
+awx/ui/client/src/local_settings.json
 awx/ui/static/css/awx.min.css
 awx/main/fixtures
 awx/*.log
diff --git a/awx/ui/client/src/login/authentication.service.js b/awx/ui/client/src/login/authenticationServices/authentication.service.js
similarity index 100%
rename from awx/ui/client/src/login/authentication.service.js
rename to awx/ui/client/src/login/authenticationServices/authentication.service.js
diff --git a/awx/ui/client/src/login/checkAccess.factory.js b/awx/ui/client/src/login/authenticationServices/checkAccess.factory.js
similarity index 100%
rename from awx/ui/client/src/login/checkAccess.factory.js
rename to awx/ui/client/src/login/authenticationServices/checkAccess.factory.js
diff --git a/awx/ui/client/src/login/isAdmin.factory.js b/awx/ui/client/src/login/authenticationServices/isAdmin.factory.js
similarity index 100%
rename from awx/ui/client/src/login/isAdmin.factory.js
rename to awx/ui/client/src/login/authenticationServices/isAdmin.factory.js
diff --git a/awx/ui/client/src/login/authenticationServices/main.js b/awx/ui/client/src/login/authenticationServices/main.js
new file mode 100644
index 0000000000..c6e4818cb3
--- /dev/null
+++ b/awx/ui/client/src/login/authenticationServices/main.js
@@ -0,0 +1,17 @@
+/*************************************************
+ * Copyright (c) 2015 Ansible, Inc.
+ *
+ * All Rights Reserved
+ *************************************************/
+
+import authenticationService from './authentication.service';
+import checkAccess from './checkAccess.factory';
+import isAdmin from './isAdmin.factory';
+import timer from './timer.factory';
+
+export default
+    angular.module('authentication', [])
+        .factory('Authorization', authenticationService)
+        .factory('CheckAccess', checkAccess)
+        .factory('IsAdmin', isAdmin)
+        .factory('Timer', timer);
diff --git a/awx/ui/client/src/login/timer.factory.js b/awx/ui/client/src/login/authenticationServices/timer.factory.js
similarity index 100%
rename from awx/ui/client/src/login/timer.factory.js
rename to awx/ui/client/src/login/authenticationServices/timer.factory.js
diff --git a/awx/ui/client/src/login/login.route.js b/awx/ui/client/src/login/login.route.js
index 0a6c118db0..b290adfcfe 100644
--- a/awx/ui/client/src/login/login.route.js
+++ b/awx/ui/client/src/login/login.route.js
@@ -9,8 +9,7 @@ import {templateUrl} from '../shared/template-url/template-url.factory';
 export default {
     name: 'signIn',
     route: '/login',
-    templateUrl: templateUrl('login/loginScreen'), //templateUrl('management-jobs/schedule/schedule'),
-    // controller: 'authenticationController',
+    templateUrl: templateUrl('login/loginBackDrop'),
     resolve: {
         features: ['FeaturesService', function(FeaturesService) {
             return FeaturesService.get();
diff --git a/awx/ui/client/src/login/loginScreen.partial.html b/awx/ui/client/src/login/loginBackDrop.partial.html
similarity index 100%
rename from awx/ui/client/src/login/loginScreen.partial.html
rename to awx/ui/client/src/login/loginBackDrop.partial.html
diff --git a/awx/ui/client/src/login/loginModal.block.less b/awx/ui/client/src/login/loginModal/loginModal.block.less
similarity index 74%
rename from awx/ui/client/src/login/loginModal.block.less
rename to awx/ui/client/src/login/loginModal/loginModal.block.less
index a865a58085..2dc59a44f9 100644
--- a/awx/ui/client/src/login/loginModal.block.less
+++ b/awx/ui/client/src/login/loginModal/loginModal.block.less
@@ -3,11 +3,6 @@
 .LoginModal-header {
     text-align: center;
     background-color: #171717;
-    border-left: 1px solid #686868;
-    border-right: 1px solid #686868;
-    border-top: 1px solid #686868;
-    border-top-left-radius: 6px;
-    border-top-right-radius: 6px;
 }
 
 .LoginModal-alert {
diff --git a/awx/ui/client/src/login/authentication.controller.js b/awx/ui/client/src/login/loginModal/loginModal.controller.js
similarity index 100%
rename from awx/ui/client/src/login/authentication.controller.js
rename to awx/ui/client/src/login/loginModal/loginModal.controller.js
diff --git a/awx/ui/client/src/login/loginModal.directive.js b/awx/ui/client/src/login/loginModal/loginModal.directive.js
similarity index 84%
rename from awx/ui/client/src/login/loginModal.directive.js
rename to awx/ui/client/src/login/loginModal/loginModal.directive.js
index 9c520bbb28..4d5964025f 100644
--- a/awx/ui/client/src/login/loginModal.directive.js
+++ b/awx/ui/client/src/login/loginModal/loginModal.directive.js
@@ -3,7 +3,7 @@
  *
  * All Rights Reserved
  *************************************************/
-import authenticationController from './authentication.controller';
+import authenticationController from './loginModal.controller';
 
 /* jshint unused: vars */
 export default
@@ -13,7 +13,7 @@ export default
                 restrict: 'E',
                 scope: true,
                 controller: authenticationController,
-                templateUrl: templateUrl('login/loginModal'),
+                templateUrl: templateUrl('login/loginModal/loginModal'),
                 link: function(scope, element, attrs) {
                     // Display the login dialog
                     $('#login-modal').modal({
diff --git a/awx/ui/client/src/login/loginModal.partial.html b/awx/ui/client/src/login/loginModal/loginModal.partial.html
similarity index 90%
rename from awx/ui/client/src/login/loginModal.partial.html
rename to awx/ui/client/src/login/loginModal/loginModal.partial.html
index 5224c89098..efe3785644 100644
--- a/awx/ui/client/src/login/loginModal.partial.html
+++ b/awx/ui/client/src/login/loginModal/loginModal.partial.html
@@ -17,12 +17,12 @@
                     class="form-horizontal"
                     autocomplete="off" novalidate>
                     <div class="form-group">
-                        <label class="control-label col-md-offset-1
-                            col-md-2 col-sm-offset-1 col-sm-2
+                        <label class="control-label
+                            col-md-2 col-sm-2
                             col-xs-3 prepend-asterisk
                             LoginModal-labelAsterisk">Username
                         </label>
-                        <div class="col-md-8 col-sm-8 col-xs-9">
+                        <div class="col-md-10 col-sm-10 col-xs-9">
                             <input type="text" name="login_username"
                                 class="form-control"
                                 ng-model="login_username"
@@ -38,12 +38,12 @@
                         </div>
                     </div>
                     <div class="form-group">
-                        <label class="control-label col-md-offset-1
-                            col-md-2 col-sm-offset-1 col-sm-2
+                        <label class="control-label
+                            col-md-2 col-sm-2
                             col-xs-3 prepend-asterisk
                             LoginModal-labelAsterisk">Password
                         </label>
-                        <div class="col-md-8 col-sm-8 col-xs-9">
+                        <div class="col-md-10 col-sm-10 col-xs-9">
                             <input type="password"
                                 name="login_password"
                                 id="login-password"
diff --git a/awx/ui/client/src/login/loginMotalNotice.block.less b/awx/ui/client/src/login/loginModal/loginMotalNotice.block.less
similarity index 100%
rename from awx/ui/client/src/login/loginMotalNotice.block.less
rename to awx/ui/client/src/login/loginModal/loginMotalNotice.block.less
diff --git a/awx/ui/client/src/login/loginModal/main.js b/awx/ui/client/src/login/loginModal/main.js
new file mode 100644
index 0000000000..3d063d4e1c
--- /dev/null
+++ b/awx/ui/client/src/login/loginModal/main.js
@@ -0,0 +1,13 @@
+/*************************************************
+ * Copyright (c) 2015 Ansible, Inc.
+ *
+ * All Rights Reserved
+ *************************************************/
+
+import thirdPartySignOn from './thirdPartySignOn/main';
+
+import loginModalDirective from './loginModal.directive';
+
+export default
+    angular.module('loginModal', [thirdPartySignOn.name])
+        .directive('loginModal', loginModalDirective);
diff --git a/awx/ui/client/src/login/loginModal/thirdPartySignOn/main.js b/awx/ui/client/src/login/loginModal/thirdPartySignOn/main.js
new file mode 100644
index 0000000000..ec674ad764
--- /dev/null
+++ b/awx/ui/client/src/login/loginModal/thirdPartySignOn/main.js
@@ -0,0 +1,11 @@
+/*************************************************
+ * Copyright (c) 2015 Ansible, Inc.
+ *
+ * All Rights Reserved
+ *************************************************/
+
+import thirdPartySignOnDirective from './thirdPartySignOn.directive';
+
+export default
+    angular.module('thirdPartySignOn', [])
+        .directive('thirdPartySignOn', thirdPartySignOnDirective);
diff --git a/awx/ui/client/src/login/thirdPartySignOn.block.less b/awx/ui/client/src/login/loginModal/thirdPartySignOn/thirdPartySignOn.block.less
similarity index 100%
rename from awx/ui/client/src/login/thirdPartySignOn.block.less
rename to awx/ui/client/src/login/loginModal/thirdPartySignOn/thirdPartySignOn.block.less
diff --git a/awx/ui/client/src/login/thirdPartySignOn.directive.js b/awx/ui/client/src/login/loginModal/thirdPartySignOn/thirdPartySignOn.directive.js
similarity index 94%
rename from awx/ui/client/src/login/thirdPartySignOn.directive.js
rename to awx/ui/client/src/login/loginModal/thirdPartySignOn/thirdPartySignOn.directive.js
index 46bf5528a7..319d852a1f 100644
--- a/awx/ui/client/src/login/thirdPartySignOn.directive.js
+++ b/awx/ui/client/src/login/loginModal/thirdPartySignOn/thirdPartySignOn.directive.js
@@ -12,7 +12,7 @@ export default
                 restrict: 'E',
                 scope: true,
                 // controller: authenticationController,
-                templateUrl: templateUrl('login/thirdPartySignOn'),
+                templateUrl: templateUrl('login/loginModal/thirdPartySignOn/thirdPartySignOn'),
                 link: function(scope, element, attrs) {
                     // these vars will be set programatically once
                     // api stuff lands
diff --git a/awx/ui/client/src/login/thirdPartySignOn.partial.html b/awx/ui/client/src/login/loginModal/thirdPartySignOn/thirdPartySignOn.partial.html
similarity index 100%
rename from awx/ui/client/src/login/thirdPartySignOn.partial.html
rename to awx/ui/client/src/login/loginModal/thirdPartySignOn/thirdPartySignOn.partial.html
diff --git a/awx/ui/client/src/login/logout.route.js b/awx/ui/client/src/login/logout.route.js
index cf3b965559..942a436a04 100644
--- a/awx/ui/client/src/login/logout.route.js
+++ b/awx/ui/client/src/login/logout.route.js
@@ -13,7 +13,7 @@ export default {
         Authorization.logout();
         $location.path('/login');
     }],
-    templateUrl: '/static/partials/blank.html', //templateUrl('management-jobs/schedule/schedule'),
+    templateUrl: '/static/partials/blank.html',
     resolve: {
         features: ['FeaturesService', function(FeaturesService) {
             return FeaturesService.get();
diff --git a/awx/ui/client/src/login/main.js b/awx/ui/client/src/login/main.js
index a309b2047c..e4326a7d89 100644
--- a/awx/ui/client/src/login/main.js
+++ b/awx/ui/client/src/login/main.js
@@ -4,29 +4,19 @@
  * All Rights Reserved
  *************************************************/
 
-import authenticationService from './authentication.service';
-import checkAccess from './checkAccess.factory';
-import isAdmin from './isAdmin.factory';
-import timer from './timer.factory';
+import authentication from './authenticationServices/main';
+import loginModal from './loginModal/main';
+
 import loginRoute from './login.route';
 import logoutRoute from './logout.route';
-import loginModalDirective from './loginModal.directive';
-import thirdPartySignOnDirective from './thirdPartySignOn.directive';
 
 export default
-    angular.module('login', [
-    ])
-    .factory('Authorization', authenticationService)
-    .factory('CheckAccess', checkAccess)
-    .factory('IsAdmin', isAdmin)
-    .factory('Timer', timer)
-    .directive('loginModal', loginModalDirective)
-    .directive('thirdPartySignOn', thirdPartySignOnDirective)
-    .config(['$routeProvider', function($routeProvider) {
-        var url = loginRoute.route;
-        delete loginRoute.route;
-        $routeProvider.when(url, loginRoute);
-        url = logoutRoute.route;
-        delete logoutRoute.route;
-        $routeProvider.when(url, logoutRoute);
-    }]);
+    angular.module('login', [authentication.name, loginModal.name])
+        .config(['$routeProvider', function($routeProvider) {
+            var url = loginRoute.route;
+            delete loginRoute.route;
+            $routeProvider.when(url, loginRoute);
+            url = logoutRoute.route;
+            delete logoutRoute.route;
+            $routeProvider.when(url, logoutRoute);
+        }]);