diff --git a/awx/ui/client/src/app.js b/awx/ui/client/src/app.js
index 095f216f59..89221d272f 100644
--- a/awx/ui/client/src/app.js
+++ b/awx/ui/client/src/app.js
@@ -138,8 +138,6 @@ var tower = angular.module('Tower', [
     'HostListDefinition',
     'GroupFormDefinition',
     'GroupListDefinition',
-    'TeamsListDefinition',
-    'TeamFormDefinition',
     'TemplatesListDefinition',
     'PortalJobTemplatesListDefinition',
     'JobTemplateFormDefinition',
diff --git a/awx/ui/client/src/forms.js b/awx/ui/client/src/forms.js
index 83de6838c2..5442dd5e17 100644
--- a/awx/ui/client/src/forms.js
+++ b/awx/ui/client/src/forms.js
@@ -18,7 +18,6 @@ import JobVarsPrompt from "./forms/JobVarsPrompt";
 import LogViewerOptions from "./forms/LogViewerOptions";
 import LogViewerStatus from "./forms/LogViewerStatus";
 import Organizations from "./forms/Organizations";
-import Teams from "./forms/Teams";
 import Users from "./forms/Users";
 import WorkflowMaker from "./forms/WorkflowMaker";
 import Workflows from "./forms/Workflows";
@@ -39,7 +38,6 @@ export
         LogViewerOptions,
         LogViewerStatus,
         Organizations,
-        Teams,
         Users,
         WorkflowMaker,
         Workflows
diff --git a/awx/ui/client/src/lists.js b/awx/ui/client/src/lists.js
index dc2e952485..db2007a4c8 100644
--- a/awx/ui/client/src/lists.js
+++ b/awx/ui/client/src/lists.js
@@ -21,7 +21,6 @@ import PortalJobs from "./lists/PortalJobs";
 import ScheduledJobs from "./lists/ScheduledJobs";
 import Schedules from "./lists/Schedules";
 import Streams from "./lists/Streams";
-import Teams from "./lists/Teams";
 import Templates from "./lists/Templates";
 import Users from "./lists/Users";
 
@@ -43,7 +42,6 @@ export
         ScheduledJobs,
         Schedules,
         Streams,
-        Teams,
         Templates,
         Users
     };
diff --git a/awx/ui/client/src/teams/add/teams-add.controller.js b/awx/ui/client/src/teams/add/teams-add.controller.js
index f91df286bc..6204565958 100644
--- a/awx/ui/client/src/teams/add/teams-add.controller.js
+++ b/awx/ui/client/src/teams/add/teams-add.controller.js
@@ -4,10 +4,10 @@
  * All Rights Reserved
  *************************************************/
 
-export default ['$scope', '$rootScope', '$stateParams', 'TeamForm', 'GenerateForm',
-    'Rest', 'Alert', 'ProcessErrors', 'ClearScope', 'GetBasePath', 'Wait', '$state',
-    function($scope, $rootScope, $stateParams, TeamForm, GenerateForm, Rest, Alert, ProcessErrors,
-        ClearScope, GetBasePath, Wait, $state) {
+export default ['$scope', '$rootScope', 'TeamForm', 'GenerateForm', 'Rest',
+    'Alert', 'ProcessErrors', 'ClearScope', 'GetBasePath', 'Wait',  '$state',
+    function($scope, $rootScope, TeamForm, GenerateForm, Rest, Alert,
+    ProcessErrors, ClearScope, GetBasePath, Wait, $state) {
 
         ClearScope('htmlTemplate'); //Garbage collection. Don't leave behind any listeners/watchers from the prior
         //$scope.
diff --git a/awx/ui/client/src/teams/edit/teams-edit.controller.js b/awx/ui/client/src/teams/edit/teams-edit.controller.js
index c4b1d1fa4c..6587311c7d 100644
--- a/awx/ui/client/src/teams/edit/teams-edit.controller.js
+++ b/awx/ui/client/src/teams/edit/teams-edit.controller.js
@@ -6,9 +6,8 @@
 
 export default ['$scope', '$rootScope', '$stateParams', 'TeamForm', 'Rest',
     'ProcessErrors', 'ClearScope', 'GetBasePath', 'Wait', '$state',
-    function($scope, $rootScope, $stateParams,
-    TeamForm, Rest, ProcessErrors, ClearScope, GetBasePath, Wait, $state) {
-
+    function($scope, $rootScope, $stateParams, TeamForm, Rest, ProcessErrors,
+    ClearScope, GetBasePath, Wait, $state) {
         ClearScope();
 
         var form = TeamForm,
diff --git a/awx/ui/client/src/teams/list/teams-list.controller.js b/awx/ui/client/src/teams/list/teams-list.controller.js
index a4793de0ec..1477452358 100644
--- a/awx/ui/client/src/teams/list/teams-list.controller.js
+++ b/awx/ui/client/src/teams/list/teams-list.controller.js
@@ -4,11 +4,10 @@
  * All Rights Reserved
  *************************************************/
 
-export default ['$scope', '$rootScope', '$log',
-    '$stateParams', 'Rest', 'Alert', 'TeamList', 'Prompt', 'ClearScope',
-    'ProcessErrors', 'GetBasePath', 'Wait', '$state', '$filter', 'rbacUiControlService', 'Dataset',
-    function($scope, $rootScope, $log, $stateParams,
-    Rest, Alert, TeamList, Prompt, ClearScope, ProcessErrors,
+export default ['$scope', 'Rest', 'TeamList', 'Prompt', 'ClearScope',
+    'ProcessErrors', 'GetBasePath', 'Wait', '$state', '$filter',
+    'rbacUiControlService', 'Dataset',
+    function($scope, Rest, TeamList, Prompt, ClearScope, ProcessErrors,
     GetBasePath, Wait, $state, $filter, rbacUiControlService, Dataset) {
 
         ClearScope();
diff --git a/awx/ui/client/src/teams/main.js b/awx/ui/client/src/teams/main.js
index cd800ddb11..258af14dda 100644
--- a/awx/ui/client/src/teams/main.js
+++ b/awx/ui/client/src/teams/main.js
@@ -7,6 +7,8 @@
 import TeamsList from './list/teams-list.controller';
 import TeamsAdd from './add/teams-add.controller';
 import TeamsEdit from './edit/teams-edit.controller';
+import TeamList from './teams.list';
+import TeamForm from './teams.form';
 import { N_ } from '../i18n';
 
 export default
@@ -14,6 +16,8 @@ angular.module('Teams', [])
     .controller('TeamsList', TeamsList)
     .controller('TeamsAdd', TeamsAdd)
     .controller('TeamsEdit', TeamsEdit)
+    .factory('TeamList', TeamList)
+    .factory('TeamForm', TeamForm)
     .config(['$stateProvider', 'stateDefinitionsProvider',
         function($stateProvider, stateDefinitionsProvider) {
             let stateDefinitions = stateDefinitionsProvider.$get();
diff --git a/awx/ui/client/src/forms/Teams.js b/awx/ui/client/src/teams/teams.form.js
similarity index 97%
rename from awx/ui/client/src/forms/Teams.js
rename to awx/ui/client/src/teams/teams.form.js
index 7b883ab834..2a3e97fcfa 100644
--- a/awx/ui/client/src/forms/Teams.js
+++ b/awx/ui/client/src/teams/teams.form.js
@@ -10,9 +10,7 @@
  * @description This form is for adding/editing teams
 */
 
-export default
-    angular.module('TeamFormDefinition', [])
-        .factory('TeamForm', ['i18n', function(i18n) {
+export default ['i18n', function(i18n) {
         return {
 
             addTitle: i18n._('NEW TEAM'), //Legend in add mode
@@ -162,4 +160,4 @@ export default
                     }
                 }
             },
-        };}]); //InventoryForm
+        };}];
diff --git a/awx/ui/client/src/lists/Teams.js b/awx/ui/client/src/teams/teams.list.js
similarity index 95%
rename from awx/ui/client/src/lists/Teams.js
rename to awx/ui/client/src/teams/teams.list.js
index ea8bce2419..551d07f37c 100644
--- a/awx/ui/client/src/lists/Teams.js
+++ b/awx/ui/client/src/teams/teams.list.js
@@ -5,9 +5,7 @@
  *************************************************/
 
 
-export default
-    angular.module('TeamsListDefinition', [])
-    .factory('TeamList', ['i18n', function(i18n) {
+export default ['i18n', function(i18n) {
     return {
 
         name: 'teams',
@@ -83,4 +81,4 @@ export default
                 ngShow: 'team.summary_fields.user_capabilities.delete'
             }
         }
-    };}]);
+    };}];