diff --git a/plugins/user-settings/package.json b/plugins/user-settings/package.json
index c744f757c5..b811213f13 100644
--- a/plugins/user-settings/package.json
+++ b/plugins/user-settings/package.json
@@ -4,7 +4,7 @@
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
-  "private": true,
+  "private": false,
   "publishConfig": {
     "access": "public",
     "main": "dist/index.esm.js",
diff --git a/plugins/user-settings/src/components/AuthProviders.tsx b/plugins/user-settings/src/components/AuthProviders/AuthProviders.tsx
similarity index 100%
rename from plugins/user-settings/src/components/AuthProviders.tsx
rename to plugins/user-settings/src/components/AuthProviders/AuthProviders.tsx
diff --git a/plugins/user-settings/src/components/DefaultProviderSettings.test.tsx b/plugins/user-settings/src/components/AuthProviders/DefaultProviderSettings.test.tsx
similarity index 100%
rename from plugins/user-settings/src/components/DefaultProviderSettings.test.tsx
rename to plugins/user-settings/src/components/AuthProviders/DefaultProviderSettings.test.tsx
diff --git a/plugins/user-settings/src/components/DefaultProviderSettings.tsx b/plugins/user-settings/src/components/AuthProviders/DefaultProviderSettings.tsx
similarity index 100%
rename from plugins/user-settings/src/components/DefaultProviderSettings.tsx
rename to plugins/user-settings/src/components/AuthProviders/DefaultProviderSettings.tsx
diff --git a/plugins/user-settings/src/components/ProviderSettingsItem.tsx b/plugins/user-settings/src/components/AuthProviders/ProviderSettingsItem.tsx
similarity index 100%
rename from plugins/user-settings/src/components/ProviderSettingsItem.tsx
rename to plugins/user-settings/src/components/AuthProviders/ProviderSettingsItem.tsx
diff --git a/plugins/user-settings/src/components/AuthProviders/index.ts b/plugins/user-settings/src/components/AuthProviders/index.ts
new file mode 100644
index 0000000000..2f6a2b5ab1
--- /dev/null
+++ b/plugins/user-settings/src/components/AuthProviders/index.ts
@@ -0,0 +1,18 @@
+/*
+ * Copyright 2020 Spotify AB
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+export { AuthProviders } from './AuthProviders';
+export { DefaultProviderSettings } from './DefaultProviderSettings';
diff --git a/plugins/user-settings/src/components/FeatureFlags.tsx b/plugins/user-settings/src/components/FeatureFlags/FeatureFlags.tsx
similarity index 100%
rename from plugins/user-settings/src/components/FeatureFlags.tsx
rename to plugins/user-settings/src/components/FeatureFlags/FeatureFlags.tsx
diff --git a/plugins/user-settings/src/components/FeatureFlagsItem.tsx b/plugins/user-settings/src/components/FeatureFlags/FeatureFlagsItem.tsx
similarity index 100%
rename from plugins/user-settings/src/components/FeatureFlagsItem.tsx
rename to plugins/user-settings/src/components/FeatureFlags/FeatureFlagsItem.tsx
diff --git a/plugins/user-settings/src/components/index.ts b/plugins/user-settings/src/components/FeatureFlags/index.ts
similarity index 92%
rename from plugins/user-settings/src/components/index.ts
rename to plugins/user-settings/src/components/FeatureFlags/index.ts
index 59a8b425e4..37c9fd1fd2 100644
--- a/plugins/user-settings/src/components/index.ts
+++ b/plugins/user-settings/src/components/FeatureFlags/index.ts
@@ -14,4 +14,4 @@
  * limitations under the License.
  */
 
-export { UserSettings } from './UserSettings';
+export { FeatureFlags } from './FeatureFlags';
diff --git a/plugins/user-settings/src/components/General.tsx b/plugins/user-settings/src/components/General/General.tsx
similarity index 100%
rename from plugins/user-settings/src/components/General.tsx
rename to plugins/user-settings/src/components/General/General.tsx
diff --git a/plugins/user-settings/src/components/PinButton.test.tsx b/plugins/user-settings/src/components/General/PinButton.test.tsx
similarity index 100%
rename from plugins/user-settings/src/components/PinButton.test.tsx
rename to plugins/user-settings/src/components/General/PinButton.test.tsx
diff --git a/plugins/user-settings/src/components/PinButton.tsx b/plugins/user-settings/src/components/General/PinButton.tsx
similarity index 100%
rename from plugins/user-settings/src/components/PinButton.tsx
rename to plugins/user-settings/src/components/General/PinButton.tsx
diff --git a/plugins/user-settings/src/components/Profile.tsx b/plugins/user-settings/src/components/General/Profile.tsx
similarity index 96%
rename from plugins/user-settings/src/components/Profile.tsx
rename to plugins/user-settings/src/components/General/Profile.tsx
index 5bb9485f8d..b0231d95b6 100644
--- a/plugins/user-settings/src/components/Profile.tsx
+++ b/plugins/user-settings/src/components/General/Profile.tsx
@@ -18,7 +18,7 @@ import { Grid, Typography } from '@material-ui/core';
 import React from 'react';
 import { SignInAvatar } from './SignInAvatar';
 import { UserSettingsMenu } from './UserSettingsMenu';
-import { useUserProfile } from './useUserProfileInfo';
+import { useUserProfile } from '../useUserProfileInfo';
 
 export const Profile = () => {
   const { profile, displayName } = useUserProfile();
diff --git a/plugins/user-settings/src/components/SignInAvatar.tsx b/plugins/user-settings/src/components/General/SignInAvatar.tsx
similarity index 95%
rename from plugins/user-settings/src/components/SignInAvatar.tsx
rename to plugins/user-settings/src/components/General/SignInAvatar.tsx
index 72c636ffe7..8a5bbd75bf 100644
--- a/plugins/user-settings/src/components/SignInAvatar.tsx
+++ b/plugins/user-settings/src/components/General/SignInAvatar.tsx
@@ -17,7 +17,7 @@
 import React from 'react';
 import { BackstageTheme } from '@backstage/theme';
 import { makeStyles, Avatar } from '@material-ui/core';
-import { useUserProfile } from './useUserProfileInfo';
+import { useUserProfile } from '../useUserProfileInfo';
 import { sidebarConfig } from '@backstage/core';
 
 const useStyles = makeStyles<BackstageTheme, { size: number }>(theme => ({
diff --git a/plugins/user-settings/src/components/ThemeToggle.test.tsx b/plugins/user-settings/src/components/General/ThemeToggle.test.tsx
similarity index 100%
rename from plugins/user-settings/src/components/ThemeToggle.test.tsx
rename to plugins/user-settings/src/components/General/ThemeToggle.test.tsx
diff --git a/plugins/user-settings/src/components/ThemeToggle.tsx b/plugins/user-settings/src/components/General/ThemeToggle.tsx
similarity index 100%
rename from plugins/user-settings/src/components/ThemeToggle.tsx
rename to plugins/user-settings/src/components/General/ThemeToggle.tsx
diff --git a/plugins/user-settings/src/components/UserSettingsMenu.test.tsx b/plugins/user-settings/src/components/General/UserSettingsMenu.test.tsx
similarity index 100%
rename from plugins/user-settings/src/components/UserSettingsMenu.test.tsx
rename to plugins/user-settings/src/components/General/UserSettingsMenu.test.tsx
diff --git a/plugins/user-settings/src/components/UserSettingsMenu.tsx b/plugins/user-settings/src/components/General/UserSettingsMenu.tsx
similarity index 100%
rename from plugins/user-settings/src/components/UserSettingsMenu.tsx
rename to plugins/user-settings/src/components/General/UserSettingsMenu.tsx
diff --git a/plugins/user-settings/src/components/General/index.ts b/plugins/user-settings/src/components/General/index.ts
new file mode 100644
index 0000000000..2015d345fe
--- /dev/null
+++ b/plugins/user-settings/src/components/General/index.ts
@@ -0,0 +1,18 @@
+/*
+ * Copyright 2020 Spotify AB
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+export { General } from './General';
+export { SignInAvatar } from './SignInAvatar';
diff --git a/plugins/user-settings/src/components/Settings.tsx b/plugins/user-settings/src/components/Settings.tsx
index ae141457df..f754f1e7c3 100644
--- a/plugins/user-settings/src/components/Settings.tsx
+++ b/plugins/user-settings/src/components/Settings.tsx
@@ -16,7 +16,7 @@
 
 import React from 'react';
 import { SidebarItem } from '@backstage/core';
-import { SignInAvatar } from './SignInAvatar';
+import { SignInAvatar } from './General';
 import { useUserProfile } from './useUserProfileInfo';
 import { settingsRouteRef } from '../plugin';
 
diff --git a/plugins/user-settings/src/components/SettingsPage.tsx b/plugins/user-settings/src/components/SettingsPage.tsx
index de76866653..6ed8e33670 100644
--- a/plugins/user-settings/src/components/SettingsPage.tsx
+++ b/plugins/user-settings/src/components/SettingsPage.tsx
@@ -25,8 +25,7 @@ import {
   useApi,
 } from '@backstage/core';
 import { General } from './General';
-import { AuthProviders } from './AuthProviders';
-import { DefaultProviderSettings } from './DefaultProviderSettings';
+import { AuthProviders, DefaultProviderSettings } from './AuthProviders';
 import { FeatureFlags } from './FeatureFlags';
 
 type Props = {