diff --git a/src/vs/workbench/contrib/void/common/chatThreadService.ts b/src/vs/workbench/contrib/void/browser/chatThreadService.ts
similarity index 98%
rename from src/vs/workbench/contrib/void/common/chatThreadService.ts
rename to src/vs/workbench/contrib/void/browser/chatThreadService.ts
index 32afe5e8..e9bd708a 100644
--- a/src/vs/workbench/contrib/void/common/chatThreadService.ts
+++ b/src/vs/workbench/contrib/void/browser/chatThreadService.ts
@@ -11,12 +11,12 @@ import { IStorageService, StorageScope, StorageTarget } from '../../../../platfo
 import { URI } from '../../../../base/common/uri.js';
 import { Emitter, Event } from '../../../../base/common/event.js';
 import { IRange } from '../../../../editor/common/core/range.js';
-import { ILLMMessageService } from './llmMessageService.js';
-import { chat_userMessageContent, chat_systemMessage, chat_userMessageContentWithAllFilesToo, chat_selectionsString } from '../browser/prompt/prompts.js';
+import { ILLMMessageService } from '../common/llmMessageService.js';
+import { chat_userMessageContent, chat_systemMessage, chat_userMessageContentWithAllFilesToo, chat_selectionsString } from '../common/prompt/prompts.js';
 import { InternalToolInfo, IToolsService, ToolCallParams, ToolResultType, ToolName, toolNamesThatRequireApproval, voidTools } from './toolsService.js';
-import { toLLMChatMessage, ToolCallType } from './llmMessageTypes.js';
+import { toLLMChatMessage, ToolCallType } from '../common/llmMessageTypes.js';
 import { IWorkspaceContextService } from '../../../../platform/workspace/common/workspace.js';
-import { IVoidFileService } from './voidFileService.js';
+import { IVoidFileService } from '../common/voidFileService.js';
 import { generateUuid } from '../../../../base/common/uuid.js';
 import { getErrorMessage } from '../../../../base/common/errors.js';
 
diff --git a/src/vs/workbench/contrib/void/browser/editCodeService.ts b/src/vs/workbench/contrib/void/browser/editCodeService.ts
index f8b7dd07..5e1625fa 100644
--- a/src/vs/workbench/contrib/void/browser/editCodeService.ts
+++ b/src/vs/workbench/contrib/void/browser/editCodeService.ts
@@ -5,7 +5,7 @@
 
 import { Disposable } from '../../../../base/common/lifecycle.js';
 import { registerSingleton, InstantiationType } from '../../../../platform/instantiation/common/extensions.js';
-import { createDecorator, IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
 import { ICodeEditor, IOverlayWidget, IViewZone, OverlayWidgetPositionPreference } from '../../../../editor/browser/editorBrowser.js';
 
 // import { IUndoRedoService } from '../../../../platform/undoRedo/common/undoRedo.js';
@@ -25,23 +25,24 @@ import * as dom from '../../../../base/browser/dom.js';
 import { Widget } from '../../../../base/browser/ui/widget.js';
 import { URI } from '../../../../base/common/uri.js';
 import { IConsistentEditorItemService, IConsistentItemService } from './helperServices/consistentItemService.js';
-import { voidPrefixAndSuffix, ctrlKStream_userMessage, ctrlKStream_systemMessage, defaultQuickEditFimTags, rewriteCode_systemMessage, rewriteCode_userMessage, searchReplace_systemMessage, searchReplace_userMessage, } from './prompt/prompts.js';
+import { voidPrefixAndSuffix, ctrlKStream_userMessage, ctrlKStream_systemMessage, defaultQuickEditFimTags, rewriteCode_systemMessage, rewriteCode_userMessage, searchReplace_systemMessage, searchReplace_userMessage, } from '../common/prompt/prompts.js';
 
 import { mountCtrlK } from './react/out/quick-edit-tsx/index.js'
 import { QuickEditPropsType } from './quickEditActions.js';
 import { IModelContentChangedEvent } from '../../../../editor/common/textModelEvents.js';
 import { extractCodeFromFIM, extractCodeFromRegular, ExtractedSearchReplaceBlock, extractSearchReplaceBlocks } from './helpers/extractCodeFromResult.js';
-import { filenameToVscodeLanguage } from './helpers/detectLanguage.js';
+import { filenameToVscodeLanguage } from '../common/helpers/detectLanguage.js';
 import { INotificationService, Severity } from '../../../../platform/notification/common/notification.js';
 import { isMacintosh } from '../../../../base/common/platform.js';
 import { EditorOption } from '../../../../editor/common/config/editorOptions.js';
-import { Emitter, Event } from '../../../../base/common/event.js';
+import { Emitter } from '../../../../base/common/event.js';
 import { VOID_OPEN_SETTINGS_ACTION_ID } from './voidSettingsPane.js';
 import { ICommandService } from '../../../../platform/commands/common/commands.js';
 import { ILLMMessageService } from '../common/llmMessageService.js';
-import { LLMChatMessage, OnError, OnFinalMessage, OnText, errorDetails } from '../common/llmMessageTypes.js';
+import { LLMChatMessage, OnError, errorDetails } from '../common/llmMessageTypes.js';
 import { IMetricsService } from '../common/metricsService.js';
 import { IVoidFileService } from '../common/voidFileService.js';
+import { IEditCodeService, URIStreamState, AddCtrlKOpts, StartApplyingOpts } from './editCodeServiceInterface.js';
 
 const configOfBG = (color: Color) => {
 	return { dark: color, light: color, hcDark: color, hcLight: color, }
@@ -121,32 +122,8 @@ const findTextInCode = (text: string, fileContents: string, startingAtLine?: num
 }
 
 
-export type URIStreamState = 'idle' | 'acceptRejectAll' | 'streaming'
 
 
-export type StartApplyingOpts = {
-	from: 'QuickEdit';
-	type: 'rewrite';
-	diffareaid: number; // id of the CtrlK area (contains text selection)
-} | {
-	from: 'ClickApply';
-	type: 'searchReplace' | 'rewrite';
-	applyStr: string;
-	uri: 'current' | URI;
-
-	onText?: OnText;
-	onFinalMessage?: OnFinalMessage;
-	onError?: OnError;
-}
-
-
-
-export type AddCtrlKOpts = {
-	startLine: number,
-	endLine: number,
-	editor: ICodeEditor,
-}
-
 // // TODO diffArea should be removed if we just discovered it has no more diffs in it
 // for (const diffareaid of this.diffAreasOfURI[uri.fsPath] || []) {
 // 	const diffArea = this.diffAreaOfId[diffareaid]
@@ -252,28 +229,6 @@ type HistorySnapshot = {
 type StreamLocationMutable = { line: number, col: number, addedSplitYet: boolean, originalCodeStartLine: number }
 
 
-export interface IEditCodeService {
-	readonly _serviceBrand: undefined;
-	startApplying(opts: StartApplyingOpts): URI | null;
-
-	addCtrlKZone(opts: AddCtrlKOpts): number | undefined;
-	removeCtrlKZone(opts: { diffareaid: number }): void;
-	removeDiffAreas(opts: { uri: URI, removeCtrlKs: boolean, behavior: 'reject' | 'accept' }): void;
-
-	// CtrlKZone streaming state
-	isCtrlKZoneStreaming(opts: { diffareaid: number }): boolean;
-	interruptCtrlKStreaming(opts: { diffareaid: number }): void;
-	onDidChangeCtrlKZoneStreaming: Event<{ uri: URI; diffareaid: number }>;
-
-	// // DiffZone codeBoxId streaming state
-	getURIStreamState(opts: { uri: URI | null }): URIStreamState;
-	interruptURIStreaming(opts: { uri: URI }): void;
-	onDidChangeURIStreamState: Event<{ uri: URI; state: URIStreamState }>;
-
-	// testDiffs(): void;
-}
-
-export const IEditCodeService = createDecorator<IEditCodeService>('editCodeService');
 
 class EditCodeService extends Disposable implements IEditCodeService {
 	_serviceBrand: undefined;
diff --git a/src/vs/workbench/contrib/void/browser/editCodeServiceInterface.ts b/src/vs/workbench/contrib/void/browser/editCodeServiceInterface.ts
new file mode 100644
index 00000000..1d900ce7
--- /dev/null
+++ b/src/vs/workbench/contrib/void/browser/editCodeServiceInterface.ts
@@ -0,0 +1,62 @@
+/*--------------------------------------------------------------------------------------
+ *  Copyright 2025 Glass Devtools, Inc. All rights reserved.
+ *  Licensed under the Apache License, Version 2.0. See LICENSE.txt for more information.
+ *--------------------------------------------------------------------------------------*/
+
+import { Event } from '../../../../base/common/event.js';
+import { URI } from '../../../../base/common/uri.js';
+import { ICodeEditor } from '../../../../editor/browser/editorBrowser.js';
+import { createDecorator } from '../../../../platform/instantiation/common/instantiation.js';
+import { OnError, OnFinalMessage, OnText } from '../common/llmMessageTypes.js';
+
+
+
+
+export type StartApplyingOpts = {
+	from: 'QuickEdit';
+	type: 'rewrite';
+	diffareaid: number; // id of the CtrlK area (contains text selection)
+} | {
+	from: 'ClickApply';
+	type: 'searchReplace' | 'rewrite';
+	applyStr: string;
+	uri: 'current' | URI;
+
+	onText?: OnText;
+	onFinalMessage?: OnFinalMessage;
+	onError?: OnError;
+}
+
+
+
+export type AddCtrlKOpts = {
+	startLine: number,
+	endLine: number,
+	editor: ICodeEditor,
+}
+
+export type URIStreamState = 'idle' | 'acceptRejectAll' | 'streaming'
+
+
+export const IEditCodeService = createDecorator<IEditCodeService>('editCodeService');
+
+export interface IEditCodeService {
+	readonly _serviceBrand: undefined;
+	startApplying(opts: StartApplyingOpts): URI | null;
+
+	addCtrlKZone(opts: AddCtrlKOpts): number | undefined;
+	removeCtrlKZone(opts: { diffareaid: number }): void;
+	removeDiffAreas(opts: { uri: URI, removeCtrlKs: boolean, behavior: 'reject' | 'accept' }): void;
+
+	// CtrlKZone streaming state
+	isCtrlKZoneStreaming(opts: { diffareaid: number }): boolean;
+	interruptCtrlKStreaming(opts: { diffareaid: number }): void;
+	onDidChangeCtrlKZoneStreaming: Event<{ uri: URI; diffareaid: number }>;
+
+	// // DiffZone codeBoxId streaming state
+	getURIStreamState(opts: { uri: URI | null }): URIStreamState;
+	interruptURIStreaming(opts: { uri: URI }): void;
+	onDidChangeURIStreamState: Event<{ uri: URI; state: URIStreamState }>;
+
+	// testDiffs(): void;
+}
diff --git a/src/vs/workbench/contrib/void/browser/helpers/extractCodeFromResult.ts b/src/vs/workbench/contrib/void/browser/helpers/extractCodeFromResult.ts
index e24bc232..7b3eca15 100644
--- a/src/vs/workbench/contrib/void/browser/helpers/extractCodeFromResult.ts
+++ b/src/vs/workbench/contrib/void/browser/helpers/extractCodeFromResult.ts
@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------*/
 
 import { OnText } from '../../common/llmMessageTypes.js'
-import { DIVIDER, FINAL, ORIGINAL } from '../prompt/prompts.js'
+import { DIVIDER, FINAL, ORIGINAL } from '../../common/prompt/prompts.js'
 
 class SurroundingsRemover {
 	readonly originalS: string
diff --git a/src/vs/workbench/contrib/void/browser/quickEditActions.ts b/src/vs/workbench/contrib/void/browser/quickEditActions.ts
index da8f5c55..a420d8bb 100644
--- a/src/vs/workbench/contrib/void/browser/quickEditActions.ts
+++ b/src/vs/workbench/contrib/void/browser/quickEditActions.ts
@@ -8,7 +8,7 @@ import { Action2, registerAction2 } from '../../../../platform/actions/common/ac
 import { ServicesAccessor } from '../../../../platform/instantiation/common/instantiation.js';
 import { KeybindingWeight } from '../../../../platform/keybinding/common/keybindingsRegistry.js';
 import { ICodeEditorService } from '../../../../editor/browser/services/codeEditorService.js';
-import { IEditCodeService } from './editCodeService.js';
+import { IEditCodeService } from './editCodeServiceInterface.js';
 import { roundRangeToLines } from './sidebarActions.js';
 import { VOID_CTRL_K_ACTION_ID } from './actionIDs.js';
 import { localize2 } from '../../../../nls.js';
diff --git a/src/vs/workbench/contrib/void/browser/react/src/markdown/ApplyBlockHoverButtons.tsx b/src/vs/workbench/contrib/void/browser/react/src/markdown/ApplyBlockHoverButtons.tsx
index 8ce22b2f..ec6107ba 100644
--- a/src/vs/workbench/contrib/void/browser/react/src/markdown/ApplyBlockHoverButtons.tsx
+++ b/src/vs/workbench/contrib/void/browser/react/src/markdown/ApplyBlockHoverButtons.tsx
@@ -3,7 +3,6 @@ import { useAccessor, useURIStreamState, useSettingsState } from '../util/servic
 import { useRefState } from '../util/helpers.js'
 import { isFeatureNameDisabled } from '../../../../common/voidSettingsTypes.js'
 import { URI } from '../../../../../../../base/common/uri.js'
-import { IEditCodeService, URIStreamState } from '../../../editCodeService.js'
 
 enum CopyButtonText {
 	Idle = 'Copy',
diff --git a/src/vs/workbench/contrib/void/browser/react/src/markdown/ChatMarkdownRender.tsx b/src/vs/workbench/contrib/void/browser/react/src/markdown/ChatMarkdownRender.tsx
index c8571403..0d57ca81 100644
--- a/src/vs/workbench/contrib/void/browser/react/src/markdown/ChatMarkdownRender.tsx
+++ b/src/vs/workbench/contrib/void/browser/react/src/markdown/ChatMarkdownRender.tsx
@@ -6,7 +6,7 @@
 import React, { JSX } from 'react'
 import { marked, MarkedToken, Token } from 'marked'
 import { BlockCode } from './BlockCode.js'
-import { nameToVscodeLanguage } from '../../../helpers/detectLanguage.js'
+import { nameToVscodeLanguage } from '../../../../common/helpers/detectLanguage.js'
 import { ApplyBlockHoverButtons } from './ApplyBlockHoverButtons.js'
 
 export type ChatMessageLocation = {
diff --git a/src/vs/workbench/contrib/void/browser/react/src/sidebar-tsx/SidebarChat.tsx b/src/vs/workbench/contrib/void/browser/react/src/sidebar-tsx/SidebarChat.tsx
index e89ddbb0..8e890fc2 100644
--- a/src/vs/workbench/contrib/void/browser/react/src/sidebar-tsx/SidebarChat.tsx
+++ b/src/vs/workbench/contrib/void/browser/react/src/sidebar-tsx/SidebarChat.tsx
@@ -7,7 +7,7 @@ import React, { ButtonHTMLAttributes, FormEvent, FormHTMLAttributes, Fragment, K
 
 
 import { useAccessor, useSidebarState, useChatThreadsState, useChatThreadsStreamState, useUriState, useSettingsState } from '../util/services.js';
-import { ChatMessage, StagingSelectionItem, ToolMessage } from '../../../../common/chatThreadService.js';
+import { ChatMessage, StagingSelectionItem, ToolMessage } from '../../../chatThreadService.js';
 
 import { BlockCode } from '../markdown/BlockCode.js';
 import { ChatMarkdownRender, ChatMessageLocation } from '../markdown/ChatMarkdownRender.js';
@@ -19,13 +19,13 @@ import { ModelDropdown, } from '../void-settings-tsx/ModelDropdown.js';
 import { SidebarThreadSelector } from './SidebarThreadSelector.js';
 import { useScrollbarStyles } from '../util/useScrollbarStyles.js';
 import { VOID_CTRL_L_ACTION_ID } from '../../../actionIDs.js';
-import { filenameToVscodeLanguage } from '../../../helpers/detectLanguage.js';
+import { filenameToVscodeLanguage } from '../../../../common/helpers/detectLanguage.js';
 import { VOID_OPEN_SETTINGS_ACTION_ID } from '../../../voidSettingsPane.js';
 import { ChevronRight, Pencil, X } from 'lucide-react';
 import { FeatureName, isFeatureNameDisabled } from '../../../../../../../workbench/contrib/void/common/voidSettingsTypes.js';
 import { WarningBox } from '../void-settings-tsx/WarningBox.js';
 
-import { ToolResultType, ToolName } from '../../../../common/toolsService.js';
+import { ToolResultType, ToolName } from '../../../toolsService.js';
 
 
 
diff --git a/src/vs/workbench/contrib/void/browser/react/src/util/services.tsx b/src/vs/workbench/contrib/void/browser/react/src/util/services.tsx
index 9898ef52..33d0ae8b 100644
--- a/src/vs/workbench/contrib/void/browser/react/src/util/services.tsx
+++ b/src/vs/workbench/contrib/void/browser/react/src/util/services.tsx
@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------*/
 
 import React, { useState, useEffect, useCallback } from 'react'
-import { ThreadStreamState,IChatThreadService, ThreadsState } from '../../../../common/chatThreadService.js'
+import { ThreadStreamState,IChatThreadService, ThreadsState } from '../../../chatThreadService.js'
 import { RefreshableProviderName, SettingsOfProvider } from '../../../../../../../workbench/contrib/void/common/voidSettingsTypes.js'
 import { IDisposable } from '../../../../../../../base/common/lifecycle.js'
 import { VoidSidebarState } from '../../../sidebarStateService.js'
@@ -25,7 +25,8 @@ import { IThemeService } from '../../../../../../../platform/theme/common/themeS
 import { ILLMMessageService } from '../../../../../../../workbench/contrib/void/common/llmMessageService.js';
 import { IRefreshModelService } from '../../../../../../../workbench/contrib/void/common/refreshModelService.js';
 import { IVoidSettingsService } from '../../../../../../../workbench/contrib/void/common/voidSettingsService.js';
-import { IEditCodeService, URIStreamState } from '../../../editCodeService.js';
+import { IEditCodeService, URIStreamState } from '../../../editCodeServiceInterface.js'
+
 import { IVoidUriStateService } from '../../../voidUriStateService.js';
 import { IQuickEditStateService } from '../../../quickEditStateService.js';
 import { ISidebarStateService } from '../../../sidebarStateService.js';
@@ -171,7 +172,7 @@ export const _registerServices = (accessor: ServicesAccessor) => {
 	colorThemeState = themeService.getColorTheme().type
 	disposables.push(
 		themeService.onDidColorThemeChange(theme => {
-			colorThemeState = theme.type
+			colorThemeState = theme.theme.type
 			colorThemeStateListeners.forEach(l => l(colorThemeState))
 		})
 	)
diff --git a/src/vs/workbench/contrib/void/browser/react/src/void-settings-tsx/Settings.tsx b/src/vs/workbench/contrib/void/browser/react/src/void-settings-tsx/Settings.tsx
index 7f28467f..f886fdff 100644
--- a/src/vs/workbench/contrib/void/browser/react/src/void-settings-tsx/Settings.tsx
+++ b/src/vs/workbench/contrib/void/browser/react/src/void-settings-tsx/Settings.tsx
@@ -17,7 +17,7 @@ import { env } from '../../../../../../../base/common/process.js'
 import { ModelDropdown } from './ModelDropdown.js'
 import { ChatMarkdownRender } from '../markdown/ChatMarkdownRender.js'
 import { WarningBox } from './WarningBox.js'
-import { os } from '../../../helpers/systemInfo.js'
+import { os } from '../../../../common/helpers/systemInfo.js'
 
 const SubtleButton = ({ onClick, text, icon, disabled }: { onClick: () => void, text: string, icon: React.ReactNode, disabled: boolean }) => {
 
diff --git a/src/vs/workbench/contrib/void/browser/sidebarActions.ts b/src/vs/workbench/contrib/void/browser/sidebarActions.ts
index fff6dda4..23974f7e 100644
--- a/src/vs/workbench/contrib/void/browser/sidebarActions.ts
+++ b/src/vs/workbench/contrib/void/browser/sidebarActions.ts
@@ -11,7 +11,7 @@ import { ServicesAccessor } from '../../../../editor/browser/editorExtensions.js
 
 import { KeybindingWeight } from '../../../../platform/keybinding/common/keybindingsRegistry.js';
 import { ContextKeyExpr } from '../../../../platform/contextkey/common/contextkey.js';
-import { StagingSelectionItem, IChatThreadService } from '../common/chatThreadService.js';
+import { StagingSelectionItem, IChatThreadService } from './chatThreadService.js';
 
 import { ICodeEditorService } from '../../../../editor/browser/services/codeEditorService.js';
 import { IRange } from '../../../../editor/common/core/range.js';
diff --git a/src/vs/workbench/contrib/void/common/toolsService.ts b/src/vs/workbench/contrib/void/browser/toolsService.ts
similarity index 97%
rename from src/vs/workbench/contrib/void/common/toolsService.ts
rename to src/vs/workbench/contrib/void/browser/toolsService.ts
index 4e0d080a..64c9bf1d 100644
--- a/src/vs/workbench/contrib/void/common/toolsService.ts
+++ b/src/vs/workbench/contrib/void/browser/toolsService.ts
@@ -4,11 +4,11 @@ import { IFileService } from '../../../../platform/files/common/files.js'
 import { registerSingleton, InstantiationType } from '../../../../platform/instantiation/common/extensions.js'
 import { createDecorator, IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js'
 import { IWorkspaceContextService } from '../../../../platform/workspace/common/workspace.js'
-import { QueryBuilder } from '../../../../workbench/services/search/common/queryBuilder.js'
-import { ISearchService } from '../../../../workbench/services/search/common/search.js'
-import { IEditCodeService } from '../browser/editCodeService.js'
-import { editToolDesc_toolDescription } from '../browser/prompt/prompts.js'
-import { IVoidFileService } from './voidFileService.js'
+import { QueryBuilder } from '../../../services/search/common/queryBuilder.js'
+import { ISearchService } from '../../../services/search/common/search.js'
+import { IEditCodeService } from './editCodeServiceInterface.js'
+import { editToolDesc_toolDescription } from '../common/prompt/prompts.js'
+import { IVoidFileService } from '../common/voidFileService.js'
 
 
 // tool use for AI
diff --git a/src/vs/workbench/contrib/void/browser/void.contribution.ts b/src/vs/workbench/contrib/void/browser/void.contribution.ts
index f9f6a29b..d5e78754 100644
--- a/src/vs/workbench/contrib/void/browser/void.contribution.ts
+++ b/src/vs/workbench/contrib/void/browser/void.contribution.ts
@@ -53,8 +53,8 @@ import '../common/metricsService.js'
 import '../common/voidUpdateService.js'
 
 // tools
-import '../common/toolsService.js'
+import './toolsService.js'
 
 // register Thread History
-import '../common/chatThreadService.js'
+import './chatThreadService.js'
 
diff --git a/src/vs/workbench/contrib/void/browser/helpers/detectLanguage.ts b/src/vs/workbench/contrib/void/common/helpers/detectLanguage.ts
similarity index 100%
rename from src/vs/workbench/contrib/void/browser/helpers/detectLanguage.ts
rename to src/vs/workbench/contrib/void/common/helpers/detectLanguage.ts
diff --git a/src/vs/workbench/contrib/void/browser/helpers/systemInfo.ts b/src/vs/workbench/contrib/void/common/helpers/systemInfo.ts
similarity index 100%
rename from src/vs/workbench/contrib/void/browser/helpers/systemInfo.ts
rename to src/vs/workbench/contrib/void/common/helpers/systemInfo.ts
diff --git a/src/vs/workbench/contrib/void/common/llmMessageTypes.ts b/src/vs/workbench/contrib/void/common/llmMessageTypes.ts
index b38e7030..74c2d067 100644
--- a/src/vs/workbench/contrib/void/common/llmMessageTypes.ts
+++ b/src/vs/workbench/contrib/void/common/llmMessageTypes.ts
@@ -3,8 +3,8 @@
  *  Licensed under the Apache License, Version 2.0. See LICENSE.txt for more information.
  *--------------------------------------------------------------------------------------*/
 
-import { ChatMessage } from './chatThreadService.js'
-import { InternalToolInfo, ToolName } from './toolsService.js'
+import { ChatMessage } from '../browser/chatThreadService.js'
+import { InternalToolInfo, ToolName } from '../browser/toolsService.js'
 import { FeatureName, ProviderName, SettingsOfProvider } from './voidSettingsTypes.js'
 
 
diff --git a/src/vs/workbench/contrib/void/browser/prompt/prompts.ts b/src/vs/workbench/contrib/void/common/prompt/prompts.ts
similarity index 99%
rename from src/vs/workbench/contrib/void/browser/prompt/prompts.ts
rename to src/vs/workbench/contrib/void/common/prompt/prompts.ts
index 801abcb6..6be879c2 100644
--- a/src/vs/workbench/contrib/void/browser/prompt/prompts.ts
+++ b/src/vs/workbench/contrib/void/common/prompt/prompts.ts
@@ -6,10 +6,10 @@
 
 import { URI } from '../../../../../base/common/uri.js';
 import { filenameToVscodeLanguage } from '../helpers/detectLanguage.js';
-import { CodeSelection, StagingSelectionItem, FileSelection } from '../../common/chatThreadService.js';
+import { CodeSelection, StagingSelectionItem, FileSelection } from '../../browser/chatThreadService.js';
 import { IModelService } from '../../../../../editor/common/services/model.js';
 import { os } from '../helpers/systemInfo.js';
-import { IVoidFileService } from '../../common/voidFileService.js';
+import { IVoidFileService } from '../voidFileService.js';
 
 
 // this is just for ease of readability
diff --git a/src/vs/workbench/contrib/void/electron-main/llmMessage/MODELS.ts b/src/vs/workbench/contrib/void/electron-main/llmMessage/MODELS.ts
index ccad5462..e7945b71 100644
--- a/src/vs/workbench/contrib/void/electron-main/llmMessage/MODELS.ts
+++ b/src/vs/workbench/contrib/void/electron-main/llmMessage/MODELS.ts
@@ -10,7 +10,7 @@ import OpenAI, { ClientOptions } from 'openai';
 import { Model as OpenAIModel } from 'openai/resources/models.js';
 import { extractReasoningOnFinalMessage, extractReasoningOnTextWrapper } from '../../browser/helpers/extractCodeFromResult.js';
 import { LLMChatMessage, LLMFIMMessage, ModelListParams, OllamaModelResponse, OnError, OnFinalMessage, OnText } from '../../common/llmMessageTypes.js';
-import { InternalToolInfo, isAToolName, ToolName } from '../../common/toolsService.js';
+import { InternalToolInfo, isAToolName, ToolName } from '../../browser/toolsService.js';
 import { defaultProviderSettings, displayInfoOfProviderName, ProviderName, SettingsOfProvider } from '../../common/voidSettingsTypes.js';
 import { prepareFIMMessage, prepareMessages } from './preprocessLLMMessages.js';