diff --git a/components/Settings/AppSettings/index.ts b/components/Settings/AppSettings/index.ts
new file mode 100644
index 0000000..27890a5
--- /dev/null
+++ b/components/Settings/AppSettings/index.ts
@@ -0,0 +1,11 @@
+import Appearance from './Appearance.vue';
+import Notifications from './Notifications.vue';
+import Keybinds from './Keybinds.vue';
+import Language from './Language.vue';
+
+export {
+	Appearance,
+	Notifications,
+	Keybinds,
+	Language,
+}
\ No newline at end of file
diff --git a/components/Settings/UserSettings/index.ts b/components/Settings/UserSettings/index.ts
new file mode 100644
index 0000000..b2129e0
--- /dev/null
+++ b/components/Settings/UserSettings/index.ts
@@ -0,0 +1,13 @@
+import Profile from './Profile.vue';
+import Account from './Account.vue';
+import Privacy from './Privacy.vue';
+import Devices from './Devices.vue';
+import Connections from './Connections.vue';
+
+export {
+	Profile,
+	Account,
+	Privacy,
+	Devices,
+	Connections,
+}
\ No newline at end of file
diff --git a/pages/settings.vue b/pages/settings.vue
index 8b270bc..ae9745a 100644
--- a/pages/settings.vue
+++ b/pages/settings.vue
@@ -46,9 +46,13 @@
 
 
 <script lang="ts" setup>
+import { Profile, Account, Privacy, Devices, Connections } from '~/components/Settings/UserSettings';
+import { Appearance, Notifications, Keybinds, Language } from '~/components/Settings/AppSettings';
+
 import VerticalSpacer from '~/components/UserInterface/VerticalSpacer.vue';
 import Button from '~/components/UserInterface/Button.vue';
 
+
 const { logout } = useAuth()
 const appConfig = useRuntimeConfig()
 
@@ -62,17 +66,6 @@ interface Category {
   pages: Page[];
 }
 
-import Profile from '~/components/Settings/UserSettings/Profile.vue';
-import Account from '~/components/Settings/UserSettings/Account.vue';
-import Privacy from '~/components/Settings/UserSettings/Privacy.vue';
-import Devices from '~/components/Settings/UserSettings/Devices.vue';
-import Connections from '~/components/Settings/UserSettings/Connections.vue';
-
-import Appearance from '~/components/Settings/AppSettings/Appearance.vue';
-import Notifications from '~/components/Settings/AppSettings/Notifications.vue';
-import Keybinds from '~/components/Settings/AppSettings/Keybinds.vue';
-import Language from '~/components/Settings/AppSettings/Language.vue';
-
 const settingsCategories = {
   userSettings: {
     displayName: "User Settings",