More layering and compile strictness (#8973)

* add more folders to strictire compile, add more strict compile options

* update ci

* wip

* add more layering and fix issues

* add more strictness

* remove unnecessary assertion

* add missing checks

* fix indentation

* remove jsdoc

src/sql/workbench/contrib/accounts/browser/accountDialog.ts

@@ -24,7 +24,7 @@ import * as azdata from 'azdata';
 
 import { Button } from 'sql/base/browser/ui/button/button';
 import { Modal } from 'sql/workbench/browser/modal/modal';
-import { attachModalDialogStyler, attachButtonStyler, attachPanelStyler } from 'sql/platform/theme/common/styler';
+import { attachButtonStyler } from 'sql/platform/theme/common/styler';
 import { AccountViewModel } from 'sql/platform/accounts/common/accountViewModel';
 import { AddAccountAction } from 'sql/platform/accounts/common/accountActions';
 import { AccountListRenderer, AccountListDelegate } from 'sql/workbench/contrib/accounts/browser/accountListRenderer';
@@ -36,6 +36,7 @@ import { IWorkbenchLayoutService } from 'vs/workbench/services/layout/browser/la
 import { ITextResourcePropertiesService } from 'vs/editor/common/services/textResourceConfigurationService';
 import { IAdsTelemetryService } from 'sql/platform/telemetry/common/telemetry';
 import { IViewPaneOptions, ViewPane } from 'vs/workbench/browser/parts/views/viewPaneContainer';
+import { attachModalDialogStyler, attachPanelStyler } from 'sql/workbench/common/styler';
 import { IViewDescriptorService } from 'vs/workbench/common/views';
 
 class AccountPanel extends ViewPane {

src/sql/workbench/contrib/accounts/browser/autoOAuthDialog.ts

@@ -17,13 +17,14 @@ import { $, append } from 'vs/base/browser/dom';
 import { Button } from 'sql/base/browser/ui/button/button';
 import { Modal } from 'sql/workbench/browser/modal/modal';
 import { InputBox } from 'sql/base/browser/ui/inputBox/inputBox';
-import { attachModalDialogStyler, attachButtonStyler } from 'sql/platform/theme/common/styler';
+import { attachButtonStyler } from 'sql/platform/theme/common/styler';
 import * as TelemetryKeys from 'sql/platform/telemetry/common/telemetryKeys';
 import { IClipboardService } from 'vs/platform/clipboard/common/clipboardService';
 import { ILogService } from 'vs/platform/log/common/log';
 import { IWorkbenchLayoutService } from 'vs/workbench/services/layout/browser/layoutService';
 import { ITextResourcePropertiesService } from 'vs/editor/common/services/textResourceConfigurationService';
 import { IAdsTelemetryService } from 'sql/platform/telemetry/common/telemetry';
+import { attachModalDialogStyler } from 'sql/workbench/common/styler';
 
 export class AutoOAuthDialog extends Modal {
 	private _copyAndOpenButton: Button;

src/sql/workbench/contrib/accounts/browser/firewallRuleDialog.ts

@@ -22,7 +22,7 @@ import * as azdata from 'azdata';
 import { Button } from 'sql/base/browser/ui/button/button';
 import { Modal } from 'sql/workbench/browser/modal/modal';
 import { FirewallRuleViewModel } from 'sql/platform/accounts/common/firewallRuleViewModel';
-import { attachModalDialogStyler, attachButtonStyler } from 'sql/platform/theme/common/styler';
+import { attachButtonStyler } from 'sql/platform/theme/common/styler';
 import { InputBox } from 'sql/base/browser/ui/inputBox/inputBox';
 import { IAccountPickerService } from 'sql/workbench/contrib/accounts/browser/accountPicker';
 import * as TelemetryKeys from 'sql/platform/telemetry/common/telemetryKeys';
@@ -31,6 +31,7 @@ import { IWorkbenchLayoutService } from 'vs/workbench/services/layout/browser/la
 import { ITextResourcePropertiesService } from 'vs/editor/common/services/textResourceConfigurationService';
 import { IOpenerService } from 'vs/platform/opener/common/opener';
 import { IAdsTelemetryService } from 'sql/platform/telemetry/common/telemetry';
+import { attachModalDialogStyler } from 'sql/workbench/common/styler';
 
 // TODO: Make the help link 1) extensible (01/08/2018, https://github.com/Microsoft/azuredatastudio/issues/450)
 // in case that other non-Azure sign in is to be used

src/sql/workbench/contrib/backup/browser/backupActions.ts

@@ -14,7 +14,7 @@ import { IEditorService } from 'vs/workbench/services/editor/common/editorServic
 import { getCurrentGlobalConnection } from 'sql/workbench/browser/taskUtilities';
 import { mssqlProviderName } from 'sql/platform/connection/common/constants';
 import { IBackupUiService } from 'sql/workbench/services/backup/common/backupUiService';
-import { Task } from 'sql/platform/tasks/browser/tasksRegistry';
+import { Task } from 'sql/workbench/services/tasks/browser/tasksRegistry';
 import { ICapabilitiesService } from 'sql/platform/capabilities/common/capabilitiesService';
 import { ConnectionProfile } from 'sql/platform/connection/common/connectionProfile';
 

src/sql/workbench/contrib/backup/browser/backupDialog.ts

@@ -7,7 +7,6 @@ import { Modal } from 'sql/workbench/browser/modal/modal';
 import { IConnectionProfile } from 'sql/platform/connection/common/interfaces';
 import { BackupModule } from 'sql/workbench/contrib/backup/browser/backup.module';
 import { BACKUP_SELECTOR } from 'sql/workbench/contrib/backup/browser/backup.component';
-import { attachModalDialogStyler } from 'sql/platform/theme/common/styler';
 import * as TelemetryKeys from 'sql/platform/telemetry/common/telemetryKeys';
 
 import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
@@ -20,6 +19,7 @@ import { ILogService } from 'vs/platform/log/common/log';
 import { IWorkbenchLayoutService } from 'vs/workbench/services/layout/browser/layoutService';
 import { ITextResourcePropertiesService } from 'vs/editor/common/services/textResourceConfigurationService';
 import { IAdsTelemetryService } from 'sql/platform/telemetry/common/telemetry';
+import { attachModalDialogStyler } from 'sql/workbench/common/styler';
 
 export class BackupDialog extends Modal {
 	private _body: HTMLElement;

src/sql/workbench/contrib/charts/browser/chartTab.ts

@@ -5,7 +5,7 @@
 
 import { IPanelTab } from 'sql/base/browser/ui/panel/panel';
 import { ChartView } from './chartView';
-import QueryRunner from 'sql/platform/query/common/queryRunner';
+import QueryRunner from 'sql/workbench/services/query/common/queryRunner';
 
 import { localize } from 'vs/nls';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
@@ -34,4 +34,4 @@ export class ChartTab implements IPanelTab {
 	public clear() {
 		this.view.clear();
 	}
-}
+}

src/sql/workbench/contrib/charts/browser/chartView.ts

@@ -7,10 +7,9 @@ import 'vs/css!./media/chartView';
 
 import { IPanelView } from 'sql/base/browser/ui/panel/panel';
 import { Insight } from './insight';
-import QueryRunner from 'sql/platform/query/common/queryRunner';
+import QueryRunner from 'sql/workbench/services/query/common/queryRunner';
 import { ChartOptions, IChartOption, ControlType } from './chartOptions';
-import { Extensions, IInsightRegistry } from 'sql/platform/dashboard/browser/insightRegistry';
-import { IInsightData } from './interfaces';
+import { Extensions, IInsightRegistry, IInsightData } from 'sql/platform/dashboard/browser/insightRegistry';
 import { Registry } from 'vs/platform/registry/common/platform';
 import * as DOM from 'vs/base/browser/dom';
 import { SelectBox } from 'sql/base/browser/ui/selectBox/selectBox';

src/sql/workbench/contrib/charts/browser/countInsight.ts

@@ -5,10 +5,11 @@
 
 import 'vs/css!./media/countInsight';
 
-import { IInsight, IInsightData } from './interfaces';
+import { IInsight } from './interfaces';
 
 import { $, clearNode } from 'vs/base/browser/dom';
 import { InsightType } from 'sql/workbench/contrib/charts/common/interfaces';
+import { IInsightData } from 'sql/platform/dashboard/browser/insightRegistry';
 
 export class CountInsight implements IInsight {
 	public options;

src/sql/workbench/contrib/charts/browser/graphInsight.ts

@@ -11,10 +11,11 @@ import * as colors from 'vs/platform/theme/common/colorRegistry';
 import { editorLineNumbers } from 'vs/editor/common/view/editorColorRegistry';
 import { IThemeService, ITheme } from 'vs/platform/theme/common/themeService';
 
-import { IInsight, IInsightData, IPointDataSet, customMixin } from './interfaces';
+import { IInsight, IPointDataSet, customMixin } from './interfaces';
 import { IInsightOptions, DataDirection, ChartType, LegendPosition, DataType } from 'sql/workbench/contrib/charts/common/interfaces';
 import { values } from 'vs/base/common/collections';
 import { find } from 'vs/base/common/arrays';
+import { IInsightData } from 'sql/platform/dashboard/browser/insightRegistry';
 
 const noneLineGraphs = [ChartType.Doughnut, ChartType.Pie];
 

src/sql/workbench/contrib/charts/browser/imageInsight.ts

@@ -3,13 +3,14 @@
  *  Licensed under the Source EULA. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IInsight, IInsightData } from './interfaces';
+import { IInsight } from './interfaces';
 import { INotificationService } from 'vs/platform/notification/common/notification';
 import { $ } from 'vs/base/browser/dom';
 import { mixin } from 'vs/base/common/objects';
 import { IInsightOptions, InsightType } from 'sql/workbench/contrib/charts/common/interfaces';
 import * as nls from 'vs/nls';
 import { startsWith } from 'vs/base/common/strings';
+import { IInsightData } from 'sql/platform/dashboard/browser/insightRegistry';
 
 export interface IConfig extends IInsightOptions {
 	encoding?: string;

src/sql/workbench/contrib/charts/browser/insight.ts

@@ -6,7 +6,7 @@
 import { Graph } from './graphInsight';
 import { ImageInsight } from './imageInsight';
 import { TableInsight } from './tableInsight';
-import { IInsight, IInsightCtor, IInsightData } from './interfaces';
+import { IInsight, IInsightCtor } from './interfaces';
 import { CountInsight } from './countInsight';
 
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
@@ -14,6 +14,7 @@ import { Dimension, clearNode } from 'vs/base/browser/dom';
 import { deepClone } from 'vs/base/common/objects';
 import { IInsightOptions, ChartType, DataDirection, InsightType } from 'sql/workbench/contrib/charts/common/interfaces';
 import { find } from 'vs/base/common/arrays';
+import { IInsightData } from 'sql/platform/dashboard/browser/insightRegistry';
 
 const defaultOptions: IInsightOptions = {
 	type: ChartType.Bar,

src/sql/workbench/contrib/charts/browser/interfaces.ts

@@ -7,6 +7,7 @@ import { Dimension } from 'vs/base/browser/dom';
 import { mixin } from 'sql/base/common/objects';
 import * as types from 'vs/base/common/types';
 import { IInsightOptions, InsightType, ChartType } from 'sql/workbench/contrib/charts/common/interfaces';
+import { IInsightData } from 'sql/platform/dashboard/browser/insightRegistry';
 
 export interface IPointDataSet {
 	data: Array<{ x: number | string, y: number }>;
@@ -32,11 +33,6 @@ export function customMixin(destination: any, source: any, overwrite?: boolean):
 	return destination;
 }
 
-export interface IInsightData {
-	columns: Array<string>;
-	rows: Array<Array<string>>;
-}
-
 export interface IInsight {
 	options: IInsightOptions;
 	data: IInsightData;

src/sql/workbench/contrib/charts/browser/tableInsight.ts

@@ -3,7 +3,7 @@
  *  Licensed under the Source EULA. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IInsight, IInsightData } from './interfaces';
+import { IInsight } from './interfaces';
 import { TableDataView } from 'sql/base/browser/ui/table/tableDataView';
 import { Table } from 'sql/base/browser/ui/table/table';
 import { attachTableStyler } from 'sql/platform/theme/common/styler';
@@ -13,6 +13,7 @@ import { $, Dimension } from 'vs/base/browser/dom';
 import { Disposable } from 'vs/base/common/lifecycle';
 import { IThemeService } from 'vs/platform/theme/common/themeService';
 import { InsightType } from 'sql/workbench/contrib/charts/common/interfaces';
+import { IInsightData } from 'sql/platform/dashboard/browser/insightRegistry';
 
 export class TableInsight extends Disposable implements IInsight {
 	public static readonly types = [InsightType.Table];

src/sql/workbench/contrib/commandLine/test/electron-browser/commandLine.test.ts

@@ -25,9 +25,9 @@ import { TestConfigurationService } from 'vs/platform/configuration/test/common/
 import { TestEditorService, TestDialogService } from 'vs/workbench/test/workbenchTestServices';
 import { URI } from 'vs/base/common/uri';
 import { UntitledQueryEditorInput } from 'sql/workbench/contrib/query/common/untitledQueryEditorInput';
-import { TestQueryModelService } from 'sql/platform/query/test/common/testQueryModelService';
+import { TestQueryModelService } from 'sql/workbench/services/query/test/common/testQueryModelService';
 import { Event } from 'vs/base/common/event';
-import { IQueryModelService } from 'sql/platform/query/common/queryModel';
+import { IQueryModelService } from 'sql/workbench/services/query/common/queryModel';
 import { TestInstantiationService } from 'vs/platform/instantiation/test/common/instantiationServiceMock';
 import { IDialogService } from 'vs/platform/dialogs/common/dialogs';
 import { INotificationService } from 'vs/platform/notification/common/notification';

src/sql/workbench/contrib/connection/common/connectionContextKey.ts

@@ -5,7 +5,7 @@
 
 import { RawContextKey, IContextKeyService, IContextKey } from 'vs/platform/contextkey/common/contextkey';
 import { IConnectionProfile } from 'azdata';
-import { IQueryManagementService } from 'sql/platform/query/common/queryManagement';
+import { IQueryManagementService } from 'sql/workbench/services/query/common/queryManagement';
 
 export class ConnectionContextKey implements IContextKey<IConnectionProfile> {
 

src/sql/workbench/contrib/dashboard/browser/containers/dashboardHomeContainer.component.ts

@@ -53,14 +53,14 @@ export class DashboardHomeContainer extends DashboardWidgetContainer {
 		if (collapsedVal === 'collapsed') {
 			this._propertiesClass.collapsed = true;
 		}
-		this.angularEventingService.onAngularEvent(this.dashboardService.getUnderlyingUri(), event => {
+		this._register(this.angularEventingService.onAngularEvent(this.dashboardService.getUnderlyingUri())(event => {
 			if (event.event === AngularEventType.COLLAPSE_WIDGET && this._propertiesClass && event.payload === this._propertiesClass.guid) {
 				this._propertiesClass.collapsed = !this._propertiesClass.collapsed;
 				this._cd.detectChanges();
 				this._configurationService.updateValue(`dashboard.${this.properties.context}.properties`,
 					this._propertiesClass.collapsed ? 'collapsed' : true, ConfigurationTarget.USER);
 			}
-		});
+		}));
 	}
 
 	public layout() {

src/sql/workbench/contrib/dashboard/browser/containers/dashboardWidgetContainer.component.ts

@@ -5,7 +5,7 @@
 
 import 'vs/css!./dashboardWidgetContainer';
 
-import { Component, Inject, Input, forwardRef, ViewChild, OnDestroy, ChangeDetectorRef, AfterContentInit } from '@angular/core';
+import { Component, Inject, Input, forwardRef, ViewChild, ChangeDetectorRef, AfterContentInit } from '@angular/core';
 
 import { TabConfig, WidgetConfig } from 'sql/workbench/contrib/dashboard/browser/core/dashboardWidget';
 import { DashboardTab } from 'sql/workbench/contrib/dashboard/browser/core/interfaces';
@@ -23,7 +23,7 @@ import { values } from 'vs/base/common/collections';
 		</widget-content>
 	`
 })
-export class DashboardWidgetContainer extends DashboardTab implements OnDestroy, AfterContentInit {
+export class DashboardWidgetContainer extends DashboardTab implements AfterContentInit {
 	@Input() protected tab: TabConfig;
 	protected widgets: WidgetConfig[];
 	private _onResize = new Emitter<void>();
@@ -50,10 +50,6 @@ export class DashboardWidgetContainer extends DashboardTab implements OnDestroy,
 		}));
 	}
 
-	ngOnDestroy() {
-		this.dispose();
-	}
-
 	public get id(): string {
 		return this.tab.id;
 	}

src/sql/workbench/contrib/dashboard/browser/core/actions.ts

@@ -11,7 +11,6 @@ import { StandardKeyboardEvent } from 'vs/base/browser/keyboardEvent';
 import { IAngularEventingService, AngularEventType, IAngularEvent } from 'sql/platform/angularEventing/browser/angularEventingService';
 import { INewDashboardTabDialogService } from 'sql/workbench/services/dashboard/browser/newDashboardTabDialog';
 import { IDashboardTab } from 'sql/workbench/contrib/dashboard/browser/dashboardRegistry';
-import { subscriptionToDisposable } from 'sql/base/browser/lifecycle';
 import { find, firstIndex } from 'vs/base/common/arrays';
 import { CellContext } from 'sql/workbench/contrib/notebook/browser/cellViews/codeActions';
 
@@ -166,7 +165,7 @@ export class AddFeatureTabAction extends Action {
 		@IAngularEventingService private _angularEventService: IAngularEventingService
 	) {
 		super(AddFeatureTabAction.ID, AddFeatureTabAction.LABEL, AddFeatureTabAction.ICON);
-		this._register(subscriptionToDisposable(this._angularEventService.onAngularEvent(this._uri, (event) => this.handleDashboardEvent(event))));
+		this._register(this._angularEventService.onAngularEvent(this._uri)(event => this.handleDashboardEvent(event)));
 	}
 
 	run(): Promise<boolean> {

src/sql/workbench/contrib/dashboard/browser/core/interfaces.ts

@@ -3,15 +3,13 @@
  *  Licensed under the Source EULA. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { OnDestroy } from '@angular/core';
-
 import { Event } from 'vs/base/common/event';
 import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
 
 import { TabChild } from 'sql/base/browser/ui/panel/tab.component';
 import { SingleConnectionManagementService } from 'sql/workbench/services/bootstrap/browser/commonServiceInterface.service';
 
-export abstract class DashboardTab extends TabChild implements OnDestroy {
+export abstract class DashboardTab extends TabChild {
 	public abstract layout(): void;
 	public abstract readonly id: string;
 	public abstract readonly editable: boolean;
@@ -23,10 +21,6 @@ export abstract class DashboardTab extends TabChild implements OnDestroy {
 	constructor() {
 		super();
 	}
-
-	ngOnDestroy() {
-		this.dispose();
-	}
 }
 
 export interface IConfigModifierCollection {

src/sql/workbench/contrib/dashboard/browser/dashboardEditor.ts

@@ -23,7 +23,7 @@ import { IConnectionProfile } from 'sql/platform/connection/common/interfaces';
 import { IConnectionManagementService } from 'sql/platform/connection/common/connectionManagement';
 import { CancellationToken } from 'vs/base/common/cancellation';
 import { IStorageService } from 'vs/platform/storage/common/storage';
-import { IQueryManagementService } from 'sql/platform/query/common/queryManagement';
+import { IQueryManagementService } from 'sql/workbench/services/query/common/queryManagement';
 
 export class DashboardEditor extends BaseEditor {
 

src/sql/workbench/contrib/dashboard/browser/services/dashboardServiceInterface.service.ts

@@ -12,7 +12,7 @@ import { IDashboardComponentParams, IBootstrapParams } from 'sql/workbench/servi
 import { IMetadataService } from 'sql/platform/metadata/common/metadataService';
 import { IConnectionManagementService } from 'sql/platform/connection/common/connectionManagement';
 import { IAdminService } from 'sql/workbench/services/admin/common/adminService';
-import { IQueryManagementService } from 'sql/platform/query/common/queryManagement';
+import { IQueryManagementService } from 'sql/workbench/services/query/common/queryManagement';
 import { AngularEventType, IAngularEvent, IAngularEventingService } from 'sql/platform/angularEventing/browser/angularEventingService';
 import { IDashboardTab } from 'sql/workbench/contrib/dashboard/browser/dashboardRegistry';
 import { TabSettingConfig } from 'sql/workbench/contrib/dashboard/browser/core/dashboardWidget';
@@ -26,7 +26,6 @@ import * as nls from 'vs/nls';
 import { deepClone } from 'vs/base/common/objects';
 import { RawContextKey, IContextKey } from 'vs/platform/contextkey/common/contextkey';
 import { INotificationService } from 'vs/platform/notification/common/notification';
-import { subscriptionToDisposable } from 'sql/base/browser/lifecycle';
 
 const DASHBOARD_SETTINGS = 'dashboard';
 
@@ -77,7 +76,7 @@ export class DashboardServiceInterface extends CommonServiceInterface {
 		// during testing there may not be params
 		if (this._params) {
 			this.dashboardContextKey = this._dashboardContextKey.bindTo(this.scopedContextKeyService);
-			this._register(subscriptionToDisposable(this.angularEventingService.onAngularEvent(this._uri, (event) => this.handleDashboardEvent(event))));
+			this._register(this.angularEventingService.onAngularEvent(this._uri)(event => this.handleDashboardEvent(event)));
 		}
 	}
 

src/sql/workbench/contrib/dashboard/browser/widgets/insights/views/charts/chartInsight.component.ts

@@ -16,8 +16,8 @@ import * as types from 'vs/base/common/types';
 import { Disposable } from 'vs/base/common/lifecycle';
 import * as nls from 'vs/nls';
 import { IThemeService, ITheme } from 'vs/platform/theme/common/themeService';
-import { IInsightData, IPointDataSet } from 'sql/workbench/contrib/charts/browser/interfaces';
-import { IInsightsView } from 'sql/platform/dashboard/browser/insightRegistry';
+import { IPointDataSet } from 'sql/workbench/contrib/charts/browser/interfaces';
+import { IInsightsView, IInsightData } from 'sql/platform/dashboard/browser/insightRegistry';
 import { ChartType, LegendPosition } from 'sql/workbench/contrib/charts/common/interfaces';
 import { createMemoizer } from 'vs/base/common/decorators';
 import { IAdsTelemetryService } from 'sql/platform/telemetry/common/telemetry';

src/sql/workbench/contrib/dashboard/browser/widgets/insights/views/countInsight.component.ts

@@ -5,8 +5,7 @@
 
 import { Component, Input, Inject, ChangeDetectorRef, forwardRef } from '@angular/core';
 
-import { IInsightData } from 'sql/workbench/contrib/charts/browser/interfaces';
-import { IInsightsView } from 'sql/platform/dashboard/browser/insightRegistry';
+import { IInsightsView, IInsightData } from 'sql/platform/dashboard/browser/insightRegistry';
 
 @Component({
 	template: `

src/sql/workbench/contrib/dashboard/browser/widgets/insights/views/imageInsight.component.ts

@@ -6,8 +6,7 @@
 import { Component, Input, Inject, ChangeDetectorRef, forwardRef, ViewChild, OnInit, ElementRef } from '@angular/core';
 
 import { mixin } from 'vs/base/common/objects';
-import { IInsightData } from 'sql/workbench/contrib/charts/browser/interfaces';
-import { IInsightsView } from 'sql/platform/dashboard/browser/insightRegistry';
+import { IInsightsView, IInsightData } from 'sql/platform/dashboard/browser/insightRegistry';
 import { startsWith } from 'vs/base/common/strings';
 
 interface IConfig {

src/sql/workbench/contrib/dashboard/browser/widgets/insights/views/tableInsight.component.ts

@@ -13,8 +13,7 @@ import { Table } from 'sql/base/browser/ui/table/table';
 import { TableDataView } from 'sql/base/browser/ui/table/tableDataView';
 import { attachTableStyler } from 'sql/platform/theme/common/styler';
 import { CellSelectionModel } from 'sql/base/browser/ui/table/plugins/cellSelectionModel.plugin';
-import { IInsightData } from 'sql/workbench/contrib/charts/browser/interfaces';
-import { IInsightsView } from 'sql/platform/dashboard/browser/insightRegistry';
+import { IInsightsView, IInsightData } from 'sql/platform/dashboard/browser/insightRegistry';
 
 @Component({
 	template: ''

src/sql/workbench/contrib/dashboard/browser/widgets/tasks/tasksWidget.component.ts

@@ -27,7 +27,7 @@ import { MenuRegistry, ICommandAction } from 'vs/platform/actions/common/actions
 import { ContextKeyExpr, IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
 import { StandardKeyboardEvent } from 'vs/base/browser/keyboardEvent';
 import { KeyCode } from 'vs/base/common/keyCodes';
-import { TaskRegistry } from 'sql/platform/tasks/browser/tasksRegistry';
+import { TaskRegistry } from 'sql/workbench/services/tasks/browser/tasksRegistry';
 
 interface ITask {
 	name: string;

src/sql/workbench/contrib/dashboard/browser/widgets/tasks/tasksWidget.contribution.ts

@@ -6,7 +6,7 @@
 import { registerDashboardWidget } from 'sql/platform/dashboard/browser/widgetRegistry';
 
 import { IJSONSchema } from 'vs/base/common/jsonSchema';
-import { TaskRegistry } from 'sql/platform/tasks/browser/tasksRegistry';
+import { TaskRegistry } from 'sql/workbench/services/tasks/browser/tasksRegistry';
 
 const singleTaskSchema: IJSONSchema = {
 	type: 'string',

src/sql/workbench/contrib/dataExplorer/browser/nodeContext.ts

@@ -8,7 +8,7 @@ import { IOEShimService } from 'sql/workbench/contrib/objectExplorer/browser/obj
 import { ITreeItem } from 'sql/workbench/common/views';
 import { Disposable } from 'vs/base/common/lifecycle';
 import { IContextKey, IContextKeyService, RawContextKey } from 'vs/platform/contextkey/common/contextkey';
-import { IQueryManagementService } from 'sql/platform/query/common/queryManagement';
+import { IQueryManagementService } from 'sql/workbench/services/query/common/queryManagement';
 import { MssqlNodeContext } from 'sql/workbench/contrib/dataExplorer/browser/mssqlNodeContext';
 import { IConnectionManagementService } from 'sql/platform/connection/common/connectionManagement';
 import { ICapabilitiesService } from 'sql/platform/capabilities/common/capabilitiesService';

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

@@ -5,7 +5,7 @@
 
 import { Action, IActionViewItem, IActionRunner } from 'vs/base/common/actions';
 import { Disposable } from 'vs/base/common/lifecycle';
-import { IQueryModelService } from 'sql/platform/query/common/queryModel';
+import { IQueryModelService } from 'sql/workbench/services/query/common/queryModel';
 import { SelectBox } from 'sql/base/browser/ui/selectBox/selectBox';
 import { IConnectionManagementService } from 'sql/platform/connection/common/connectionManagement';
 import { EditDataEditor } from 'sql/workbench/contrib/editData/browser/editDataEditor';

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

@@ -21,7 +21,7 @@ import * as queryContext from 'sql/workbench/contrib/query/common/queryContext';
 import { Taskbar, ITaskbarContent } from 'sql/base/browser/ui/taskbar/taskbar';
 import { IActionViewItem } from 'vs/base/browser/ui/actionbar/actionbar';
 import { Action } from 'vs/base/common/actions';
-import { IQueryModelService } from 'sql/platform/query/common/queryModel';
+import { IQueryModelService } from 'sql/workbench/services/query/common/queryModel';
 import { IEditorDescriptorService } from 'sql/workbench/services/queryEditor/browser/editorDescriptorService';
 import {
 	RefreshTableAction, StopRefreshTableAction, ChangeMaxRowsAction, ChangeMaxRowsActionItem, ShowQueryPaneAction

src/sql/workbench/contrib/editData/browser/editDataInput.ts

@@ -5,7 +5,7 @@
 
 import { EditorInput, EditorModel, EncodingMode, IEditorInput } from 'vs/workbench/common/editor';
 import { IConnectionManagementService, IConnectableInput, INewConnectionParams } from 'sql/platform/connection/common/connectionManagement';
-import { IQueryModelService } from 'sql/platform/query/common/queryModel';
+import { IQueryModelService } from 'sql/workbench/services/query/common/queryModel';
 import { Event, Emitter } from 'vs/base/common/event';
 import { EditSessionReadyParams } from 'azdata';
 import { URI } from 'vs/base/common/uri';

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

@@ -14,7 +14,7 @@ import { IConfigurationService } from 'vs/platform/configuration/common/configur
 import { BaseEditor } from 'vs/workbench/browser/parts/editor/baseEditor';
 import * as types from 'vs/base/common/types';
 
-import { IQueryModelService } from 'sql/platform/query/common/queryModel';
+import { IQueryModelService } from 'sql/workbench/services/query/common/queryModel';
 import { BareResultsGridInfo, getBareResultsGridInfoStyles } from 'sql/workbench/contrib/query/browser/queryResultsEditor';
 import { EditDataGridPanel } from 'sql/workbench/contrib/editData/browser/editDataGridPanel';
 import { EditDataResultsInput } from 'sql/workbench/contrib/editData/browser/editDataResultsInput';

src/sql/workbench/contrib/editData/browser/gridCommands.ts

@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import * as GridContentEvents from 'sql/workbench/contrib/grid/common/gridContentEvents';
-import { IQueryModelService } from 'sql/platform/query/common/queryModel';
+import { IQueryModelService } from 'sql/workbench/services/query/common/queryModel';
 import { QueryEditor } from 'sql/workbench/contrib/query/browser/queryEditor';
 import { EditDataEditor } from 'sql/workbench/contrib/editData/browser/editDataEditor';
 

src/sql/workbench/contrib/grid/common/dataService.ts

@@ -6,7 +6,7 @@
 import { Subject } from 'rxjs/Subject';
 
 import { EditUpdateCellResult, EditSubsetResult, EditCreateRowResult } from 'azdata';
-import { IQueryModelService } from 'sql/platform/query/common/queryModel';
+import { IQueryModelService } from 'sql/workbench/services/query/common/queryModel';
 import { ResultSerializer } from 'sql/workbench/contrib/query/common/resultSerializer';
 import { ISaveRequest } from 'sql/workbench/contrib/grid/common/interfaces';
 

src/sql/workbench/contrib/jobManagement/browser/agentView.component.ts

@@ -9,7 +9,7 @@ import * as nls from 'vs/nls';
 import { Component, Inject, forwardRef, ChangeDetectorRef, ViewChild, Injectable } from '@angular/core';
 import { AgentJobInfo, AgentNotebookInfo } from 'azdata';
 import { PanelComponent, IPanelOptions, NavigationBarLayout } from 'sql/base/browser/ui/panel/panel.component';
-import { IJobManagementService } from 'sql/platform/jobManagement/common/interfaces';
+import { IJobManagementService } from 'sql/workbench/services/jobManagement/common/interfaces';
 
 
 export const DASHBOARD_SELECTOR: string = 'agentview-component';

src/sql/workbench/contrib/jobManagement/browser/alertsView.component.ts

@@ -12,8 +12,8 @@ import { Component, Inject, forwardRef, ElementRef, ChangeDetectorRef, ViewChild
 import { TabChild } from 'sql/base/browser/ui/panel/tab.component';
 import { Table } from 'sql/base/browser/ui/table/table';
 import { AgentViewComponent } from 'sql/workbench/contrib/jobManagement/browser/agentView.component';
-import { IJobManagementService } from 'sql/platform/jobManagement/common/interfaces';
-import { EditAlertAction, DeleteAlertAction, NewAlertAction } from 'sql/platform/jobManagement/browser/jobActions';
+import { IJobManagementService } from 'sql/workbench/services/jobManagement/common/interfaces';
+import { EditAlertAction, DeleteAlertAction, NewAlertAction } from 'sql/workbench/services/jobManagement/browser/jobActions';
 import { JobManagementView } from 'sql/workbench/contrib/jobManagement/browser/jobManagementView';
 import { CommonServiceInterface } from 'sql/workbench/services/bootstrap/browser/commonServiceInterface.service';
 import { ICommandService } from 'vs/platform/commands/common/commands';
@@ -22,7 +22,7 @@ import { IAction } from 'vs/base/common/actions';
 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 { AlertsCacheObject } from 'sql/workbench/services/jobManagement/common/jobManagementService';
 import { RowDetailView } from 'sql/base/browser/ui/table/plugins/rowDetailView';
 
 export const VIEW_SELECTOR: string = 'jobalertsview-component';

src/sql/workbench/contrib/jobManagement/browser/jobHistory.component.ts

@@ -12,10 +12,10 @@ import { OnInit, Component, Inject, Input, forwardRef, ElementRef, ChangeDetecto
 import { Taskbar } from 'sql/base/browser/ui/taskbar/taskbar';
 import { AgentViewComponent } from 'sql/workbench/contrib/jobManagement/browser/agentView.component';
 import { CommonServiceInterface } from 'sql/workbench/services/bootstrap/browser/commonServiceInterface.service';
-import { RunJobAction, StopJobAction, EditJobAction, JobsRefreshAction } from 'sql/platform/jobManagement/browser/jobActions';
-import { JobCacheObject } from 'sql/platform/jobManagement/common/jobManagementService';
-import { JobManagementUtilities } from 'sql/platform/jobManagement/browser/jobManagementUtilities';
-import { IJobManagementService } from 'sql/platform/jobManagement/common/interfaces';
+import { RunJobAction, StopJobAction, EditJobAction, JobsRefreshAction } from 'sql/workbench/services/jobManagement/browser/jobActions';
+import { JobCacheObject } from 'sql/workbench/services/jobManagement/common/jobManagementService';
+import { JobManagementUtilities } from 'sql/workbench/services/jobManagement/browser/jobManagementUtilities';
+import { IJobManagementService } from 'sql/workbench/services/jobManagement/common/interfaces';
 import {
 	JobHistoryController, JobHistoryDataSource,
 	JobHistoryRenderer, JobHistoryFilter, JobHistoryModel, JobHistoryRow

src/sql/workbench/contrib/jobManagement/browser/jobManagementView.ts

@@ -14,7 +14,7 @@ import { IContextMenuService } from 'vs/platform/contextview/browser/contextView
 import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 import { Taskbar } from 'sql/base/browser/ui/taskbar/taskbar';
-import { JobsRefreshAction, IJobActionInfo } from 'sql/platform/jobManagement/browser/jobActions';
+import { JobsRefreshAction, IJobActionInfo } from 'sql/workbench/services/jobManagement/browser/jobActions';
 import { TabChild } from 'sql/base/browser/ui/panel/tab.component';
 import { IDashboardService } from 'sql/platform/dashboard/browser/dashboardService';
 import { ITableMouseEvent } from 'sql/base/browser/ui/table/interfaces';

src/sql/workbench/contrib/jobManagement/browser/jobsView.component.ts

@@ -13,11 +13,11 @@ import { TabChild } from 'sql/base/browser/ui/panel/tab.component';
 import { Table } from 'sql/base/browser/ui/table/table';
 import { AgentViewComponent } from 'sql/workbench/contrib/jobManagement/browser/agentView.component';
 import { RowDetailView } from 'sql/base/browser/ui/table/plugins/rowDetailView';
-import { JobCacheObject } from 'sql/platform/jobManagement/common/jobManagementService';
-import { EditJobAction, DeleteJobAction, NewJobAction, RunJobAction } from 'sql/platform/jobManagement/browser/jobActions';
-import { JobManagementUtilities } from 'sql/platform/jobManagement/browser/jobManagementUtilities';
+import { JobCacheObject } from 'sql/workbench/services/jobManagement/common/jobManagementService';
+import { EditJobAction, DeleteJobAction, NewJobAction, RunJobAction } from 'sql/workbench/services/jobManagement/browser/jobActions';
+import { JobManagementUtilities } from 'sql/workbench/services/jobManagement/browser/jobManagementUtilities';
 import { HeaderFilter } from 'sql/base/browser/ui/table/plugins/headerFilter.plugin';
-import { IJobManagementService } from 'sql/platform/jobManagement/common/interfaces';
+import { IJobManagementService } from 'sql/workbench/services/jobManagement/common/interfaces';
 import { JobManagementView, JobActionContext } from 'sql/workbench/contrib/jobManagement/browser/jobManagementView';
 import { CommonServiceInterface } from 'sql/workbench/services/bootstrap/browser/commonServiceInterface.service';
 import { ICommandService } from 'vs/platform/commands/common/commands';

src/sql/workbench/contrib/jobManagement/browser/notebookHistory.component.ts

@@ -12,9 +12,9 @@ import { OnInit, Component, Inject, Input, forwardRef, ElementRef, ChangeDetecto
 import { Taskbar } from 'sql/base/browser/ui/taskbar/taskbar';
 import { AgentViewComponent } from 'sql/workbench/contrib/jobManagement/browser/agentView.component';
 import { CommonServiceInterface } from 'sql/workbench/services/bootstrap/browser/commonServiceInterface.service';
-import { RunJobAction, StopJobAction, JobsRefreshAction, EditNotebookJobAction, OpenMaterializedNotebookAction, OpenTemplateNotebookAction, RenameNotebookMaterializedAction, PinNotebookMaterializedAction, UnpinNotebookMaterializedAction, DeleteMaterializedNotebookAction } from 'sql/platform/jobManagement/browser/jobActions';
-import { NotebookCacheObject } from 'sql/platform/jobManagement/common/jobManagementService';
-import { IJobManagementService } from 'sql/platform/jobManagement/common/interfaces';
+import { RunJobAction, StopJobAction, JobsRefreshAction, EditNotebookJobAction, OpenMaterializedNotebookAction, OpenTemplateNotebookAction, RenameNotebookMaterializedAction, PinNotebookMaterializedAction, UnpinNotebookMaterializedAction, DeleteMaterializedNotebookAction } from 'sql/workbench/services/jobManagement/browser/jobActions';
+import { NotebookCacheObject } from 'sql/workbench/services/jobManagement/common/jobManagementService';
+import { IJobManagementService } from 'sql/workbench/services/jobManagement/common/interfaces';
 import { JobStepsViewRow } from 'sql/workbench/contrib/jobManagement/browser/jobStepsViewTree';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 import { IAction } from 'vs/base/common/actions';

src/sql/workbench/contrib/jobManagement/browser/notebooksView.component.ts

@@ -13,11 +13,11 @@ import { TabChild } from 'sql/base/browser/ui/panel/tab.component';
 import { Table } from 'sql/base/browser/ui/table/table';
 import { AgentViewComponent } from 'sql/workbench/contrib/jobManagement/browser/agentView.component';
 import { RowDetailView } from 'sql/base/browser/ui/table/plugins/rowDetailView';
-import { NotebookCacheObject } from 'sql/platform/jobManagement/common/jobManagementService';
-import { NewNotebookJobAction, RunJobAction, EditNotebookJobAction, JobsRefreshAction, IJobActionInfo, DeleteNotebookAction, OpenLatestRunMaterializedNotebook } from 'sql/platform/jobManagement/browser/jobActions';
-import { JobManagementUtilities } from 'sql/platform/jobManagement/browser/jobManagementUtilities';
+import { NotebookCacheObject } from 'sql/workbench/services/jobManagement/common/jobManagementService';
+import { NewNotebookJobAction, RunJobAction, EditNotebookJobAction, JobsRefreshAction, IJobActionInfo, DeleteNotebookAction, OpenLatestRunMaterializedNotebook } from 'sql/workbench/services/jobManagement/browser/jobActions';
+import { JobManagementUtilities } from 'sql/workbench/services/jobManagement/browser/jobManagementUtilities';
 import { HeaderFilter } from 'sql/base/browser/ui/table/plugins/headerFilter.plugin';
-import { IJobManagementService } from 'sql/platform/jobManagement/common/interfaces';
+import { IJobManagementService } from 'sql/workbench/services/jobManagement/common/interfaces';
 import { JobManagementView, JobActionContext } from 'sql/workbench/contrib/jobManagement/browser/jobManagementView';
 import { CommonServiceInterface } from 'sql/workbench/services/bootstrap/browser/commonServiceInterface.service';
 import { ICommandService } from 'vs/platform/commands/common/commands';

src/sql/workbench/contrib/jobManagement/browser/operatorsView.component.ts

@@ -11,8 +11,8 @@ import * as azdata from 'azdata';
 import { Component, Inject, forwardRef, ElementRef, ChangeDetectorRef, ViewChild, OnInit, OnDestroy } from '@angular/core';
 import { Table } from 'sql/base/browser/ui/table/table';
 import { AgentViewComponent } from 'sql/workbench/contrib/jobManagement/browser/agentView.component';
-import { IJobManagementService } from 'sql/platform/jobManagement/common/interfaces';
-import { EditOperatorAction, DeleteOperatorAction, NewOperatorAction } from 'sql/platform/jobManagement/browser/jobActions';
+import { IJobManagementService } from 'sql/workbench/services/jobManagement/common/interfaces';
+import { EditOperatorAction, DeleteOperatorAction, NewOperatorAction } from 'sql/workbench/services/jobManagement/browser/jobActions';
 import { JobManagementView } from 'sql/workbench/contrib/jobManagement/browser/jobManagementView';
 import { CommonServiceInterface } from 'sql/workbench/services/bootstrap/browser/commonServiceInterface.service';
 import { TabChild } from 'sql/base/browser/ui/panel/tab.component';
@@ -22,7 +22,7 @@ import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
 import { IAction } from 'vs/base/common/actions';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 import { IDashboardService } from 'sql/platform/dashboard/browser/dashboardService';
-import { OperatorsCacheObject } from 'sql/platform/jobManagement/common/jobManagementService';
+import { OperatorsCacheObject } from 'sql/workbench/services/jobManagement/common/jobManagementService';
 import { RowDetailView } from 'sql/base/browser/ui/table/plugins/rowDetailView';
 
 export const VIEW_SELECTOR: string = 'joboperatorsview-component';

src/sql/workbench/contrib/jobManagement/browser/proxiesView.component.ts

@@ -11,8 +11,8 @@ import * as nls from 'vs/nls';
 import { Component, Inject, forwardRef, ElementRef, ChangeDetectorRef, ViewChild, OnInit, OnDestroy } from '@angular/core';
 import { Table } from 'sql/base/browser/ui/table/table';
 import { AgentViewComponent } from 'sql/workbench/contrib/jobManagement/browser/agentView.component';
-import { IJobManagementService } from 'sql/platform/jobManagement/common/interfaces';
-import { EditProxyAction, DeleteProxyAction, NewProxyAction } from 'sql/platform/jobManagement/browser/jobActions';
+import { IJobManagementService } from 'sql/workbench/services/jobManagement/common/interfaces';
+import { EditProxyAction, DeleteProxyAction, NewProxyAction } from 'sql/workbench/services/jobManagement/browser/jobActions';
 import { CommonServiceInterface } from 'sql/workbench/services/bootstrap/browser/commonServiceInterface.service';
 import { TabChild } from 'sql/base/browser/ui/panel/tab.component';
 import { JobManagementView } from 'sql/workbench/contrib/jobManagement/browser/jobManagementView';
@@ -22,7 +22,7 @@ import { IAction } from 'vs/base/common/actions';
 import { ICommandService } from 'vs/platform/commands/common/commands';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 import { IDashboardService } from 'sql/platform/dashboard/browser/dashboardService';
-import { ProxiesCacheObject } from 'sql/platform/jobManagement/common/jobManagementService';
+import { ProxiesCacheObject } from 'sql/workbench/services/jobManagement/common/jobManagementService';
 import { RowDetailView } from 'sql/base/browser/ui/table/plugins/rowDetailView';
 
 export const VIEW_SELECTOR: string = 'jobproxiesview-component';

src/sql/workbench/contrib/notebook/browser/outputs/gridOutput.component.ts

@@ -6,7 +6,7 @@
 import { OnInit, Component, Input, Inject, ViewChild, ElementRef } from '@angular/core';
 import * as azdata from 'azdata';
 
-import { IGridDataProvider, getResultsString } from 'sql/platform/query/common/gridDataProvider';
+import { IGridDataProvider, getResultsString } from 'sql/workbench/services/query/common/gridDataProvider';
 import { IContextMenuService } from 'vs/platform/contextview/browser/contextView';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
@@ -14,7 +14,7 @@ import { IConfigurationService } from 'vs/platform/configuration/common/configur
 import { SaveFormat } from 'sql/workbench/contrib/grid/common/interfaces';
 import { IDataResource } from 'sql/workbench/services/notebook/browser/sql/sqlSessionManager';
 import { ITextResourcePropertiesService } from 'vs/editor/common/services/textResourceConfigurationService';
-import { getEolString, shouldIncludeHeaders, shouldRemoveNewLines } from 'sql/platform/query/common/queryRunner';
+import { getEolString, shouldIncludeHeaders, shouldRemoveNewLines } from 'sql/workbench/services/query/common/queryRunner';
 import { INotificationService } from 'vs/platform/notification/common/notification';
 import { IClipboardService } from 'vs/platform/clipboard/common/clipboardService';
 import { attachTableStyler } from 'sql/platform/theme/common/styler';

src/sql/workbench/contrib/objectExplorer/browser/serverGroupDialog.ts

@@ -21,7 +21,7 @@ import { Button } from 'sql/base/browser/ui/button/button';
 import { Modal } from 'sql/workbench/browser/modal/modal';
 import { InputBox } from 'sql/base/browser/ui/inputBox/inputBox';
 import { ServerGroupViewModel } from 'sql/workbench/contrib/objectExplorer/common/serverGroupViewModel';
-import { attachButtonStyler, attachModalDialogStyler } from 'sql/platform/theme/common/styler';
+import { attachButtonStyler } from 'sql/platform/theme/common/styler';
 import * as TelemetryKeys from 'sql/platform/telemetry/common/telemetryKeys';
 import { IClipboardService } from 'sql/platform/clipboard/common/clipboardService';
 import { ILogService } from 'vs/platform/log/common/log';
@@ -29,6 +29,7 @@ import { IWorkbenchLayoutService } from 'vs/workbench/services/layout/browser/la
 import { Color } from 'vs/base/common/color';
 import { ITextResourcePropertiesService } from 'vs/editor/common/services/textResourceConfigurationService';
 import { IAdsTelemetryService } from 'sql/platform/telemetry/common/telemetry';
+import { attachModalDialogStyler } from 'sql/workbench/common/styler';
 
 export class ServerGroupDialog extends Modal {
 	private _addServerButton: Button;

src/sql/workbench/contrib/objectExplorer/browser/serverTreeActionProvider.ts

@@ -22,7 +22,7 @@ import { IConnectionManagementService } from 'sql/platform/connection/common/con
 import { MenuId, IMenuService } from 'vs/platform/actions/common/actions';
 import { ConnectionContextKey } from 'sql/workbench/contrib/connection/common/connectionContextKey';
 import { TreeNodeContextKey } from 'sql/workbench/contrib/objectExplorer/common/treeNodeContextKey';
-import { IQueryManagementService } from 'sql/platform/query/common/queryManagement';
+import { IQueryManagementService } from 'sql/workbench/services/query/common/queryManagement';
 import { ServerInfoContextKey } from 'sql/workbench/contrib/connection/common/serverInfoContextKey';
 import { fillInActions } from 'vs/platform/actions/browser/menuEntryActionViewItem';
 import { Separator } from 'vs/base/browser/ui/actionbar/actionbar';

src/sql/workbench/contrib/profiler/browser/profilerActions.ts

@@ -6,7 +6,7 @@
 import { IProfilerService } from 'sql/workbench/services/profiler/browser/interfaces';
 import { IProfilerController } from 'sql/workbench/contrib/profiler/common/interfaces';
 import { ProfilerInput } from 'sql/workbench/contrib/profiler/browser/profilerInput';
-import { Task } from 'sql/platform/tasks/browser/tasksRegistry';
+import { Task } from 'sql/workbench/services/tasks/browser/tasksRegistry';
 import { ConnectionProfile } from 'sql/platform/connection/common/connectionProfile';
 import { IConnectionManagementService, IConnectionCompletionOptions } from 'sql/platform/connection/common/connectionManagement';
 import { IConnectionProfile } from 'sql/platform/connection/common/interfaces';

src/sql/workbench/contrib/profiler/browser/profilerColumnEditorDialog.ts

@@ -6,7 +6,6 @@
 import 'vs/css!./media/profiler';
 
 import { Modal } from 'sql/workbench/browser/modal/modal';
-import { attachModalDialogStyler } from 'sql/platform/theme/common/styler';
 import { ProfilerInput } from 'sql/workbench/contrib/profiler/browser/profilerInput';
 import * as TelemetryKeys from 'sql/platform/telemetry/common/telemetryKeys';
 import { IClipboardService } from 'sql/platform/clipboard/common/clipboardService';
@@ -27,6 +26,7 @@ import { ILogService } from 'vs/platform/log/common/log';
 import { IWorkbenchLayoutService } from 'vs/workbench/services/layout/browser/layoutService';
 import { ITextResourcePropertiesService } from 'vs/editor/common/services/textResourceConfigurationService';
 import { IAdsTelemetryService } from 'sql/platform/telemetry/common/telemetry';
+import { attachModalDialogStyler } from 'sql/workbench/common/styler';
 
 class EventItem {
 

src/sql/workbench/contrib/profiler/browser/profilerEditor.ts

@@ -9,7 +9,7 @@ import { Table } from 'sql/base/browser/ui/table/table';
 import { TableDataView } from 'sql/base/browser/ui/table/tableDataView';
 import { IProfilerService, IProfilerViewTemplate } from 'sql/workbench/services/profiler/browser/interfaces';
 import { Taskbar } from 'sql/base/browser/ui/taskbar/taskbar';
-import { attachTableStyler, attachTabbedPanelStyler } from 'sql/platform/theme/common/styler';
+import { attachTableStyler } from 'sql/platform/theme/common/styler';
 import { IProfilerStateChangedEvent } from 'sql/workbench/contrib/profiler/common/profilerState';
 import { ProfilerTableEditor, ProfilerTableViewState } from 'sql/workbench/contrib/profiler/browser/profilerTableEditor';
 import * as Actions from 'sql/workbench/contrib/profiler/browser/profilerActions';
@@ -52,6 +52,7 @@ import { handleCopyRequest } from 'sql/workbench/contrib/profiler/browser/profil
 import { ITextResourcePropertiesService } from 'vs/editor/common/services/textResourceConfigurationService';
 import { find } from 'vs/base/common/arrays';
 import { UntitledTextEditorInput } from 'vs/workbench/common/editor/untitledTextEditorInput';
+import { attachTabbedPanelStyler } from 'sql/workbench/common/styler';
 
 class BasicView implements IView {
 	public get element(): HTMLElement {

src/sql/workbench/contrib/profiler/browser/profilerFilterDialog.ts

@@ -7,7 +7,7 @@ import 'vs/css!./media/profilerFilterDialog';
 import { Button } from 'sql/base/browser/ui/button/button';
 import { Modal } from 'sql/workbench/browser/modal/modal';
 import * as TelemetryKeys from 'sql/platform/telemetry/common/telemetryKeys';
-import { attachButtonStyler, attachModalDialogStyler, attachInputBoxStyler } from 'sql/platform/theme/common/styler';
+import { attachButtonStyler, attachInputBoxStyler } from 'sql/platform/theme/common/styler';
 import { KeyCode } from 'vs/base/common/keyCodes';
 import { IThemeService } from 'vs/platform/theme/common/themeService';
 import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
@@ -28,6 +28,7 @@ import { ITextResourcePropertiesService } from 'vs/editor/common/services/textRe
 import { find, firstIndex } from 'vs/base/common/arrays';
 import { IAdsTelemetryService } from 'sql/platform/telemetry/common/telemetry';
 import { onUnexpectedError } from 'vs/base/common/errors';
+import { attachModalDialogStyler } from 'sql/workbench/common/styler';
 
 
 const ClearText: string = localize('profilerFilterDialog.clear', "Clear all");

src/sql/workbench/contrib/query/browser/actions.ts

@@ -15,9 +15,9 @@ import { QueryEditor } from './queryEditor';
 import { CellSelectionModel } from 'sql/base/browser/ui/table/plugins/cellSelectionModel.plugin';
 import { isWindows } from 'vs/base/common/platform';
 import { removeAnsiEscapeCodes } from 'vs/base/common/strings';
-import { IGridDataProvider } from 'sql/platform/query/common/gridDataProvider';
+import { IGridDataProvider } from 'sql/workbench/services/query/common/gridDataProvider';
 import { INotificationService } from 'vs/platform/notification/common/notification';
-import QueryRunner from 'sql/platform/query/common/queryRunner';
+import QueryRunner from 'sql/workbench/services/query/common/queryRunner';
 import { GridTableState } from 'sql/workbench/contrib/query/common/gridPanelState';
 import * as Constants from 'sql/workbench/contrib/extensions/common/constants';
 import { IAdsTelemetryService } from 'sql/platform/telemetry/common/telemetry';

src/sql/workbench/contrib/query/browser/gridPanel.ts

@@ -6,7 +6,7 @@
 import 'vs/css!./media/gridPanel';
 
 import { attachTableStyler } from 'sql/platform/theme/common/styler';
-import QueryRunner, { QueryGridDataProvider } from 'sql/platform/query/common/queryRunner';
+import QueryRunner, { QueryGridDataProvider } from 'sql/workbench/services/query/common/queryRunner';
 import { VirtualizedCollection, AsyncDataProvider } from 'sql/base/browser/ui/table/asyncDataView';
 import { Table } from 'sql/base/browser/ui/table/table';
 import { ScrollableSplitView, IView } from 'sql/base/browser/ui/scrollableSplitview/scrollableSplitview';
@@ -42,7 +42,7 @@ import { IAction } from 'vs/base/common/actions';
 import { ScrollbarVisibility } from 'vs/base/common/scrollable';
 import { ILogService } from 'vs/platform/log/common/log';
 import { localize } from 'vs/nls';
-import { IGridDataProvider } from 'sql/platform/query/common/gridDataProvider';
+import { IGridDataProvider } from 'sql/workbench/services/query/common/gridDataProvider';
 import { formatDocumentWithSelectedProvider, FormattingMode } from 'vs/editor/contrib/format/format';
 import { CancellationToken } from 'vs/base/common/cancellation';
 import { GridPanelState, GridTableState } from 'sql/workbench/contrib/query/common/gridPanelState';

src/sql/workbench/contrib/query/browser/keyboardQueryActions.ts

@@ -10,10 +10,10 @@ import { IEditorService } from 'vs/workbench/services/editor/common/editorServic
 
 import * as azdata from 'azdata';
 
-import { IQueryManagementService } from 'sql/platform/query/common/queryManagement';
+import { IQueryManagementService } from 'sql/workbench/services/query/common/queryManagement';
 import { IConnectionManagementService } from 'sql/platform/connection/common/connectionManagement';
 import { QueryEditor } from 'sql/workbench/contrib/query/browser/queryEditor';
-import { IQueryModelService } from 'sql/platform/query/common/queryModel';
+import { IQueryModelService } from 'sql/workbench/services/query/common/queryModel';
 import * as WorkbenchUtils from 'sql/workbench/common/sqlWorkbenchUtils';
 import * as Constants from 'sql/workbench/contrib/query/common/constants';
 import * as ConnectionConstants from 'sql/platform/connection/common/constants';

src/sql/workbench/contrib/query/browser/messagePanel.ts

@@ -5,7 +5,7 @@
 
 import 'vs/css!./media/messagePanel';
 import { IMessagesActionContext, CopyMessagesAction, CopyAllMessagesAction } from './actions';
-import QueryRunner, { IQueryMessage } from 'sql/platform/query/common/queryRunner';
+import QueryRunner, { IQueryMessage } from 'sql/workbench/services/query/common/queryRunner';
 import { IExpandableTree } from 'sql/workbench/contrib/objectExplorer/browser/treeUpdateUtils';
 
 import { ISelectionData } from 'azdata';

src/sql/workbench/contrib/query/browser/modelViewTab/queryModelViewTabContainer.component.ts

@@ -7,9 +7,9 @@ import 'vs/css!./media/dialogModal';
 import { Component, ViewChild, Inject, forwardRef, ElementRef, AfterViewInit } from '@angular/core';
 import { ModelViewContent } from 'sql/workbench/browser/modelComponents/modelViewContent.component';
 import { DialogPane } from 'sql/workbench/services/dialog/browser/dialogPane';
-import { ComponentEventType } from 'sql/workbench/browser/modelComponents/interfaces';
 import { Event, Emitter } from 'vs/base/common/event';
 import { IBootstrapParams } from 'sql/workbench/services/bootstrap/common/bootstrapParams';
+import { ComponentEventType } from 'sql/platform/dashboard/browser/interfaces';
 
 export interface LayoutRequestParams {
 	modelViewId?: string;

src/sql/workbench/contrib/query/browser/queryActions.ts

@@ -25,11 +25,11 @@ import {
 	IConnectableInput
 } from 'sql/platform/connection/common/connectionManagement';
 import { QueryEditor } from 'sql/workbench/contrib/query/browser/queryEditor';
-import { IQueryModelService } from 'sql/platform/query/common/queryModel';
+import { IQueryModelService } from 'sql/workbench/services/query/common/queryModel';
 import { SelectBox } from 'sql/base/browser/ui/selectBox/selectBox';
 import { attachEditableDropdownStyler, attachSelectBoxStyler } from 'sql/platform/theme/common/styler';
 import { Dropdown } from 'sql/base/parts/editableDropdown/browser/dropdown';
-import { Task } from 'sql/platform/tasks/browser/tasksRegistry';
+import { Task } from 'sql/workbench/services/tasks/browser/tasksRegistry';
 import { IObjectExplorerService } from 'sql/workbench/services/objectExplorer/browser/objectExplorerService';
 import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
 import { IQueryEditorService } from 'sql/workbench/services/queryEditor/common/queryEditorService';
@@ -41,7 +41,7 @@ import { OEAction } from 'sql/workbench/contrib/objectExplorer/browser/objectExp
 import { TreeViewItemHandleArg } from 'sql/workbench/common/views';
 import { ICapabilitiesService } from 'sql/platform/capabilities/common/capabilitiesService';
 import { ConnectionProfile } from 'sql/platform/connection/common/connectionProfile';
-import { IQueryManagementService } from 'sql/platform/query/common/queryManagement';
+import { IQueryManagementService } from 'sql/workbench/services/query/common/queryManagement';
 
 /**
  * Action class that query-based Actions will extend. This base class automatically handles activating and

src/sql/workbench/contrib/query/browser/queryResultsView.ts

@@ -5,8 +5,8 @@
 
 import { QueryResultsInput } from 'sql/workbench/contrib/query/common/queryResultsInput';
 import { TabbedPanel, IPanelTab, IPanelView } from 'sql/base/browser/ui/panel/panel';
-import { IQueryModelService } from 'sql/platform/query/common/queryModel';
-import QueryRunner from 'sql/platform/query/common/queryRunner';
+import { IQueryModelService } from 'sql/workbench/services/query/common/queryModel';
+import QueryRunner from 'sql/workbench/services/query/common/queryRunner';
 import { MessagePanel } from 'sql/workbench/contrib/query/browser/messagePanel';
 import { GridPanel } from 'sql/workbench/contrib/query/browser/gridPanel';
 import { ChartTab } from 'sql/workbench/contrib/charts/browser/chartTab';
@@ -20,11 +20,11 @@ import * as nls from 'vs/nls';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 import * as DOM from 'vs/base/browser/dom';
 import { dispose, Disposable, DisposableStore } from 'vs/base/common/lifecycle';
-import { attachTabbedPanelStyler } from 'sql/platform/theme/common/styler';
 import { IThemeService } from 'vs/platform/theme/common/themeService';
 import { Event } from 'vs/base/common/event';
 import { startsWith } from 'vs/base/common/strings';
 import { URI } from 'vs/base/common/uri';
+import { attachTabbedPanelStyler } from 'sql/workbench/common/styler';
 
 class MessagesView extends Disposable implements IPanelView {
 	private messagePanel: MessagePanel;

src/sql/workbench/contrib/query/browser/statusBarItems.ts

@@ -4,12 +4,12 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
-import { IQueryModelService } from 'sql/platform/query/common/queryModel';
+import { IQueryModelService } from 'sql/workbench/services/query/common/queryModel';
 import { IntervalTimer } from 'vs/base/common/async';
 import { Disposable, DisposableStore } from 'vs/base/common/lifecycle';
 import { IWorkbenchContribution } from 'vs/workbench/common/contributions';
 import { localize } from 'vs/nls';
-import QueryRunner from 'sql/platform/query/common/queryRunner';
+import QueryRunner from 'sql/workbench/services/query/common/queryRunner';
 import { parseNumAsTimeString } from 'sql/platform/connection/common/utils';
 import { Event } from 'vs/base/common/event';
 import { QueryEditorInput } from 'sql/workbench/contrib/query/common/queryEditorInput';

src/sql/workbench/contrib/query/common/fileQueryEditorInput.ts

@@ -6,7 +6,7 @@
 import { QueryEditorInput } from 'sql/workbench/contrib/query/common/queryEditorInput';
 import { QueryResultsInput } from 'sql/workbench/contrib/query/common/queryResultsInput';
 import { IConnectionManagementService } from 'sql/platform/connection/common/connectionManagement';
-import { IQueryModelService } from 'sql/platform/query/common/queryModel';
+import { IQueryModelService } from 'sql/workbench/services/query/common/queryModel';
 
 import { FileEditorInput } from 'vs/workbench/contrib/files/common/editors/fileEditorInput';
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';

src/sql/workbench/contrib/query/common/queryEditorInput.ts

@@ -13,7 +13,7 @@ import { IFileService } from 'vs/platform/files/common/files';
 
 import { IConnectionManagementService, IConnectableInput, INewConnectionParams, RunQueryOnConnectionMode } from 'sql/platform/connection/common/connectionManagement';
 import { QueryResultsInput } from 'sql/workbench/contrib/query/common/queryResultsInput';
-import { IQueryModelService } from 'sql/platform/query/common/queryModel';
+import { IQueryModelService } from 'sql/workbench/services/query/common/queryModel';
 
 import { ISelectionData, ExecutionPlanOptions } from 'azdata';
 import { startsWith } from 'vs/base/common/strings';

src/sql/workbench/contrib/query/common/resultSerializer.ts

@@ -6,7 +6,7 @@
 import * as ConnectionConstants from 'sql/platform/connection/common/constants';
 import * as LocalizedConstants from 'sql/workbench/contrib/query/common/localizedConstants';
 import { SaveResultsRequestParams } from 'azdata';
-import { IQueryManagementService } from 'sql/platform/query/common/queryManagement';
+import { IQueryManagementService } from 'sql/workbench/services/query/common/queryManagement';
 import { ISaveRequest, SaveFormat } from 'sql/workbench/contrib/grid/common/interfaces';
 
 import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';

src/sql/workbench/contrib/query/common/untitledQueryEditorInput.ts

@@ -6,7 +6,7 @@
 import { QueryEditorInput } from 'sql/workbench/contrib/query/common/queryEditorInput';
 import { QueryResultsInput } from 'sql/workbench/contrib/query/common/queryResultsInput';
 import { IConnectionManagementService } from 'sql/platform/connection/common/connectionManagement';
-import { IQueryModelService } from 'sql/platform/query/common/queryModel';
+import { IQueryModelService } from 'sql/workbench/services/query/common/queryModel';
 
 import { IEncodingSupport, EncodingMode } from 'vs/workbench/common/editor';
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';

src/sql/workbench/contrib/query/test/browser/queryActions.test.ts

@@ -18,7 +18,7 @@ import {
 	DisconnectDatabaseAction, ConnectDatabaseAction, QueryTaskbarAction
 } from 'sql/workbench/contrib/query/browser/queryActions';
 import { QueryEditor } from 'sql/workbench/contrib/query/browser/queryEditor';
-import { QueryModelService } from 'sql/platform/query/common/queryModelService';
+import { QueryModelService } from 'sql/workbench/services/query/common/queryModelService';
 import { IConnectionProfile } from 'sql/platform/connection/common/interfaces';
 
 import * as TypeMoq from 'typemoq';
@@ -27,7 +27,7 @@ import { TestStorageService, TestFileService } from 'vs/workbench/test/workbench
 import { MockContextKeyService } from 'vs/platform/keybinding/test/common/mockKeybindingService';
 import { UntitledQueryEditorInput } from 'sql/workbench/contrib/query/common/untitledQueryEditorInput';
 import { TestThemeService } from 'vs/platform/theme/test/common/testThemeService';
-import { TestQueryModelService } from 'sql/platform/query/test/common/testQueryModelService';
+import { TestQueryModelService } from 'sql/workbench/services/query/test/common/testQueryModelService';
 import { URI } from 'vs/base/common/uri';
 import { TestInstantiationService } from 'vs/platform/instantiation/test/common/instantiationServiceMock';
 import { TestConnectionManagementService } from 'sql/platform/connection/test/common/testConnectionManagementService';

src/sql/workbench/contrib/query/test/browser/queryEditor.test.ts

@@ -22,7 +22,7 @@ import { TestStorageService } from 'vs/workbench/test/workbenchTestServices';
 import { TestConfigurationService } from 'vs/platform/configuration/test/common/testConfigurationService';
 import { UntitledTextEditorInput } from 'vs/workbench/common/editor/untitledTextEditorInput';
 import { UntitledQueryEditorInput } from 'sql/workbench/contrib/query/common/untitledQueryEditorInput';
-import { TestQueryModelService } from 'sql/platform/query/test/common/testQueryModelService';
+import { TestQueryModelService } from 'sql/workbench/services/query/test/common/testQueryModelService';
 import { Event } from 'vs/base/common/event';
 import { LabelService } from 'vs/workbench/services/label/common/labelService';
 

src/sql/workbench/contrib/queryHistory/browser/queryHistoryActions.ts

@@ -11,7 +11,7 @@ import { IWorkbenchLayoutService } from 'vs/workbench/services/layout/browser/la
 import { IPanelService } from 'vs/workbench/services/panel/common/panelService';
 import { TogglePanelAction } from 'vs/workbench/browser/panel';
 import { localize } from 'vs/nls';
-import { IQueryHistoryService } from 'sql/platform/queryHistory/common/queryHistoryService';
+import { IQueryHistoryService } from 'sql/workbench/services/queryHistory/common/queryHistoryService';
 import { QueryHistoryNode } from 'sql/workbench/contrib/queryHistory/browser/queryHistoryNode';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 import { openNewQuery } from 'sql/workbench/contrib/query/browser/queryActions';

src/sql/workbench/contrib/queryHistory/browser/queryHistoryNode.ts

@@ -3,7 +3,7 @@
  *  Licensed under the Source EULA. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { QueryHistoryInfo } from 'sql/platform/queryHistory/common/queryHistoryInfo';
+import { QueryHistoryInfo } from 'sql/workbench/services/queryHistory/common/queryHistoryInfo';
 
 /**
  * Wrapper around a QueryHistoryInfo for displaying in the panel TreeView

src/sql/workbench/contrib/queryHistory/browser/queryHistoryRenderer.ts

@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { ITree, IRenderer } from 'vs/base/parts/tree/browser/tree';
-import { QueryStatus } from 'sql/platform/queryHistory/common/queryHistoryInfo';
+import { QueryStatus } from 'sql/workbench/services/queryHistory/common/queryHistoryInfo';
 import * as dom from 'vs/base/browser/dom';
 import { localize } from 'vs/nls';
 import { IDisposable, dispose } from 'vs/base/common/lifecycle';

src/sql/workbench/contrib/queryHistory/browser/queryHistoryView.ts

@@ -18,9 +18,9 @@ import { QueryHistoryDataSource } from 'sql/workbench/contrib/queryHistory/brows
 import { QueryHistoryController } from 'sql/workbench/contrib/queryHistory/browser/queryHistoryController';
 import { QueryHistoryActionProvider } from 'sql/workbench/contrib/queryHistory/browser/queryHistoryActionProvider';
 import { IExpandableTree } from 'sql/workbench/contrib/objectExplorer/browser/treeUpdateUtils';
-import { IQueryHistoryService } from 'sql/platform/queryHistory/common/queryHistoryService';
+import { IQueryHistoryService } from 'sql/workbench/services/queryHistory/common/queryHistoryService';
 import { QueryHistoryNode } from 'sql/workbench/contrib/queryHistory/browser/queryHistoryNode';
-import { QueryHistoryInfo } from 'sql/platform/queryHistory/common/queryHistoryInfo';
+import { QueryHistoryInfo } from 'sql/workbench/services/queryHistory/common/queryHistoryInfo';
 import { IAction } from 'vs/base/common/actions';
 /**
  * QueryHistoryView implements the dynamic tree view for displaying Query History

src/sql/workbench/contrib/queryHistory/electron-browser/queryHistory.ts

@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { IWorkbenchContribution } from 'vs/workbench/common/contributions';
-import { IQueryHistoryService } from 'sql/platform/queryHistory/common/queryHistoryService';
+import { IQueryHistoryService } from 'sql/workbench/services/queryHistory/common/queryHistoryService';
 import { KeyMod, KeyCode } from 'vs/base/common/keyCodes';
 import { localize } from 'vs/nls';
 import { SyncActionDescriptor, MenuRegistry, MenuId } from 'vs/platform/actions/common/actions';

src/sql/workbench/contrib/restore/browser/restoreActions.ts

@@ -8,12 +8,12 @@ import { ServicesAccessor, IInstantiationService } from 'vs/platform/instantiati
 import { IConnectionProfile } from 'sql/platform/connection/common/interfaces';
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
 import { getCurrentGlobalConnection } from 'sql/workbench/browser/taskUtilities';
-import { IRestoreDialogController } from 'sql/platform/restore/common/restoreService';
+import { IRestoreDialogController } from 'sql/workbench/services/restore/common/restoreService';
 import { INotificationService } from 'vs/platform/notification/common/notification';
 import { IConnectionManagementService } from 'sql/platform/connection/common/connectionManagement';
 import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
 import { IObjectExplorerService } from 'sql/workbench/services/objectExplorer/browser/objectExplorerService';
-import { Task } from 'sql/platform/tasks/browser/tasksRegistry';
+import { Task } from 'sql/workbench/services/tasks/browser/tasksRegistry';
 import { mssqlProviderName } from 'sql/platform/connection/common/constants';
 import { ICapabilitiesService } from 'sql/platform/capabilities/common/capabilitiesService';
 import { ConnectionProfile } from 'sql/platform/connection/common/connectionProfile';

src/sql/workbench/contrib/restore/browser/restoreDialog.ts

@@ -30,7 +30,7 @@ import { Table } from 'sql/base/browser/ui/table/table';
 import { TableDataView } from 'sql/base/browser/ui/table/tableDataView';
 import * as DialogHelper from 'sql/workbench/browser/modal/dialogHelper';
 import { Modal } from 'sql/workbench/browser/modal/modal';
-import { attachButtonStyler, attachModalDialogStyler, attachTableStyler, attachInputBoxStyler, attachSelectBoxStyler, attachEditableDropdownStyler, attachCheckboxStyler, attachTabbedPanelStyler } from 'sql/platform/theme/common/styler';
+import { attachButtonStyler, attachTableStyler, attachInputBoxStyler, attachSelectBoxStyler, attachEditableDropdownStyler, attachCheckboxStyler } from 'sql/platform/theme/common/styler';
 import * as TelemetryKeys from 'sql/platform/telemetry/common/telemetryKeys';
 import * as BackupConstants from 'sql/workbench/contrib/backup/common/constants';
 import { RestoreViewModel, RestoreOptionParam, SouceDatabaseNamesParam } from 'sql/workbench/contrib/restore/browser/restoreViewModel';
@@ -44,6 +44,7 @@ import { ILogService } from 'vs/platform/log/common/log';
 import { IWorkbenchLayoutService } from 'vs/workbench/services/layout/browser/layoutService';
 import { ITextResourcePropertiesService } from 'vs/editor/common/services/textResourceConfigurationService';
 import { IAdsTelemetryService } from 'sql/platform/telemetry/common/telemetry';
+import { attachModalDialogStyler, attachTabbedPanelStyler } from 'sql/workbench/common/styler';
 
 interface FileListElement {
 	logicalFileName: string;

src/sql/workbench/contrib/tasks/browser/tasks.contribution.ts

@@ -11,7 +11,7 @@ import { Registry } from 'vs/platform/registry/common/platform';
 import { TasksPanel } from 'sql/workbench/contrib/tasks/browser/tasksPanel';
 import * as lifecycle from 'vs/base/common/lifecycle';
 import * as ext from 'vs/workbench/common/contributions';
-import { ITaskService } from 'sql/platform/tasks/common/tasksService';
+import { ITaskService } from 'sql/workbench/services/tasks/common/tasksService';
 import { IActivityService, NumberBadge } from 'vs/workbench/services/activity/common/activity';
 import { LifecyclePhase } from 'vs/platform/lifecycle/common/lifecycle';
 import { PanelRegistry, Extensions as PanelExtensions, PanelDescriptor } from 'vs/workbench/browser/panel';

src/sql/workbench/contrib/tasks/browser/tasksActionProvider.ts

@@ -7,7 +7,7 @@ import { ITree } from 'vs/base/parts/tree/browser/tree';
 import { ContributableActionProvider } from 'vs/workbench/browser/actions';
 import { IAction } from 'vs/base/common/actions';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { TaskNode, TaskStatus, TaskExecutionMode } from 'sql/platform/tasks/common/tasksNode';
+import { TaskNode, TaskStatus, TaskExecutionMode } from 'sql/workbench/services/tasks/common/tasksNode';
 import { CancelAction, ScriptAction } from 'sql/workbench/contrib/tasks/common/tasksAction';
 
 /**

src/sql/workbench/contrib/tasks/browser/tasksDataSource.ts

@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { ITree, IDataSource } from 'vs/base/parts/tree/browser/tree';
-import { TaskNode } from 'sql/platform/tasks/common/tasksNode';
+import { TaskNode } from 'sql/workbench/services/tasks/common/tasksNode';
 
 /**
  * Implements the DataSource(that returns a parent/children of an element) for the task history

src/sql/workbench/contrib/tasks/browser/tasksRenderer.ts

@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { ITree, IRenderer } from 'vs/base/parts/tree/browser/tree';
-import { TaskNode, TaskStatus } from 'sql/platform/tasks/common/tasksNode';
+import { TaskNode, TaskStatus } from 'sql/workbench/services/tasks/common/tasksNode';
 import * as dom from 'vs/base/browser/dom';
 import { localize } from 'vs/nls';
 import * as Utils from 'sql/platform/connection/common/utils';

src/sql/workbench/contrib/tasks/browser/tasksView.ts

@@ -19,8 +19,8 @@ import { TaskHistoryRenderer } from 'sql/workbench/contrib/tasks/browser/tasksRe
 import { TaskHistoryDataSource } from 'sql/workbench/contrib/tasks/browser/tasksDataSource';
 import { TaskHistoryController } from 'sql/workbench/contrib/tasks/browser/tasksController';
 import { TaskHistoryActionProvider } from 'sql/workbench/contrib/tasks/browser/tasksActionProvider';
-import { ITaskService } from 'sql/platform/tasks/common/tasksService';
-import { TaskNode, TaskStatus } from 'sql/platform/tasks/common/tasksNode';
+import { ITaskService } from 'sql/workbench/services/tasks/common/tasksService';
+import { TaskNode, TaskStatus } from 'sql/workbench/services/tasks/common/tasksNode';
 import { IErrorMessageService } from 'sql/platform/errorMessage/common/errorMessageService';
 import { IExpandableTree } from 'sql/workbench/contrib/objectExplorer/browser/treeUpdateUtils';
 

src/sql/workbench/contrib/tasks/common/tasksAction.ts

@@ -5,8 +5,8 @@
 
 import { localize } from 'vs/nls';
 import { Action } from 'vs/base/common/actions';
-import { ITaskService } from 'sql/platform/tasks/common/tasksService';
-import { TaskNode } from 'sql/platform/tasks/common/tasksNode';
+import { ITaskService } from 'sql/workbench/services/tasks/common/tasksService';
+import { TaskNode } from 'sql/workbench/services/tasks/common/tasksNode';
 import { IQueryEditorService } from 'sql/workbench/services/queryEditor/common/queryEditorService';
 import Severity from 'vs/base/common/severity';
 import { IErrorMessageService } from 'sql/platform/errorMessage/common/errorMessageService';

src/sql/workbench/contrib/webview/browser/webViewDialog.ts

@@ -7,7 +7,7 @@ import 'vs/css!sql/media/icons/common-icons';
 import { Button } from 'sql/base/browser/ui/button/button';
 import { Modal } from 'sql/workbench/browser/modal/modal';
 import * as TelemetryKeys from 'sql/platform/telemetry/common/telemetryKeys';
-import { attachButtonStyler, attachModalDialogStyler } from 'sql/platform/theme/common/styler';
+import { attachButtonStyler } from 'sql/platform/theme/common/styler';
 import { IThemeService } from 'vs/platform/theme/common/themeService';
 import { Event, Emitter } from 'vs/base/common/event';
 import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
@@ -21,6 +21,7 @@ import { IWebviewService, WebviewElement } from 'vs/workbench/contrib/webview/br
 import { generateUuid } from 'vs/base/common/uuid';
 import { ITextResourcePropertiesService } from 'vs/editor/common/services/textResourceConfigurationService';
 import { IAdsTelemetryService } from 'sql/platform/telemetry/common/telemetry';
+import { attachModalDialogStyler } from 'sql/workbench/common/styler';
 
 export class WebViewDialog extends Modal {