diff --git a/src/tsconfig.strictNullChecks.json b/src/tsconfig.strictNullChecks.json
index c4d5bc85314..9944394faa1 100644
--- a/src/tsconfig.strictNullChecks.json
+++ b/src/tsconfig.strictNullChecks.json
@@ -200,11 +200,11 @@
 		"./vs/workbench/contrib/feedback/electron-browser/feedback.contribution.ts",
 		"./vs/workbench/contrib/feedback/electron-browser/feedback.ts",
 		"./vs/workbench/contrib/feedback/electron-browser/feedbackStatusbarItem.ts",
-		"./vs/workbench/contrib/files/browser/files.ts",
 		"./vs/workbench/contrib/files/common/explorerModel.ts",
 		"./vs/workbench/contrib/files/common/files.ts",
-		"./vs/workbench/contrib/files/electron-browser/explorerService.ts",
-		"./vs/workbench/contrib/files/electron-browser/views/explorerDecorationsProvider.ts",
+		"./vs/workbench/contrib/files/common/explorerService.ts",
+		"./vs/workbench/contrib/files/browser/files.ts",
+		"./vs/workbench/contrib/files/browser/views/explorerDecorationsProvider.ts",
 		"./vs/workbench/contrib/format/browser/format.contribution.ts",
 		"./vs/workbench/contrib/localizations/electron-browser/localizations.contribution.ts",
 		"./vs/workbench/contrib/localizations/electron-browser/localizationsActions.ts",
diff --git a/src/vs/workbench/contrib/files/electron-browser/explorerViewlet.ts b/src/vs/workbench/contrib/files/browser/explorerViewlet.ts
similarity index 97%
rename from src/vs/workbench/contrib/files/electron-browser/explorerViewlet.ts
rename to src/vs/workbench/contrib/files/browser/explorerViewlet.ts
index 9d581341970..b8c1d34f383 100644
--- a/src/vs/workbench/contrib/files/electron-browser/explorerViewlet.ts
+++ b/src/vs/workbench/contrib/files/browser/explorerViewlet.ts
@@ -9,9 +9,9 @@ import * as DOM from 'vs/base/browser/dom';
 import { VIEWLET_ID, ExplorerViewletVisibleContext, IFilesConfiguration, OpenEditorsVisibleContext, OpenEditorsVisibleCondition, VIEW_CONTAINER } from 'vs/workbench/contrib/files/common/files';
 import { ViewContainerViewlet, IViewletViewOptions } from 'vs/workbench/browser/parts/views/viewsViewlet';
 import { IConfigurationService, IConfigurationChangeEvent } from 'vs/platform/configuration/common/configuration';
-import { ExplorerView } from 'vs/workbench/contrib/files/electron-browser/views/explorerView';
-import { EmptyView } from 'vs/workbench/contrib/files/electron-browser/views/emptyView';
-import { OpenEditorsView } from 'vs/workbench/contrib/files/electron-browser/views/openEditorsView';
+import { ExplorerView } from 'vs/workbench/contrib/files/browser/views/explorerView';
+import { EmptyView } from 'vs/workbench/contrib/files/browser/views/emptyView';
+import { OpenEditorsView } from 'vs/workbench/contrib/files/browser/views/openEditorsView';
 import { IStorageService } from 'vs/platform/storage/common/storage';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 import { IExtensionService } from 'vs/workbench/services/extensions/common/extensions';
diff --git a/src/vs/workbench/contrib/files/electron-browser/fileActions.contribution.ts b/src/vs/workbench/contrib/files/browser/fileActions.contribution.ts
similarity index 97%
rename from src/vs/workbench/contrib/files/electron-browser/fileActions.contribution.ts
rename to src/vs/workbench/contrib/files/browser/fileActions.contribution.ts
index 1d6e6e45001..d1bea6d2d45 100644
--- a/src/vs/workbench/contrib/files/electron-browser/fileActions.contribution.ts
+++ b/src/vs/workbench/contrib/files/browser/fileActions.contribution.ts
@@ -5,12 +5,12 @@
 
 import * as nls from 'vs/nls';
 import { Registry } from 'vs/platform/registry/common/platform';
-import { ToggleAutoSaveAction, GlobalNewUntitledFileAction, ShowOpenedFileInNewWindow, FocusFilesExplorer, GlobalCompareResourcesAction, SaveAllAction, ShowActiveFileInExplorer, CollapseExplorerView, RefreshExplorerView, CompareWithClipboardAction, NEW_FILE_COMMAND_ID, NEW_FILE_LABEL, NEW_FOLDER_COMMAND_ID, NEW_FOLDER_LABEL, TRIGGER_RENAME_LABEL, MOVE_FILE_TO_TRASH_LABEL, COPY_FILE_LABEL, PASTE_FILE_LABEL, FileCopiedContext, renameHandler, moveFileToTrashHandler, copyFileHandler, pasteFileHandler, deleteFileHandler, cutFileHandler } from 'vs/workbench/contrib/files/electron-browser/fileActions';
-import { revertLocalChangesCommand, acceptLocalChangesCommand, CONFLICT_RESOLUTION_CONTEXT } from 'vs/workbench/contrib/files/electron-browser/saveErrorHandler';
+import { ToggleAutoSaveAction, GlobalNewUntitledFileAction, ShowOpenedFileInNewWindow, FocusFilesExplorer, GlobalCompareResourcesAction, SaveAllAction, ShowActiveFileInExplorer, CollapseExplorerView, RefreshExplorerView, CompareWithClipboardAction, NEW_FILE_COMMAND_ID, NEW_FILE_LABEL, NEW_FOLDER_COMMAND_ID, NEW_FOLDER_LABEL, TRIGGER_RENAME_LABEL, MOVE_FILE_TO_TRASH_LABEL, COPY_FILE_LABEL, PASTE_FILE_LABEL, FileCopiedContext, renameHandler, moveFileToTrashHandler, copyFileHandler, pasteFileHandler, deleteFileHandler, cutFileHandler } from 'vs/workbench/contrib/files/browser/fileActions';
+import { revertLocalChangesCommand, acceptLocalChangesCommand, CONFLICT_RESOLUTION_CONTEXT } from 'vs/workbench/contrib/files/browser/saveErrorHandler';
 import { SyncActionDescriptor, MenuId, MenuRegistry, ILocalizedString } from 'vs/platform/actions/common/actions';
 import { IWorkbenchActionRegistry, Extensions as ActionExtensions } from 'vs/workbench/common/actions';
 import { KeyMod, KeyChord, KeyCode } from 'vs/base/common/keyCodes';
-import { openWindowCommand, REVEAL_IN_OS_COMMAND_ID, COPY_PATH_COMMAND_ID, REVEAL_IN_EXPLORER_COMMAND_ID, OPEN_TO_SIDE_COMMAND_ID, REVERT_FILE_COMMAND_ID, SAVE_FILE_COMMAND_ID, SAVE_FILE_LABEL, SAVE_FILE_AS_COMMAND_ID, SAVE_FILE_AS_LABEL, SAVE_ALL_IN_GROUP_COMMAND_ID, OpenEditorsGroupContext, COMPARE_WITH_SAVED_COMMAND_ID, COMPARE_RESOURCE_COMMAND_ID, SELECT_FOR_COMPARE_COMMAND_ID, ResourceSelectedForCompareContext, REVEAL_IN_OS_LABEL, DirtyEditorContext, COMPARE_SELECTED_COMMAND_ID, REMOVE_ROOT_FOLDER_COMMAND_ID, REMOVE_ROOT_FOLDER_LABEL, SAVE_FILES_COMMAND_ID, COPY_RELATIVE_PATH_COMMAND_ID, SAVE_FILE_WITHOUT_FORMATTING_COMMAND_ID, SAVE_FILE_WITHOUT_FORMATTING_LABEL } from 'vs/workbench/contrib/files/electron-browser/fileCommands';
+import { openWindowCommand, REVEAL_IN_OS_COMMAND_ID, COPY_PATH_COMMAND_ID, REVEAL_IN_EXPLORER_COMMAND_ID, OPEN_TO_SIDE_COMMAND_ID, REVERT_FILE_COMMAND_ID, SAVE_FILE_COMMAND_ID, SAVE_FILE_LABEL, SAVE_FILE_AS_COMMAND_ID, SAVE_FILE_AS_LABEL, SAVE_ALL_IN_GROUP_COMMAND_ID, OpenEditorsGroupContext, COMPARE_WITH_SAVED_COMMAND_ID, COMPARE_RESOURCE_COMMAND_ID, SELECT_FOR_COMPARE_COMMAND_ID, ResourceSelectedForCompareContext, REVEAL_IN_OS_LABEL, DirtyEditorContext, COMPARE_SELECTED_COMMAND_ID, REMOVE_ROOT_FOLDER_COMMAND_ID, REMOVE_ROOT_FOLDER_LABEL, SAVE_FILES_COMMAND_ID, COPY_RELATIVE_PATH_COMMAND_ID, SAVE_FILE_WITHOUT_FORMATTING_COMMAND_ID, SAVE_FILE_WITHOUT_FORMATTING_LABEL } from 'vs/workbench/contrib/files/browser/fileCommands';
 import { CommandsRegistry, ICommandHandler } from 'vs/platform/commands/common/commands';
 import { ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey';
 import { KeybindingsRegistry, KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry';
@@ -160,12 +160,12 @@ function appendEditorTitleContextMenuItem(id: string, title: string, when: Conte
 
 // Editor Title Menu for Conflict Resolution
 appendSaveConflictEditorTitleAction('workbench.files.action.acceptLocalChanges', nls.localize('acceptLocalChanges', "Use your changes and overwrite disk contents"), {
-	light: URI.parse(require.toUrl(`vs/workbench/contrib/files/electron-browser/media/check.svg`)),
-	dark: URI.parse(require.toUrl(`vs/workbench/contrib/files/electron-browser/media/check-inverse.svg`))
+	light: URI.parse(require.toUrl(`vs/workbench/contrib/files/browser/media/check.svg`)),
+	dark: URI.parse(require.toUrl(`vs/workbench/contrib/files/browser/media/check-inverse.svg`))
 }, -10, acceptLocalChangesCommand);
 appendSaveConflictEditorTitleAction('workbench.files.action.revertLocalChanges', nls.localize('revertLocalChanges', "Discard your changes and revert to content on disk"), {
-	light: URI.parse(require.toUrl(`vs/workbench/contrib/files/electron-browser/media/undo.svg`)),
-	dark: URI.parse(require.toUrl(`vs/workbench/contrib/files/electron-browser/media/undo-inverse.svg`))
+	light: URI.parse(require.toUrl(`vs/workbench/contrib/files/browser/media/undo.svg`)),
+	dark: URI.parse(require.toUrl(`vs/workbench/contrib/files/browser/media/undo-inverse.svg`))
 }, -9, revertLocalChangesCommand);
 
 function appendSaveConflictEditorTitleAction(id: string, title: string, iconLocation: { dark: URI; light?: URI; }, order: number, command: ICommandHandler): void {
diff --git a/src/vs/workbench/contrib/files/electron-browser/fileActions.ts b/src/vs/workbench/contrib/files/browser/fileActions.ts
similarity index 99%
rename from src/vs/workbench/contrib/files/electron-browser/fileActions.ts
rename to src/vs/workbench/contrib/files/browser/fileActions.ts
index 56aa8b7bda5..23f0d78a75b 100644
--- a/src/vs/workbench/contrib/files/electron-browser/fileActions.ts
+++ b/src/vs/workbench/contrib/files/browser/fileActions.ts
@@ -18,14 +18,14 @@ import { VIEWLET_ID, IExplorerService } from 'vs/workbench/contrib/files/common/
 import { ITextFileService } from 'vs/workbench/services/textfile/common/textfiles';
 import { IFileService, AutoSaveConfiguration } from 'vs/platform/files/common/files';
 import { toResource, IUntitledResourceInput, ITextEditor } from 'vs/workbench/common/editor';
-import { ExplorerViewlet } from 'vs/workbench/contrib/files/electron-browser/explorerViewlet';
+import { ExplorerViewlet } from 'vs/workbench/contrib/files/browser/explorerViewlet';
 import { IUntitledEditorService } from 'vs/workbench/services/untitled/common/untitledEditorService';
 import { IQuickOpenService } from 'vs/platform/quickOpen/common/quickOpen';
 import { IViewletService } from 'vs/workbench/services/viewlet/browser/viewlet';
 import { IInstantiationService, ServicesAccessor, IConstructorSignature1 } from 'vs/platform/instantiation/common/instantiation';
 import { ITextModel } from 'vs/editor/common/model';
 import { IWindowService } from 'vs/platform/windows/common/windows';
-import { REVEAL_IN_EXPLORER_COMMAND_ID, SAVE_ALL_COMMAND_ID, SAVE_ALL_LABEL, SAVE_ALL_IN_GROUP_COMMAND_ID } from 'vs/workbench/contrib/files/electron-browser/fileCommands';
+import { REVEAL_IN_EXPLORER_COMMAND_ID, SAVE_ALL_COMMAND_ID, SAVE_ALL_LABEL, SAVE_ALL_IN_GROUP_COMMAND_ID } from 'vs/workbench/contrib/files/browser/fileCommands';
 import { ITextModelService, ITextModelContentProvider } from 'vs/editor/common/services/resolverService';
 import { IConfigurationService, ConfigurationTarget } from 'vs/platform/configuration/common/configuration';
 import { IClipboardService } from 'vs/platform/clipboard/common/clipboardService';
diff --git a/src/vs/workbench/contrib/files/electron-browser/fileCommands.ts b/src/vs/workbench/contrib/files/browser/fileCommands.ts
similarity index 99%
rename from src/vs/workbench/contrib/files/electron-browser/fileCommands.ts
rename to src/vs/workbench/contrib/files/browser/fileCommands.ts
index 9a9e757e255..136bbc9d387 100644
--- a/src/vs/workbench/contrib/files/electron-browser/fileCommands.ts
+++ b/src/vs/workbench/contrib/files/browser/fileCommands.ts
@@ -11,7 +11,7 @@ import { ServicesAccessor, IInstantiationService } from 'vs/platform/instantiati
 import { IViewletService } from 'vs/workbench/services/viewlet/browser/viewlet';
 import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
 import { ExplorerFocusCondition, FileOnDiskContentProvider, VIEWLET_ID, IExplorerService } from 'vs/workbench/contrib/files/common/files';
-import { ExplorerViewlet } from 'vs/workbench/contrib/files/electron-browser/explorerViewlet';
+import { ExplorerViewlet } from 'vs/workbench/contrib/files/browser/explorerViewlet';
 import { IClipboardService } from 'vs/platform/clipboard/common/clipboardService';
 import { ITextFileService, ISaveOptions } from 'vs/workbench/services/textfile/common/textfiles';
 import { toErrorMessage } from 'vs/base/common/errorMessage';
diff --git a/src/vs/workbench/contrib/files/electron-browser/files.contribution.ts b/src/vs/workbench/contrib/files/browser/files.contribution.ts
similarity index 98%
rename from src/vs/workbench/contrib/files/electron-browser/files.contribution.ts
rename to src/vs/workbench/contrib/files/browser/files.contribution.ts
index 222927311e1..4c80e7a9f08 100644
--- a/src/vs/workbench/contrib/files/electron-browser/files.contribution.ts
+++ b/src/vs/workbench/contrib/files/browser/files.contribution.ts
@@ -16,7 +16,7 @@ import { IEditorInputFactory, EditorInput, IFileEditorInput, IEditorInputFactory
 import { AutoSaveConfiguration, HotExitConfiguration, SUPPORTED_ENCODINGS } from 'vs/platform/files/common/files';
 import { VIEWLET_ID, SortOrderConfiguration, FILE_EDITOR_INPUT_ID, IExplorerService } from 'vs/workbench/contrib/files/common/files';
 import { FileEditorTracker } from 'vs/workbench/contrib/files/browser/editors/fileEditorTracker';
-import { SaveErrorHandler } from 'vs/workbench/contrib/files/electron-browser/saveErrorHandler';
+import { SaveErrorHandler } from 'vs/workbench/contrib/files/browser/saveErrorHandler';
 import { FileEditorInput } from 'vs/workbench/contrib/files/common/editors/fileEditorInput';
 import { TextFileEditor } from 'vs/workbench/contrib/files/browser/editors/textFileEditor';
 import { BinaryFileEditor } from 'vs/workbench/contrib/files/browser/editors/binaryFileEditor';
@@ -27,7 +27,7 @@ import { IViewletService } from 'vs/workbench/services/viewlet/browser/viewlet';
 import { KeyMod, KeyCode } from 'vs/base/common/keyCodes';
 import * as platform from 'vs/base/common/platform';
 import { DirtyFilesTracker } from 'vs/workbench/contrib/files/common/dirtyFilesTracker';
-import { ExplorerViewlet, ExplorerViewletViewsContribution } from 'vs/workbench/contrib/files/electron-browser/explorerViewlet';
+import { ExplorerViewlet, ExplorerViewletViewsContribution } from 'vs/workbench/contrib/files/browser/explorerViewlet';
 import { IEditorRegistry, EditorDescriptor, Extensions as EditorExtensions } from 'vs/workbench/browser/editor';
 import { DataUriEditorInput } from 'vs/workbench/common/editor/dataUriEditorInput';
 import { LifecyclePhase } from 'vs/platform/lifecycle/common/lifecycle';
@@ -36,7 +36,7 @@ import { IEditorGroupsService } from 'vs/workbench/services/editor/common/editor
 import { ILabelService } from 'vs/platform/label/common/label';
 import { IPartService } from 'vs/workbench/services/part/common/partService';
 import { registerSingleton } from 'vs/platform/instantiation/common/extensions';
-import { ExplorerService } from 'vs/workbench/contrib/files/electron-browser/explorerService';
+import { ExplorerService } from 'vs/workbench/contrib/files/common/explorerService';
 
 // Viewlet Action
 export class OpenExplorerViewletAction extends ShowViewletAction {
diff --git a/src/vs/workbench/contrib/files/electron-browser/media/AddFile.svg b/src/vs/workbench/contrib/files/browser/media/AddFile.svg
similarity index 100%
rename from src/vs/workbench/contrib/files/electron-browser/media/AddFile.svg
rename to src/vs/workbench/contrib/files/browser/media/AddFile.svg
diff --git a/src/vs/workbench/contrib/files/electron-browser/media/AddFile_inverse.svg b/src/vs/workbench/contrib/files/browser/media/AddFile_inverse.svg
similarity index 100%
rename from src/vs/workbench/contrib/files/electron-browser/media/AddFile_inverse.svg
rename to src/vs/workbench/contrib/files/browser/media/AddFile_inverse.svg
diff --git a/src/vs/workbench/contrib/files/electron-browser/media/AddFolder.svg b/src/vs/workbench/contrib/files/browser/media/AddFolder.svg
similarity index 100%
rename from src/vs/workbench/contrib/files/electron-browser/media/AddFolder.svg
rename to src/vs/workbench/contrib/files/browser/media/AddFolder.svg
diff --git a/src/vs/workbench/contrib/files/electron-browser/media/AddFolder_inverse.svg b/src/vs/workbench/contrib/files/browser/media/AddFolder_inverse.svg
similarity index 100%
rename from src/vs/workbench/contrib/files/electron-browser/media/AddFolder_inverse.svg
rename to src/vs/workbench/contrib/files/browser/media/AddFolder_inverse.svg
diff --git a/src/vs/workbench/contrib/files/electron-browser/media/CollapseAll.svg b/src/vs/workbench/contrib/files/browser/media/CollapseAll.svg
similarity index 100%
rename from src/vs/workbench/contrib/files/electron-browser/media/CollapseAll.svg
rename to src/vs/workbench/contrib/files/browser/media/CollapseAll.svg
diff --git a/src/vs/workbench/contrib/files/electron-browser/media/CollapseAll_inverse.svg b/src/vs/workbench/contrib/files/browser/media/CollapseAll_inverse.svg
similarity index 100%
rename from src/vs/workbench/contrib/files/electron-browser/media/CollapseAll_inverse.svg
rename to src/vs/workbench/contrib/files/browser/media/CollapseAll_inverse.svg
diff --git a/src/vs/workbench/contrib/files/electron-browser/media/Preview.svg b/src/vs/workbench/contrib/files/browser/media/Preview.svg
similarity index 100%
rename from src/vs/workbench/contrib/files/electron-browser/media/Preview.svg
rename to src/vs/workbench/contrib/files/browser/media/Preview.svg
diff --git a/src/vs/workbench/contrib/files/electron-browser/media/Preview_inverse.svg b/src/vs/workbench/contrib/files/browser/media/Preview_inverse.svg
similarity index 100%
rename from src/vs/workbench/contrib/files/electron-browser/media/Preview_inverse.svg
rename to src/vs/workbench/contrib/files/browser/media/Preview_inverse.svg
diff --git a/src/vs/workbench/contrib/files/electron-browser/media/Refresh.svg b/src/vs/workbench/contrib/files/browser/media/Refresh.svg
similarity index 100%
rename from src/vs/workbench/contrib/files/electron-browser/media/Refresh.svg
rename to src/vs/workbench/contrib/files/browser/media/Refresh.svg
diff --git a/src/vs/workbench/contrib/files/electron-browser/media/Refresh_inverse.svg b/src/vs/workbench/contrib/files/browser/media/Refresh_inverse.svg
similarity index 100%
rename from src/vs/workbench/contrib/files/electron-browser/media/Refresh_inverse.svg
rename to src/vs/workbench/contrib/files/browser/media/Refresh_inverse.svg
diff --git a/src/vs/workbench/contrib/files/electron-browser/media/action-close-dark.svg b/src/vs/workbench/contrib/files/browser/media/action-close-dark.svg
similarity index 100%
rename from src/vs/workbench/contrib/files/electron-browser/media/action-close-dark.svg
rename to src/vs/workbench/contrib/files/browser/media/action-close-dark.svg
diff --git a/src/vs/workbench/contrib/files/electron-browser/media/action-close-dirty-dark.svg b/src/vs/workbench/contrib/files/browser/media/action-close-dirty-dark.svg
similarity index 100%
rename from src/vs/workbench/contrib/files/electron-browser/media/action-close-dirty-dark.svg
rename to src/vs/workbench/contrib/files/browser/media/action-close-dirty-dark.svg
diff --git a/src/vs/workbench/contrib/files/electron-browser/media/action-close-dirty-focus.svg b/src/vs/workbench/contrib/files/browser/media/action-close-dirty-focus.svg
similarity index 100%
rename from src/vs/workbench/contrib/files/electron-browser/media/action-close-dirty-focus.svg
rename to src/vs/workbench/contrib/files/browser/media/action-close-dirty-focus.svg
diff --git a/src/vs/workbench/contrib/files/electron-browser/media/action-close-dirty.svg b/src/vs/workbench/contrib/files/browser/media/action-close-dirty.svg
similarity index 100%
rename from src/vs/workbench/contrib/files/electron-browser/media/action-close-dirty.svg
rename to src/vs/workbench/contrib/files/browser/media/action-close-dirty.svg
diff --git a/src/vs/workbench/contrib/files/electron-browser/media/action-close-focus.svg b/src/vs/workbench/contrib/files/browser/media/action-close-focus.svg
similarity index 100%
rename from src/vs/workbench/contrib/files/electron-browser/media/action-close-focus.svg
rename to src/vs/workbench/contrib/files/browser/media/action-close-focus.svg
diff --git a/src/vs/workbench/contrib/files/electron-browser/media/action-close.svg b/src/vs/workbench/contrib/files/browser/media/action-close.svg
similarity index 100%
rename from src/vs/workbench/contrib/files/electron-browser/media/action-close.svg
rename to src/vs/workbench/contrib/files/browser/media/action-close.svg
diff --git a/src/vs/workbench/contrib/files/electron-browser/media/check-inverse.svg b/src/vs/workbench/contrib/files/browser/media/check-inverse.svg
similarity index 100%
rename from src/vs/workbench/contrib/files/electron-browser/media/check-inverse.svg
rename to src/vs/workbench/contrib/files/browser/media/check-inverse.svg
diff --git a/src/vs/workbench/contrib/files/electron-browser/media/check.svg b/src/vs/workbench/contrib/files/browser/media/check.svg
similarity index 100%
rename from src/vs/workbench/contrib/files/electron-browser/media/check.svg
rename to src/vs/workbench/contrib/files/browser/media/check.svg
diff --git a/src/vs/workbench/contrib/files/electron-browser/media/closeall.svg b/src/vs/workbench/contrib/files/browser/media/closeall.svg
similarity index 100%
rename from src/vs/workbench/contrib/files/electron-browser/media/closeall.svg
rename to src/vs/workbench/contrib/files/browser/media/closeall.svg
diff --git a/src/vs/workbench/contrib/files/electron-browser/media/closeall_inverse.svg b/src/vs/workbench/contrib/files/browser/media/closeall_inverse.svg
similarity index 100%
rename from src/vs/workbench/contrib/files/electron-browser/media/closeall_inverse.svg
rename to src/vs/workbench/contrib/files/browser/media/closeall_inverse.svg
diff --git a/src/vs/workbench/contrib/files/electron-browser/media/explorerviewlet.css b/src/vs/workbench/contrib/files/browser/media/explorerviewlet.css
similarity index 100%
rename from src/vs/workbench/contrib/files/electron-browser/media/explorerviewlet.css
rename to src/vs/workbench/contrib/files/browser/media/explorerviewlet.css
diff --git a/src/vs/workbench/contrib/files/electron-browser/media/fileactions.css b/src/vs/workbench/contrib/files/browser/media/fileactions.css
similarity index 100%
rename from src/vs/workbench/contrib/files/electron-browser/media/fileactions.css
rename to src/vs/workbench/contrib/files/browser/media/fileactions.css
diff --git a/src/vs/workbench/contrib/files/electron-browser/media/files-dark.svg b/src/vs/workbench/contrib/files/browser/media/files-dark.svg
similarity index 100%
rename from src/vs/workbench/contrib/files/electron-browser/media/files-dark.svg
rename to src/vs/workbench/contrib/files/browser/media/files-dark.svg
diff --git a/src/vs/workbench/contrib/files/electron-browser/media/saveall.svg b/src/vs/workbench/contrib/files/browser/media/saveall.svg
similarity index 100%
rename from src/vs/workbench/contrib/files/electron-browser/media/saveall.svg
rename to src/vs/workbench/contrib/files/browser/media/saveall.svg
diff --git a/src/vs/workbench/contrib/files/electron-browser/media/saveall_inverse.svg b/src/vs/workbench/contrib/files/browser/media/saveall_inverse.svg
similarity index 100%
rename from src/vs/workbench/contrib/files/electron-browser/media/saveall_inverse.svg
rename to src/vs/workbench/contrib/files/browser/media/saveall_inverse.svg
diff --git a/src/vs/workbench/contrib/files/electron-browser/media/split-editor-horizontal-inverse.svg b/src/vs/workbench/contrib/files/browser/media/split-editor-horizontal-inverse.svg
similarity index 100%
rename from src/vs/workbench/contrib/files/electron-browser/media/split-editor-horizontal-inverse.svg
rename to src/vs/workbench/contrib/files/browser/media/split-editor-horizontal-inverse.svg
diff --git a/src/vs/workbench/contrib/files/electron-browser/media/split-editor-horizontal.svg b/src/vs/workbench/contrib/files/browser/media/split-editor-horizontal.svg
similarity index 100%
rename from src/vs/workbench/contrib/files/electron-browser/media/split-editor-horizontal.svg
rename to src/vs/workbench/contrib/files/browser/media/split-editor-horizontal.svg
diff --git a/src/vs/workbench/contrib/files/electron-browser/media/split-editor-vertical-inverse.svg b/src/vs/workbench/contrib/files/browser/media/split-editor-vertical-inverse.svg
similarity index 100%
rename from src/vs/workbench/contrib/files/electron-browser/media/split-editor-vertical-inverse.svg
rename to src/vs/workbench/contrib/files/browser/media/split-editor-vertical-inverse.svg
diff --git a/src/vs/workbench/contrib/files/electron-browser/media/split-editor-vertical.svg b/src/vs/workbench/contrib/files/browser/media/split-editor-vertical.svg
similarity index 100%
rename from src/vs/workbench/contrib/files/electron-browser/media/split-editor-vertical.svg
rename to src/vs/workbench/contrib/files/browser/media/split-editor-vertical.svg
diff --git a/src/vs/workbench/contrib/files/electron-browser/media/undo-inverse.svg b/src/vs/workbench/contrib/files/browser/media/undo-inverse.svg
similarity index 100%
rename from src/vs/workbench/contrib/files/electron-browser/media/undo-inverse.svg
rename to src/vs/workbench/contrib/files/browser/media/undo-inverse.svg
diff --git a/src/vs/workbench/contrib/files/electron-browser/media/undo.svg b/src/vs/workbench/contrib/files/browser/media/undo.svg
similarity index 100%
rename from src/vs/workbench/contrib/files/electron-browser/media/undo.svg
rename to src/vs/workbench/contrib/files/browser/media/undo.svg
diff --git a/src/vs/workbench/contrib/files/electron-browser/saveErrorHandler.ts b/src/vs/workbench/contrib/files/browser/saveErrorHandler.ts
similarity index 99%
rename from src/vs/workbench/contrib/files/electron-browser/saveErrorHandler.ts
rename to src/vs/workbench/contrib/files/browser/saveErrorHandler.ts
index 0232222e3ba..76ea4afea5f 100644
--- a/src/vs/workbench/contrib/files/electron-browser/saveErrorHandler.ts
+++ b/src/vs/workbench/contrib/files/browser/saveErrorHandler.ts
@@ -22,7 +22,7 @@ import { IContextKeyService, IContextKey, RawContextKey } from 'vs/platform/cont
 import { FileOnDiskContentProvider } from 'vs/workbench/contrib/files/common/files';
 import { FileEditorInput } from 'vs/workbench/contrib/files/common/editors/fileEditorInput';
 import { IModelService } from 'vs/editor/common/services/modelService';
-import { SAVE_FILE_COMMAND_ID, REVERT_FILE_COMMAND_ID, SAVE_FILE_AS_COMMAND_ID, SAVE_FILE_AS_LABEL } from 'vs/workbench/contrib/files/electron-browser/fileCommands';
+import { SAVE_FILE_COMMAND_ID, REVERT_FILE_COMMAND_ID, SAVE_FILE_AS_COMMAND_ID, SAVE_FILE_AS_LABEL } from 'vs/workbench/contrib/files/browser/fileCommands';
 import { createTextBufferFactoryFromSnapshot } from 'vs/editor/common/model/textModel';
 import { INotificationService, INotificationHandle, INotificationActions, Severity } from 'vs/platform/notification/common/notification';
 import { IOpenerService } from 'vs/platform/opener/common/opener';
diff --git a/src/vs/workbench/contrib/files/electron-browser/views/emptyView.ts b/src/vs/workbench/contrib/files/browser/views/emptyView.ts
similarity index 100%
rename from src/vs/workbench/contrib/files/electron-browser/views/emptyView.ts
rename to src/vs/workbench/contrib/files/browser/views/emptyView.ts
diff --git a/src/vs/workbench/contrib/files/electron-browser/views/explorerDecorationsProvider.ts b/src/vs/workbench/contrib/files/browser/views/explorerDecorationsProvider.ts
similarity index 95%
rename from src/vs/workbench/contrib/files/electron-browser/views/explorerDecorationsProvider.ts
rename to src/vs/workbench/contrib/files/browser/views/explorerDecorationsProvider.ts
index f6c4e49f923..32d71575398 100644
--- a/src/vs/workbench/contrib/files/electron-browser/views/explorerDecorationsProvider.ts
+++ b/src/vs/workbench/contrib/files/browser/views/explorerDecorationsProvider.ts
@@ -9,8 +9,7 @@ import { localize } from 'vs/nls';
 import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
 import { IDecorationsProvider, IDecorationData } from 'vs/workbench/services/decorations/browser/decorations';
 import { listInvalidItemForeground } from 'vs/platform/theme/common/colorRegistry';
-import { IDisposable } from 'vscode-xterm';
-import { dispose } from 'vs/base/common/lifecycle';
+import { dispose, IDisposable } from 'vs/base/common/lifecycle';
 import { IExplorerService } from 'vs/workbench/contrib/files/common/files';
 
 export class ExplorerDecorationsProvider implements IDecorationsProvider {
diff --git a/src/vs/workbench/contrib/files/electron-browser/views/explorerView.ts b/src/vs/workbench/contrib/files/browser/views/explorerView.ts
similarity index 99%
rename from src/vs/workbench/contrib/files/electron-browser/views/explorerView.ts
rename to src/vs/workbench/contrib/files/browser/views/explorerView.ts
index c1ef97915b9..da3ce613e05 100644
--- a/src/vs/workbench/contrib/files/electron-browser/views/explorerView.ts
+++ b/src/vs/workbench/contrib/files/browser/views/explorerView.ts
@@ -10,13 +10,13 @@ import { sequence } from 'vs/base/common/async';
 import { Action, IAction } from 'vs/base/common/actions';
 import { memoize } from 'vs/base/common/decorators';
 import { IFilesConfiguration, ExplorerFolderContext, FilesExplorerFocusedContext, ExplorerFocusedContext, ExplorerRootContext, ExplorerResourceReadonlyContext, IExplorerService, ExplorerResourceCut } from 'vs/workbench/contrib/files/common/files';
-import { NewFolderAction, NewFileAction, FileCopiedContext, RefreshExplorerView } from 'vs/workbench/contrib/files/electron-browser/fileActions';
+import { NewFolderAction, NewFileAction, FileCopiedContext, RefreshExplorerView } from 'vs/workbench/contrib/files/browser/fileActions';
 import { toResource } from 'vs/workbench/common/editor';
 import { DiffEditorInput } from 'vs/workbench/common/editor/diffEditorInput';
 import * as DOM from 'vs/base/browser/dom';
 import { CollapseAction2 } from 'vs/workbench/browser/viewlet';
 import { IPartService } from 'vs/workbench/services/part/common/partService';
-import { ExplorerDecorationsProvider } from 'vs/workbench/contrib/files/electron-browser/views/explorerDecorationsProvider';
+import { ExplorerDecorationsProvider } from 'vs/workbench/contrib/files/browser/views/explorerDecorationsProvider';
 import { IWorkspaceContextService, WorkbenchState } from 'vs/platform/workspace/common/workspace';
 import { IConfigurationService, IConfigurationChangeEvent } from 'vs/platform/configuration/common/configuration';
 import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
@@ -31,7 +31,7 @@ import { DelayedDragHandler } from 'vs/base/browser/dnd';
 import { IEditorService, SIDE_GROUP, ACTIVE_GROUP } from 'vs/workbench/services/editor/common/editorService';
 import { IViewletPanelOptions, ViewletPanel } from 'vs/workbench/browser/parts/views/panelViewlet';
 import { ILabelService } from 'vs/platform/label/common/label';
-import { ExplorerDelegate, ExplorerAccessibilityProvider, ExplorerDataSource, FilesRenderer, FilesFilter, FileSorter, FileDragAndDrop } from 'vs/workbench/contrib/files/electron-browser/views/explorerViewer';
+import { ExplorerDelegate, ExplorerAccessibilityProvider, ExplorerDataSource, FilesRenderer, FilesFilter, FileSorter, FileDragAndDrop } from 'vs/workbench/contrib/files/browser/views/explorerViewer';
 import { IThemeService } from 'vs/platform/theme/common/themeService';
 import { IWorkbenchThemeService } from 'vs/workbench/services/themes/common/workbenchThemeService';
 import { ITreeContextMenuEvent } from 'vs/base/browser/ui/tree/tree';
diff --git a/src/vs/workbench/contrib/files/electron-browser/views/explorerViewer.ts b/src/vs/workbench/contrib/files/browser/views/explorerViewer.ts
similarity index 99%
rename from src/vs/workbench/contrib/files/electron-browser/views/explorerViewer.ts
rename to src/vs/workbench/contrib/files/browser/views/explorerViewer.ts
index e4515c8b522..879380bc8ee 100644
--- a/src/vs/workbench/contrib/files/electron-browser/views/explorerViewer.ts
+++ b/src/vs/workbench/contrib/files/browser/views/explorerViewer.ts
@@ -44,7 +44,7 @@ import { URI } from 'vs/base/common/uri';
 import { ITask, sequence } from 'vs/base/common/async';
 import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
 import { IWorkspaceFolderCreationData } from 'vs/platform/workspaces/common/workspaces';
-import { findValidPasteFileTarget } from 'vs/workbench/contrib/files/electron-browser/fileActions';
+import { findValidPasteFileTarget } from 'vs/workbench/contrib/files/browser/fileActions';
 import { FuzzyScore, createMatches } from 'vs/base/common/filters';
 
 export class ExplorerDelegate implements IListVirtualDelegate<ExplorerItem> {
diff --git a/src/vs/workbench/contrib/files/electron-browser/views/openEditorsView.ts b/src/vs/workbench/contrib/files/browser/views/openEditorsView.ts
similarity index 99%
rename from src/vs/workbench/contrib/files/electron-browser/views/openEditorsView.ts
rename to src/vs/workbench/contrib/files/browser/views/openEditorsView.ts
index 99b54b31610..e2aba5cbff6 100644
--- a/src/vs/workbench/contrib/files/electron-browser/views/openEditorsView.ts
+++ b/src/vs/workbench/contrib/files/browser/views/openEditorsView.ts
@@ -13,7 +13,7 @@ import { IEditorGroupsService, IEditorGroup, GroupChangeKind, GroupsOrder } from
 import { IConfigurationService, IConfigurationChangeEvent } from 'vs/platform/configuration/common/configuration';
 import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
 import { IEditorInput } from 'vs/workbench/common/editor';
-import { SaveAllAction, SaveAllInGroupAction, CloseGroupAction } from 'vs/workbench/contrib/files/electron-browser/fileActions';
+import { SaveAllAction, SaveAllInGroupAction, CloseGroupAction } from 'vs/workbench/contrib/files/browser/fileActions';
 import { OpenEditorsFocusedContext, ExplorerFocusedContext, IFilesConfiguration, OpenEditor } from 'vs/workbench/contrib/files/common/files';
 import { ITextFileService, AutoSaveMode } from 'vs/workbench/services/textfile/common/textfiles';
 import { IUntitledEditorService } from 'vs/workbench/services/untitled/common/untitledEditorService';
@@ -32,7 +32,7 @@ import { IEditorService, SIDE_GROUP, ACTIVE_GROUP } from 'vs/workbench/services/
 import { IDisposable, dispose } from 'vs/base/common/lifecycle';
 import { fillInContextMenuActions } from 'vs/platform/actions/browser/menuItemActionItem';
 import { IMenuService, MenuId, IMenu } from 'vs/platform/actions/common/actions';
-import { DirtyEditorContext, OpenEditorsGroupContext } from 'vs/workbench/contrib/files/electron-browser/fileCommands';
+import { DirtyEditorContext, OpenEditorsGroupContext } from 'vs/workbench/contrib/files/browser/fileCommands';
 import { ResourceContextKey } from 'vs/workbench/common/resources';
 import { ResourcesDropHandler, fillResourceDataTransfers, CodeDataTransfers } from 'vs/workbench/browser/dnd';
 import { ViewletPanel, IViewletPanelOptions } from 'vs/workbench/browser/parts/views/panelViewlet';
diff --git a/src/vs/workbench/contrib/files/electron-browser/explorerService.ts b/src/vs/workbench/contrib/files/common/explorerService.ts
similarity index 100%
rename from src/vs/workbench/contrib/files/electron-browser/explorerService.ts
rename to src/vs/workbench/contrib/files/common/explorerService.ts
diff --git a/src/vs/workbench/contrib/files/test/electron-browser/explorerModel.test.ts b/src/vs/workbench/contrib/files/test/electron-browser/explorerModel.test.ts
index cf94544bcbb..0ba7c406b70 100644
--- a/src/vs/workbench/contrib/files/test/electron-browser/explorerModel.test.ts
+++ b/src/vs/workbench/contrib/files/test/electron-browser/explorerModel.test.ts
@@ -7,7 +7,7 @@ import * as assert from 'assert';
 import { isLinux, isWindows } from 'vs/base/common/platform';
 import { URI } from 'vs/base/common/uri';
 import { join } from 'vs/base/common/path';
-import { validateFileName } from 'vs/workbench/contrib/files/electron-browser/fileActions';
+import { validateFileName } from 'vs/workbench/contrib/files/browser/fileActions';
 import { ExplorerItem } from 'vs/workbench/contrib/files/common/explorerModel';
 import { toResource } from 'vs/base/test/common/utils';
 
diff --git a/src/vs/workbench/contrib/files/test/electron-browser/fileActions.test.ts b/src/vs/workbench/contrib/files/test/electron-browser/fileActions.test.ts
index c0235370147..dde3743e766 100644
--- a/src/vs/workbench/contrib/files/test/electron-browser/fileActions.test.ts
+++ b/src/vs/workbench/contrib/files/test/electron-browser/fileActions.test.ts
@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import * as assert from 'assert';
-import { incrementFileName } from 'vs/workbench/contrib/files/electron-browser/fileActions';
+import { incrementFileName } from 'vs/workbench/contrib/files/browser/fileActions';
 
 suite('Files - Increment file name', () => {
 
diff --git a/src/vs/workbench/contrib/watermark/electron-browser/watermark.ts b/src/vs/workbench/contrib/watermark/electron-browser/watermark.ts
index b2dffd595a3..150f230c22c 100644
--- a/src/vs/workbench/contrib/watermark/electron-browser/watermark.ts
+++ b/src/vs/workbench/contrib/watermark/electron-browser/watermark.ts
@@ -16,7 +16,7 @@ import { IWorkbenchContribution, IWorkbenchContributionsRegistry, Extensions as
 import { ILifecycleService, LifecyclePhase } from 'vs/platform/lifecycle/common/lifecycle';
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
 import { OpenRecentAction } from 'vs/workbench/electron-browser/actions/windowActions';
-import { GlobalNewUntitledFileAction } from 'vs/workbench/contrib/files/electron-browser/fileActions';
+import { GlobalNewUntitledFileAction } from 'vs/workbench/contrib/files/browser/fileActions';
 import { OpenFolderAction, OpenFileFolderAction, OpenFileAction } from 'vs/workbench/browser/actions/workspaceActions';
 import { ShowAllCommandsAction } from 'vs/workbench/contrib/quickopen/browser/commandsHandler';
 import { Parts, IPartService, IDimension } from 'vs/workbench/services/part/common/partService';
diff --git a/src/vs/workbench/test/workbenchTestServices.ts b/src/vs/workbench/test/workbenchTestServices.ts
index 4eed1759dea..d605a994a11 100644
--- a/src/vs/workbench/test/workbenchTestServices.ts
+++ b/src/vs/workbench/test/workbenchTestServices.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import 'vs/workbench/contrib/files/electron-browser/files.contribution'; // load our contribution into the test
+import 'vs/workbench/contrib/files/browser/files.contribution'; // load our contribution into the test
 import { FileEditorInput } from 'vs/workbench/contrib/files/common/editors/fileEditorInput';
 import { TestInstantiationService } from 'vs/platform/instantiation/test/common/instantiationServiceMock';
 import { join } from 'vs/base/common/path';
diff --git a/src/vs/workbench/workbench.main.ts b/src/vs/workbench/workbench.main.ts
index 3d8b0dbf2c4..477b1934fb4 100644
--- a/src/vs/workbench/workbench.main.ts
+++ b/src/vs/workbench/workbench.main.ts
@@ -60,9 +60,9 @@ import 'vs/workbench/contrib/logs/electron-browser/logs.contribution';
 import 'vs/workbench/contrib/quickopen/browser/quickopen.contribution';
 
 // Explorer
-import 'vs/workbench/contrib/files/electron-browser/explorerViewlet';
-import 'vs/workbench/contrib/files/electron-browser/fileActions.contribution';
-import 'vs/workbench/contrib/files/electron-browser/files.contribution';
+import 'vs/workbench/contrib/files/browser/explorerViewlet';
+import 'vs/workbench/contrib/files/browser/fileActions.contribution';
+import 'vs/workbench/contrib/files/browser/files.contribution';
 
 // Backup
 import 'vs/workbench/contrib/backup/common/backup.contribution';
diff --git a/tslint.json b/tslint.json
index 100e72fd258..322b245ef04 100644
--- a/tslint.json
+++ b/tslint.json
@@ -489,23 +489,6 @@
 					"assert"
 				]
 			},
-			{
-				"target": "**/vs/workbench/contrib/files/electron-browser/**",
-				"restrictions": [
-					"vs/nls",
-					"vs/css!./**/*",
-					"**/vs/base/{common,browser,node,electron-browser}/**",
-					"**/vs/base/parts/*/{common,browser,node,electron-browser}/**",
-					"**/vs/platform/node/**",
-					"**/vs/platform/*/{common,browser,node,electron-browser}/**",
-					"**/vs/editor/{common,browser,node,electron-browser}/**",
-					"**/vs/editor/contrib/**", // editor/contrib is equivalent to /browser/ by convention
-					"**/vs/workbench/{common,browser,node,electron-browser,api}/**",
-					"**/vs/workbench/services/*/{common,browser,node,electron-browser}/**",
-					"**/vs/workbench/contrib/files/{common,browser,node,electron-browser}/**",
-					"*" // node modules
-				]
-			},
 			{
 				"target": "**/vs/code/node/**",
 				"restrictions": [