diff --git a/public/app/features/all.ts b/public/app/features/all.ts
index 7f6f84b7676..d62eb8cacdc 100644
--- a/public/app/features/all.ts
+++ b/public/app/features/all.ts
@@ -9,3 +9,4 @@ import './admin';
 import './alerting/NotificationsEditCtrl';
 import './alerting/NotificationsListCtrl';
 import './manage-dashboards';
+import './teams/CreateTeamCtrl';
diff --git a/public/app/features/org/all.ts b/public/app/features/org/all.ts
index 1349da5effa..f87905c6b1b 100644
--- a/public/app/features/org/all.ts
+++ b/public/app/features/org/all.ts
@@ -3,4 +3,3 @@ import './select_org_ctrl';
 import './change_password_ctrl';
 import './new_org_ctrl';
 import './user_invite_ctrl';
-import './create_team_ctrl';
diff --git a/public/app/features/org/create_team_ctrl.ts b/public/app/features/teams/CreateTeamCtrl.ts
similarity index 100%
rename from public/app/features/org/create_team_ctrl.ts
rename to public/app/features/teams/CreateTeamCtrl.ts
diff --git a/public/app/features/org/partials/create_team.html b/public/app/features/teams/partials/create_team.html
similarity index 100%
rename from public/app/features/org/partials/create_team.html
rename to public/app/features/teams/partials/create_team.html
diff --git a/public/app/routes/routes.ts b/public/app/routes/routes.ts
index 35ecfcecc0a..7e70ac34274 100644
--- a/public/app/routes/routes.ts
+++ b/public/app/routes/routes.ts
@@ -167,7 +167,7 @@ export function setupAngularRoutes($routeProvider, $locationProvider) {
       },
     })
     .when('/org/teams/new', {
-      templateUrl: 'public/app/features/org/partials/create_team.html',
+      templateUrl: 'public/app/features/teams/partials/create_team.html',
       controller: 'CreateTeamCtrl',
       controllerAs: 'ctrl',
     })