Layering of everything else but query (#5085)

* layer profiler and edit data

* relayering everything but query

* fix css import

* readd qp

* fix script src

* fix hygiene

src/sql/parts/profiler/editor/controller/interfaces.ts

@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the Source EULA. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-
-export interface IProfilerController {
-	findNext(): void;
-	findPrevious(): void;
-}

src/sql/parts/query/common/query.contribution.ts

@@ -21,8 +21,8 @@ import { QueryResultsEditor } from 'sql/parts/query/editor/queryResultsEditor';
 import { QueryResultsInput } from 'sql/parts/query/common/queryResultsInput';
 import * as queryContext from 'sql/parts/query/common/queryContext';
 import { QueryInput } from 'sql/parts/query/common/queryInput';
-import { EditDataEditor } from 'sql/parts/editData/editor/editDataEditor';
-import { EditDataInput } from 'sql/parts/editData/common/editDataInput';
+import { EditDataEditor } from 'sql/workbench/parts/editData/browser/editDataEditor';
+import { EditDataInput } from 'sql/workbench/parts/editData/common/editDataInput';
 import {
 	RunQueryKeyboardAction, RunCurrentQueryKeyboardAction, CancelQueryKeyboardAction, RefreshIntellisenseKeyboardAction, ToggleQueryResultsKeyboardAction,
 	RunQueryShortcutAction, RunCurrentQueryWithActualPlanKeyboardAction, FocusOnCurrentQueryKeyboardAction, ParseSyntaxAction
@@ -33,8 +33,8 @@ import { QueryPlanEditor } from 'sql/workbench/parts/queryPlan/electron-browser/
 import { QueryPlanInput } from 'sql/workbench/parts/queryPlan/common/queryPlanInput';
 import * as Constants from 'sql/parts/query/common/constants';
 import { localize } from 'vs/nls';
-import { EditDataResultsEditor } from 'sql/parts/editData/editor/editDataResultsEditor';
-import { EditDataResultsInput } from 'sql/parts/editData/common/editDataResultsInput';
+import { EditDataResultsEditor } from 'sql/workbench/parts/editData/browser/editDataResultsEditor';
+import { EditDataResultsInput } from 'sql/workbench/parts/editData/common/editDataResultsInput';
 
 const gridCommandsWeightBonus = 100; // give our commands a little bit more weight over other default list/tree commands
 

src/sql/parts/query/execution/keyboardQueryActions.ts

@@ -17,7 +17,7 @@ import { IQueryModelService } from 'sql/platform/query/common/queryModel';
 import * as WorkbenchUtils from 'sql/workbench/common/sqlWorkbenchUtils';
 import * as Constants from 'sql/parts/query/common/constants';
 import * as ConnectionConstants from 'sql/platform/connection/common/constants';
-import { EditDataEditor } from 'sql/parts/editData/editor/editDataEditor';
+import { EditDataEditor } from 'sql/workbench/parts/editData/browser/editDataEditor';
 import { INotificationService, Severity } from 'vs/platform/notification/common/notification';
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
 

src/sql/parts/query/modelViewTab/queryModelViewTab.module.ts

@@ -13,8 +13,8 @@ import { CommonModule, APP_BASE_HREF } from '@angular/common';
 import { BrowserModule } from '@angular/platform-browser';
 import { WizardNavigation } from 'sql/platform/dialog/wizardNavigation.component';
 import { Extensions, IComponentRegistry } from 'sql/platform/dashboard/common/modelComponentRegistry';
-import { ModelViewContent } from 'sql/parts/modelComponents/modelViewContent.component';
-import { ModelComponentWrapper } from 'sql/parts/modelComponents/modelComponentWrapper.component';
+import { ModelViewContent } from 'sql/workbench/electron-browser/modelComponents/modelViewContent.component';
+import { ModelComponentWrapper } from 'sql/workbench/electron-browser/modelComponents/modelComponentWrapper.component';
 import { ComponentHostDirective } from 'sql/workbench/parts/dashboard/common/componentHost.directive';
 import { IBootstrapParams, ISelector, providerIterator } from 'sql/platform/bootstrap/node/bootstrapService';
 import { CommonServiceInterface } from 'sql/platform/bootstrap/node/commonServiceInterface.service';

src/sql/parts/query/modelViewTab/queryModelViewTabContainer.component.ts

@@ -7,10 +7,10 @@
 
 import 'vs/css!./media/dialogModal';
 import { Component, ViewChild, Inject, forwardRef, ElementRef, AfterViewInit } from '@angular/core';
-import { ModelViewContent } from 'sql/parts/modelComponents/modelViewContent.component';
+import { ModelViewContent } from 'sql/workbench/electron-browser/modelComponents/modelViewContent.component';
 import { IBootstrapParams } from 'sql/platform/bootstrap/node/bootstrapService';
 import { DialogPane } from 'sql/platform/dialog/dialogPane';
-import { ComponentEventType } from 'sql/parts/modelComponents/interfaces';
+import { ComponentEventType } from 'sql/workbench/electron-browser/modelComponents/interfaces';
 import { Event, Emitter } from 'vs/base/common/event';
 
 export interface LayoutRequestParams {

src/sql/platform/dashboard/common/modelComponentRegistry.ts

@@ -8,7 +8,7 @@ import { ModelComponentTypes } from 'sql/workbench/api/common/sqlExtHostTypes';
 import * as platform from 'vs/platform/registry/common/platform';
 import { IJSONSchema } from 'vs/base/common/jsonSchema';
 import * as nls from 'vs/nls';
-import { IComponent } from 'sql/parts/modelComponents/interfaces';
+import { IComponent } from 'sql/workbench/electron-browser/modelComponents/interfaces';
 
 export type ComponentIdentifier = string;
 

src/sql/platform/dialog/dialog.module.ts

@@ -15,8 +15,8 @@ import { BrowserModule } from '@angular/platform-browser';
 import { DialogContainer } from 'sql/platform/dialog/dialogContainer.component';
 import { WizardNavigation } from 'sql/platform/dialog/wizardNavigation.component';
 import { Extensions, IComponentRegistry } from 'sql/platform/dashboard/common/modelComponentRegistry';
-import { ModelViewContent } from 'sql/parts/modelComponents/modelViewContent.component';
-import { ModelComponentWrapper } from 'sql/parts/modelComponents/modelComponentWrapper.component';
+import { ModelViewContent } from 'sql/workbench/electron-browser/modelComponents/modelViewContent.component';
+import { ModelComponentWrapper } from 'sql/workbench/electron-browser/modelComponents/modelComponentWrapper.component';
 import { ComponentHostDirective } from 'sql/workbench/parts/dashboard/common/componentHost.directive';
 import { IBootstrapParams, ISelector, providerIterator } from 'sql/platform/bootstrap/node/bootstrapService';
 import { CommonServiceInterface } from 'sql/platform/bootstrap/node/commonServiceInterface.service';

src/sql/platform/dialog/dialogContainer.component.ts

@@ -7,10 +7,10 @@
 
 import 'vs/css!./media/dialogModal';
 import { Component, ViewChild, Inject, forwardRef, ElementRef, AfterViewInit } from '@angular/core';
-import { ModelViewContent } from 'sql/parts/modelComponents/modelViewContent.component';
+import { ModelViewContent } from 'sql/workbench/electron-browser/modelComponents/modelViewContent.component';
 import { IBootstrapParams } from 'sql/platform/bootstrap/node/bootstrapService';
 import { DialogPane } from 'sql/platform/dialog/dialogPane';
-import { ComponentEventType } from 'sql/parts/modelComponents/interfaces';
+import { ComponentEventType } from 'sql/workbench/electron-browser/modelComponents/interfaces';
 import { Event, Emitter } from 'vs/base/common/event';
 
 export interface LayoutRequestParams {

src/sql/platform/jobManagement/common/jobActions.ts

@@ -8,18 +8,18 @@ import * as nls from 'vs/nls';
 import * as azdata from 'azdata';
 import { INotificationService } from 'vs/platform/notification/common/notification';
 import Severity from 'vs/base/common/severity';
-import { JobHistoryComponent } from 'sql/parts/jobManagement/views/jobHistory.component';
+import { JobHistoryComponent } from 'sql/workbench/parts/jobManagement/electron-browser/jobHistory.component';
 import { IJobManagementService } from '../common/interfaces';
 import { ICommandService } from 'vs/platform/commands/common/commands';
-import { JobsViewComponent } from 'sql/parts/jobManagement/views/jobsView.component';
-import { AlertsViewComponent } from 'sql/parts/jobManagement/views/alertsView.component';
-import { OperatorsViewComponent } from 'sql/parts/jobManagement/views/operatorsView.component';
-import { ProxiesViewComponent } from 'sql/parts/jobManagement/views/proxiesView.component';
+import { JobsViewComponent } from 'sql/workbench/parts/jobManagement/electron-browser/jobsView.component';
+import { AlertsViewComponent } from 'sql/workbench/parts/jobManagement/electron-browser/alertsView.component';
+import { OperatorsViewComponent } from 'sql/workbench/parts/jobManagement/electron-browser/operatorsView.component';
+import { ProxiesViewComponent } from 'sql/workbench/parts/jobManagement/electron-browser/proxiesView.component';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
 import * as TelemetryKeys from 'sql/platform/telemetry/telemetryKeys';
 import { IErrorMessageService } from 'sql/platform/errorMessage/common/errorMessageService';
-import { JobManagementView } from 'sql/parts/jobManagement/views/jobManagementView';
+import { JobManagementView } from 'sql/workbench/parts/jobManagement/electron-browser/jobManagementView';
 
 export const successLabel: string = nls.localize('jobaction.successLabel', 'Success');
 export const errorLabel: string = nls.localize('jobaction.faillabel', 'Error');

src/sql/platform/model/common/modelViewService.ts

@@ -6,7 +6,7 @@
 'use strict';
 import * as azdata from 'azdata';
 import { IItemConfig, IComponentShape } from 'sql/workbench/api/common/sqlExtHostTypes';
-import { IComponentEventArgs } from 'sql/parts/modelComponents/interfaces';
+import { IComponentEventArgs } from 'sql/workbench/electron-browser/modelComponents/interfaces';
 import { Event } from 'vs/base/common/event';
 
 export interface IView {

src/sql/platform/restore/common/restoreServiceImpl.ts

@@ -12,7 +12,7 @@ import * as azdata from 'azdata';
 import { ICapabilitiesService } from 'sql/platform/capabilities/common/capabilitiesService';
 import { IRestoreService, IRestoreDialogController, TaskExecutionMode } from 'sql/platform/restore/common/restoreService';
 import { OptionsDialog } from 'sql/workbench/browser/modal/optionsDialog';
-import { RestoreDialog } from 'sql/parts/disasterRecovery/restore/restoreDialog';
+import { RestoreDialog } from 'sql/workbench/parts/restore/browser/restoreDialog';
 import * as ConnectionConstants from 'sql/platform/connection/common/constants';
 import { MssqlRestoreInfo } from 'sql/platform/restore/common/mssqlRestoreInfo';
 import { IConnectionProfile } from 'sql/platform/connection/common/interfaces';

src/sql/workbench/api/node/mainThreadModelViewDialog.ts

@@ -13,7 +13,7 @@ import { MainThreadModelViewDialogShape, SqlMainContext, ExtHostModelViewDialogS
 import { Dialog, DialogTab, DialogButton, WizardPage, Wizard } from 'sql/platform/dialog/dialogTypes';
 import { CustomDialogService } from 'sql/platform/dialog/customDialogService';
 import { IModelViewDialogDetails, IModelViewTabDetails, IModelViewButtonDetails, IModelViewWizardPageDetails, IModelViewWizardDetails } from 'sql/workbench/api/common/sqlExtHostTypes';
-import { ModelViewInput, ModelViewInputModel, ModeViewSaveHandler } from 'sql/parts/modelComponents/modelEditor/modelViewInput';
+import { ModelViewInput, ModelViewInputModel, ModeViewSaveHandler } from 'sql/workbench/electron-browser/modelComponents/modelViewInput';
 
 import * as vscode from 'vscode';
 import * as azdata from 'azdata';

src/sql/workbench/api/node/mainThreadNotebookDocumentsAndEditors.ts

@@ -30,7 +30,7 @@ import { ICapabilitiesService } from 'sql/platform/capabilities/common/capabilit
 import { IUntitledEditorService } from 'vs/workbench/services/untitled/common/untitledEditorService';
 import { IEditorGroupsService } from 'vs/workbench/services/editor/common/editorGroupsService';
 import { viewColumnToEditorGroup } from 'vs/workbench/api/common/shared/editor';
-import { notebookModeId } from 'sql/parts/common/customInputConverter';
+import { notebookModeId } from 'sql/workbench/common/customInputConverter';
 
 class MainThreadNotebookEditor extends Disposable {
 	private _contentChangedEmitter = new Emitter<NotebookContentChange>();

src/sql/workbench/common/taskUtilities.ts

@@ -13,7 +13,7 @@ import {
 } from 'sql/platform/connection/common/connectionManagement';
 import { IQueryEditorService } from 'sql/workbench/services/queryEditor/common/queryEditorService';
 import { IScriptingService } from 'sql/platform/scripting/common/scriptingService';
-import { EditDataInput } from 'sql/parts/editData/common/editDataInput';
+import { EditDataInput } from 'sql/workbench/parts/editData/common/editDataInput';
 import { IRestoreDialogController } from 'sql/platform/restore/common/restoreService';
 import { IInsightsConfig } from 'sql/workbench/parts/dashboard/widgets/insights/interfaces';
 import { IInsightsDialogService } from 'sql/workbench/services/insights/common/insightsDialogService';
@@ -21,7 +21,7 @@ import { ConnectionManagementInfo } from 'sql/platform/connection/common/connect
 import { IObjectExplorerService } from 'sql/workbench/services/objectExplorer/common/objectExplorerService';
 import { QueryInput } from 'sql/parts/query/common/queryInput';
 import { DashboardInput } from 'sql/workbench/parts/dashboard/dashboardInput';
-import { ProfilerInput } from 'sql/parts/profiler/editor/profilerInput';
+import { ProfilerInput } from 'sql/workbench/parts/profiler/browser/profilerInput';
 import { IErrorMessageService } from 'sql/platform/errorMessage/common/errorMessageService';
 import { IBackupUiService } from 'sql/workbench/services/backup/common/backupUiService';
 

src/sql/workbench/electron-browser/modelComponents/button.component.ts

@@ -2,7 +2,7 @@
  *  Copyright (c) Microsoft Corporation. All rights reserved.
  *  Licensed under the Source EULA. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
-import 'vs/css!./button';
+import 'vs/css!./media/button';
 import {
 	Component, Input, Inject, ChangeDetectorRef, forwardRef,
 	ViewChild, ElementRef, OnDestroy, AfterViewInit
@@ -10,8 +10,8 @@ import {
 
 import * as azdata from 'azdata';
 
-import { ComponentWithIconBase } from 'sql/parts/modelComponents/componentWithIconBase';
-import { IComponent, IComponentDescriptor, IModelStore, ComponentEventType } from 'sql/parts/modelComponents/interfaces';
+import { ComponentWithIconBase } from 'sql/workbench/electron-browser/modelComponents/componentWithIconBase';
+import { IComponent, IComponentDescriptor, IModelStore, ComponentEventType } from 'sql/workbench/electron-browser/modelComponents/interfaces';
 import { attachButtonStyler } from 'sql/platform/theme/common/styler';
 
 import { SIDE_BAR_BACKGROUND, SIDE_BAR_TITLE_FOREGROUND } from 'vs/workbench/common/theme';

src/sql/workbench/electron-browser/modelComponents/card.component.ts

@@ -2,26 +2,23 @@
  *  Copyright (c) Microsoft Corporation. All rights reserved.
  *  Licensed under the Source EULA. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
-import 'vs/css!./card';
+import 'vs/css!./media/card';
 
 import {
-	Component, Input, Inject, ChangeDetectorRef, forwardRef, ComponentFactoryResolver,
-	ViewChild, ViewChildren, ElementRef, Injector, OnDestroy, QueryList,
+	Component, Input, Inject, ChangeDetectorRef, forwardRef, ElementRef, OnDestroy
 } from '@angular/core';
 
 import * as azdata from 'azdata';
 
-import { ITheme, ICssStyleCollector } from 'vs/platform/theme/common/themeService';
 import * as colors from 'vs/platform/theme/common/colorRegistry';
 import { IColorTheme, IWorkbenchThemeService } from 'vs/workbench/services/themes/common/workbenchThemeService';
 
-import { DashboardServiceInterface } from 'sql/workbench/parts/dashboard/services/dashboardServiceInterface.service';
-import { ComponentWithIconBase } from 'sql/parts/modelComponents/componentWithIconBase';
-import { IComponent, IComponentDescriptor, IModelStore, ComponentEventType } from 'sql/parts/modelComponents/interfaces';
+import { ComponentWithIconBase } from 'sql/workbench/electron-browser/modelComponents/componentWithIconBase';
+import { IComponent, IComponentDescriptor, IModelStore, ComponentEventType } from 'sql/workbench/electron-browser/modelComponents/interfaces';
 import { StatusIndicator, CardProperties, ActionDescriptor } from 'sql/workbench/api/common/sqlExtHostTypes';
 
 @Component({
-	templateUrl: decodeURI(require.toUrl('sql/parts/modelComponents/card.component.html'))
+	templateUrl: decodeURI(require.toUrl('sql/workbench/electron-browser/modelComponents/card.component.html'))
 })
 export default class CardComponent extends ComponentWithIconBase implements IComponent, OnDestroy {
 	@Input() descriptor: IComponentDescriptor;

src/sql/workbench/electron-browser/modelComponents/checkbox.component.ts

@@ -10,8 +10,8 @@ import {
 
 import * as azdata from 'azdata';
 
-import { ComponentBase } from 'sql/parts/modelComponents/componentBase';
-import { IComponent, IComponentDescriptor, IModelStore, ComponentEventType } from 'sql/parts/modelComponents/interfaces';
+import { ComponentBase } from 'sql/workbench/electron-browser/modelComponents/componentBase';
+import { IComponent, IComponentDescriptor, IModelStore, ComponentEventType } from 'sql/workbench/electron-browser/modelComponents/interfaces';
 import { Checkbox, ICheckboxOptions } from 'sql/base/browser/ui/checkbox/checkbox';
 import { CommonServiceInterface } from 'sql/platform/bootstrap/node/commonServiceInterface.service';
 import { attachCheckboxStyler } from 'sql/platform/theme/common/styler';

src/sql/workbench/electron-browser/modelComponents/componentBase.ts

@@ -2,7 +2,7 @@
  *  Copyright (c) Microsoft Corporation. All rights reserved.
  *  Licensed under the Source EULA. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
-import 'vs/css!./flexContainer';
+import 'vs/css!./media/flexContainer';
 
 import {
 	ChangeDetectorRef, ViewChildren, ElementRef, OnDestroy, OnInit, QueryList
@@ -10,11 +10,11 @@ import {
 
 import * as types from 'vs/base/common/types';
 
-import { IComponent, IComponentDescriptor, IModelStore, IComponentEventArgs, ComponentEventType } from 'sql/parts/modelComponents/interfaces';
+import { IComponent, IComponentDescriptor, IModelStore, IComponentEventArgs, ComponentEventType } from 'sql/workbench/electron-browser/modelComponents/interfaces';
 import * as azdata from 'azdata';
 import { Emitter } from 'vs/base/common/event';
 import { IDisposable, Disposable } from 'vs/base/common/lifecycle';
-import { ModelComponentWrapper } from 'sql/parts/modelComponents/modelComponentWrapper.component';
+import { ModelComponentWrapper } from 'sql/workbench/electron-browser/modelComponents/modelComponentWrapper.component';
 import { URI } from 'vs/base/common/uri';
 import * as nls from 'vs/nls';
 

src/sql/workbench/electron-browser/modelComponents/componentWithIconBase.ts

@@ -3,17 +3,14 @@
  *  Licensed under the Source EULA. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import {
-	Component, Input, Inject, ChangeDetectorRef, forwardRef, ComponentFactoryResolver,
-	ViewChild, ViewChildren, ElementRef, Injector, OnDestroy, OnInit, QueryList, AfterViewInit
-} from '@angular/core';
+import { ChangeDetectorRef, ElementRef } from '@angular/core';
 
-import { IComponent, IComponentDescriptor, IModelStore, IComponentEventArgs, ComponentEventType } from 'sql/parts/modelComponents/interfaces';
+import { IComponentDescriptor } from 'sql/workbench/electron-browser/modelComponents/interfaces';
 import * as azdata from 'azdata';
 import { URI } from 'vs/base/common/uri';
 import { IdGenerator } from 'vs/base/common/idGenerator';
 import { createCSSRule, removeCSSRulesContainingSelector } from 'vs/base/browser/dom';
-import { ComponentBase } from 'sql/parts/modelComponents/componentBase';
+import { ComponentBase } from 'sql/workbench/electron-browser/modelComponents/componentBase';
 
 
 export type IUserFriendlyIcon = string | URI | { light: string | URI; dark: string | URI };

src/sql/workbench/electron-browser/modelComponents/components.contribution.ts

@@ -14,7 +14,7 @@ import DeclarativeTableComponent from './declarativeTable.component';
 import ListBoxComponent from './listbox.component';
 import ButtonComponent from './button.component';
 import CheckBoxComponent from './checkbox.component';
-import TreeComponent from './tree/tree.component';
+import TreeComponent from './tree.component';
 import RadioButtonComponent from './radioButton.component';
 import WebViewComponent from './webview.component';
 import TableComponent from './table.component';
@@ -26,8 +26,8 @@ import DiffEditorComponent from './diffeditor.component';
 import DomComponent from './dom.component';
 import { registerComponentType } from 'sql/platform/dashboard/common/modelComponentRegistry';
 import { ModelComponentTypes } from 'sql/workbench/api/common/sqlExtHostTypes';
-import HyperlinkComponent from 'sql/parts/modelComponents/hyperlink.component';
-import SplitViewContainer from 'sql/parts/modelComponents/splitviewContainer.component';
+import HyperlinkComponent from 'sql/workbench/electron-browser/modelComponents/hyperlink.component';
+import SplitViewContainer from 'sql/workbench/electron-browser/modelComponents/splitviewContainer.component';
 
 export const DIV_CONTAINER = 'div-container';
 registerComponentType(DIV_CONTAINER, ModelComponentTypes.DivContainer, DivContainer);

src/sql/workbench/electron-browser/modelComponents/declarativeTable.component.ts

@@ -3,7 +3,7 @@
  *  Licensed under the Source EULA. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import 'vs/css!./declarativeTable';
+import 'vs/css!./media/declarativeTable';
 
 import {
 	Component, Input, Inject, ChangeDetectorRef, forwardRef, ViewChild, ElementRef, OnDestroy, AfterViewInit
@@ -11,8 +11,8 @@ import {
 
 import * as azdata from 'azdata';
 
-import { ComponentBase } from 'sql/parts/modelComponents/componentBase';
-import { IComponent, IComponentDescriptor, IModelStore, ComponentEventType } from 'sql/parts/modelComponents/interfaces';
+import { ComponentBase } from 'sql/workbench/electron-browser/modelComponents/componentBase';
+import { IComponent, IComponentDescriptor, IModelStore, ComponentEventType } from 'sql/workbench/electron-browser/modelComponents/interfaces';
 import { ISelectData } from 'vs/base/browser/ui/selectBox/selectBox';
 
 export enum DeclarativeDataType {

src/sql/workbench/electron-browser/modelComponents/diffeditor.component.ts

@@ -2,10 +2,9 @@
  *  Copyright (c) Microsoft Corporation. All rights reserved.
  *  Licensed under the Source EULA. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
-import 'vs/css!./editor';
+import 'vs/css!./media/editor';
 import {
-	Component, Input, Inject, ChangeDetectorRef, forwardRef, ComponentFactoryResolver,
-	ViewChild, ViewChildren, ElementRef, Injector, OnDestroy, QueryList
+	Component, Input, Inject, ChangeDetectorRef, forwardRef, ElementRef, OnDestroy
 } from '@angular/core';
 
 import * as azdata from 'azdata';
@@ -17,8 +16,8 @@ import { Schemas } from 'vs/base/common/network';
 import { IModeService } from 'vs/editor/common/services/modeService';
 import { IModelService } from 'vs/editor/common/services/modelService';
 
-import { ComponentBase } from 'sql/parts/modelComponents/componentBase';
-import { IComponent, IComponentDescriptor, IModelStore, ComponentEventType } from 'sql/parts/modelComponents/interfaces';
+import { ComponentBase } from 'sql/workbench/electron-browser/modelComponents/componentBase';
+import { IComponent, IComponentDescriptor, IModelStore } from 'sql/workbench/electron-browser/modelComponents/interfaces';
 import { ServiceCollection } from 'vs/platform/instantiation/common/serviceCollection';
 import { SimpleProgressService } from 'vs/editor/standalone/browser/simpleServices';
 import { IProgressService } from 'vs/platform/progress/common/progress';

src/sql/workbench/electron-browser/modelComponents/divContainer.component.ts

@@ -2,21 +2,18 @@
  *  Copyright (c) Microsoft Corporation. All rights reserved.
  *  Licensed under the Source EULA. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
-import 'vs/css!./divContainer';
+import 'vs/css!./media/divContainer';
 
 import {
-	Component, Input, Inject, ChangeDetectorRef, forwardRef, ComponentFactoryResolver,
-	ViewChild, ViewChildren, ElementRef, Injector, OnDestroy, QueryList,
+	Component, Input, Inject, ChangeDetectorRef, forwardRef,
+	ViewChild, ElementRef, OnDestroy,
 } from '@angular/core';
 
-import { IComponent, IComponentDescriptor, IModelStore, ComponentEventType } from 'sql/parts/modelComponents/interfaces';
+import { IComponent, IComponentDescriptor, IModelStore, ComponentEventType } from 'sql/workbench/electron-browser/modelComponents/interfaces';
 import * as azdata from 'azdata';
 
-import { DashboardServiceInterface } from 'sql/workbench/parts/dashboard/services/dashboardServiceInterface.service';
-import { ContainerBase } from 'sql/parts/modelComponents/componentBase';
-import { ModelComponentWrapper } from 'sql/parts/modelComponents/modelComponentWrapper.component';
+import { ContainerBase } from 'sql/workbench/electron-browser/modelComponents/componentBase';
 
-import types = require('vs/base/common/types');
 import { StandardKeyboardEvent } from 'vs/base/browser/keyboardEvent';
 import { KeyCode } from 'vs/base/common/keyCodes';
 

src/sql/workbench/electron-browser/modelComponents/dom.component.ts

@@ -2,9 +2,9 @@
  *  Copyright (c) Microsoft Corporation. All rights reserved.
  *  Licensed under the Source EULA. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
-import 'vs/css!./dom';
-import 'vs/css!./highlight';
-import 'vs/css!./markdown';
+import 'vs/css!./media/dom';
+import 'vs/css!./media/highlight';
+import 'vs/css!./media/markdown';
 
 import {
 	Component, Input, Inject, ChangeDetectorRef, forwardRef, ElementRef, OnDestroy
@@ -13,8 +13,8 @@ import {
 import * as azdata from 'azdata';
 import * as DOM from 'vs/base/browser/dom';
 
-import { ComponentBase } from 'sql/parts/modelComponents/componentBase';
-import { IComponent, IComponentDescriptor, IModelStore } from 'sql/parts/modelComponents/interfaces';
+import { ComponentBase } from 'sql/workbench/electron-browser/modelComponents/componentBase';
+import { IComponent, IComponentDescriptor, IModelStore } from 'sql/workbench/electron-browser/modelComponents/interfaces';
 
 @Component({
 	template: '',

src/sql/workbench/electron-browser/modelComponents/dropdown.component.ts

@@ -10,8 +10,8 @@ import {
 
 import * as azdata from 'azdata';
 
-import { ComponentBase } from 'sql/parts/modelComponents/componentBase';
-import { IComponent, IComponentDescriptor, IModelStore, ComponentEventType } from 'sql/parts/modelComponents/interfaces';
+import { ComponentBase } from 'sql/workbench/electron-browser/modelComponents/componentBase';
+import { IComponent, IComponentDescriptor, IModelStore, ComponentEventType } from 'sql/workbench/electron-browser/modelComponents/interfaces';
 import { Dropdown, IDropdownOptions } from 'sql/base/browser/ui/editableDropdown/dropdown';
 import { SelectBox } from 'sql/base/browser/ui/selectBox/selectBox';
 import { attachEditableDropdownStyler } from 'sql/platform/theme/common/styler';

src/sql/workbench/electron-browser/modelComponents/editor.component.ts

@@ -2,10 +2,9 @@
  *  Copyright (c) Microsoft Corporation. All rights reserved.
  *  Licensed under the Source EULA. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
-import 'vs/css!./editor';
+import 'vs/css!./media/editor';
 import {
-	Component, Input, Inject, ChangeDetectorRef, forwardRef, ComponentFactoryResolver,
-	ViewChild, ViewChildren, ElementRef, Injector, OnDestroy, QueryList
+	Component, Input, Inject, ChangeDetectorRef, forwardRef, ElementRef, OnDestroy
 } from '@angular/core';
 
 import * as azdata from 'azdata';
@@ -18,9 +17,9 @@ import { Schemas } from 'vs/base/common/network';
 import { IModeService } from 'vs/editor/common/services/modeService';
 import { IModelService } from 'vs/editor/common/services/modelService';
 
-import { ComponentBase } from 'sql/parts/modelComponents/componentBase';
-import { IComponent, IComponentDescriptor, IModelStore, ComponentEventType } from 'sql/parts/modelComponents/interfaces';
-import { QueryTextEditor } from 'sql/parts/modelComponents/queryTextEditor';
+import { ComponentBase } from 'sql/workbench/electron-browser/modelComponents/componentBase';
+import { IComponent, IComponentDescriptor, IModelStore, ComponentEventType } from 'sql/workbench/electron-browser/modelComponents/interfaces';
+import { QueryTextEditor } from 'sql/workbench/electron-browser/modelComponents/queryTextEditor';
 import { ServiceCollection } from 'vs/platform/instantiation/common/serviceCollection';
 import { SimpleProgressService } from 'vs/editor/standalone/browser/simpleServices';
 import { IProgressService } from 'vs/platform/progress/common/progress';

src/sql/workbench/electron-browser/modelComponents/fileBrowserTree.component.ts

@@ -9,8 +9,8 @@ import {
 
 import * as azdata from 'azdata';
 
-import { ComponentBase } from 'sql/parts/modelComponents/componentBase';
-import { IComponent, IComponentDescriptor, IModelStore, ComponentEventType } from 'sql/parts/modelComponents/interfaces';
+import { ComponentBase } from 'sql/workbench/electron-browser/modelComponents/componentBase';
+import { IComponent, IComponentDescriptor, IModelStore, ComponentEventType } from 'sql/workbench/electron-browser/modelComponents/interfaces';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 import { FileBrowserViewModel } from 'sql/workbench/services/fileBrowser/common/fileBrowserViewModel';
 import { FileNode } from 'sql/workbench/services/fileBrowser/common/fileNode';

src/sql/workbench/electron-browser/modelComponents/flexContainer.component.ts

@@ -2,21 +2,17 @@
  *  Copyright (c) Microsoft Corporation. All rights reserved.
  *  Licensed under the Source EULA. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
-import 'vs/css!./flexContainer';
+import 'vs/css!./media/flexContainer';
 
 import {
-	Component, Input, Inject, ChangeDetectorRef, forwardRef, ComponentFactoryResolver,
-	ViewChild, ViewChildren, ElementRef, Injector, OnDestroy, QueryList,
+	Component, Input, Inject, ChangeDetectorRef, forwardRef,
+	ElementRef, OnDestroy
 } from '@angular/core';
 
-import { IComponent, IComponentDescriptor, IModelStore } from 'sql/parts/modelComponents/interfaces';
+import { IComponent, IComponentDescriptor, IModelStore } from 'sql/workbench/electron-browser/modelComponents/interfaces';
 import { FlexLayout, FlexItemLayout } from 'azdata';
 
-import { DashboardServiceInterface } from 'sql/workbench/parts/dashboard/services/dashboardServiceInterface.service';
-import { ContainerBase } from 'sql/parts/modelComponents/componentBase';
-import { ModelComponentWrapper } from 'sql/parts/modelComponents/modelComponentWrapper.component';
-
-import types = require('vs/base/common/types');
+import { ContainerBase } from 'sql/workbench/electron-browser/modelComponents/componentBase';
 
 export class FlexItem {
 	constructor(public descriptor: IComponentDescriptor, public config: FlexItemLayout) { }

src/sql/workbench/electron-browser/modelComponents/formContainer.component.ts

@@ -2,22 +2,18 @@
  *  Copyright (c) Microsoft Corporation. All rights reserved.
  *  Licensed under the Source EULA. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
-import 'vs/css!./formLayout';
-import 'vs/css!sql/media/icons/common-icons';
+import 'vs/css!./media/formLayout';
 
 import {
-	Component, Input, Inject, ChangeDetectorRef, forwardRef, ComponentFactoryResolver,
-	ViewChild, ViewChildren, ElementRef, Injector, OnDestroy, QueryList, AfterViewInit
+	Component, Input, Inject, ChangeDetectorRef, forwardRef,
+	ViewChild, ElementRef, OnDestroy, AfterViewInit
 } from '@angular/core';
 
-import { IComponent, IComponentDescriptor, IModelStore, ComponentEventType } from 'sql/parts/modelComponents/interfaces';
+import { IComponent, IComponentDescriptor, IModelStore } from 'sql/workbench/electron-browser/modelComponents/interfaces';
 import { FormLayout, FormItemLayout } from 'azdata';
 
-import { DashboardServiceInterface } from 'sql/workbench/parts/dashboard/services/dashboardServiceInterface.service';
-import { ContainerBase } from 'sql/parts/modelComponents/componentBase';
-import { ModelComponentWrapper } from 'sql/parts/modelComponents/modelComponentWrapper.component';
+import { ContainerBase } from 'sql/workbench/electron-browser/modelComponents/componentBase';
 import { CommonServiceInterface } from 'sql/platform/bootstrap/node/commonServiceInterface.service';
-import { getContentHeight, getContentWidth, Dimension } from 'vs/base/browser/dom';
 
 export interface TitledFormItemLayout {
 	title: string;

src/sql/workbench/electron-browser/modelComponents/groupContainer.component.ts

@@ -2,20 +2,17 @@
  *  Copyright (c) Microsoft Corporation. All rights reserved.
  *  Licensed under the Source EULA. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
-import 'vs/css!./groupLayout';
+import 'vs/css!./media/groupLayout';
 
 import {
-	Component, Input, Inject, ChangeDetectorRef, forwardRef, ComponentFactoryResolver,
-	ViewChild, ViewChildren, ElementRef, Injector, OnDestroy, QueryList, AfterViewInit
+	Component, Input, Inject, ChangeDetectorRef, forwardRef,
+	ViewChild, ElementRef, OnDestroy, AfterViewInit
 } from '@angular/core';
 
-import { IComponent, IComponentDescriptor, IModelStore, ComponentEventType } from 'sql/parts/modelComponents/interfaces';
-import { GroupLayout, GroupItemLayout } from 'azdata';
+import { IComponent, IComponentDescriptor, IModelStore } from 'sql/workbench/electron-browser/modelComponents/interfaces';
+import { GroupLayout } from 'azdata';
 
-import { DashboardServiceInterface } from 'sql/workbench/parts/dashboard/services/dashboardServiceInterface.service';
-import { ContainerBase } from 'sql/parts/modelComponents/componentBase';
-import { ModelComponentWrapper } from 'sql/parts/modelComponents/modelComponentWrapper.component';
-import { CommonServiceInterface } from 'sql/platform/bootstrap/node/commonServiceInterface.service';
+import { ContainerBase } from 'sql/workbench/electron-browser/modelComponents/componentBase';
 
 @Component({
 	selector: 'modelview-groupContainer',
@@ -45,7 +42,6 @@ export default class GroupContainer extends ContainerBase<GroupLayout> implement
 	@ViewChild('container', { read: ElementRef }) private _container: ElementRef;
 
 	constructor(
-		@Inject(forwardRef(() => CommonServiceInterface)) private _commonService: CommonServiceInterface,
 		@Inject(forwardRef(() => ChangeDetectorRef)) changeRef: ChangeDetectorRef,
 		@Inject(forwardRef(() => ElementRef)) el: ElementRef) {
 		super(changeRef, el);

src/sql/workbench/electron-browser/modelComponents/hyperlink.component.ts

@@ -10,9 +10,8 @@ import {
 
 import * as azdata from 'azdata';
 
-import { ComponentBase } from 'sql/parts/modelComponents/componentBase';
-import { IComponent, IComponentDescriptor, IModelStore } from 'sql/parts/modelComponents/interfaces';
-import { CommonServiceInterface } from 'sql/platform/bootstrap/node/commonServiceInterface.service';
+import { ComponentBase } from 'sql/workbench/electron-browser/modelComponents/componentBase';
+import { IComponent, IComponentDescriptor, IModelStore } from 'sql/workbench/electron-browser/modelComponents/interfaces';
 
 @Component({
 	selector: 'modelview-hyperlink',
@@ -23,7 +22,6 @@ export default class HyperlinkComponent extends ComponentBase implements ICompon
 	@Input() modelStore: IModelStore;
 
 	constructor(
-		@Inject(forwardRef(() => CommonServiceInterface)) private _commonService: CommonServiceInterface,
 		@Inject(forwardRef(() => ChangeDetectorRef)) changeRef: ChangeDetectorRef,
 		@Inject(forwardRef(() => ElementRef)) el: ElementRef) {
 		super(changeRef, el);

src/sql/workbench/electron-browser/modelComponents/inputbox.component.ts

@@ -10,8 +10,8 @@ import {
 
 import * as azdata from 'azdata';
 
-import { ComponentBase } from 'sql/parts/modelComponents/componentBase';
-import { IComponent, IComponentDescriptor, IModelStore, ComponentEventType } from 'sql/parts/modelComponents/interfaces';
+import { ComponentBase } from 'sql/workbench/electron-browser/modelComponents/componentBase';
+import { IComponent, IComponentDescriptor, IModelStore, ComponentEventType } from 'sql/workbench/electron-browser/modelComponents/interfaces';
 import { InputBox } from 'sql/base/browser/ui/inputBox/inputBox';
 import { attachInputBoxStyler } from 'sql/platform/theme/common/styler';
 

src/sql/workbench/electron-browser/modelComponents/interfaces.ts

@@ -4,8 +4,6 @@
  *--------------------------------------------------------------------------------------------*/
 import { InjectionToken } from '@angular/core';
 
-import * as azdata from 'azdata';
-import { Event, Emitter } from 'vs/base/common/event';
 import { IDisposable } from 'vs/base/common/lifecycle';
 
 /**

src/sql/workbench/electron-browser/modelComponents/listbox.component.ts

@@ -10,8 +10,8 @@ import {
 
 import * as azdata from 'azdata';
 
-import { ComponentBase } from 'sql/parts/modelComponents/componentBase';
-import { IComponent, IComponentDescriptor, IModelStore, ComponentEventType } from 'sql/parts/modelComponents/interfaces';
+import { ComponentBase } from 'sql/workbench/electron-browser/modelComponents/componentBase';
+import { IComponent, IComponentDescriptor, IModelStore, ComponentEventType } from 'sql/workbench/electron-browser/modelComponents/interfaces';
 
 import { ListBox } from 'sql/base/browser/ui/listBox/listBox';
 import { attachListBoxStyler } from 'sql/platform/theme/common/styler';

src/sql/workbench/electron-browser/modelComponents/loadingComponent.component.ts

@@ -3,15 +3,15 @@
  *  Licensed under the Source EULA. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import 'vs/css!./loadingComponent';
+import 'vs/css!./media/loadingComponent';
 import {
 	Component, Input, Inject, ChangeDetectorRef, forwardRef, OnDestroy, AfterViewInit, ElementRef
 } from '@angular/core';
 
 import * as azdata from 'azdata';
 
-import { ComponentBase } from 'sql/parts/modelComponents/componentBase';
-import { IComponent, IComponentDescriptor, IModelStore } from 'sql/parts/modelComponents/interfaces';
+import { ComponentBase } from 'sql/workbench/electron-browser/modelComponents/componentBase';
+import { IComponent, IComponentDescriptor, IModelStore } from 'sql/workbench/electron-browser/modelComponents/interfaces';
 import * as nls from 'vs/nls';
 
 @Component({

src/sql/workbench/electron-browser/modelComponents/loadingSpinner.component.ts

@@ -3,10 +3,8 @@
  *  Licensed under the Source EULA. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import 'vs/css!./loadingComponent';
-import {
-	Component, Input, Inject, ChangeDetectorRef, forwardRef, ElementRef
-} from '@angular/core';
+import 'vs/css!./media/loadingComponent';
+import { Component, Input } from '@angular/core';
 
 import * as nls from 'vs/nls';
 
@@ -22,9 +20,4 @@ export default class LoadingSpinner {
 	private readonly _loadingTitle = nls.localize('loadingMessage', 'Loading');
 
 	@Input() loading: boolean;
-
-	constructor(
-		@Inject(forwardRef(() => ChangeDetectorRef)) changeRef: ChangeDetectorRef,
-		@Inject(forwardRef(() => ElementRef)) el: ElementRef) {
-	}
 }

src/sql/workbench/electron-browser/modelComponents/modelComponentWrapper.component.ts

@@ -2,7 +2,6 @@
  *  Copyright (c) Microsoft Corporation. All rights reserved.
  *  Licensed under the Source EULA. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
-import 'vs/css!sql/media/icons/common-icons';
 
 import {
 	Component, Input, Inject, forwardRef, ComponentFactoryResolver, ViewChild,

src/sql/workbench/electron-browser/modelComponents/modelViewContent.component.ts

@@ -2,7 +2,6 @@
  *  Copyright (c) Microsoft Corporation. All rights reserved.
  *  Licensed under the Source EULA. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
-// import 'vs/css!./modelViewContent';
 
 import { Component, forwardRef, Input, OnInit, Inject, ChangeDetectorRef } from '@angular/core';
 
@@ -13,7 +12,7 @@ import { memoize } from 'vs/base/common/decorators';
 
 import { CommonServiceInterface } from 'sql/platform/bootstrap/node/commonServiceInterface.service';
 import { IModelView } from 'sql/platform/model/common/modelViewService';
-import { ViewBase } from 'sql/parts/modelComponents/viewBase';
+import { ViewBase } from 'sql/workbench/electron-browser/modelComponents/viewBase';
 import { IModelViewService } from 'sql/platform/modelComponents/common/modelViewService';
 
 import * as azdata from 'azdata';

src/sql/workbench/electron-browser/modelComponents/modelViewEditor.contribution.ts

@@ -6,8 +6,8 @@ import { Registry } from 'vs/platform/registry/common/platform';
 import { EditorDescriptor, IEditorRegistry, Extensions as EditorExtensions } from 'vs/workbench/browser/editor';
 import { SyncDescriptor } from 'vs/platform/instantiation/common/descriptors';
 
-import { ModelViewInput } from 'sql/parts/modelComponents/modelEditor/modelViewInput';
-import { ModelViewEditor } from 'sql/parts/modelComponents/modelEditor/modelViewEditor';
+import { ModelViewInput } from 'sql/workbench/electron-browser/modelComponents/modelViewInput';
+import { ModelViewEditor } from 'sql/workbench/electron-browser/modelComponents/modelViewEditor';
 
 // Model View editor registration
 const viewModelEditorDescriptor = new EditorDescriptor(

src/sql/workbench/electron-browser/modelComponents/modelViewEditor.ts

@@ -2,7 +2,7 @@
  *  Copyright (c) Microsoft Corporation. All rights reserved.
  *  Licensed under the Source EULA. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
-import 'vs/css!./modelViewEditor';
+import 'vs/css!./media/modelViewEditor';
 
 import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
 import { IThemeService } from 'vs/platform/theme/common/themeService';
@@ -10,7 +10,7 @@ import { BaseEditor } from 'vs/workbench/browser/parts/editor/baseEditor';
 import { EditorOptions } from 'vs/workbench/common/editor';
 import * as DOM from 'vs/base/browser/dom';
 
-import { ModelViewInput } from 'sql/parts/modelComponents/modelEditor/modelViewInput';
+import { ModelViewInput } from 'sql/workbench/electron-browser/modelComponents/modelViewInput';
 import { CancellationToken } from 'vs/base/common/cancellation';
 import { IStorageService } from 'vs/platform/storage/common/storage';
 

src/sql/workbench/electron-browser/modelComponents/radioButton.component.ts

@@ -3,19 +3,17 @@
  *  Licensed under the Source EULA. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import 'vs/css!./radioButton';
+import 'vs/css!./media/radioButton';
 import {
-	Component, Input, Inject, ChangeDetectorRef, forwardRef, ComponentFactoryResolver,
-	ViewChild, ViewChildren, ElementRef, Injector, OnDestroy, QueryList, AfterViewInit
+	Component, Input, Inject, ChangeDetectorRef, forwardRef,
+	ViewChild, ElementRef, OnDestroy, AfterViewInit
 } from '@angular/core';
 
 import * as azdata from 'azdata';
-import { Event, Emitter } from 'vs/base/common/event';
 
-import { ComponentBase } from 'sql/parts/modelComponents/componentBase';
-import { IComponent, IComponentDescriptor, IModelStore, ComponentEventType } from 'sql/parts/modelComponents/interfaces';
+import { ComponentBase } from 'sql/workbench/electron-browser/modelComponents/componentBase';
+import { IComponent, IComponentDescriptor, IModelStore, ComponentEventType } from 'sql/workbench/electron-browser/modelComponents/interfaces';
 import { RadioButton } from 'sql/base/browser/ui/radioButton/radioButton';
-import { CommonServiceInterface } from 'sql/platform/bootstrap/node/commonServiceInterface.service';
 
 @Component({
 	selector: 'modelview-radioButton',
@@ -32,7 +30,6 @@ export default class RadioButtonComponent extends ComponentBase implements IComp
 
 	@ViewChild('input', { read: ElementRef }) private _inputContainer: ElementRef;
 	constructor(
-		@Inject(forwardRef(() => CommonServiceInterface)) private _commonService: CommonServiceInterface,
 		@Inject(forwardRef(() => ChangeDetectorRef)) changeRef: ChangeDetectorRef,
 		@Inject(forwardRef(() => ElementRef)) el: ElementRef) {
 		super(changeRef, el);

src/sql/workbench/electron-browser/modelComponents/splitviewContainer.component.ts

@@ -2,16 +2,14 @@
  *  Copyright (c) Microsoft Corporation. All rights reserved.
  *  Licensed under the Source EULA. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
-import 'vs/css!./flexContainer';
+import 'vs/css!./media/flexContainer';
 
-import {
-	Component, Input, Inject, ChangeDetectorRef, forwardRef, ElementRef, OnDestroy,
-} from '@angular/core';
+import { Component, Input, Inject, ChangeDetectorRef, forwardRef, ElementRef, OnDestroy } from '@angular/core';
 
-import { IComponent, IComponentDescriptor, IModelStore } from 'sql/parts/modelComponents/interfaces';
+import { IComponent, IComponentDescriptor, IModelStore } from 'sql/workbench/electron-browser/modelComponents/interfaces';
 import { FlexItemLayout, SplitViewLayout } from 'azdata';
 import { FlexItem } from './flexContainer.component';
-import { ContainerBase, ComponentBase } from 'sql/parts/modelComponents/componentBase';
+import { ContainerBase, ComponentBase } from 'sql/workbench/electron-browser/modelComponents/componentBase';
 import { Event } from 'vs/base/common/event';
 import { SplitView, Orientation, Sizing, IView } from 'vs/base/browser/ui/splitview/splitview';
 

src/sql/workbench/electron-browser/modelComponents/table.component.ts

@@ -3,7 +3,7 @@
  *  Licensed under the Source EULA. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import 'vs/css!./table';
+import 'vs/css!./media/table';
 
 import {
 	Component, Input, Inject, ChangeDetectorRef, forwardRef, ViewChild, ElementRef, OnDestroy, AfterViewInit
@@ -11,8 +11,8 @@ import {
 
 import * as azdata from 'azdata';
 
-import { ComponentBase } from 'sql/parts/modelComponents/componentBase';
-import { IComponent, IComponentDescriptor, IModelStore, ComponentEventType } from 'sql/parts/modelComponents/interfaces';
+import { ComponentBase } from 'sql/workbench/electron-browser/modelComponents/componentBase';
+import { IComponent, IComponentDescriptor, IModelStore, ComponentEventType } from 'sql/workbench/electron-browser/modelComponents/interfaces';
 
 import { Table } from 'sql/base/browser/ui/table/table';
 import { TableDataView } from 'sql/base/browser/ui/table/tableDataView';

src/sql/workbench/electron-browser/modelComponents/text.component.ts

@@ -3,7 +3,7 @@
  *  Licensed under the Source EULA. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import 'vs/css!./radioButton';
+import 'vs/css!./media/radioButton';
 import {
 	Component, Input, Inject, ChangeDetectorRef, forwardRef,
 	OnDestroy, AfterViewInit, ElementRef, SecurityContext
@@ -11,9 +11,8 @@ import {
 
 import * as azdata from 'azdata';
 
-import { ComponentBase } from 'sql/parts/modelComponents/componentBase';
-import { IComponent, IComponentDescriptor, IModelStore } from 'sql/parts/modelComponents/interfaces';
-import { CommonServiceInterface } from 'sql/platform/bootstrap/node/commonServiceInterface.service';
+import { ComponentBase } from 'sql/workbench/electron-browser/modelComponents/componentBase';
+import { IComponent, IComponentDescriptor, IModelStore } from 'sql/workbench/electron-browser/modelComponents/interfaces';
 import { SafeHtml, DomSanitizer } from '@angular/platform-browser';
 
 @Component({
@@ -26,7 +25,6 @@ export default class TextComponent extends ComponentBase implements IComponent,
 	@Input() modelStore: IModelStore;
 
 	constructor(
-		@Inject(forwardRef(() => CommonServiceInterface)) private _commonService: CommonServiceInterface,
 		@Inject(forwardRef(() => ChangeDetectorRef)) changeRef: ChangeDetectorRef,
 		@Inject(forwardRef(() => ElementRef)) el: ElementRef,
 		@Inject(forwardRef(() => DomSanitizer)) private _domSanitizer: DomSanitizer) {

src/sql/workbench/electron-browser/modelComponents/toolbarContainer.component.ts

@@ -2,8 +2,7 @@
  *  Copyright (c) Microsoft Corporation. All rights reserved.
  *  Licensed under the Source EULA. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
-import 'vs/css!./toolbarLayout';
-import 'vs/css!../../../sql/base/browser/ui/taskbar/media/taskbar';
+import 'vs/css!./media/toolbarLayout';
 
 import {
 	Component, Input, Inject, ChangeDetectorRef, forwardRef,
@@ -12,9 +11,9 @@ import {
 
 import { Orientation, ToolbarLayout } from 'sql/workbench/api/common/sqlExtHostTypes';
 
-import { IComponent, IComponentDescriptor, IModelStore } from 'sql/parts/modelComponents/interfaces';
+import { IComponent, IComponentDescriptor, IModelStore } from 'sql/workbench/electron-browser/modelComponents/interfaces';
 
-import { ContainerBase } from 'sql/parts/modelComponents/componentBase';
+import { ContainerBase } from 'sql/workbench/electron-browser/modelComponents/componentBase';
 import { CommonServiceInterface } from 'sql/platform/bootstrap/node/commonServiceInterface.service';
 
 export interface ToolbarItemConfig {

src/sql/workbench/electron-browser/modelComponents/tree.component.ts

@@ -2,8 +2,7 @@
  *  Copyright (c) Microsoft Corporation. All rights reserved.
  *  Licensed under the Source EULA. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
-import 'vs/css!sql/parts/modelComponents/tree/treeComponent';
-import 'vs/css!sql/media/icons/common-icons';
+import 'vs/css!./media/treeComponent';
 
 import {
 	Component, Input, Inject, ChangeDetectorRef, forwardRef,
@@ -12,19 +11,19 @@ import {
 
 import * as azdata from 'azdata';
 
-import { ComponentBase } from 'sql/parts/modelComponents/componentBase';
-import { IComponent, IComponentDescriptor, IModelStore, ComponentEventType } from 'sql/parts/modelComponents/interfaces';
+import { ComponentBase } from 'sql/workbench/electron-browser/modelComponents/componentBase';
+import { IComponent, IComponentDescriptor, IModelStore } from 'sql/workbench/electron-browser/modelComponents/interfaces';
 import { Tree } from 'vs/base/parts/tree/browser/treeImpl';
 import { CommonServiceInterface } from 'sql/platform/bootstrap/node/commonServiceInterface.service';
-import { TreeComponentRenderer } from 'sql/parts/modelComponents/tree/treeComponentRenderer';
-import { TreeComponentDataSource } from 'sql/parts/modelComponents/tree/treeDataSource';
+import { TreeComponentRenderer } from 'sql/workbench/electron-browser/modelComponents/treeComponentRenderer';
+import { TreeComponentDataSource } from 'sql/workbench/electron-browser/modelComponents/treeDataSource';
 import { IWorkbenchThemeService } from 'vs/workbench/services/themes/common/workbenchThemeService';
 import { IContextViewService } from 'vs/platform/contextview/browser/contextView';
 import { attachListStyler } from 'vs/platform/theme/common/styler';
 import { DefaultFilter, DefaultAccessibilityProvider, DefaultController } from 'vs/base/parts/tree/browser/treeDefaults';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 import { ITreeComponentItem } from 'sql/workbench/common/views';
-import { TreeViewDataProvider } from './treeViewDataProvider';
+import { TreeViewDataProvider } from 'sql/workbench/electron-browser/modelComponents/treeViewDataProvider';
 import { getContentHeight, getContentWidth } from 'vs/base/browser/dom';
 
 class Root implements ITreeComponentItem {

src/sql/workbench/electron-browser/modelComponents/treeComponentRenderer.ts

@@ -3,13 +3,8 @@
  *  Licensed under the Source EULA. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-'use strict';
-import 'vs/css!sql/media/icons/common-icons';
 import * as dom from 'vs/base/browser/dom';
-import { localize } from 'vs/nls';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 import { ITree, IRenderer } from 'vs/base/parts/tree/browser/tree';
-import { IContextViewService } from 'vs/platform/contextview/browser/contextView';
 import { LIGHT } from 'vs/platform/theme/common/themeService';
 import { Disposable } from 'vs/base/common/lifecycle';
 import { Event, Emitter } from 'vs/base/common/event';

src/sql/workbench/electron-browser/modelComponents/treeDataSource.ts

@@ -3,8 +3,6 @@
  *  Licensed under the Source EULA. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-'use strict';
-
 import { ITree, IDataSource } from 'vs/base/parts/tree/browser/tree';
 import { IModelViewTreeViewDataProvider, ITreeComponentItem } from 'sql/workbench/common/views';
 import { TreeItemCollapsibleState } from 'vs/workbench/common/views';

src/sql/workbench/electron-browser/modelComponents/treeViewDataProvider.ts

@@ -2,7 +2,6 @@
  *  Copyright (c) Microsoft Corporation. All rights reserved.
  *  Licensed under the Source EULA. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
-'use strict';
 
 import { ExtHostModelViewTreeViewsShape, SqlExtHostContext } from 'sql/workbench/api/node/sqlExtHost.protocol';
 import { IExtHostContext } from 'vs/workbench/api/common/extHost.protocol';

src/sql/workbench/electron-browser/modelComponents/viewBase.ts

@@ -6,7 +6,7 @@
 import { ChangeDetectorRef } from '@angular/core';
 
 import { Registry } from 'vs/platform/registry/common/platform';
-import nls = require('vs/nls');
+import * as nls from 'vs/nls';
 
 import * as azdata from 'azdata';
 import { IModelStore, IComponentDescriptor, IComponent } from './interfaces';
@@ -14,7 +14,7 @@ import { IItemConfig, ModelComponentTypes, IComponentShape } from 'sql/workbench
 import { IModelView, IModelViewEventArgs } from 'sql/platform/model/common/modelViewService';
 import { Extensions, IComponentRegistry } from 'sql/platform/dashboard/common/modelComponentRegistry';
 import { AngularDisposable } from 'sql/base/node/lifecycle';
-import { ModelStore } from 'sql/parts/modelComponents/modelStore';
+import { ModelStore } from 'sql/workbench/electron-browser/modelComponents/modelStore';
 import { Event, Emitter } from 'vs/base/common/event';
 
 const componentRegistry = <IComponentRegistry>Registry.as(Extensions.ComponentContribution);

src/sql/workbench/electron-browser/modelComponents/webview.component.ts

@@ -2,7 +2,7 @@
  *  Copyright (c) Microsoft Corporation. All rights reserved.
  *  Licensed under the Source EULA. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
-import 'vs/css!./webview';
+import 'vs/css!./media/webview';
 import {
 	Component, Input, Inject, ChangeDetectorRef, forwardRef, ElementRef, OnDestroy
 } from '@angular/core';
@@ -14,8 +14,8 @@ import { URI, UriComponents } from 'vs/base/common/uri';
 import { IOpenerService } from 'vs/platform/opener/common/opener';
 import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
 
-import { ComponentBase } from 'sql/parts/modelComponents/componentBase';
-import { IComponent, IComponentDescriptor, IModelStore, ComponentEventType } from 'sql/parts/modelComponents/interfaces';
+import { ComponentBase } from 'sql/workbench/electron-browser/modelComponents/componentBase';
+import { IComponent, IComponentDescriptor, IModelStore, ComponentEventType } from 'sql/workbench/electron-browser/modelComponents/interfaces';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 import { IContextKey } from 'vs/platform/contextkey/common/contextkey';
 import { WebviewElement } from 'vs/workbench/contrib/webview/electron-browser/webviewElement';

src/sql/workbench/parts/backup/common/constants.ts

@@ -2,6 +2,7 @@
  *  Copyright (c) Microsoft Corporation. All rights reserved.
  *  Licensed under the Source EULA. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
+
 import { localize } from 'vs/nls';
 
 // Constants

src/sql/workbench/parts/backup/electron-browser/backup.component.ts

@@ -3,7 +3,7 @@
  *  Licensed under the Source EULA. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import 'vs/css!sql/parts/disasterRecovery/backup/media/backupDialog';
+import 'vs/css!./media/backupDialog';
 
 import { ElementRef, Component, Inject, forwardRef, ViewChild, ChangeDetectorRef } from '@angular/core';
 import { Button } from 'sql/base/browser/ui/button/button';
@@ -14,7 +14,7 @@ import { ModalFooterStyle } from 'sql/workbench/browser/modal/modal';
 import { SelectBox } from 'sql/base/browser/ui/selectBox/selectBox';
 import { attachButtonStyler, attachListBoxStyler, attachInputBoxStyler, attachSelectBoxStyler, attachCheckboxStyler } from 'sql/platform/theme/common/styler';
 import { IConnectionProfile } from 'sql/platform/connection/common/interfaces';
-import * as BackupConstants from 'sql/parts/disasterRecovery/backup/constants';
+import * as BackupConstants from 'sql/workbench/parts/backup/common/constants';
 import { IBackupService, TaskExecutionMode } from 'sql/platform/backup/common/backupService';
 import * as FileValidationConstants from 'sql/workbench/services/fileBrowser/common/fileValidationServiceConstants';
 import { IConnectionManagementService } from 'sql/platform/connection/common/connectionManagement';
@@ -111,7 +111,7 @@ const LocalizedStrings = {
 
 @Component({
 	selector: BACKUP_SELECTOR,
-	templateUrl: decodeURI(require.toUrl('sql/parts/disasterRecovery/backup/backup.component.html'))
+	templateUrl: decodeURI(require.toUrl('sql/workbench/parts/backup/electron-browser/backup.component.html'))
 })
 export class BackupComponent {
 	@ViewChild('pathContainer', { read: ElementRef }) pathElement;

src/sql/workbench/parts/backup/electron-browser/backup.module.ts

@@ -12,7 +12,7 @@ import { FormsModule } from '@angular/forms';
 import { BrowserModule } from '@angular/platform-browser';
 
 import { IBootstrapParams, ISelector, providerIterator } from 'sql/platform/bootstrap/node/bootstrapService';
-import { BackupComponent } from 'sql/parts/disasterRecovery/backup/backup.component';
+import { BackupComponent } from 'sql/workbench/parts/backup/electron-browser/backup.component';
 
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 

src/sql/workbench/parts/backup/electron-browser/backupDialog.ts

@@ -5,8 +5,8 @@
 
 import { Modal } from 'sql/workbench/browser/modal/modal';
 import { IConnectionProfile } from 'sql/platform/connection/common/interfaces';
-import { BackupModule } from 'sql/parts/disasterRecovery/backup/backup.module';
-import { BACKUP_SELECTOR } from 'sql/parts/disasterRecovery/backup/backup.component';
+import { BackupModule } from 'sql/workbench/parts/backup/electron-browser/backup.module';
+import { BACKUP_SELECTOR } from 'sql/workbench/parts/backup/electron-browser/backup.component';
 import { attachModalDialogStyler } from 'sql/platform/theme/common/styler';
 import * as TelemetryKeys from 'sql/platform/telemetry/telemetryKeys';
 

src/sql/workbench/parts/connection/common/connectionActions.ts

@@ -13,7 +13,7 @@ import Severity from 'vs/base/common/severity';
 import { IDialogService, IConfirmation, IConfirmationResult } from 'vs/platform/dialogs/common/dialogs';
 import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
 import { QueryInput } from 'sql/parts/query/common/queryInput';
-import { EditDataInput } from 'sql/parts/editData/common/editDataInput';
+import { EditDataInput } from 'sql/workbench/parts/editData/common/editDataInput';
 import { DashboardInput } from 'sql/workbench/parts/dashboard/dashboardInput';
 import { IClipboardService } from 'vs/platform/clipboard/common/clipboardService';
 import { IQuickInputService } from 'vs/platform/quickinput/common/quickInput';

src/sql/workbench/parts/dashboard/containers/dashboardModelViewContainer.component.ts

@@ -11,7 +11,7 @@ import { Event, Emitter } from 'vs/base/common/event';
 
 import { DashboardTab } from 'sql/workbench/parts/dashboard/common/interfaces';
 import { TabConfig } from 'sql/workbench/parts/dashboard/common/dashboardWidget';
-import { ModelViewContent } from 'sql/parts/modelComponents/modelViewContent.component';
+import { ModelViewContent } from 'sql/workbench/electron-browser/modelComponents/modelViewContent.component';
 import { TabChild } from 'sql/base/browser/ui/panel/tab.component';
 
 @Component({

src/sql/workbench/parts/dashboard/contents/controlHostContent.component.ts

@@ -13,7 +13,7 @@ import { CommonServiceInterface } from 'sql/platform/bootstrap/node/commonServic
 
 import * as azdata from 'azdata';
 import { memoize } from 'vs/base/common/decorators';
-import { AgentViewComponent } from '../../../../parts/jobManagement/agent/agentView.component';
+import { AgentViewComponent } from '../../jobManagement/electron-browser/agentView.component';
 
 @Component({
 	templateUrl: decodeURI(require.toUrl('sql/workbench/parts/dashboard/contents/controlHostContent.component.html')),

src/sql/workbench/parts/dashboard/dashboard.module.ts

@@ -41,25 +41,25 @@ import { DashboardModelViewContainer } from 'sql/workbench/parts/dashboard/conta
 import { DashboardErrorContainer } from 'sql/workbench/parts/dashboard/containers/dashboardErrorContainer.component';
 import { DashboardNavSection } from 'sql/workbench/parts/dashboard/containers/dashboardNavSection.component';
 import { WidgetContent } from 'sql/workbench/parts/dashboard/contents/widgetContent.component';
-import { ModelViewContent } from 'sql/parts/modelComponents/modelViewContent.component';
-import { ModelComponentWrapper } from 'sql/parts/modelComponents/modelComponentWrapper.component';
+import { ModelViewContent } from 'sql/workbench/electron-browser/modelComponents/modelViewContent.component';
+import { ModelComponentWrapper } from 'sql/workbench/electron-browser/modelComponents/modelComponentWrapper.component';
 import { WebviewContent } from 'sql/workbench/parts/dashboard/contents/webviewContent.component';
 import { BreadcrumbComponent } from 'sql/base/browser/ui/breadcrumb/breadcrumb.component';
 import { IBreadcrumbService } from 'sql/base/browser/ui/breadcrumb/interfaces';
 import { DashboardHomeContainer } from 'sql/workbench/parts/dashboard/containers/dashboardHomeContainer.component';
 import { ControlHostContent } from 'sql/workbench/parts/dashboard/contents/controlHostContent.component';
 import { DashboardControlHostContainer } from 'sql/workbench/parts/dashboard/containers/dashboardControlHostContainer.component';
-import { JobsViewComponent } from 'sql/parts/jobManagement/views/jobsView.component';
-import { AgentViewComponent } from 'sql/parts/jobManagement/agent/agentView.component';
-import { AlertsViewComponent } from 'sql/parts/jobManagement/views/alertsView.component';
-import { JobHistoryComponent } from 'sql/parts/jobManagement/views/jobHistory.component';
-import { OperatorsViewComponent } from 'sql/parts/jobManagement/views/operatorsView.component';
-import { ProxiesViewComponent } from 'sql/parts/jobManagement/views/proxiesView.component';
+import { JobsViewComponent } from 'sql/workbench/parts/jobManagement/electron-browser/jobsView.component';
+import { AgentViewComponent } from 'sql/workbench/parts/jobManagement/electron-browser/agentView.component';
+import { AlertsViewComponent } from 'sql/workbench/parts/jobManagement/electron-browser/alertsView.component';
+import { JobHistoryComponent } from 'sql/workbench/parts/jobManagement/electron-browser/jobHistory.component';
+import { OperatorsViewComponent } from 'sql/workbench/parts/jobManagement/electron-browser/operatorsView.component';
+import { ProxiesViewComponent } from 'sql/workbench/parts/jobManagement/electron-browser/proxiesView.component';
 import { Checkbox } from 'sql/base/browser/ui/checkbox/checkbox.component';
 import { SelectBox } from 'sql/base/browser/ui/selectBox/selectBox.component';
 import { EditableDropDown } from 'sql/base/browser/ui/editableDropdown/editableDropdown.component';
 import { InputBox } from 'sql/base/browser/ui/inputBox/inputBox.component';
-import LoadingSpinner from 'sql/parts/modelComponents/loadingSpinner.component';
+import LoadingSpinner from 'sql/workbench/electron-browser/modelComponents/loadingSpinner.component';
 
 const baseComponents = [DashboardHomeContainer, DashboardComponent, DashboardWidgetWrapper, DashboardWebviewContainer,
 	DashboardWidgetContainer, DashboardGridContainer, DashboardErrorContainer, DashboardNavSection, ModelViewContent, WebviewContent, WidgetContent,
@@ -84,7 +84,7 @@ import { ExplorerWidget } from 'sql/workbench/parts/dashboard/widgets/explorer/e
 import { TasksWidget } from 'sql/workbench/parts/dashboard/widgets/tasks/tasksWidget.component';
 import { InsightsWidget } from 'sql/workbench/parts/dashboard/widgets/insights/insightsWidget.component';
 import { WebviewWidget } from 'sql/workbench/parts/dashboard/widgets/webview/webviewWidget.component';
-import { JobStepsViewComponent } from 'sql/parts/jobManagement/views/jobStepsView.component';
+import { JobStepsViewComponent } from 'sql/workbench/parts/jobManagement/electron-browser/jobStepsView.component';
 import { IInstantiationService, _util } from 'vs/platform/instantiation/common/instantiation';
 
 const widgetComponents = [

src/sql/workbench/parts/editData/browser/editDataActions.ts

@@ -9,11 +9,11 @@ import { IQueryModelService } from 'sql/platform/query/common/queryModel';
 import { SelectBox } from 'sql/base/browser/ui/selectBox/selectBox';
 import { EventEmitter } from 'sql/base/common/eventEmitter';
 import { IConnectionManagementService } from 'sql/platform/connection/common/connectionManagement';
-import { EditDataEditor } from 'sql/parts/editData/editor/editDataEditor';
-import nls = require('vs/nls');
+import { EditDataEditor } from 'sql/workbench/parts/editData/browser/editDataEditor';
+import * as nls from 'vs/nls';
 import * as dom from 'vs/base/browser/dom';
 import { IContextViewService } from 'vs/platform/contextview/browser/contextView';
-import { INotificationService, INotificationActions } from 'vs/platform/notification/common/notification';
+import { INotificationService } from 'vs/platform/notification/common/notification';
 import Severity from 'vs/base/common/severity';
 import { attachSelectBoxStyler } from 'vs/platform/theme/common/styler';
 import { IThemeService } from 'vs/platform/theme/common/themeService';

src/sql/workbench/parts/editData/browser/editDataEditor.ts

@@ -16,7 +16,7 @@ import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
 import { IThemeService } from 'vs/platform/theme/common/themeService';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 
-import { EditDataInput } from 'sql/parts/editData/common/editDataInput';
+import { EditDataInput } from 'sql/workbench/parts/editData/common/editDataInput';
 
 import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
 import * as queryContext from 'sql/parts/query/common/queryContext';
@@ -27,14 +27,14 @@ import { IQueryModelService } from 'sql/platform/query/common/queryModel';
 import { IEditorDescriptorService } from 'sql/workbench/services/queryEditor/common/editorDescriptorService';
 import {
 	RefreshTableAction, StopRefreshTableAction, ChangeMaxRowsAction, ChangeMaxRowsActionItem, ShowQueryPaneAction
-} from 'sql/parts/editData/execution/editDataActions';
+} from 'sql/workbench/parts/editData/browser/editDataActions';
 import { TextResourceEditor } from 'vs/workbench/browser/parts/editor/textResourceEditor';
 import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
 import { IContextKey, IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
 import { UntitledEditorInput } from 'vs/workbench/common/editor/untitledEditorInput';
 import { IFlexibleSash, HorizontalFlexibleSash } from 'sql/parts/query/views/flexibleSash';
-import { EditDataResultsEditor } from 'sql/parts/editData/editor/editDataResultsEditor';
-import { EditDataResultsInput } from 'sql/parts/editData/common/editDataResultsInput';
+import { EditDataResultsEditor } from 'sql/workbench/parts/editData/browser/editDataResultsEditor';
+import { EditDataResultsInput } from 'sql/workbench/parts/editData/common/editDataResultsInput';
 import { CancellationToken } from 'vs/base/common/cancellation';
 import { IStorageService } from 'vs/platform/storage/common/storage';
 import { IEditorGroup } from 'vs/workbench/services/editor/common/editorGroupsService';
@@ -46,9 +46,6 @@ export class EditDataEditor extends BaseEditor {
 
 	public static ID: string = 'workbench.editor.editDataEditor';
 
-	// The height of the tabs above the editor
-	private readonly _tabHeight: number = 35;
-
 	// The minimum width/height of the editors hosted in the QueryEditor
 	private readonly _minEditorSize: number = 220;
 

src/sql/workbench/parts/editData/browser/editDataResultsEditor.ts

@@ -20,7 +20,7 @@ import { BareResultsGridInfo } from 'sql/parts/query/editor/queryResultsEditor';
 import { IEditDataComponentParams } from 'sql/platform/bootstrap/node/bootstrapParams';
 import { EditDataModule } from 'sql/workbench/parts/grid/views/editData/editData.module';
 import { EDITDATA_SELECTOR } from 'sql/workbench/parts/grid/views/editData/editData.component';
-import { EditDataResultsInput } from 'sql/parts/editData/common/editDataResultsInput';
+import { EditDataResultsInput } from 'sql/workbench/parts/editData/common/editDataResultsInput';
 import { CancellationToken } from 'vs/base/common/cancellation';
 import { IStorageService } from 'vs/platform/storage/common/storage';
 

src/sql/workbench/parts/editData/common/editDataInput.ts

@@ -6,15 +6,15 @@
 import { EditorInput, EditorModel, ConfirmResult, EncodingMode } from 'vs/workbench/common/editor';
 import { IConnectionManagementService, IConnectableInput, INewConnectionParams } from 'sql/platform/connection/common/connectionManagement';
 import { IQueryModelService } from 'sql/platform/query/common/queryModel';
-import { IDisposable, dispose } from 'vs/base/common/lifecycle';
+import { dispose } from 'vs/base/common/lifecycle';
 import { Event, Emitter } from 'vs/base/common/event';
-import { EditSessionReadyParams, ISelectionData } from 'azdata';
+import { EditSessionReadyParams } from 'azdata';
 import { URI } from 'vs/base/common/uri';
-import nls = require('vs/nls');
+import * as nls from 'vs/nls';
 import { INotificationService } from 'vs/platform/notification/common/notification';
 import Severity from 'vs/base/common/severity';
 import { UntitledEditorInput } from 'vs/workbench/common/editor/untitledEditorInput';
-import { EditDataResultsInput } from 'sql/parts/editData/common/editDataResultsInput';
+import { EditDataResultsInput } from 'sql/workbench/parts/editData/common/editDataResultsInput';
 import { IEditorViewState } from 'vs/editor/common/editorCommon';
 
 /**
@@ -22,7 +22,6 @@ import { IEditorViewState } from 'vs/editor/common/editorCommon';
  */
 export class EditDataInput extends EditorInput implements IConnectableInput {
 	public static ID: string = 'workbench.editorinputs.editDataInput';
-	private _visible: boolean;
 	private _hasBootstrapped: boolean;
 	private _editorContainer: HTMLElement;
 	private _updateTaskbar: Emitter<EditDataInput>;
@@ -50,7 +49,6 @@ export class EditDataInput extends EditorInput implements IConnectableInput {
 		@INotificationService private notificationService: INotificationService
 	) {
 		super();
-		this._visible = false;
 		this._hasBootstrapped = false;
 		this._updateTaskbar = new Emitter<EditDataInput>();
 		this._showResultsEditor = new Emitter<EditDataInput>();

src/sql/workbench/parts/editData/common/editDataResultsInput.ts

@@ -3,9 +3,6 @@
  *  Licensed under the Source EULA. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-'use strict';
-
-import { localize } from 'vs/nls';
 import { EditorInput } from 'vs/workbench/common/editor';
 import { Emitter } from 'vs/base/common/event';
 

src/sql/workbench/parts/grid/views/gridCommands.ts

@@ -6,7 +6,7 @@
 import * as GridContentEvents from 'sql/workbench/parts/grid/common/gridContentEvents';
 import { IQueryModelService } from 'sql/platform/query/common/queryModel';
 import { QueryEditor } from 'sql/parts/query/editor/queryEditor';
-import { EditDataEditor } from 'sql/parts/editData/editor/editDataEditor';
+import { EditDataEditor } from 'sql/workbench/parts/editData/browser/editDataEditor';
 
 import { ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
 import { IEditorService } from 'vs/workbench/services/editor/common/editorService';

src/sql/workbench/parts/jobManagement/electron-browser/agentView.component.ts

@@ -3,8 +3,7 @@
  *  Licensed under the Source EULA. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import 'vs/css!../common/media/jobs';
-import 'sql/workbench/parts/dashboard/common/dashboardPanelStyles';
+import 'vs/css!./media/jobs';
 
 import * as nls from 'vs/nls';
 import { Component, Inject, forwardRef, ChangeDetectorRef, ViewChild, Injectable } from '@angular/core';

src/sql/workbench/parts/jobManagement/electron-browser/alertsView.component.ts

@@ -3,10 +3,7 @@
  *  Licensed under the Source EULA. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import 'vs/css!sql/workbench/parts/grid/media/flexbox';
-import 'vs/css!sql/workbench/parts/grid/media/styles';
-import 'vs/css!../common/media/jobs';
-import 'vs/css!sql/media/icons/common-icons';
+import 'vs/css!./media/jobs';
 
 import * as dom from 'vs/base/browser/dom';
 import * as nls from 'vs/nls';
@@ -14,10 +11,10 @@ import * as azdata from 'azdata';
 import { Component, Inject, forwardRef, ElementRef, ChangeDetectorRef, ViewChild, OnInit, OnDestroy } from '@angular/core';
 import { TabChild } from 'sql/base/browser/ui/panel/tab.component';
 import { Table } from 'sql/base/browser/ui/table/table';
-import { AgentViewComponent } from 'sql/parts/jobManagement/agent/agentView.component';
+import { AgentViewComponent } from 'sql/workbench/parts/jobManagement/electron-browser/agentView.component';
 import { IJobManagementService } from 'sql/platform/jobManagement/common/interfaces';
 import { EditAlertAction, DeleteAlertAction, NewAlertAction } from 'sql/platform/jobManagement/common/jobActions';
-import { JobManagementView } from 'sql/parts/jobManagement/views/jobManagementView';
+import { JobManagementView } from 'sql/workbench/parts/jobManagement/electron-browser/jobManagementView';
 import { CommonServiceInterface } from 'sql/platform/bootstrap/node/commonServiceInterface.service';
 import { ICommandService } from 'vs/platform/commands/common/commands';
 import { IContextMenuService } from 'vs/platform/contextview/browser/contextView';
@@ -26,7 +23,7 @@ import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 import { IDashboardService } from 'sql/platform/dashboard/browser/dashboardService';
 import { AlertsCacheObject } from 'sql/platform/jobManagement/common/jobManagementService';
-import { RowDetailView } from 'sql/base/browser/ui/table/plugins/rowdetailview';
+import { RowDetailView } from 'sql/base/browser/ui/table/plugins/rowDetailView';
 
 export const VIEW_SELECTOR: string = 'jobalertsview-component';
 export const ROW_HEIGHT: number = 45;

src/sql/workbench/parts/jobManagement/electron-browser/jobHistory.component.ts

@@ -3,15 +3,14 @@
  *  Licensed under the Source EULA. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import 'vs/css!./jobHistory';
-import 'vs/css!sql/media/icons/common-icons';
+import 'vs/css!./media/jobHistory';
 
 import * as azdata from 'azdata';
 import * as nls from 'vs/nls';
 import * as dom from 'vs/base/browser/dom';
 import { OnInit, Component, Inject, Input, forwardRef, ElementRef, ChangeDetectorRef, ViewChild, ChangeDetectionStrategy, Injectable } from '@angular/core';
 import { Taskbar } from 'sql/base/browser/ui/taskbar/taskbar';
-import { AgentViewComponent } from 'sql/parts/jobManagement/agent/agentView.component';
+import { AgentViewComponent } from 'sql/workbench/parts/jobManagement/electron-browser/agentView.component';
 import { CommonServiceInterface } from 'sql/platform/bootstrap/node/commonServiceInterface.service';
 import { RunJobAction, StopJobAction, EditJobAction, JobsRefreshAction } from 'sql/platform/jobManagement/common/jobActions';
 import { JobCacheObject } from 'sql/platform/jobManagement/common/jobManagementService';
@@ -20,15 +19,15 @@ import { IJobManagementService } from 'sql/platform/jobManagement/common/interfa
 import {
 	JobHistoryController, JobHistoryDataSource,
 	JobHistoryRenderer, JobHistoryFilter, JobHistoryModel, JobHistoryRow
-} from 'sql/parts/jobManagement/views/jobHistoryTree';
-import { JobStepsViewRow } from 'sql/parts/jobManagement/views/jobStepsViewTree';
+} from 'sql/workbench/parts/jobManagement/electron-browser/jobHistoryTree';
+import { JobStepsViewRow } from 'sql/workbench/parts/jobManagement/electron-browser/jobStepsViewTree';
 import { IWorkbenchThemeService } from 'vs/workbench/services/themes/common/workbenchThemeService';
 import { attachListStyler } from 'vs/platform/theme/common/styler';
 import { Tree } from 'vs/base/parts/tree/browser/treeImpl';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 import { ScrollbarVisibility } from 'vs/base/common/scrollable';
 import { IContextMenuService } from 'vs/platform/contextview/browser/contextView';
-import { JobManagementView } from 'sql/parts/jobManagement/views/jobManagementView';
+import { JobManagementView } from 'sql/workbench/parts/jobManagement/electron-browser/jobManagementView';
 import { TabChild } from 'sql/base/browser/ui/panel/tab.component';
 import { IDashboardService } from 'sql/platform/dashboard/browser/dashboardService';
 import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';

src/sql/workbench/parts/jobManagement/electron-browser/jobHistoryTree.ts

@@ -3,10 +3,6 @@
  *  Licensed under the Source EULA. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import {
-	NewQueryAction, ScriptSelectAction, EditDataAction, ScriptCreateAction, ScriptExecuteAction, ScriptAlterAction,
-	BackupAction, ManageActionContext, BaseActionContext, ManageAction, RestoreAction
-} from 'sql/workbench/common/actions';
 import * as tree from 'vs/base/parts/tree/browser/tree';
 import * as TreeDefaults from 'vs/base/parts/tree/browser/treeDefaults';
 import { IMouseEvent } from 'vs/base/browser/mouseEvent';