diff --git a/packages/kilo-vscode/webview-ui/agent-manager/AgentManagerApp.tsx b/packages/kilo-vscode/webview-ui/agent-manager/AgentManagerApp.tsx
index 04dfbe8c82..e4e9dfffbe 100644
--- a/packages/kilo-vscode/webview-ui/agent-manager/AgentManagerApp.tsx
+++ b/packages/kilo-vscode/webview-ui/agent-manager/AgentManagerApp.tsx
@@ -58,8 +58,8 @@ import { ConfigProvider } from "../src/context/config"
 import { SessionProvider, useSession } from "../src/context/session"
 import { WorktreeModeProvider } from "../src/context/worktree-mode"
 import { ChatView } from "../src/components/chat"
-import { ModelSelectorBase } from "../src/components/chat/ModelSelector"
-import { ModeSwitcherBase } from "../src/components/chat/ModeSwitcher"
+import { ModelSelectorBase } from "../src/components/shared/ModelSelector"
+import { ModeSwitcherBase } from "../src/components/shared/ModeSwitcher"
 import {
   MultiModelSelector,
   type ModelAllocations,
diff --git a/packages/kilo-vscode/webview-ui/agent-manager/MultiModelSelector.tsx b/packages/kilo-vscode/webview-ui/agent-manager/MultiModelSelector.tsx
index 7cb106322b..e497771b9f 100644
--- a/packages/kilo-vscode/webview-ui/agent-manager/MultiModelSelector.tsx
+++ b/packages/kilo-vscode/webview-ui/agent-manager/MultiModelSelector.tsx
@@ -3,7 +3,7 @@ import { Icon } from "@kilocode/kilo-ui/icon"
 import { useProvider } from "../src/context/provider"
 import type { EnrichedModel } from "../src/context/provider"
 import { useLanguage } from "../src/context/language"
-import { KILO_GATEWAY_ID, providerSortKey } from "../src/components/chat/model-selector-utils"
+import { KILO_GATEWAY_ID, providerSortKey } from "../src/components/shared/model-selector-utils"
 import {
   type ModelAllocations,
   MAX_MULTI_VERSIONS,
diff --git a/packages/kilo-vscode/webview-ui/src/App.tsx b/packages/kilo-vscode/webview-ui/src/App.tsx
index 2e5e8d5816..b05fc439dd 100644
--- a/packages/kilo-vscode/webview-ui/src/App.tsx
+++ b/packages/kilo-vscode/webview-ui/src/App.tsx
@@ -8,8 +8,8 @@ import { Code } from "@kilocode/kilo-ui/code"
 import { Diff } from "@kilocode/kilo-ui/diff"
 import { DataProvider } from "@kilocode/kilo-ui/context/data"
 import { Toast } from "@kilocode/kilo-ui/toast"
-import Settings from "./components/Settings"
-import ProfileView from "./components/ProfileView"
+import Settings from "./components/settings/Settings"
+import ProfileView from "./components/profile/ProfileView"
 import { VSCodeProvider, useVSCode } from "./context/vscode"
 import { ServerProvider, useServer } from "./context/server"
 import { ProviderProvider, useProvider } from "./context/provider"
diff --git a/packages/kilo-vscode/webview-ui/src/components/chat/MessageList.tsx b/packages/kilo-vscode/webview-ui/src/components/chat/MessageList.tsx
index 43e83e5af5..98ddfe8d5a 100644
--- a/packages/kilo-vscode/webview-ui/src/components/chat/MessageList.tsx
+++ b/packages/kilo-vscode/webview-ui/src/components/chat/MessageList.tsx
@@ -18,7 +18,7 @@ import { useLanguage } from "../../context/language"
 import { formatRelativeDate } from "../../utils/date"
 import { CloudImportDialog } from "./CloudImportDialog"
 import { VscodeSessionTurn } from "./VscodeSessionTurn"
-import { WorkingIndicator } from "./WorkingIndicator"
+import { WorkingIndicator } from "../shared/WorkingIndicator"
 
 const KiloLogo = (): JSX.Element => {
   const iconsBaseUri = (window as { ICONS_BASE_URI?: string }).ICONS_BASE_URI || ""
diff --git a/packages/kilo-vscode/webview-ui/src/components/chat/PromptInput.tsx b/packages/kilo-vscode/webview-ui/src/components/chat/PromptInput.tsx
index fbdca63bea..96a12d0556 100644
--- a/packages/kilo-vscode/webview-ui/src/components/chat/PromptInput.tsx
+++ b/packages/kilo-vscode/webview-ui/src/components/chat/PromptInput.tsx
@@ -11,9 +11,9 @@ import { useSession } from "../../context/session"
 import { useServer } from "../../context/server"
 import { useLanguage } from "../../context/language"
 import { useVSCode } from "../../context/vscode"
-import { ModelSelector } from "./ModelSelector"
-import { ModeSwitcher } from "./ModeSwitcher"
-import { ThinkingSelector } from "./ThinkingSelector"
+import { ModelSelector } from "../shared/ModelSelector"
+import { ModeSwitcher } from "../shared/ModeSwitcher"
+import { ThinkingSelector } from "../shared/ThinkingSelector"
 import { useFileMention } from "../../hooks/useFileMention"
 import { useImageAttachments } from "../../hooks/useImageAttachments"
 import { fileName, dirName, buildHighlightSegments } from "./prompt-input-utils"
diff --git a/packages/kilo-vscode/webview-ui/src/components/DeviceAuthCard.tsx b/packages/kilo-vscode/webview-ui/src/components/profile/DeviceAuthCard.tsx
similarity index 97%
rename from packages/kilo-vscode/webview-ui/src/components/DeviceAuthCard.tsx
rename to packages/kilo-vscode/webview-ui/src/components/profile/DeviceAuthCard.tsx
index 13b2a89a07..4befc8fc06 100644
--- a/packages/kilo-vscode/webview-ui/src/components/DeviceAuthCard.tsx
+++ b/packages/kilo-vscode/webview-ui/src/components/profile/DeviceAuthCard.tsx
@@ -3,10 +3,10 @@ import { Button } from "@kilocode/kilo-ui/button"
 import { Card } from "@kilocode/kilo-ui/card"
 import { Spinner } from "@kilocode/kilo-ui/spinner"
 import { showToast } from "@kilocode/kilo-ui/toast"
-import { useVSCode } from "../context/vscode"
-import { useLanguage } from "../context/language"
-import { generateQRCode } from "../utils/qrcode"
-import type { DeviceAuthStatus } from "../types/messages"
+import { useVSCode } from "../../context/vscode"
+import { useLanguage } from "../../context/language"
+import { generateQRCode } from "../../utils/qrcode"
+import type { DeviceAuthStatus } from "../../types/messages"
 
 interface DeviceAuthCardProps {
   status: DeviceAuthStatus
diff --git a/packages/kilo-vscode/webview-ui/src/components/ProfileView.tsx b/packages/kilo-vscode/webview-ui/src/components/profile/ProfileView.tsx
similarity index 98%
rename from packages/kilo-vscode/webview-ui/src/components/ProfileView.tsx
rename to packages/kilo-vscode/webview-ui/src/components/profile/ProfileView.tsx
index d9fca0682f..d3d156e5ea 100644
--- a/packages/kilo-vscode/webview-ui/src/components/ProfileView.tsx
+++ b/packages/kilo-vscode/webview-ui/src/components/profile/ProfileView.tsx
@@ -4,10 +4,10 @@ import { Card } from "@kilocode/kilo-ui/card"
 import { Icon } from "@kilocode/kilo-ui/icon"
 import { Select } from "@kilocode/kilo-ui/select"
 import { Tooltip } from "@kilocode/kilo-ui/tooltip"
-import { useVSCode } from "../context/vscode"
-import { useLanguage } from "../context/language"
+import { useVSCode } from "../../context/vscode"
+import { useLanguage } from "../../context/language"
 import DeviceAuthCard from "./DeviceAuthCard"
-import type { ProfileData, DeviceAuthState } from "../types/messages"
+import type { ProfileData, DeviceAuthState } from "../../types/messages"
 
 export type { ProfileData }
 
diff --git a/packages/kilo-vscode/webview-ui/src/components/settings/ProvidersTab.tsx b/packages/kilo-vscode/webview-ui/src/components/settings/ProvidersTab.tsx
index 5e91fb7b4c..69dbfc93a2 100644
--- a/packages/kilo-vscode/webview-ui/src/components/settings/ProvidersTab.tsx
+++ b/packages/kilo-vscode/webview-ui/src/components/settings/ProvidersTab.tsx
@@ -6,7 +6,7 @@ import { IconButton } from "@kilocode/kilo-ui/icon-button"
 import { useConfig } from "../../context/config"
 import { useProvider } from "../../context/provider"
 import { useLanguage } from "../../context/language"
-import { ModelSelectorBase } from "../chat/ModelSelector"
+import { ModelSelectorBase } from "../shared/ModelSelector"
 import type { ModelSelection } from "../../types/messages"
 import SettingsRow from "./SettingsRow"
 
diff --git a/packages/kilo-vscode/webview-ui/src/components/Settings.tsx b/packages/kilo-vscode/webview-ui/src/components/settings/Settings.tsx
similarity index 87%
rename from packages/kilo-vscode/webview-ui/src/components/Settings.tsx
rename to packages/kilo-vscode/webview-ui/src/components/settings/Settings.tsx
index e6c1e8f74f..b4d527f245 100644
--- a/packages/kilo-vscode/webview-ui/src/components/Settings.tsx
+++ b/packages/kilo-vscode/webview-ui/src/components/settings/Settings.tsx
@@ -3,22 +3,22 @@ import { Button } from "@kilocode/kilo-ui/button"
 import { Icon } from "@kilocode/kilo-ui/icon"
 import { Tabs } from "@kilocode/kilo-ui/tabs"
 import { Tooltip } from "@kilocode/kilo-ui/tooltip"
-import { useLanguage } from "../context/language"
-import ProvidersTab from "./settings/ProvidersTab"
-import AgentBehaviourTab from "./settings/AgentBehaviourTab"
-import AutoApproveTab from "./settings/AutoApproveTab"
-import BrowserTab from "./settings/BrowserTab"
-import CheckpointsTab from "./settings/CheckpointsTab"
-import DisplayTab from "./settings/DisplayTab"
-import AutocompleteTab from "./settings/AutocompleteTab"
-import NotificationsTab from "./settings/NotificationsTab"
-import ContextTab from "./settings/ContextTab"
-import TerminalTab from "./settings/TerminalTab"
-import PromptsTab from "./settings/PromptsTab"
-import ExperimentalTab from "./settings/ExperimentalTab"
-import LanguageTab from "./settings/LanguageTab"
-import AboutKiloCodeTab from "./settings/AboutKiloCodeTab"
-import { useServer } from "../context/server"
+import { useLanguage } from "../../context/language"
+import ProvidersTab from "./ProvidersTab"
+import AgentBehaviourTab from "./AgentBehaviourTab"
+import AutoApproveTab from "./AutoApproveTab"
+import BrowserTab from "./BrowserTab"
+import CheckpointsTab from "./CheckpointsTab"
+import DisplayTab from "./DisplayTab"
+import AutocompleteTab from "./AutocompleteTab"
+import NotificationsTab from "./NotificationsTab"
+import ContextTab from "./ContextTab"
+import TerminalTab from "./TerminalTab"
+import PromptsTab from "./PromptsTab"
+import ExperimentalTab from "./ExperimentalTab"
+import LanguageTab from "./LanguageTab"
+import AboutKiloCodeTab from "./AboutKiloCodeTab"
+import { useServer } from "../../context/server"
 
 export interface SettingsProps {
   onBack?: () => void
diff --git a/packages/kilo-vscode/webview-ui/src/components/settings/index.ts b/packages/kilo-vscode/webview-ui/src/components/settings/index.ts
index 4b6d7b5d3a..b77d680079 100644
--- a/packages/kilo-vscode/webview-ui/src/components/settings/index.ts
+++ b/packages/kilo-vscode/webview-ui/src/components/settings/index.ts
@@ -1,3 +1,4 @@
+export { default as Settings } from "./Settings"
 export { default as ProvidersTab } from "./ProvidersTab"
 export { default as AgentBehaviourTab } from "./AgentBehaviourTab"
 export { default as AutoApproveTab } from "./AutoApproveTab"
diff --git a/packages/kilo-vscode/webview-ui/src/components/chat/ModeSwitcher.tsx b/packages/kilo-vscode/webview-ui/src/components/shared/ModeSwitcher.tsx
similarity index 100%
rename from packages/kilo-vscode/webview-ui/src/components/chat/ModeSwitcher.tsx
rename to packages/kilo-vscode/webview-ui/src/components/shared/ModeSwitcher.tsx
diff --git a/packages/kilo-vscode/webview-ui/src/components/chat/ModelSelector.tsx b/packages/kilo-vscode/webview-ui/src/components/shared/ModelSelector.tsx
similarity index 100%
rename from packages/kilo-vscode/webview-ui/src/components/chat/ModelSelector.tsx
rename to packages/kilo-vscode/webview-ui/src/components/shared/ModelSelector.tsx
diff --git a/packages/kilo-vscode/webview-ui/src/components/chat/ThinkingSelector.tsx b/packages/kilo-vscode/webview-ui/src/components/shared/ThinkingSelector.tsx
similarity index 100%
rename from packages/kilo-vscode/webview-ui/src/components/chat/ThinkingSelector.tsx
rename to packages/kilo-vscode/webview-ui/src/components/shared/ThinkingSelector.tsx
diff --git a/packages/kilo-vscode/webview-ui/src/components/chat/WorkingIndicator.tsx b/packages/kilo-vscode/webview-ui/src/components/shared/WorkingIndicator.tsx
similarity index 100%
rename from packages/kilo-vscode/webview-ui/src/components/chat/WorkingIndicator.tsx
rename to packages/kilo-vscode/webview-ui/src/components/shared/WorkingIndicator.tsx
diff --git a/packages/kilo-vscode/webview-ui/src/components/chat/model-selector-utils.ts b/packages/kilo-vscode/webview-ui/src/components/shared/model-selector-utils.ts
similarity index 100%
rename from packages/kilo-vscode/webview-ui/src/components/chat/model-selector-utils.ts
rename to packages/kilo-vscode/webview-ui/src/components/shared/model-selector-utils.ts