diff --git a/app/src/lib/components/BaseBranchSwitch.svelte b/app/src/lib/components/BaseBranchSwitch.svelte
index 444cb6a70..6d9b67d4e 100644
--- a/app/src/lib/components/BaseBranchSwitch.svelte
+++ b/app/src/lib/components/BaseBranchSwitch.svelte
@@ -5,7 +5,7 @@
 	import { Project } from '$lib/backend/projects';
 	import SectionCard from '$lib/components/SectionCard.svelte';
 	import SelectItem from '$lib/components/SelectItem.svelte';
-	import Section from '$lib/components/settings/Section.svelte';
+	import Section from '$lib/settings/Section.svelte';
 	import { getContext, getContextStore } from '$lib/utils/context';
 	import { getRemoteBranches } from '$lib/vbranches/baseBranch';
 	import { BranchController } from '$lib/vbranches/branchController';
diff --git a/app/src/lib/components/ProjectSetup.svelte b/app/src/lib/components/ProjectSetup.svelte
index 668ef44b9..aa3eea100 100644
--- a/app/src/lib/components/ProjectSetup.svelte
+++ b/app/src/lib/components/ProjectSetup.svelte
@@ -1,10 +1,10 @@
 <script async lang="ts">
 	import Button from './Button.svelte';
-	import KeysForm from './KeysForm.svelte';
 	import ProjectSetupTarget from './ProjectSetupTarget.svelte';
 	import newProjectSvg from '$lib/assets/illustrations/new-project.svg?raw';
 	import { Project, ProjectService } from '$lib/backend/projects';
 	import DecorativeSplitView from '$lib/components/DecorativeSplitView.svelte';
+	import KeysForm from '$lib/settings/KeysForm.svelte';
 	import { getContext } from '$lib/utils/context';
 	import { BranchController } from '$lib/vbranches/branchController';
 	import { platform } from '@tauri-apps/api/os';
diff --git a/app/src/lib/components/ProjectSetupTarget.svelte b/app/src/lib/components/ProjectSetupTarget.svelte
index 813e6ae60..84b1705b2 100644
--- a/app/src/lib/components/ProjectSetupTarget.svelte
+++ b/app/src/lib/components/ProjectSetupTarget.svelte
@@ -3,7 +3,6 @@
 	import { Project } from '$lib/backend/projects';
 	import BackButton from '$lib/components/BackButton.svelte';
 	import Button from '$lib/components/Button.svelte';
-	import GithubIntegration from '$lib/components/GithubIntegration.svelte';
 	import Login from '$lib/components/Login.svelte';
 	import Select from '$lib/components/Select.svelte';
 	import SelectItem from '$lib/components/SelectItem.svelte';
@@ -11,6 +10,7 @@
 	import Toggle from '$lib/components/Toggle.svelte';
 	import { projectAiGenEnabled } from '$lib/config/config';
 	import { projectAiGenAutoBranchNamingEnabled } from '$lib/config/config';
+	import GithubIntegration from '$lib/settings/GithubIntegration.svelte';
 	import { UserService } from '$lib/stores/user';
 	import { getContext } from '$lib/utils/context';
 	import { platform } from '@tauri-apps/api/os';
diff --git a/app/src/lib/components/AnalyticsConfirmation.svelte b/app/src/lib/settings/AnalyticsConfirmation.svelte
similarity index 86%
rename from app/src/lib/components/AnalyticsConfirmation.svelte
rename to app/src/lib/settings/AnalyticsConfirmation.svelte
index fd77931e9..3fa6d007a 100644
--- a/app/src/lib/components/AnalyticsConfirmation.svelte
+++ b/app/src/lib/settings/AnalyticsConfirmation.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
-	import AnalyticsSettings from './AnalyticsSettings.svelte';
-	import Button from './Button.svelte';
 	import { initAnalyticsIfEnabled } from '$lib/analytics/analytics';
+	import Button from '$lib/components/Button.svelte';
+	import AnalyticsSettings from '$lib/settings/AnalyticsSettings.svelte';
 	import type { Writable } from 'svelte/store';
 
 	export let analyticsConfirmed: Writable<boolean>;
diff --git a/app/src/lib/components/AnalyticsSettings.svelte b/app/src/lib/settings/AnalyticsSettings.svelte
similarity index 94%
rename from app/src/lib/components/AnalyticsSettings.svelte
rename to app/src/lib/settings/AnalyticsSettings.svelte
index 7b28df352..2294c4d92 100644
--- a/app/src/lib/components/AnalyticsSettings.svelte
+++ b/app/src/lib/settings/AnalyticsSettings.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
-	import Link from './Link.svelte';
-	import SectionCard from './SectionCard.svelte';
-	import Toggle from './Toggle.svelte';
+	import Link from '$lib/components/Link.svelte';
+	import SectionCard from '$lib/components/SectionCard.svelte';
+	import Toggle from '$lib/components/Toggle.svelte';
 	import {
 		appErrorReportingEnabled,
 		appMetricsEnabled,
diff --git a/app/src/lib/components/CloudForm.svelte b/app/src/lib/settings/CloudForm.svelte
similarity index 96%
rename from app/src/lib/components/CloudForm.svelte
rename to app/src/lib/settings/CloudForm.svelte
index 1d8ba0fcc..be741606a 100644
--- a/app/src/lib/components/CloudForm.svelte
+++ b/app/src/lib/settings/CloudForm.svelte
@@ -1,15 +1,15 @@
 <script lang="ts">
-	import SectionCard from './SectionCard.svelte';
-	import WelcomeSigninAction from './WelcomeSigninAction.svelte';
 	import { Project, ProjectService } from '$lib/backend/projects';
 	import AiPromptSelect from '$lib/components/AIPromptSelect.svelte';
 	import Button from '$lib/components/Button.svelte';
 	import Link from '$lib/components/Link.svelte';
+	import SectionCard from '$lib/components/SectionCard.svelte';
 	import Spacer from '$lib/components/Spacer.svelte';
 	import Toggle from '$lib/components/Toggle.svelte';
-	import Section from '$lib/components/settings/Section.svelte';
+	import WelcomeSigninAction from '$lib/components/WelcomeSigninAction.svelte';
 	import { projectAiGenEnabled } from '$lib/config/config';
 	import { projectAiGenAutoBranchNamingEnabled } from '$lib/config/config';
+	import Section from '$lib/settings/Section.svelte';
 	import { UserService } from '$lib/stores/user';
 	import { getContext } from '$lib/utils/context';
 	import * as toasts from '$lib/utils/toasts';
diff --git a/app/src/lib/components/settings/ContentWrapper.svelte b/app/src/lib/settings/ContentWrapper.svelte
similarity index 100%
rename from app/src/lib/components/settings/ContentWrapper.svelte
rename to app/src/lib/settings/ContentWrapper.svelte
diff --git a/app/src/lib/components/DetailsForm.svelte b/app/src/lib/settings/DetailsForm.svelte
similarity index 100%
rename from app/src/lib/components/DetailsForm.svelte
rename to app/src/lib/settings/DetailsForm.svelte
diff --git a/app/src/lib/components/GithubIntegration.svelte b/app/src/lib/settings/GithubIntegration.svelte
similarity index 99%
rename from app/src/lib/components/GithubIntegration.svelte
rename to app/src/lib/settings/GithubIntegration.svelte
index b9c45191f..39d87712e 100644
--- a/app/src/lib/components/GithubIntegration.svelte
+++ b/app/src/lib/settings/GithubIntegration.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
-	import Icon from './Icon.svelte';
 	import { checkAuthStatus, initDeviceOauth } from '$lib/backend/github';
 	import Button from '$lib/components/Button.svelte';
+	import Icon from '$lib/components/Icon.svelte';
 	import Modal from '$lib/components/Modal.svelte';
 	import SectionCard from '$lib/components/SectionCard.svelte';
 	import { GitHubService } from '$lib/github/service';
diff --git a/app/src/lib/components/KeysForm.svelte b/app/src/lib/settings/KeysForm.svelte
similarity index 94%
rename from app/src/lib/components/KeysForm.svelte
rename to app/src/lib/settings/KeysForm.svelte
index 1e8c8273d..67529f690 100644
--- a/app/src/lib/components/KeysForm.svelte
+++ b/app/src/lib/settings/KeysForm.svelte
@@ -1,15 +1,15 @@
 <script lang="ts">
-	import CredentialCheck from './CredentialCheck.svelte';
-	import ProjectNameLabel from './ProjectNameLabel.svelte';
-	import RadioButton from './RadioButton.svelte';
-	import SectionCard from './SectionCard.svelte';
-	import TextBox from './TextBox.svelte';
 	import { AuthService } from '$lib/backend/auth';
 	import { ProjectService, type Key, type KeyType, Project } from '$lib/backend/projects';
 	import Button from '$lib/components/Button.svelte';
+	import CredentialCheck from '$lib/components/CredentialCheck.svelte';
 	import Link from '$lib/components/Link.svelte';
-	import Section from '$lib/components/settings/Section.svelte';
+	import ProjectNameLabel from '$lib/components/ProjectNameLabel.svelte';
+	import RadioButton from '$lib/components/RadioButton.svelte';
+	import SectionCard from '$lib/components/SectionCard.svelte';
+	import TextBox from '$lib/components/TextBox.svelte';
 	import { showError } from '$lib/notifications/toasts';
+	import Section from '$lib/settings/Section.svelte';
 	import { copyToClipboard } from '$lib/utils/clipboard';
 	import { getContext, getContextStore } from '$lib/utils/context';
 	import { openExternalUrl } from '$lib/utils/url';
diff --git a/app/src/lib/components/PreferencesForm.svelte b/app/src/lib/settings/PreferencesForm.svelte
similarity index 95%
rename from app/src/lib/components/PreferencesForm.svelte
rename to app/src/lib/settings/PreferencesForm.svelte
index 55ccbebab..a698d75aa 100644
--- a/app/src/lib/components/PreferencesForm.svelte
+++ b/app/src/lib/settings/PreferencesForm.svelte
@@ -1,17 +1,17 @@
 <script lang="ts">
-	import Button from './Button.svelte';
-	import InfoMessage from './InfoMessage.svelte';
-	import Link from './Link.svelte';
-	import SectionCard from './SectionCard.svelte';
-	import SectionCardDisclaimer from './SectionCardDisclaimer.svelte';
-	import TextBox from './TextBox.svelte';
 	import { GitConfigService } from '$lib/backend/gitConfigService';
 	import { Project, ProjectService } from '$lib/backend/projects';
+	import Button from '$lib/components/Button.svelte';
+	import InfoMessage from '$lib/components/InfoMessage.svelte';
+	import Link from '$lib/components/Link.svelte';
+	import SectionCard from '$lib/components/SectionCard.svelte';
+	import SectionCardDisclaimer from '$lib/components/SectionCardDisclaimer.svelte';
 	import Select from '$lib/components/Select.svelte';
 	import SelectItem from '$lib/components/SelectItem.svelte';
+	import TextBox from '$lib/components/TextBox.svelte';
 	import Toggle from '$lib/components/Toggle.svelte';
-	import Section from '$lib/components/settings/Section.svelte';
 	import { projectRunCommitHooks } from '$lib/config/config';
+	import Section from '$lib/settings/Section.svelte';
 	import { getContext } from '$lib/utils/context';
 	import { invoke } from '@tauri-apps/api/tauri';
 	import { onMount } from 'svelte';
diff --git a/app/src/lib/components/settings/Section.svelte b/app/src/lib/settings/Section.svelte
similarity index 94%
rename from app/src/lib/components/settings/Section.svelte
rename to app/src/lib/settings/Section.svelte
index aca545269..ae9bc9dc6 100644
--- a/app/src/lib/components/settings/Section.svelte
+++ b/app/src/lib/settings/Section.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-	import Spacer from '../Spacer.svelte';
+	import Spacer from '$lib/components/Spacer.svelte';
 	import { pxToRem } from '$lib/utils/pxToRem';
 
 	export let spacer = false;
diff --git a/app/src/lib/components/settings/Sidebar.svelte b/app/src/lib/settings/Sidebar.svelte
similarity index 100%
rename from app/src/lib/components/settings/Sidebar.svelte
rename to app/src/lib/settings/Sidebar.svelte
diff --git a/app/src/lib/components/settings/SupportersBanner.svelte b/app/src/lib/settings/SupportersBanner.svelte
similarity index 100%
rename from app/src/lib/components/settings/SupportersBanner.svelte
rename to app/src/lib/settings/SupportersBanner.svelte
diff --git a/app/src/lib/components/ThemeSelector.svelte b/app/src/lib/settings/ThemeSelector.svelte
similarity index 100%
rename from app/src/lib/components/ThemeSelector.svelte
rename to app/src/lib/settings/ThemeSelector.svelte
diff --git a/app/src/routes/+page.svelte b/app/src/routes/+page.svelte
index 7b4270cc9..aad2999eb 100644
--- a/app/src/routes/+page.svelte
+++ b/app/src/routes/+page.svelte
@@ -2,11 +2,11 @@
 	import analyticsSvg from '$lib/assets/illustrations/analytics.svg?raw';
 	import newProjectSvg from '$lib/assets/illustrations/new-project.svg?raw';
 	import { ProjectService } from '$lib/backend/projects';
-	import AnalyticsConfirmation from '$lib/components/AnalyticsConfirmation.svelte';
 	import DecorativeSplitView from '$lib/components/DecorativeSplitView.svelte';
 	import FullviewLoading from '$lib/components/FullviewLoading.svelte';
 	import Welcome from '$lib/components/Welcome.svelte';
 	import { appAnalyticsConfirmed } from '$lib/config/appSettings';
+	import AnalyticsConfirmation from '$lib/settings/AnalyticsConfirmation.svelte';
 	import { getContext } from '$lib/utils/context';
 	import { derived } from 'svelte/store';
 	import { goto } from '$app/navigation';
diff --git a/app/src/routes/[projectId]/settings/+page.svelte b/app/src/routes/[projectId]/settings/+page.svelte
index d33e050f9..502c8b3bc 100644
--- a/app/src/routes/[projectId]/settings/+page.svelte
+++ b/app/src/routes/[projectId]/settings/+page.svelte
@@ -1,16 +1,16 @@
 <script lang="ts">
 	import { Project, ProjectService } from '$lib/backend/projects';
 	import BaseBranchSwitch from '$lib/components/BaseBranchSwitch.svelte';
-	import CloudForm from '$lib/components/CloudForm.svelte';
-	import DetailsForm from '$lib/components/DetailsForm.svelte';
-	import KeysForm from '$lib/components/KeysForm.svelte';
-	import PreferencesForm from '$lib/components/PreferencesForm.svelte';
 	import RemoveProjectButton from '$lib/components/RemoveProjectButton.svelte';
 	import SectionCard from '$lib/components/SectionCard.svelte';
 	import Spacer from '$lib/components/Spacer.svelte';
-	import ContentWrapper from '$lib/components/settings/ContentWrapper.svelte';
 	import { featureBaseBranchSwitching } from '$lib/config/uiFeatureFlags';
 	import { showError } from '$lib/notifications/toasts';
+	import CloudForm from '$lib/settings/CloudForm.svelte';
+	import ContentWrapper from '$lib/settings/ContentWrapper.svelte';
+	import DetailsForm from '$lib/settings/DetailsForm.svelte';
+	import KeysForm from '$lib/settings/KeysForm.svelte';
+	import PreferencesForm from '$lib/settings/PreferencesForm.svelte';
 	import { getContext } from '$lib/utils/context';
 	import * as toasts from '$lib/utils/toasts';
 	import { platform } from '@tauri-apps/api/os';
diff --git a/app/src/routes/settings/+layout.svelte b/app/src/routes/settings/+layout.svelte
index c0550b2fa..c4af53c7e 100644
--- a/app/src/routes/settings/+layout.svelte
+++ b/app/src/routes/settings/+layout.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-	import Sidebar from '$lib/components/settings/Sidebar.svelte';
+	import Sidebar from '$lib/settings/Sidebar.svelte';
 </script>
 
 <section class="profile-page">
diff --git a/app/src/routes/settings/ai/+page.svelte b/app/src/routes/settings/ai/+page.svelte
index 356cab07a..8863a5495 100644
--- a/app/src/routes/settings/ai/+page.svelte
+++ b/app/src/routes/settings/ai/+page.svelte
@@ -11,8 +11,8 @@
 	import Spacer from '$lib/components/Spacer.svelte';
 	import TextBox from '$lib/components/TextBox.svelte';
 	import WelcomeSigninAction from '$lib/components/WelcomeSigninAction.svelte';
-	import ContentWrapper from '$lib/components/settings/ContentWrapper.svelte';
-	import Section from '$lib/components/settings/Section.svelte';
+	import ContentWrapper from '$lib/settings/ContentWrapper.svelte';
+	import Section from '$lib/settings/Section.svelte';
 	import { UserService } from '$lib/stores/user';
 	import { getContext } from '$lib/utils/context';
 	import { onMount, tick } from 'svelte';
diff --git a/app/src/routes/settings/experimental/+page.svelte b/app/src/routes/settings/experimental/+page.svelte
index 0048b8f45..f3177cf04 100644
--- a/app/src/routes/settings/experimental/+page.svelte
+++ b/app/src/routes/settings/experimental/+page.svelte
@@ -1,8 +1,8 @@
 <script lang="ts">
 	import SectionCard from '$lib/components/SectionCard.svelte';
 	import Toggle from '$lib/components/Toggle.svelte';
-	import ContentWrapper from '$lib/components/settings/ContentWrapper.svelte';
 	import { featureBaseBranchSwitching } from '$lib/config/uiFeatureFlags';
+	import ContentWrapper from '$lib/settings/ContentWrapper.svelte';
 
 	const baseBranchSwitching = featureBaseBranchSwitching();
 </script>
diff --git a/app/src/routes/settings/git/+page.svelte b/app/src/routes/settings/git/+page.svelte
index ee6d8917f..afd96c26a 100644
--- a/app/src/routes/settings/git/+page.svelte
+++ b/app/src/routes/settings/git/+page.svelte
@@ -7,7 +7,7 @@
 	import Spacer from '$lib/components/Spacer.svelte';
 	import TextBox from '$lib/components/TextBox.svelte';
 	import Toggle from '$lib/components/Toggle.svelte';
-	import ContentWrapper from '$lib/components/settings/ContentWrapper.svelte';
+	import ContentWrapper from '$lib/settings/ContentWrapper.svelte';
 	import { copyToClipboard } from '$lib/utils/clipboard';
 	import { getContext } from '$lib/utils/context';
 	import { openExternalUrl } from '$lib/utils/url';
diff --git a/app/src/routes/settings/integrations/+page.svelte b/app/src/routes/settings/integrations/+page.svelte
index fba49bc49..2c60b5d44 100644
--- a/app/src/routes/settings/integrations/+page.svelte
+++ b/app/src/routes/settings/integrations/+page.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
-	import GithubIntegration from '$lib/components/GithubIntegration.svelte';
-	import ContentWrapper from '$lib/components/settings/ContentWrapper.svelte';
+	import ContentWrapper from '$lib/settings/ContentWrapper.svelte';
+	import GithubIntegration from '$lib/settings/GithubIntegration.svelte';
 	import { UserService } from '$lib/stores/user';
 	import { getContext } from '$lib/utils/context';
 
diff --git a/app/src/routes/settings/profile/+page.svelte b/app/src/routes/settings/profile/+page.svelte
index 2d2839460..5e7f8e9c8 100644
--- a/app/src/routes/settings/profile/+page.svelte
+++ b/app/src/routes/settings/profile/+page.svelte
@@ -7,10 +7,10 @@
 	import SectionCard from '$lib/components/SectionCard.svelte';
 	import Spacer from '$lib/components/Spacer.svelte';
 	import TextBox from '$lib/components/TextBox.svelte';
-	import ThemeSelector from '$lib/components/ThemeSelector.svelte';
 	import WelcomeSigninAction from '$lib/components/WelcomeSigninAction.svelte';
-	import ContentWrapper from '$lib/components/settings/ContentWrapper.svelte';
 	import { showError } from '$lib/notifications/toasts';
+	import ContentWrapper from '$lib/settings/ContentWrapper.svelte';
+	import ThemeSelector from '$lib/settings/ThemeSelector.svelte';
 	import {
 		SETTINGS,
 		type Settings,
diff --git a/app/src/routes/settings/telemetry/+page.svelte b/app/src/routes/settings/telemetry/+page.svelte
index 390c7509b..4a461ec4f 100644
--- a/app/src/routes/settings/telemetry/+page.svelte
+++ b/app/src/routes/settings/telemetry/+page.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
-	import AnalyticsSettings from '$lib/components/AnalyticsSettings.svelte';
-	import ContentWrapper from '$lib/components/settings/ContentWrapper.svelte';
+	import AnalyticsSettings from '$lib/settings/AnalyticsSettings.svelte';
+	import ContentWrapper from '$lib/settings/ContentWrapper.svelte';
 </script>
 
 <ContentWrapper title="Telemetry">