diff --git a/lib/discord/package.json b/lib/discord/package.json
index 8aa3070..35f77d4 100644
--- a/lib/discord/package.json
+++ b/lib/discord/package.json
@@ -21,17 +21,17 @@
     "./preinit": {
       "default": "./src/preinit.ts"
     },
-    "./ui": {
-      "default": "./src/ui/index.ts"
-    },
-    "./ui/settings": {
-      "default": "./src/ui/settings/index.ts"
+    "./settings": {
+      "default": "./src/settings/index.ts"
     },
     "./types": {
       "types": "./types/index.ts"
     },
-    "./_/ui/settings": {
-      "default": "./src/ui/settings/_internal.ts"
+    "./ui": {
+      "default": "./src/ui/index.ts"
+    },
+    "./_/settings": {
+      "default": "./src/settings/_internal.ts"
     }
   }
 }
diff --git a/lib/discord/src/index.ts b/lib/discord/src/index.ts
index d8fa25b..4fac83e 100644
--- a/lib/discord/src/index.ts
+++ b/lib/discord/src/index.ts
@@ -7,6 +7,7 @@ export * from './preinit'
 
 export * as flux from './flux'
 export * as native from './native'
+export * as settings from './settings'
 export * as ui from './ui'
 
 // ../discord_common/js/shared/Logger.tsx
diff --git a/lib/discord/src/ui/settings/_internal.ts b/lib/discord/src/settings/_internal.ts
similarity index 100%
rename from lib/discord/src/ui/settings/_internal.ts
rename to lib/discord/src/settings/_internal.ts
diff --git a/lib/discord/src/ui/settings/api.ts b/lib/discord/src/settings/api.ts
similarity index 98%
rename from lib/discord/src/ui/settings/api.ts
rename to lib/discord/src/settings/api.ts
index 5b23349..aebc500 100644
--- a/lib/discord/src/ui/settings/api.ts
+++ b/lib/discord/src/settings/api.ts
@@ -1,7 +1,7 @@
 import { _data, _subs } from './_internal'
 
 import type { ComponentType, ReactNode } from 'react'
-import type { DiscordModules } from '../../../types'
+import type { DiscordModules } from '../../types'
 
 export type SettingsModulesLoadedSubscription = () => void
 
diff --git a/lib/discord/src/ui/settings/common.ts b/lib/discord/src/settings/common.ts
similarity index 100%
rename from lib/discord/src/ui/settings/common.ts
rename to lib/discord/src/settings/common.ts
diff --git a/lib/discord/src/ui/settings/index.ts b/lib/discord/src/settings/index.ts
similarity index 100%
rename from lib/discord/src/ui/settings/index.ts
rename to lib/discord/src/settings/index.ts
diff --git a/lib/discord/src/ui/index.ts b/lib/discord/src/ui/index.ts
index c4c12c5..89a3196 100644
--- a/lib/discord/src/ui/index.ts
+++ b/lib/discord/src/ui/index.ts
@@ -1,2 +1 @@
 export * from './common'
-export * as settings from './settings'
diff --git a/src/plugins/developer-settings/definitions/EvaluateJavaScriptSetting.tsx b/src/plugins/developer-settings/definitions/EvaluateJavaScriptSetting.tsx
index e26c1f7..a0948d9 100644
--- a/src/plugins/developer-settings/definitions/EvaluateJavaScriptSetting.tsx
+++ b/src/plugins/developer-settings/definitions/EvaluateJavaScriptSetting.tsx
@@ -10,7 +10,7 @@ import AssetIcon from '~/components/AssetIcon'
 
 import { pluginApi } from '..'
 
-import type { SettingsItem } from '@revenge-mod/discord/ui/settings'
+import type { SettingsItem } from '@revenge-mod/discord/settings'
 
 const ALERT_KEY = 'evaluate-javascript'
 
diff --git a/src/plugins/developer-settings/definitions/ReactDevToolsConnectSetting.tsx b/src/plugins/developer-settings/definitions/ReactDevToolsConnectSetting.tsx
index 219b148..1359dac 100644
--- a/src/plugins/developer-settings/definitions/ReactDevToolsConnectSetting.tsx
+++ b/src/plugins/developer-settings/definitions/ReactDevToolsConnectSetting.tsx
@@ -5,7 +5,7 @@ import AssetIcon from '~/components/AssetIcon'
 import { MobileSetting } from '../constants'
 import { DevToolsContext, connectToDevTools, useIsDevToolsOpen } from '../devtools'
 
-import type { SettingsItem } from '@revenge-mod/discord/ui/settings'
+import type { SettingsItem } from '@revenge-mod/discord/settings'
 
 const ReactDevToolsConnectSetting: SettingsItem = {
     parent: MobileSetting.REVENGE_DEVELOPER,
diff --git a/src/plugins/developer-settings/definitions/ReactDevToolsDisconnectSetting.tsx b/src/plugins/developer-settings/definitions/ReactDevToolsDisconnectSetting.tsx
index 9c69fe6..400f866 100644
--- a/src/plugins/developer-settings/definitions/ReactDevToolsDisconnectSetting.tsx
+++ b/src/plugins/developer-settings/definitions/ReactDevToolsDisconnectSetting.tsx
@@ -5,7 +5,7 @@ import AssetIcon from '~/components/AssetIcon'
 import { MobileSetting } from '../constants'
 import { disconnectFromDevTools, useIsDevToolsOpen } from '../devtools'
 
-import type { SettingsItem } from '@revenge-mod/discord/ui/settings'
+import type { SettingsItem } from '@revenge-mod/discord/settings'
 
 const ReactDevToolsDisconnectSetting: SettingsItem = {
     parent: MobileSetting.REVENGE_DEVELOPER,
diff --git a/src/plugins/developer-settings/definitions/ReactDevToolsVersionSetting.tsx b/src/plugins/developer-settings/definitions/ReactDevToolsVersionSetting.tsx
index 6a6968e..790850a 100644
--- a/src/plugins/developer-settings/definitions/ReactDevToolsVersionSetting.tsx
+++ b/src/plugins/developer-settings/definitions/ReactDevToolsVersionSetting.tsx
@@ -5,7 +5,7 @@ import AssetIcon from '~/components/AssetIcon'
 import { MobileSetting } from '../constants'
 import { DevToolsContext } from '../devtools'
 
-import type { SettingsItem } from '@revenge-mod/discord/ui/settings'
+import type { SettingsItem } from '@revenge-mod/discord/settings'
 
 const ReactDevToolsVersionSetting: SettingsItem = {
     parent: MobileSetting.REVENGE_DEVELOPER,
diff --git a/src/plugins/developer-settings/definitions/RevengeDeveloperSetting.tsx b/src/plugins/developer-settings/definitions/RevengeDeveloperSetting.tsx
index 8607514..2d067c9 100644
--- a/src/plugins/developer-settings/definitions/RevengeDeveloperSetting.tsx
+++ b/src/plugins/developer-settings/definitions/RevengeDeveloperSetting.tsx
@@ -2,7 +2,7 @@ import AssetIcon from '~/components/AssetIcon'
 
 import { MobileSetting, UserSettingsSections } from '../constants'
 
-import type { SettingsItem } from '@revenge-mod/discord/ui/settings'
+import type { SettingsItem } from '@revenge-mod/discord/settings'
 
 const RevengeDeveloperSetting: SettingsItem = {
     parent: null,
diff --git a/src/plugins/developer-settings/index.ts b/src/plugins/developer-settings/index.ts
index 0c4c88a..36767f6 100644
--- a/src/plugins/developer-settings/index.ts
+++ b/src/plugins/developer-settings/index.ts
@@ -1,8 +1,8 @@
 import { type PluginApi, PluginFlags } from '@revenge-mod/plugins'
 import { InternalPluginFlags, registerPlugin } from '@revenge-mod/plugins/_'
 
-import { _data } from '@revenge-mod/discord/_/ui/settings'
-import { onceSettingsModulesLoaded } from '@revenge-mod/discord/ui/settings'
+import { _data } from '@revenge-mod/discord/_/settings'
+import { onceSettingsModulesLoaded } from '@revenge-mod/discord/settings'
 
 registerPlugin(
     {
diff --git a/src/plugins/developer-settings/register.ts b/src/plugins/developer-settings/register.ts
index 7c83ee2..d11bf26 100644
--- a/src/plugins/developer-settings/register.ts
+++ b/src/plugins/developer-settings/register.ts
@@ -1,4 +1,4 @@
-import { addSettingsItemToSection, registerSettingsItems } from '@revenge-mod/discord/ui/settings'
+import { addSettingsItemToSection, registerSettingsItems } from '@revenge-mod/discord/settings'
 
 import { MobileSetting } from './constants'
 
diff --git a/src/plugins/developer-settings/screens/RevengeDeveloperSettingScreen.tsx b/src/plugins/developer-settings/screens/RevengeDeveloperSettingScreen.tsx
index 62dfe46..08be805 100644
--- a/src/plugins/developer-settings/screens/RevengeDeveloperSettingScreen.tsx
+++ b/src/plugins/developer-settings/screens/RevengeDeveloperSettingScreen.tsx
@@ -1,5 +1,5 @@
+import { SettingListRenderer } from '@revenge-mod/discord/settings'
 import { Components } from '@revenge-mod/discord/ui'
-import { SettingListRenderer } from '@revenge-mod/discord/ui/settings'
 import { React, ReactNative } from '@revenge-mod/react'
 
 import { MobileSetting } from '../constants'
diff --git a/src/plugins/settings/definitions/HermesVersionSetting.tsx b/src/plugins/settings/definitions/HermesVersionSetting.tsx
index af8d670..123bf1f 100644
--- a/src/plugins/settings/definitions/HermesVersionSetting.tsx
+++ b/src/plugins/settings/definitions/HermesVersionSetting.tsx
@@ -4,7 +4,7 @@ import AssetIcon from '~/components/AssetIcon'
 
 import { MobileSetting } from '../constants'
 
-import type { SettingsItem } from '@revenge-mod/discord/ui/settings'
+import type { SettingsItem } from '@revenge-mod/discord/settings'
 
 // @ts-expect-error
 const props = HermesInternal.getRuntimeProperties()
diff --git a/src/plugins/settings/definitions/ReactNativeVersionSetting.tsx b/src/plugins/settings/definitions/ReactNativeVersionSetting.tsx
index a1b97cb..4b59345 100644
--- a/src/plugins/settings/definitions/ReactNativeVersionSetting.tsx
+++ b/src/plugins/settings/definitions/ReactNativeVersionSetting.tsx
@@ -4,7 +4,7 @@ import AssetIcon from '~/components/AssetIcon'
 
 import { MobileSetting } from '../constants'
 
-import type { SettingsItem } from '@revenge-mod/discord/ui/settings'
+import type { SettingsItem } from '@revenge-mod/discord/settings'
 
 const { major, minor, patch, prerelease } = ReactNative.Platform.constants.reactNativeVersion
 const version = `${major}.${minor}.${patch}${prerelease ? `-${prerelease}` : ''}`
diff --git a/src/plugins/settings/definitions/ReactVersionSetting.tsx b/src/plugins/settings/definitions/ReactVersionSetting.tsx
index 8baa10c..5c06402 100644
--- a/src/plugins/settings/definitions/ReactVersionSetting.tsx
+++ b/src/plugins/settings/definitions/ReactVersionSetting.tsx
@@ -4,7 +4,7 @@ import { MobileSetting } from '../constants'
 
 import AssetIcon from '~/components/AssetIcon'
 
-import type { SettingsItem } from '@revenge-mod/discord/ui/settings'
+import type { SettingsItem } from '@revenge-mod/discord/settings'
 
 const ReactVersionSetting: SettingsItem = {
     parent: MobileSetting.REVENGE,
diff --git a/src/plugins/settings/definitions/ReloadAppSetting.tsx b/src/plugins/settings/definitions/ReloadAppSetting.tsx
index ff0e0fa..076b46e 100644
--- a/src/plugins/settings/definitions/ReloadAppSetting.tsx
+++ b/src/plugins/settings/definitions/ReloadAppSetting.tsx
@@ -5,7 +5,7 @@ import AssetIcon from '~/components/AssetIcon'
 
 import { MobileSetting } from '../constants'
 
-import type { SettingsItem } from '@revenge-mod/discord/ui/settings'
+import type { SettingsItem } from '@revenge-mod/discord/settings'
 
 const ReloadAppSetting: SettingsItem = {
     parent: MobileSetting.REVENGE,
diff --git a/src/plugins/settings/definitions/RevengeDiscordServerSetting.tsx b/src/plugins/settings/definitions/RevengeDiscordServerSetting.tsx
index 9041c2f..ef822a9 100644
--- a/src/plugins/settings/definitions/RevengeDiscordServerSetting.tsx
+++ b/src/plugins/settings/definitions/RevengeDiscordServerSetting.tsx
@@ -1,11 +1,11 @@
 import { React, ReactNative } from '@revenge-mod/react'
 
-import { DiscordServerURL } from '~/constants'
 import AssetIcon from '~/components/AssetIcon'
+import { DiscordServerURL } from '~/constants'
 
 import { MobileSetting } from '../constants'
 
-import type { SettingsItem } from '@revenge-mod/discord/ui/settings'
+import type { SettingsItem } from '@revenge-mod/discord/settings'
 
 const RevengeDiscordServerSetting: SettingsItem = {
     parent: MobileSetting.REVENGE,
diff --git a/src/plugins/settings/definitions/RevengeFontsSetting.tsx b/src/plugins/settings/definitions/RevengeFontsSetting.tsx
index fe13cf9..4aff0bc 100644
--- a/src/plugins/settings/definitions/RevengeFontsSetting.tsx
+++ b/src/plugins/settings/definitions/RevengeFontsSetting.tsx
@@ -2,7 +2,7 @@ import AssetIcon from '~/components/AssetIcon'
 
 import { MobileSetting, UserSettingsSections } from '../constants'
 
-import type { SettingsItem } from '@revenge-mod/discord/ui/settings'
+import type { SettingsItem } from '@revenge-mod/discord/settings'
 
 const RevengeFontsSetting: SettingsItem = {
     parent: null,
diff --git a/src/plugins/settings/definitions/RevengeGitHubOrganizationSetting.tsx b/src/plugins/settings/definitions/RevengeGitHubOrganizationSetting.tsx
index c926e4f..1fe8cd0 100644
--- a/src/plugins/settings/definitions/RevengeGitHubOrganizationSetting.tsx
+++ b/src/plugins/settings/definitions/RevengeGitHubOrganizationSetting.tsx
@@ -1,11 +1,11 @@
 import { React, ReactNative } from '@revenge-mod/react'
 
-import { GitHubOrganizationURL } from '~/constants'
 import AssetIcon from '~/components/AssetIcon'
+import { GitHubOrganizationURL } from '~/constants'
 
 import { MobileSetting } from '../constants'
 
-import type { SettingsItem } from '@revenge-mod/discord/ui/settings'
+import type { SettingsItem } from '@revenge-mod/discord/settings'
 
 const RevengeGitHubOrganizationSetting: SettingsItem = {
     parent: MobileSetting.REVENGE,
diff --git a/src/plugins/settings/definitions/RevengeNotImplementedSetting.tsx b/src/plugins/settings/definitions/RevengeNotImplementedSetting.tsx
index b7db5d7..619e6e2 100644
--- a/src/plugins/settings/definitions/RevengeNotImplementedSetting.tsx
+++ b/src/plugins/settings/definitions/RevengeNotImplementedSetting.tsx
@@ -2,7 +2,7 @@ import { React } from '@revenge-mod/react'
 
 import AssetIcon from '~/components/AssetIcon'
 
-import type { SettingsItem } from '@revenge-mod/discord/ui/settings'
+import type { SettingsItem } from '@revenge-mod/discord/settings'
 
 const RevengeNotImplementedSetting: SettingsItem = {
     parent: null,
diff --git a/src/plugins/settings/definitions/RevengePluginsSetting.tsx b/src/plugins/settings/definitions/RevengePluginsSetting.tsx
index b35c22f..a98f6ab 100644
--- a/src/plugins/settings/definitions/RevengePluginsSetting.tsx
+++ b/src/plugins/settings/definitions/RevengePluginsSetting.tsx
@@ -4,7 +4,7 @@ import AssetIcon from '~/components/AssetIcon'
 
 import { MobileSetting, UserSettingsSections } from '../constants'
 
-import type { SettingsItem } from '@revenge-mod/discord/ui/settings'
+import type { SettingsItem } from '@revenge-mod/discord/settings'
 
 const RevengePluginsSetting: SettingsItem = {
     parent: null,
diff --git a/src/plugins/settings/definitions/RevengeSetting.tsx b/src/plugins/settings/definitions/RevengeSetting.tsx
index 3a2d836..918a532 100644
--- a/src/plugins/settings/definitions/RevengeSetting.tsx
+++ b/src/plugins/settings/definitions/RevengeSetting.tsx
@@ -3,7 +3,7 @@ import RevengeIcon from '~assets/RevengeIcon'
 
 import { MobileSetting, UserSettingsSections } from '../constants'
 
-import type { SettingsItem } from '@revenge-mod/discord/ui/settings'
+import type { SettingsItem } from '@revenge-mod/discord/settings'
 
 const RevengeSetting: SettingsItem = {
     parent: null,
diff --git a/src/plugins/settings/definitions/RevengeThemesSetting.tsx b/src/plugins/settings/definitions/RevengeThemesSetting.tsx
index a569ee4..1341ee9 100644
--- a/src/plugins/settings/definitions/RevengeThemesSetting.tsx
+++ b/src/plugins/settings/definitions/RevengeThemesSetting.tsx
@@ -2,7 +2,7 @@ import AssetIcon from '~/components/AssetIcon'
 
 import { MobileSetting, UserSettingsSections } from '../constants'
 
-import type { SettingsItem } from '@revenge-mod/discord/ui/settings'
+import type { SettingsItem } from '@revenge-mod/discord/settings'
 
 const RevengeThemesSetting: SettingsItem = {
     parent: null,
diff --git a/src/plugins/settings/definitions/RevengeVersionSetting.tsx b/src/plugins/settings/definitions/RevengeVersionSetting.tsx
index 4a9e325..0e67451 100644
--- a/src/plugins/settings/definitions/RevengeVersionSetting.tsx
+++ b/src/plugins/settings/definitions/RevengeVersionSetting.tsx
@@ -3,7 +3,7 @@ import RevengeIcon from '~assets/RevengeIcon'
 
 import { MobileSetting } from '../constants'
 
-import type { SettingsItem } from '@revenge-mod/discord/ui/settings'
+import type { SettingsItem } from '@revenge-mod/discord/settings'
 
 const RevengeVersionSetting: SettingsItem = {
     parent: MobileSetting.REVENGE,
diff --git a/src/plugins/settings/index.ts b/src/plugins/settings/index.ts
index 2120861..58bc040 100644
--- a/src/plugins/settings/index.ts
+++ b/src/plugins/settings/index.ts
@@ -4,11 +4,11 @@ import { InternalPluginFlags, registerPlugin } from '@revenge-mod/plugins/_'
 import { waitForModules } from '@revenge-mod/modules/finders'
 import { byName, byProps } from '@revenge-mod/modules/finders/filters'
 
-import { _data, _subs } from '@revenge-mod/discord/_/ui/settings'
+import { _data, _subs } from '@revenge-mod/discord/_/settings'
+import { type SettingsItem, onceSettingsModulesLoaded } from '@revenge-mod/discord/settings'
 
 import { after } from '@revenge-mod/patcher'
 
-import { type SettingsItem, onceSettingsModulesLoaded } from '@revenge-mod/discord/ui/settings'
 import type { FC } from 'react'
 
 registerPlugin(
diff --git a/src/plugins/settings/register.ts b/src/plugins/settings/register.ts
index 49f352e..4e1c249 100644
--- a/src/plugins/settings/register.ts
+++ b/src/plugins/settings/register.ts
@@ -1,4 +1,4 @@
-import { registerSettingsItems, registerSettingsSection } from '@revenge-mod/discord/ui/settings'
+import { registerSettingsItems, registerSettingsSection } from '@revenge-mod/discord/settings'
 
 import { MobileSetting } from './constants'
 
diff --git a/src/plugins/settings/screens/RevengeFontsSettingScreen.tsx b/src/plugins/settings/screens/RevengeFontsSettingScreen.tsx
index b069879..2d24ac4 100644
--- a/src/plugins/settings/screens/RevengeFontsSettingScreen.tsx
+++ b/src/plugins/settings/screens/RevengeFontsSettingScreen.tsx
@@ -1,4 +1,4 @@
-import { SettingListRenderer } from '@revenge-mod/discord/ui/settings'
+import { SettingListRenderer } from '@revenge-mod/discord/settings'
 
 import { MobileSetting } from '../constants'
 
diff --git a/src/plugins/settings/screens/RevengePluginsSettingScreen.tsx b/src/plugins/settings/screens/RevengePluginsSettingScreen.tsx
index 8e14c24..9bd53ef 100644
--- a/src/plugins/settings/screens/RevengePluginsSettingScreen.tsx
+++ b/src/plugins/settings/screens/RevengePluginsSettingScreen.tsx
@@ -1,4 +1,4 @@
-import { SettingListRenderer } from '@revenge-mod/discord/ui/settings'
+import { SettingListRenderer } from '@revenge-mod/discord/settings'
 
 import { MobileSetting } from '../constants'
 
diff --git a/src/plugins/settings/screens/RevengeSettingScreen.tsx b/src/plugins/settings/screens/RevengeSettingScreen.tsx
index 359aede..77a938b 100644
--- a/src/plugins/settings/screens/RevengeSettingScreen.tsx
+++ b/src/plugins/settings/screens/RevengeSettingScreen.tsx
@@ -1,4 +1,4 @@
-import { SettingListRenderer } from '@revenge-mod/discord/ui/settings'
+import { SettingListRenderer } from '@revenge-mod/discord/settings'
 import { Components } from '../../../../lib/discord/src/ui/common'
 import { MobileSetting } from '../constants'
 
diff --git a/src/plugins/settings/screens/RevengeThemesSettingScreen.tsx b/src/plugins/settings/screens/RevengeThemesSettingScreen.tsx
index 2def424..e85c9ee 100644
--- a/src/plugins/settings/screens/RevengeThemesSettingScreen.tsx
+++ b/src/plugins/settings/screens/RevengeThemesSettingScreen.tsx
@@ -1,4 +1,4 @@
-import { SettingListRenderer } from '@revenge-mod/discord/ui/settings'
+import { SettingListRenderer } from '@revenge-mod/discord/settings'
 
 import { MobileSetting } from '../constants'