diff --git a/src/vs/workbench/api/electron-browser/mainThreadLanguageFeatures.ts b/src/vs/workbench/api/electron-browser/mainThreadLanguageFeatures.ts
index 20854ecf66b..e71d6a37792 100644
--- a/src/vs/workbench/api/electron-browser/mainThreadLanguageFeatures.ts
+++ b/src/vs/workbench/api/electron-browser/mainThreadLanguageFeatures.ts
@@ -20,7 +20,7 @@ import { extHostNamedCustomer } from 'vs/workbench/api/electron-browser/extHostC
 import * as typeConverters from 'vs/workbench/api/node/extHostTypeConverters';
 import { URI } from 'vs/base/common/uri';
 import { Selection } from 'vs/editor/common/core/selection';
-import * as codeInset from 'vs/workbench/contrib/codeinset/codeInset';
+import * as codeInset from 'vs/workbench/contrib/codeinset/common/codeInset';
 
 @extHostNamedCustomer(MainContext.MainThreadLanguageFeatures)
 export class MainThreadLanguageFeatures implements MainThreadLanguageFeaturesShape {
diff --git a/src/vs/workbench/api/electron-browser/mainThreadWebview.ts b/src/vs/workbench/api/electron-browser/mainThreadWebview.ts
index 2c740a314d4..f51befaa700 100644
--- a/src/vs/workbench/api/electron-browser/mainThreadWebview.ts
+++ b/src/vs/workbench/api/electron-browser/mainThreadWebview.ts
@@ -24,7 +24,7 @@ import { ExtensionIdentifier } from 'vs/platform/extensions/common/extensions';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 import { WebviewElement } from 'vs/workbench/contrib/webview/electron-browser/webviewElement';
 import { ICodeEditorService } from 'vs/editor/browser/services/codeEditorService';
-import { CodeInsetController } from 'vs/workbench/contrib/codeinset/codeInset.contribution';
+import { CodeInsetController } from 'vs/workbench/contrib/codeinset/electron-browser/codeInset.contribution';
 import { IPartService, Parts } from 'vs/workbench/services/part/common/partService';
 
 @extHostNamedCustomer(MainContext.MainThreadWebviews)
diff --git a/src/vs/workbench/api/node/extHost.protocol.ts b/src/vs/workbench/api/node/extHost.protocol.ts
index 68596ed1466..d5c532ac567 100644
--- a/src/vs/workbench/api/node/extHost.protocol.ts
+++ b/src/vs/workbench/api/node/extHost.protocol.ts
@@ -45,7 +45,7 @@ import { IMarkdownString } from 'vs/base/common/htmlContent';
 import { ResolvedAuthority } from 'vs/platform/remote/common/remoteAuthorityResolver';
 import { ExtensionIdentifier } from 'vs/platform/extensions/common/extensions';
 import { IRemoteConsoleLog } from 'vs/base/node/console';
-import * as codeInset from 'vs/workbench/contrib/codeinset/codeInset';
+import * as codeInset from 'vs/workbench/contrib/codeinset/common/codeInset';
 
 export interface IEnvironment {
 	isExtensionDevelopmentDebug: boolean;
diff --git a/src/vs/workbench/api/node/extHostLanguageFeatures.ts b/src/vs/workbench/api/node/extHostLanguageFeatures.ts
index 5afbf25903d..46ae82a1459 100644
--- a/src/vs/workbench/api/node/extHostLanguageFeatures.ts
+++ b/src/vs/workbench/api/node/extHostLanguageFeatures.ts
@@ -27,7 +27,7 @@ import { ILogService } from 'vs/platform/log/common/log';
 import { CancellationToken } from 'vs/base/common/cancellation';
 import { ExtensionIdentifier } from 'vs/platform/extensions/common/extensions';
 import { ExtHostWebview } from 'vs/workbench/api/node/extHostWebview';
-import * as codeInset from 'vs/workbench/contrib/codeinset/codeInset';
+import * as codeInset from 'vs/workbench/contrib/codeinset/common/codeInset';
 import { generateUuid } from 'vs/base/common/uuid';
 
 // --- adapter
diff --git a/src/vs/workbench/contrib/codeinset/codeInset.ts b/src/vs/workbench/contrib/codeinset/common/codeInset.ts
similarity index 100%
rename from src/vs/workbench/contrib/codeinset/codeInset.ts
rename to src/vs/workbench/contrib/codeinset/common/codeInset.ts
diff --git a/src/vs/workbench/contrib/codeinset/codeInset.contribution.ts b/src/vs/workbench/contrib/codeinset/electron-browser/codeInset.contribution.ts
similarity index 99%
rename from src/vs/workbench/contrib/codeinset/codeInset.contribution.ts
rename to src/vs/workbench/contrib/codeinset/electron-browser/codeInset.contribution.ts
index 57e84679755..fdbae0581f0 100644
--- a/src/vs/workbench/contrib/codeinset/codeInset.contribution.ts
+++ b/src/vs/workbench/contrib/codeinset/electron-browser/codeInset.contribution.ts
@@ -10,7 +10,7 @@ import { StableEditorScrollState } from 'vs/editor/browser/core/editorState';
 import * as editorBrowser from 'vs/editor/browser/editorBrowser';
 import * as editorCommon from 'vs/editor/common/editorCommon';
 import { IModelDecorationsChangeAccessor } from 'vs/editor/common/model';
-import { CodeInsetProviderRegistry, getCodeInsetData, ICodeInsetData } from './codeInset';
+import { CodeInsetProviderRegistry, getCodeInsetData, ICodeInsetData } from '../common/codeInset';
 import { CodeInsetWidget, CodeInsetHelper } from './codeInsetWidget';
 import { registerEditorContribution } from 'vs/editor/browser/editorExtensions';
 import { Registry } from 'vs/platform/registry/common/platform';
diff --git a/src/vs/workbench/contrib/codeinset/codeInsetWidget.css b/src/vs/workbench/contrib/codeinset/electron-browser/codeInsetWidget.css
similarity index 100%
rename from src/vs/workbench/contrib/codeinset/codeInsetWidget.css
rename to src/vs/workbench/contrib/codeinset/electron-browser/codeInsetWidget.css
diff --git a/src/vs/workbench/contrib/codeinset/codeInsetWidget.ts b/src/vs/workbench/contrib/codeinset/electron-browser/codeInsetWidget.ts
similarity index 99%
rename from src/vs/workbench/contrib/codeinset/codeInsetWidget.ts
rename to src/vs/workbench/contrib/codeinset/electron-browser/codeInsetWidget.ts
index 12562860a9a..02f461b8e22 100644
--- a/src/vs/workbench/contrib/codeinset/codeInsetWidget.ts
+++ b/src/vs/workbench/contrib/codeinset/electron-browser/codeInsetWidget.ts
@@ -6,7 +6,7 @@
 import 'vs/css!./codeInsetWidget';
 import { Range } from 'vs/editor/common/core/range';
 import * as editorBrowser from 'vs/editor/browser/editorBrowser';
-import { ICodeInsetData } from './codeInset';
+import { ICodeInsetData } from '../common/codeInset';
 import { ModelDecorationOptions } from 'vs/editor/common/model/textModel';
 import { IModelDeltaDecoration, IModelDecorationsChangeAccessor, ITextModel } from 'vs/editor/common/model';
 import { WebviewElement } from 'vs/workbench/contrib/webview/electron-browser/webviewElement';
diff --git a/src/vs/workbench/workbench.main.ts b/src/vs/workbench/workbench.main.ts
index 50f88b96a4b..4b6909d8881 100644
--- a/src/vs/workbench/workbench.main.ts
+++ b/src/vs/workbench/workbench.main.ts
@@ -176,7 +176,7 @@ import 'vs/workbench/contrib/outline/browser/outline.contribution';
 import 'vs/workbench/contrib/experiments/electron-browser/experiments.contribution';
 
 // Code Insets
-import 'vs/workbench/contrib/codeinset/codeInset.contribution';
+import 'vs/workbench/contrib/codeinset/electron-browser/codeInset.contribution';
 
 // Issues
 import 'vs/workbench/contrib/issue/electron-browser/issue.contribution';