diff --git a/public/app/features/all.ts b/public/app/features/all.ts
index d62eb8cacdc..ccdc7d7a820 100644
--- a/public/app/features/all.ts
+++ b/public/app/features/all.ts
@@ -10,3 +10,5 @@ import './alerting/NotificationsEditCtrl';
 import './alerting/NotificationsListCtrl';
 import './manage-dashboards';
 import './teams/CreateTeamCtrl';
+import './profile/ProfileCtrl';
+import './profile/ChangePasswordCtrl';
diff --git a/public/app/features/org/all.ts b/public/app/features/org/all.ts
index f87905c6b1b..18d75f71dca 100644
--- a/public/app/features/org/all.ts
+++ b/public/app/features/org/all.ts
@@ -1,5 +1,3 @@
-import './profile_ctrl';
 import './select_org_ctrl';
-import './change_password_ctrl';
 import './new_org_ctrl';
 import './user_invite_ctrl';
diff --git a/public/app/features/org/change_password_ctrl.ts b/public/app/features/profile/ChangePasswordCtrl.ts
similarity index 100%
rename from public/app/features/org/change_password_ctrl.ts
rename to public/app/features/profile/ChangePasswordCtrl.ts
diff --git a/public/app/features/org/profile_ctrl.ts b/public/app/features/profile/ProfileCtrl.ts
similarity index 100%
rename from public/app/features/org/profile_ctrl.ts
rename to public/app/features/profile/ProfileCtrl.ts
diff --git a/public/app/features/org/partials/change_password.html b/public/app/features/profile/partials/change_password.html
similarity index 100%
rename from public/app/features/org/partials/change_password.html
rename to public/app/features/profile/partials/change_password.html
diff --git a/public/app/features/org/partials/profile.html b/public/app/features/profile/partials/profile.html
similarity index 100%
rename from public/app/features/org/partials/profile.html
rename to public/app/features/profile/partials/profile.html
diff --git a/public/app/routes/routes.ts b/public/app/routes/routes.ts
index 7e70ac34274..6770011278f 100644
--- a/public/app/routes/routes.ts
+++ b/public/app/routes/routes.ts
@@ -179,12 +179,12 @@ export function setupAngularRoutes($routeProvider, $locationProvider) {
       },
     })
     .when('/profile', {
-      templateUrl: 'public/app/features/org/partials/profile.html',
+      templateUrl: 'public/app/features/profile/partials/profile.html',
       controller: 'ProfileCtrl',
       controllerAs: 'ctrl',
     })
     .when('/profile/password', {
-      templateUrl: 'public/app/features/org/partials/change_password.html',
+      templateUrl: 'public/app/features/profile/partials/change_password.html',
       controller: 'ChangePasswordCtrl',
     })
     .when('/profile/select-org', {