Inital platform relayering (#6385)

* moving test files and inital refactoring

* relayer extension host code

* fix imports

* make insights work

* relayer dashboard

* relayer notebooks

* moveing more code around

* formatting

* accept angular as browser

* fix serializer

* add missing files

* remove declarations from extensions

* fix build errors

* more relayering

* change urls to relative to help code relayering

* remove layering to prep for merge

* fix hygiene errors

* fix hygiene errors

* fix tests

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

@@ -112,7 +112,7 @@ const LocalizedStrings = {
 
 @Component({
 	selector: BACKUP_SELECTOR,
-	templateUrl: decodeURI(require.toUrl('sql/workbench/parts/backup/electron-browser/backup.component.html'))
+	templateUrl: decodeURI(require.toUrl('./backup.component.html'))
 })
 export class BackupComponent {
 	@ViewChild('pathContainer', { read: ElementRef }) pathElement;

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

@@ -11,10 +11,11 @@ import { APP_BASE_HREF, CommonModule } from '@angular/common';
 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/workbench/parts/backup/electron-browser/backup.component';
+import { providerIterator } from 'sql/platform/bootstrap/browser/bootstrapService';
+import { BackupComponent } from 'sql/workbench/parts/backup/browser/backup.component';
 
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
+import { IBootstrapParams, ISelector } from 'sql/platform/bootstrap/common/bootstrapParams';
 
 // work around
 const BrowserAnimationsModule = (<any>require.__$__nodeRequire('@angular/platform-browser/animations')).BrowserAnimationsModule;

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

@@ -5,16 +5,16 @@
 
 import { Modal } from 'sql/workbench/browser/modal/modal';
 import { IConnectionProfile } from 'sql/platform/connection/common/interfaces';
-import { BackupModule } from 'sql/workbench/parts/backup/electron-browser/backup.module';
-import { BACKUP_SELECTOR } from 'sql/workbench/parts/backup/electron-browser/backup.component';
+import { BackupModule } from 'sql/workbench/parts/backup/browser/backup.module';
+import { BACKUP_SELECTOR } from 'sql/workbench/parts/backup/browser/backup.component';
 import { attachModalDialogStyler } from 'sql/platform/theme/common/styler';
-import * as TelemetryKeys from 'sql/platform/telemetry/telemetryKeys';
+import * as TelemetryKeys from 'sql/platform/telemetry/common/telemetryKeys';
 
 import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
 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 { bootstrapAngular } from 'sql/platform/bootstrap/node/bootstrapService';
+import { bootstrapAngular } from 'sql/platform/bootstrap/browser/bootstrapService';
 import { IClipboardService } from 'vs/platform/clipboard/common/clipboardService';
 import { append, $ } from 'vs/base/browser/dom';
 import { ILogService } from 'vs/platform/log/common/log';

src/sql/workbench/parts/charts/browser/actions.ts

@@ -3,10 +3,9 @@
  *  Licensed under the Source EULA. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IInsightOptions, IInsight } from './interfaces';
+import { IInsight } from './interfaces';
 import { Graph } from './graphInsight';
 import { IClipboardService } from 'sql/platform/clipboard/common/clipboardService';
-import { IInsightsConfig } from 'sql/workbench/parts/dashboard/widgets/insights/interfaces';
 import { resolveCurrentDirectory, getRootPath } from 'sql/platform/common/pathUtilities';
 
 import { localize } from 'vs/nls';
@@ -20,6 +19,8 @@ import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace
 import { IUntitledEditorService } from 'vs/workbench/services/untitled/common/untitledEditorService';
 import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
 import { QueryInput } from 'sql/workbench/parts/query/common/queryInput';
+import { IInsightsConfig } from 'sql/platform/dashboard/browser/insightRegistry';
+import { IInsightOptions } from 'sql/workbench/parts/charts/common/interfaces';
 
 export interface IChartActionContext {
 	options: IInsightOptions;

src/sql/workbench/parts/charts/browser/chartOptions.ts

@@ -6,9 +6,8 @@
 import { localize } from 'vs/nls';
 import { Registry } from 'vs/platform/registry/common/platform';
 
-import { Extensions, IInsightRegistry } from 'sql/platform/dashboard/common/insightRegistry';
-import { InsightType, IInsightOptions } from './interfaces';
-import { DataDirection, ChartType, LegendPosition, DataType } from 'sql/workbench/parts/dashboard/widgets/insights/views/charts/interfaces';
+import { Extensions, IInsightRegistry } from 'sql/platform/dashboard/browser/insightRegistry';
+import { IInsightOptions, DataDirection, DataType, LegendPosition, ChartType, InsightType } from 'sql/workbench/parts/charts/common/interfaces';
 
 const insightRegistry = Registry.as<IInsightRegistry>(Extensions.InsightContribution);
 

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

@@ -9,8 +9,8 @@ import { IPanelView } from 'sql/base/browser/ui/panel/panel';
 import { Insight } from './insight';
 import QueryRunner from 'sql/platform/query/common/queryRunner';
 import { ChartOptions, IChartOption, ControlType } from './chartOptions';
-import { Extensions, IInsightRegistry } from 'sql/platform/dashboard/common/insightRegistry';
-import { IInsightOptions } from './interfaces';
+import { Extensions, IInsightRegistry } from 'sql/platform/dashboard/browser/insightRegistry';
+import { IInsightData } from './interfaces';
 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';
@@ -21,22 +21,10 @@ import { attachSelectBoxStyler, attachInputBoxStyler } from 'vs/platform/theme/c
 import { IThemeService } from 'vs/platform/theme/common/themeService';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 import { isUndefinedOrNull } from 'vs/base/common/types';
-import { ChartType } from 'sql/workbench/parts/dashboard/widgets/insights/views/charts/interfaces';
-import { IInsightData } from 'sql/workbench/parts/dashboard/widgets/insights/interfaces';
 import { CreateInsightAction, CopyAction, SaveImageAction, IChartActionContext } from 'sql/workbench/parts/charts/browser/actions';
 import { Taskbar } from 'sql/base/browser/ui/taskbar/taskbar';
 import { Checkbox } from 'sql/base/browser/ui/checkbox/checkbox';
-
-export class ChartState {
-	dataId: { batchId: number, resultId: number };
-	options: IInsightOptions = {
-		type: ChartType.Bar
-	};
-
-	dispose() {
-
-	}
-}
+import { ChartState, IInsightOptions, ChartType } from 'sql/workbench/parts/charts/common/interfaces';
 
 declare class Proxy {
 	constructor(object, handler);

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

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

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

@@ -11,9 +11,8 @@ 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 { IInsightData } from 'sql/workbench/parts/dashboard/widgets/insights/interfaces';
-import { IInsightOptions, IInsight } from './interfaces';
-import { ChartType, DataDirection, LegendPosition, DataType, IPointDataSet, customMixin } from 'sql/workbench/parts/dashboard/widgets/insights/views/charts/interfaces';
+import { IInsight, IInsightData, IPointDataSet, customMixin } from './interfaces';
+import { IInsightOptions, DataDirection, ChartType, LegendPosition, DataType } from 'sql/workbench/parts/charts/common/interfaces';
 
 const noneLineGraphs = [ChartType.Doughnut, ChartType.Pie];
 

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

@@ -3,11 +3,11 @@
  *  Licensed under the Source EULA. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IInsight, IInsightOptions, InsightType } from './interfaces';
-import { IInsightData } from 'sql/workbench/parts/dashboard/widgets/insights/interfaces';
+import { IInsight, IInsightData } from './interfaces';
 
 import { $ } from 'vs/base/browser/dom';
 import { mixin } from 'vs/base/common/objects';
+import { IInsightOptions, InsightType } from 'sql/workbench/parts/charts/common/interfaces';
 
 export interface IConfig extends IInsightOptions {
 	encoding?: string;

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

@@ -4,16 +4,15 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { Graph } from './graphInsight';
-import { IInsightData } from 'sql/workbench/parts/dashboard/widgets/insights/interfaces';
-import { DataDirection, ChartType } from 'sql/workbench/parts/dashboard/widgets/insights/views/charts/interfaces';
 import { ImageInsight } from './imageInsight';
 import { TableInsight } from './tableInsight';
-import { IInsightOptions, IInsight, InsightType, IInsightCtor } from './interfaces';
+import { IInsight, IInsightCtor, IInsightData } from './interfaces';
 import { CountInsight } from './countInsight';
 
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 import { Dimension, clearNode } from 'vs/base/browser/dom';
 import { deepClone } from 'vs/base/common/objects';
+import { IInsightOptions, ChartType, DataDirection, InsightType } from 'sql/workbench/parts/charts/common/interfaces';
 
 const defaultOptions: IInsightOptions = {
 	type: ChartType.Bar,

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

@@ -4,25 +4,38 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { Dimension } from 'vs/base/browser/dom';
+import { mixin } from 'sql/base/common/objects';
+import * as types from 'vs/base/common/types';
+import { Color } from 'vs/base/common/color';
+import { IInsightOptions, InsightType, ChartType } from 'sql/workbench/parts/charts/common/interfaces';
 
-import { IInsightData } from 'sql/workbench/parts/dashboard/widgets/insights/interfaces';
-import { DataDirection, ChartType, LegendPosition, DataType } from 'sql/workbench/parts/dashboard/widgets/insights/views/charts/interfaces';
+export interface IPointDataSet {
+	data: Array<{ x: number | string, y: number }>;
+	label?: string;
+	fill: boolean;
+	backgroundColor?: Color;
+}
 
-export interface IInsightOptions {
-	type: InsightType | ChartType;
-	dataDirection?: DataDirection;
-	dataType?: DataType;
-	labelFirstColumn?: boolean;
-	columnsAsLabels?: boolean;
-	legendPosition?: LegendPosition;
-	yAxisLabel?: string;
-	yAxisMin?: number;
-	yAxisMax?: number;
-	xAxisLabel?: string;
-	xAxisMin?: number;
-	xAxisMax?: number;
-	encoding?: string;
-	imageFormat?: string;
+export function customMixin(destination: any, source: any, overwrite?: boolean): any {
+	if (types.isObject(source)) {
+		mixin(destination, source, overwrite, customMixin);
+	} else if (types.isArray(source)) {
+		for (let i = 0; i < source.length; i++) {
+			if (destination[i]) {
+				mixin(destination[i], source[i], overwrite, customMixin);
+			} else {
+				destination[i] = source[i];
+			}
+		}
+	} else {
+		destination = source;
+	}
+	return destination;
+}
+
+export interface IInsightData {
+	columns: Array<string>;
+	rows: Array<Array<string>>;
 }
 
 export interface IInsight {
@@ -37,9 +50,3 @@ export interface IInsightCtor {
 	new(container: HTMLElement, options: IInsightOptions, ...services: { _serviceBrand: any; }[]): IInsight;
 	readonly types: Array<InsightType | ChartType>;
 }
-
-export enum InsightType {
-	Image = 'image',
-	Table = 'table',
-	Count = 'count'
-}

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

@@ -3,8 +3,7 @@
  *  Licensed under the Source EULA. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IInsight, InsightType } from './interfaces';
-import { IInsightData } from 'sql/workbench/parts/dashboard/widgets/insights/interfaces';
+import { IInsight, IInsightData } 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 +12,7 @@ import { CellSelectionModel } from 'sql/base/browser/ui/table/plugins/cellSelect
 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/parts/charts/common/interfaces';
 
 export class TableInsight extends Disposable implements IInsight {
 	public static readonly types = [InsightType.Table];

src/sql/workbench/parts/charts/common/interfaces.ts

@@ -0,0 +1,66 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the Source EULA. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+export class ChartState {
+	dataId: { batchId: number, resultId: number };
+	options: IInsightOptions = {
+		type: ChartType.Bar
+	};
+
+	dispose() {
+
+	}
+}
+
+export interface IInsightOptions {
+	type: InsightType | ChartType;
+	dataDirection?: DataDirection;
+	dataType?: DataType;
+	labelFirstColumn?: boolean;
+	columnsAsLabels?: boolean;
+	legendPosition?: LegendPosition;
+	yAxisLabel?: string;
+	yAxisMin?: number;
+	yAxisMax?: number;
+	xAxisLabel?: string;
+	xAxisMin?: number;
+	xAxisMax?: number;
+	encoding?: string;
+	imageFormat?: string;
+}
+
+export enum InsightType {
+	Image = 'image',
+	Table = 'table',
+	Count = 'count'
+}
+
+export enum ChartType {
+	Bar = 'bar',
+	Doughnut = 'doughnut',
+	HorizontalBar = 'horizontalBar',
+	Line = 'line',
+	Pie = 'pie',
+	TimeSeries = 'timeSeries',
+	Scatter = 'scatter'
+}
+
+export enum LegendPosition {
+	Top = 'top',
+	Bottom = 'bottom',
+	Left = 'left',
+	Right = 'right',
+	None = 'none'
+}
+
+export enum DataType {
+	Number = 'number',
+	Point = 'point'
+}
+
+export enum DataDirection {
+	Vertical = 'vertical',
+	Horizontal = 'horizontal'
+}

src/sql/workbench/parts/connection/browser/advancedPropertiesController.ts

@@ -7,7 +7,7 @@ import { OptionsDialog } from 'sql/workbench/browser/modal/optionsDialog';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 import * as azdata from 'azdata';
 import { localize } from 'vs/nls';
-import * as TelemetryKeys from 'sql/platform/telemetry/telemetryKeys';
+import * as TelemetryKeys from 'sql/platform/telemetry/common/telemetryKeys';
 
 export class AdvancedPropertiesController {
 	private _advancedDialog: OptionsDialog;

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

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

src/sql/workbench/parts/connection/test/browser/advancedPropertiesDialog.test.ts

@@ -0,0 +1,105 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the Source EULA. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { OptionsDialog } from 'sql/workbench/browser/modal/optionsDialog';
+import { AdvancedPropertiesController } from 'sql/workbench/parts/connection/browser/advancedPropertiesController';
+import * as azdata from 'azdata';
+import * as TypeMoq from 'typemoq';
+import * as assert from 'assert';
+import { ServiceOptionType } from 'sql/workbench/api/common/sqlExtHostTypes';
+import { MockContextKeyService } from 'vs/platform/keybinding/test/common/mockKeybindingService';
+
+suite('Advanced properties dialog tests', () => {
+	let advancedController: AdvancedPropertiesController;
+	let providerOptions: azdata.ConnectionOption[];
+
+	setup(() => {
+		advancedController = new AdvancedPropertiesController(() => { }, null);
+		providerOptions = [
+			{
+				name: 'a1',
+				displayName: undefined,
+				description: undefined,
+				groupName: 'a',
+				categoryValues: undefined,
+				defaultValue: undefined,
+				isIdentity: true,
+				isRequired: true,
+				specialValueType: null,
+				valueType: ServiceOptionType.string
+			},
+			{
+				name: 'b1',
+				displayName: undefined,
+				description: undefined,
+				groupName: 'b',
+				categoryValues: undefined,
+				defaultValue: undefined,
+				isIdentity: true,
+				isRequired: true,
+				specialValueType: null,
+				valueType: ServiceOptionType.string
+			},
+			{
+				name: 'noType',
+				displayName: undefined,
+				description: undefined,
+				groupName: undefined,
+				categoryValues: undefined,
+				defaultValue: undefined,
+				isIdentity: true,
+				isRequired: true,
+				specialValueType: null,
+				valueType: ServiceOptionType.string
+			},
+			{
+				name: 'a2',
+				displayName: undefined,
+				description: undefined,
+				groupName: 'a',
+				categoryValues: undefined,
+				defaultValue: undefined,
+				isIdentity: true,
+				isRequired: true,
+				specialValueType: null,
+				valueType: ServiceOptionType.string
+			},
+			{
+				name: 'b2',
+				displayName: undefined,
+				description: undefined,
+				groupName: 'b',
+				categoryValues: undefined,
+				defaultValue: undefined,
+				isIdentity: true,
+				isRequired: true,
+				specialValueType: null,
+				valueType: ServiceOptionType.string
+			}
+		];
+	});
+
+	test('advanced dialog should open when showDialog in advancedController get called', () => {
+		let isAdvancedDialogCalled = false;
+		let options: { [name: string]: any } = {};
+		let advanceDialog = TypeMoq.Mock.ofType(OptionsDialog, TypeMoq.MockBehavior.Strict,
+			'', // title
+			'', // name
+			{}, // options
+			undefined, // partsService
+			undefined, // themeService
+			undefined, // Context view service
+			undefined, // instantiation Service
+			undefined, // telemetry service
+			new MockContextKeyService() // contextkeyservice
+		);
+		advanceDialog.setup(x => x.open(TypeMoq.It.isAny(), TypeMoq.It.isAny())).callback(() => {
+			isAdvancedDialogCalled = true;
+		});
+		advancedController.advancedDialog = advanceDialog.object;
+		advancedController.showDialog(providerOptions, options);
+		assert.equal(isAdvancedDialogCalled, true);
+	});
+});

src/sql/workbench/parts/dashboard/browser/containers/dashboardContainer.contribution.ts

@@ -8,10 +8,10 @@ import { IJSONSchema } from 'vs/base/common/jsonSchema';
 import { localize } from 'vs/nls';
 
 import { registerContainer, generateContainerTypeSchemaProperties } from 'sql/platform/dashboard/common/dashboardContainerRegistry';
-import { NAV_SECTION, validateNavSectionContributionAndRegisterIcon } from 'sql/workbench/parts/dashboard/containers/dashboardNavSection.contribution';
-import { WIDGETS_CONTAINER, validateWidgetContainerContribution } from 'sql/workbench/parts/dashboard/containers/dashboardWidgetContainer.contribution';
-import { GRID_CONTAINER, validateGridContainerContribution } from 'sql/workbench/parts/dashboard/containers/dashboardGridContainer.contribution';
-import { WEBVIEW_CONTAINER } from 'sql/workbench/parts/dashboard/containers/dashboardWebviewContainer.contribution';
+import { NAV_SECTION, validateNavSectionContributionAndRegisterIcon } from 'sql/workbench/parts/dashboard/browser/containers/dashboardNavSection.contribution';
+import { WIDGETS_CONTAINER, validateWidgetContainerContribution } from 'sql/workbench/parts/dashboard/browser/containers/dashboardWidgetContainer.contribution';
+import { GRID_CONTAINER, validateGridContainerContribution } from 'sql/workbench/parts/dashboard/browser/containers/dashboardGridContainer.contribution';
+import { WEBVIEW_CONTAINER } from 'sql/workbench/parts/dashboard/electron-browser/containers/dashboardWebviewContainer.contribution';
 
 const containerTypes = [
 	WIDGETS_CONTAINER,

src/sql/workbench/parts/dashboard/browser/containers/dashboardControlHostContainer.component.ts

@@ -9,10 +9,10 @@ import { Component, forwardRef, Input, AfterContentInit, ViewChild, OnChanges }
 
 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 { ControlHostContent } from 'sql/workbench/parts/dashboard/contents/controlHostContent.component';
-import { TabChild } from 'sql/base/electron-browser/ui/panel/tab.component';
+import { DashboardTab } from 'sql/workbench/parts/dashboard/browser/core/interfaces';
+import { TabConfig } from 'sql/workbench/parts/dashboard/browser/core/dashboardWidget';
+import { ControlHostContent } from 'sql/workbench/parts/dashboard/browser/contents/controlHostContent.component';
+import { TabChild } from 'sql/base/browser/ui/panel/tab.component';
 
 @Component({
 	selector: 'dashboard-controlhost-container',

src/sql/workbench/parts/dashboard/browser/containers/dashboardErrorContainer.component.ts

@@ -7,9 +7,9 @@ import 'vs/css!./dashboardErrorContainer';
 
 import { Component, Inject, Input, forwardRef, ViewChild, ElementRef, ChangeDetectorRef, AfterViewInit } from '@angular/core';
 
-import { TabConfig } from 'sql/workbench/parts/dashboard/common/dashboardWidget';
-import { DashboardTab } from 'sql/workbench/parts/dashboard/common/interfaces';
-import { TabChild } from 'sql/base/electron-browser/ui/panel/tab.component';
+import { TabConfig } from 'sql/workbench/parts/dashboard/browser/core/dashboardWidget';
+import { DashboardTab } from 'sql/workbench/parts/dashboard/browser/core/interfaces';
+import { TabChild } from 'sql/base/browser/ui/panel/tab.component';
 
 import { Event, Emitter } from 'vs/base/common/event';
 import * as nls from 'vs/nls';

src/sql/workbench/parts/dashboard/browser/containers/dashboardGridContainer.component.ts

@@ -7,16 +7,16 @@ import 'vs/css!./dashboardGridContainer';
 
 import { Component, Inject, Input, forwardRef, ElementRef, ViewChildren, QueryList, OnDestroy, ChangeDetectorRef, ContentChild } from '@angular/core';
 
-import { CommonServiceInterface } from 'sql/platform/bootstrap/node/commonServiceInterface.service';
-import { TabConfig, WidgetConfig } from 'sql/workbench/parts/dashboard/common/dashboardWidget';
-import { DashboardWidgetWrapper } from 'sql/workbench/parts/dashboard/contents/dashboardWidgetWrapper.component';
-import { DashboardTab } from 'sql/workbench/parts/dashboard/common/interfaces';
-import { WebviewContent } from 'sql/workbench/parts/dashboard/contents/webviewContent.component';
-import { TabChild } from 'sql/base/electron-browser/ui/panel/tab.component';
+import { CommonServiceInterface } from 'sql/platform/bootstrap/browser/commonServiceInterface.service';
+import { TabConfig, WidgetConfig } from 'sql/workbench/parts/dashboard/browser/core/dashboardWidget';
+import { DashboardWidgetWrapper } from 'sql/workbench/parts/dashboard/browser/contents/dashboardWidgetWrapper.component';
+import { DashboardTab } from 'sql/workbench/parts/dashboard/browser/core/interfaces';
+import { WebviewContent } from 'sql/workbench/parts/dashboard/electron-browser/contents/webviewContent.component';
+import { TabChild } from 'sql/base/browser/ui/panel/tab.component';
 
 import { Event, Emitter } from 'vs/base/common/event';
-import { ScrollableDirective } from 'sql/base/electron-browser/ui/scrollable/scrollable.directive';
 import { ScrollbarVisibility } from 'vs/editor/common/standalone/standaloneEnums';
+import { ScrollableDirective } from 'sql/base/browser/ui/scrollable/scrollable.directive';
 
 export interface GridCellConfig {
 	id?: string;
@@ -44,7 +44,7 @@ export interface GridModelViewConfig extends GridCellConfig {
 
 @Component({
 	selector: 'dashboard-grid-container',
-	templateUrl: decodeURI(require.toUrl('sql/workbench/parts/dashboard/containers/dashboardGridContainer.component.html')),
+	templateUrl: decodeURI(require.toUrl('./dashboardGridContainer.component.html')),
 	providers: [{ provide: TabChild, useExisting: forwardRef(() => DashboardGridContainer) }]
 })
 export class DashboardGridContainer extends DashboardTab implements OnDestroy {

src/sql/workbench/parts/dashboard/browser/containers/dashboardGridContainer.contribution.ts

@@ -7,7 +7,7 @@ import { IExtensionPointUser } from 'vs/workbench/services/extensions/common/ext
 import { IJSONSchema } from 'vs/base/common/jsonSchema';
 import * as nls from 'vs/nls';
 
-import { generateDashboardGridLayoutSchema } from 'sql/workbench/parts/dashboard/pages/dashboardPageContribution';
+import { generateDashboardGridLayoutSchema } from 'sql/workbench/parts/dashboard/browser/pages/dashboardPageContribution';
 import { registerContainerType, registerNavSectionContainerType } from 'sql/platform/dashboard/common/dashboardContainerRegistry';
 
 export const GRID_CONTAINER = 'grid-container';

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

@@ -7,14 +7,14 @@ import 'vs/css!./dashboardHomeContainer';
 
 import { Component, forwardRef, Input, ChangeDetectorRef, Inject, ViewChild, ContentChild } from '@angular/core';
 
-import { DashboardWidgetContainer } from 'sql/workbench/parts/dashboard/containers/dashboardWidgetContainer.component';
-import { WidgetConfig } from 'sql/workbench/parts/dashboard/common/dashboardWidget';
-import { DashboardServiceInterface } from 'sql/workbench/parts/dashboard/services/dashboardServiceInterface.service';
-import { CommonServiceInterface } from 'sql/platform/bootstrap/node/commonServiceInterface.service';
+import { DashboardWidgetContainer } from 'sql/workbench/parts/dashboard/browser/containers/dashboardWidgetContainer.component';
+import { WidgetConfig } from 'sql/workbench/parts/dashboard/browser/core/dashboardWidget';
+import { DashboardServiceInterface } from 'sql/workbench/parts/dashboard/browser/services/dashboardServiceInterface.service';
+import { CommonServiceInterface } from 'sql/platform/bootstrap/browser/commonServiceInterface.service';
 import { AngularEventType, IAngularEventingService } from 'sql/platform/angularEventing/common/angularEventingService';
-import { DashboardWidgetWrapper } from 'sql/workbench/parts/dashboard/contents/dashboardWidgetWrapper.component';
-import { ScrollableDirective } from 'sql/base/electron-browser/ui/scrollable/scrollable.directive';
-import { TabChild } from 'sql/base/electron-browser/ui/panel/tab.component';
+import { DashboardWidgetWrapper } from 'sql/workbench/parts/dashboard/browser/contents/dashboardWidgetWrapper.component';
+import { ScrollableDirective } from 'sql/base/browser/ui/scrollable/scrollable.directive';
+import { TabChild } from 'sql/base/browser/ui/panel/tab.component';
 
 import { ConfigurationTarget, IConfigurationService } from 'vs/platform/configuration/common/configuration';
 import { ScrollbarVisibility } from 'vs/editor/common/standalone/standaloneEnums';

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

@@ -3,16 +3,14 @@
  *  Licensed under the Source EULA. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import 'vs/css!./dashboardWebviewContainer';
-
 import { Component, forwardRef, Input, AfterContentInit, ViewChild } from '@angular/core';
 
 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/workbench/electron-browser/modelComponents/modelViewContent.component';
-import { TabChild } from 'sql/base/electron-browser/ui/panel/tab.component';
+import { DashboardTab } from 'sql/workbench/parts/dashboard/browser/core/interfaces';
+import { TabConfig } from 'sql/workbench/parts/dashboard/browser/core/dashboardWidget';
+import { ModelViewContent } from 'sql/workbench/browser/modelComponents/modelViewContent.component';
+import { TabChild } from 'sql/base/browser/ui/panel/tab.component';
 
 @Component({
 	selector: 'dashboard-modelview-container',

src/sql/workbench/parts/dashboard/browser/containers/dashboardNavSection.component.ts

@@ -7,14 +7,14 @@ import 'vs/css!./dashboardNavSection';
 
 import { Component, Inject, Input, forwardRef, ViewChild, ElementRef, ViewChildren, QueryList, OnDestroy, ChangeDetectorRef, OnChanges, AfterContentInit } from '@angular/core';
 
-import { CommonServiceInterface, SingleConnectionManagementService } from 'sql/platform/bootstrap/node/commonServiceInterface.service';
-import { WidgetConfig, TabConfig, NavSectionConfig } from 'sql/workbench/parts/dashboard/common/dashboardWidget';
-import { PanelComponent, IPanelOptions, NavigationBarLayout } from 'sql/base/electron-browser/ui/panel/panel.component';
-import { TabChild } from 'sql/base/electron-browser/ui/panel/tab.component';
-import { DashboardTab, IConfigModifierCollection } from 'sql/workbench/parts/dashboard/common/interfaces';
-import { WIDGETS_CONTAINER } from 'sql/workbench/parts/dashboard/containers/dashboardWidgetContainer.contribution';
-import { GRID_CONTAINER } from 'sql/workbench/parts/dashboard/containers/dashboardGridContainer.contribution';
-import * as dashboardHelper from 'sql/workbench/parts/dashboard/common/dashboardHelper';
+import { CommonServiceInterface, SingleConnectionManagementService } from 'sql/platform/bootstrap/browser/commonServiceInterface.service';
+import { WidgetConfig, TabConfig, NavSectionConfig } from 'sql/workbench/parts/dashboard/browser/core/dashboardWidget';
+import { PanelComponent, IPanelOptions, NavigationBarLayout } from 'sql/base/browser/ui/panel/panel.component';
+import { TabChild } from 'sql/base/browser/ui/panel/tab.component';
+import { DashboardTab, IConfigModifierCollection } from 'sql/workbench/parts/dashboard/browser/core/interfaces';
+import { WIDGETS_CONTAINER } from 'sql/workbench/parts/dashboard/browser/containers/dashboardWidgetContainer.contribution';
+import { GRID_CONTAINER } from 'sql/workbench/parts/dashboard/browser/containers/dashboardGridContainer.contribution';
+import * as dashboardHelper from 'sql/workbench/parts/dashboard/browser/core/dashboardHelper';
 
 import { Event, Emitter } from 'vs/base/common/event';
 import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
@@ -23,7 +23,7 @@ import { ILogService } from 'vs/platform/log/common/log';
 @Component({
 	selector: 'dashboard-nav-section',
 	providers: [{ provide: TabChild, useExisting: forwardRef(() => DashboardNavSection) }],
-	templateUrl: decodeURI(require.toUrl('sql/workbench/parts/dashboard/containers/dashboardNavSection.component.html'))
+	templateUrl: decodeURI(require.toUrl('./dashboardNavSection.component.html'))
 })
 export class DashboardNavSection extends DashboardTab implements OnDestroy, OnChanges, AfterContentInit, IConfigModifierCollection {
 	@Input() private tab: TabConfig;

src/sql/workbench/parts/dashboard/browser/containers/dashboardNavSection.contribution.ts

@@ -11,10 +11,10 @@ import { createCSSRule } from 'vs/base/browser/dom';
 import { URI } from 'vs/base/common/uri';
 import { IdGenerator } from 'vs/base/common/idGenerator';
 
-import { NavSectionConfig, IUserFriendlyIcon } from 'sql/workbench/parts/dashboard/common/dashboardWidget';
+import { NavSectionConfig, IUserFriendlyIcon } from 'sql/workbench/parts/dashboard/browser/core/dashboardWidget';
 import { registerContainerType, generateNavSectionContainerTypeSchemaProperties } from 'sql/platform/dashboard/common/dashboardContainerRegistry';
-import { WIDGETS_CONTAINER, validateWidgetContainerContribution } from 'sql/workbench/parts/dashboard/containers/dashboardWidgetContainer.contribution';
-import { GRID_CONTAINER, validateGridContainerContribution } from 'sql/workbench/parts/dashboard/containers/dashboardGridContainer.contribution';
+import { WIDGETS_CONTAINER, validateWidgetContainerContribution } from 'sql/workbench/parts/dashboard/browser/containers/dashboardWidgetContainer.contribution';
+import { GRID_CONTAINER, validateGridContainerContribution } from 'sql/workbench/parts/dashboard/browser/containers/dashboardGridContainer.contribution';
 
 export const NAV_SECTION = 'nav-section';
 

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

@@ -7,10 +7,10 @@ import 'vs/css!./dashboardWidgetContainer';
 
 import { Component, Inject, Input, forwardRef, ViewChild, OnDestroy, ChangeDetectorRef, AfterContentInit } from '@angular/core';
 
-import { TabConfig, WidgetConfig } from 'sql/workbench/parts/dashboard/common/dashboardWidget';
-import { DashboardTab } from 'sql/workbench/parts/dashboard/common/interfaces';
-import { WidgetContent } from 'sql/workbench/parts/dashboard/contents/widgetContent.component';
-import { TabChild } from 'sql/base/electron-browser/ui/panel/tab.component';
+import { TabConfig, WidgetConfig } from 'sql/workbench/parts/dashboard/browser/core/dashboardWidget';
+import { DashboardTab } from 'sql/workbench/parts/dashboard/browser/core/interfaces';
+import { WidgetContent } from 'sql/workbench/parts/dashboard/browser/contents/widgetContent.component';
+import { TabChild } from 'sql/base/browser/ui/panel/tab.component';
 
 import { Event, Emitter } from 'vs/base/common/event';
 

src/sql/workbench/parts/dashboard/browser/containers/dashboardWidgetContainer.contribution.ts

@@ -7,7 +7,7 @@ import { IExtensionPointUser } from 'vs/workbench/services/extensions/common/ext
 import { IJSONSchema } from 'vs/base/common/jsonSchema';
 import * as nls from 'vs/nls';
 
-import { generateDashboardWidgetSchema } from 'sql/workbench/parts/dashboard/pages/dashboardPageContribution';
+import { generateDashboardWidgetSchema } from 'sql/workbench/parts/dashboard/browser/pages/dashboardPageContribution';
 import { registerContainerType, registerNavSectionContainerType } from 'sql/platform/dashboard/common/dashboardContainerRegistry';
 
 export const WIDGETS_CONTAINER = 'widgets-container';

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

@@ -9,14 +9,14 @@ import { Component, forwardRef, Input, OnInit, Inject, ChangeDetectorRef, Elemen
 
 import { Event, Emitter } from 'vs/base/common/event';
 import { IDisposable } from 'vs/base/common/lifecycle';
-import { CommonServiceInterface } from 'sql/platform/bootstrap/node/commonServiceInterface.service';
+import { CommonServiceInterface } from 'sql/platform/bootstrap/browser/commonServiceInterface.service';
 
 import * as azdata from 'azdata';
 import { memoize } from 'vs/base/common/decorators';
-import { AgentViewComponent } from '../../jobManagement/electron-browser/agentView.component';
+import { AgentViewComponent } from '../../../jobManagement/browser/agentView.component';
 
 @Component({
-	templateUrl: decodeURI(require.toUrl('sql/workbench/parts/dashboard/contents/controlHostContent.component.html')),
+	templateUrl: decodeURI(require.toUrl('./controlHostContent.component.html')),
 	selector: 'controlhost-content'
 })
 export class ControlHostContent {

src/sql/workbench/parts/dashboard/browser/contents/dashboardWidgetWrapper.component.ts

@@ -11,20 +11,20 @@ import {
 	ElementRef, OnInit, ChangeDetectorRef, ReflectiveInjector, Injector, Type, ComponentRef
 } from '@angular/core';
 
-import { ComponentHostDirective } from 'sql/workbench/parts/dashboard/common/componentHost.directive';
-import { WidgetConfig, WIDGET_CONFIG, IDashboardWidget } from 'sql/workbench/parts/dashboard/common/dashboardWidget';
-import { Extensions, IInsightRegistry } from 'sql/platform/dashboard/common/insightRegistry';
-import { RefreshWidgetAction, ToggleMoreWidgetAction, DeleteWidgetAction, CollapseWidgetAction } from 'sql/workbench/parts/dashboard/common/actions';
-import { AngularDisposable } from 'sql/base/node/lifecycle';
+import { ComponentHostDirective } from 'sql/workbench/parts/dashboard/browser/core/componentHost.directive';
+import { WidgetConfig, WIDGET_CONFIG, IDashboardWidget } from 'sql/workbench/parts/dashboard/browser/core/dashboardWidget';
+import { Extensions, IInsightRegistry } from 'sql/platform/dashboard/browser/insightRegistry';
+import { RefreshWidgetAction, ToggleMoreWidgetAction, DeleteWidgetAction, CollapseWidgetAction } from 'sql/workbench/parts/dashboard/browser/core/actions';
+import { AngularDisposable } from 'sql/base/browser/lifecycle';
 
 /* Widgets */
-import { PropertiesWidgetComponent } from 'sql/workbench/parts/dashboard/widgets/properties/propertiesWidget.component';
-import { ExplorerWidget } from 'sql/workbench/parts/dashboard/widgets/explorer/explorerWidget.component';
-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 { PropertiesWidgetComponent } from 'sql/workbench/parts/dashboard/browser/widgets/properties/propertiesWidget.component';
+import { ExplorerWidget } from 'sql/workbench/parts/dashboard/browser/widgets/explorer/explorerWidget.component';
+import { TasksWidget } from 'sql/workbench/parts/dashboard/browser/widgets/tasks/tasksWidget.component';
+import { InsightsWidget } from 'sql/workbench/parts/dashboard/browser/widgets/insights/insightsWidget.component';
+import { WebviewWidget } from 'sql/workbench/parts/dashboard/electron-browser/widgets/webview/webviewWidget.component';
 
-import { CommonServiceInterface } from 'sql/platform/bootstrap/node/commonServiceInterface.service';
+import { CommonServiceInterface } from 'sql/platform/bootstrap/browser/commonServiceInterface.service';
 
 import { IColorTheme, IWorkbenchThemeService } from 'vs/workbench/services/themes/common/workbenchThemeService';
 import * as colors from 'vs/platform/theme/common/colorRegistry';
@@ -47,7 +47,7 @@ const componentMap: { [x: string]: Type<IDashboardWidget> } = {
 
 @Component({
 	selector: 'dashboard-widget-wrapper',
-	templateUrl: decodeURI(require.toUrl('sql/workbench/parts/dashboard/contents/dashboardWidgetWrapper.component.html'))
+	templateUrl: decodeURI(require.toUrl('./dashboardWidgetWrapper.component.html'))
 })
 export class DashboardWidgetWrapper extends AngularDisposable implements OnInit {
 	@Input() private _config: WidgetConfig;

src/sql/workbench/parts/dashboard/browser/contents/widgetContent.component.ts

@@ -8,11 +8,11 @@ import 'vs/css!./widgetContent';
 import { Component, Inject, Input, forwardRef, ViewChild, ViewChildren, QueryList, ChangeDetectorRef, ElementRef, AfterViewInit } from '@angular/core';
 import { NgGridConfig, NgGrid, NgGridItem } from 'angular2-grid';
 
-import { DashboardServiceInterface } from 'sql/workbench/parts/dashboard/services/dashboardServiceInterface.service';
-import { CommonServiceInterface } from 'sql/platform/bootstrap/node/commonServiceInterface.service';
-import { WidgetConfig } from 'sql/workbench/parts/dashboard/common/dashboardWidget';
-import { DashboardWidgetWrapper } from 'sql/workbench/parts/dashboard/contents/dashboardWidgetWrapper.component';
-import { subscriptionToDisposable, AngularDisposable } from 'sql/base/node/lifecycle';
+import { DashboardServiceInterface } from 'sql/workbench/parts/dashboard/browser/services/dashboardServiceInterface.service';
+import { CommonServiceInterface } from 'sql/platform/bootstrap/browser/commonServiceInterface.service';
+import { WidgetConfig } from 'sql/workbench/parts/dashboard/browser/core/dashboardWidget';
+import { DashboardWidgetWrapper } from 'sql/workbench/parts/dashboard/browser/contents/dashboardWidgetWrapper.component';
+import { subscriptionToDisposable, AngularDisposable } from 'sql/base/browser/lifecycle';
 
 import { IDisposable } from 'vs/base/common/lifecycle';
 import { ConfigurationTarget } from 'vs/platform/configuration/common/configuration';
@@ -69,7 +69,7 @@ function configSorter(a, b): number {
 
 @Component({
 	selector: 'widget-content',
-	templateUrl: decodeURI(require.toUrl('sql/workbench/parts/dashboard/contents/widgetContent.component.html'))
+	templateUrl: decodeURI(require.toUrl('./widgetContent.component.html'))
 })
 export class WidgetContent extends AngularDisposable implements AfterViewInit {
 	@Input() private widgets: WidgetConfig[];

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

@@ -10,9 +10,9 @@ import { StandardKeyboardEvent } from 'vs/base/browser/keyboardEvent';
 import { IDisposable } from 'vs/base/common/lifecycle';
 
 import { IAngularEventingService, AngularEventType, IAngularEvent } from 'sql/platform/angularEventing/common/angularEventingService';
-import { INewDashboardTabDialogService } from 'sql/workbench/services/dashboard/common/newDashboardTabDialog';
-import { IDashboardTab } from 'sql/platform/dashboard/common/dashboardRegistry';
-import { toDisposableSubscription } from 'sql/base/node/rxjsUtils';
+import { INewDashboardTabDialogService } from 'sql/workbench/services/dashboard/browser/newDashboardTabDialog';
+import { IDashboardTab } from 'sql/platform/dashboard/browser/dashboardRegistry';
+import { subscriptionToDisposable } from 'sql/base/browser/lifecycle';
 
 export class EditDashboardAction extends Action {
 
@@ -167,7 +167,7 @@ export class AddFeatureTabAction extends Action {
 		@IAngularEventingService private _angularEventService: IAngularEventingService
 	) {
 		super(AddFeatureTabAction.ID, AddFeatureTabAction.LABEL, AddFeatureTabAction.ICON);
-		this._disposables.push(toDisposableSubscription(this._angularEventService.onAngularEvent(this._uri, (event) => this.handleDashboardEvent(event))));
+		this._disposables.push(subscriptionToDisposable(this._angularEventService.onAngularEvent(this._uri, (event) => this.handleDashboardEvent(event))));
 	}
 
 	run(): Promise<boolean> {

src/sql/workbench/parts/dashboard/browser/core/dashboardHelper.ts

@@ -9,18 +9,18 @@ import { Registry } from 'vs/platform/registry/common/platform';
 import * as nls from 'vs/nls';
 import { ContextKeyExpr, IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
 
-import { WidgetConfig } from 'sql/workbench/parts/dashboard/common/dashboardWidget';
-import { Extensions, IInsightRegistry } from 'sql/platform/dashboard/common/insightRegistry';
+import { WidgetConfig } from 'sql/workbench/parts/dashboard/browser/core/dashboardWidget';
+import { Extensions, IInsightRegistry } from 'sql/platform/dashboard/browser/insightRegistry';
 import { ConnectionManagementInfo } from 'sql/platform/connection/common/connectionManagementInfo';
-import { DashboardServiceInterface } from 'sql/workbench/parts/dashboard/services/dashboardServiceInterface.service';
-import { WIDGETS_CONTAINER } from 'sql/workbench/parts/dashboard/containers/dashboardWidgetContainer.contribution';
-import { GRID_CONTAINER } from 'sql/workbench/parts/dashboard/containers/dashboardGridContainer.contribution';
-import { WEBVIEW_CONTAINER } from 'sql/workbench/parts/dashboard/containers/dashboardWebviewContainer.contribution';
-import { MODELVIEW_CONTAINER } from 'sql/workbench/parts/dashboard/containers/dashboardModelViewContainer.contribution';
-import { CONTROLHOST_CONTAINER } from 'sql/workbench/parts/dashboard/containers/dashboardControlHostContainer.contribution';
-import { NAV_SECTION } from 'sql/workbench/parts/dashboard/containers/dashboardNavSection.contribution';
+import { DashboardServiceInterface } from 'sql/workbench/parts/dashboard/browser/services/dashboardServiceInterface.service';
+import { WIDGETS_CONTAINER } from 'sql/workbench/parts/dashboard/browser/containers/dashboardWidgetContainer.contribution';
+import { GRID_CONTAINER } from 'sql/workbench/parts/dashboard/browser/containers/dashboardGridContainer.contribution';
+import { WEBVIEW_CONTAINER } from 'sql/workbench/parts/dashboard/electron-browser/containers/dashboardWebviewContainer.contribution';
+import { MODELVIEW_CONTAINER } from 'sql/workbench/parts/dashboard/browser/containers/dashboardModelViewContainer.contribution';
+import { CONTROLHOST_CONTAINER } from 'sql/workbench/parts/dashboard/browser/containers/dashboardControlHostContainer.contribution';
+import { NAV_SECTION } from 'sql/workbench/parts/dashboard/browser/containers/dashboardNavSection.contribution';
 import { IDashboardContainerRegistry, Extensions as DashboardContainerExtensions } from 'sql/platform/dashboard/common/dashboardContainerRegistry';
-import { SingleConnectionManagementService } from 'sql/platform/bootstrap/node/commonServiceInterface.service';
+import { SingleConnectionManagementService } from 'sql/platform/bootstrap/browser/commonServiceInterface.service';
 import * as Constants from 'sql/platform/connection/common/constants';
 import { ILogService } from 'vs/platform/log/common/log';
 

src/sql/workbench/parts/dashboard/browser/core/dashboardPage.component.ts

@@ -3,25 +3,25 @@
  *  Licensed under the Source EULA. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import 'vs/css!sql/workbench/parts/dashboard/common/dashboardPage';
-import 'sql/workbench/parts/dashboard/common/dashboardPanelStyles';
+import 'vs/css!./dashboardPage';
+import 'sql/workbench/parts/dashboard/browser/core/dashboardPanelStyles';
 
 import { Component, Inject, forwardRef, ViewChild, ElementRef, ViewChildren, QueryList, ChangeDetectorRef } from '@angular/core';
 
-import { DashboardServiceInterface } from 'sql/workbench/parts/dashboard/services/dashboardServiceInterface.service';
-import { CommonServiceInterface, SingleConnectionManagementService } from 'sql/platform/bootstrap/node/commonServiceInterface.service';
-import { WidgetConfig, TabConfig, TabSettingConfig } from 'sql/workbench/parts/dashboard/common/dashboardWidget';
-import { IPropertiesConfig } from 'sql/workbench/parts/dashboard/pages/serverDashboardPage.contribution';
-import { PanelComponent } from 'sql/base/electron-browser/ui/panel/panel.component';
-import { IDashboardRegistry, Extensions as DashboardExtensions, IDashboardTab } from 'sql/platform/dashboard/common/dashboardRegistry';
+import { DashboardServiceInterface } from 'sql/workbench/parts/dashboard/browser/services/dashboardServiceInterface.service';
+import { CommonServiceInterface, SingleConnectionManagementService } from 'sql/platform/bootstrap/browser/commonServiceInterface.service';
+import { WidgetConfig, TabConfig, TabSettingConfig } from 'sql/workbench/parts/dashboard/browser/core/dashboardWidget';
+import { IPropertiesConfig } from 'sql/workbench/parts/dashboard/browser/pages/serverDashboardPage.contribution';
+import { PanelComponent } from 'sql/base/browser/ui/panel/panel.component';
+import { IDashboardRegistry, Extensions as DashboardExtensions, IDashboardTab } from 'sql/platform/dashboard/browser/dashboardRegistry';
 import { PinUnpinTabAction, AddFeatureTabAction } from './actions';
-import { TabComponent, TabChild } from 'sql/base/electron-browser/ui/panel/tab.component';
+import { TabComponent, TabChild } from 'sql/base/browser/ui/panel/tab.component';
 import { AngularEventType, IAngularEventingService } from 'sql/platform/angularEventing/common/angularEventingService';
-import { DashboardTab, IConfigModifierCollection } from 'sql/workbench/parts/dashboard/common/interfaces';
-import * as dashboardHelper from 'sql/workbench/parts/dashboard/common/dashboardHelper';
-import { WIDGETS_CONTAINER } from 'sql/workbench/parts/dashboard/containers/dashboardWidgetContainer.contribution';
-import { GRID_CONTAINER } from 'sql/workbench/parts/dashboard/containers/dashboardGridContainer.contribution';
-import { AngularDisposable } from 'sql/base/node/lifecycle';
+import { DashboardTab, IConfigModifierCollection } from 'sql/workbench/parts/dashboard/browser/core/interfaces';
+import * as dashboardHelper from 'sql/workbench/parts/dashboard/browser/core/dashboardHelper';
+import { WIDGETS_CONTAINER } from 'sql/workbench/parts/dashboard/browser/containers/dashboardWidgetContainer.contribution';
+import { GRID_CONTAINER } from 'sql/workbench/parts/dashboard/browser/containers/dashboardGridContainer.contribution';
+import { AngularDisposable } from 'sql/base/browser/lifecycle';
 import * as Constants from 'sql/platform/connection/common/constants';
 
 import { Registry } from 'vs/platform/registry/common/platform';
@@ -42,7 +42,7 @@ const dashboardRegistry = Registry.as<IDashboardRegistry>(DashboardExtensions.Da
 
 @Component({
 	selector: 'dashboard-page',
-	templateUrl: decodeURI(require.toUrl('sql/workbench/parts/dashboard/common/dashboardPage.component.html'))
+	templateUrl: decodeURI(require.toUrl('./dashboardPage.component.html'))
 })
 export abstract class DashboardPage extends AngularDisposable implements IConfigModifierCollection {
 

src/sql/workbench/parts/dashboard/browser/core/dashboardTab.contribution.ts

@@ -9,11 +9,11 @@ import { localize } from 'vs/nls';
 import * as types from 'vs/base/common/types';
 
 import * as Constants from 'sql/platform/connection/common/constants';
-import { registerTab } from 'sql/platform/dashboard/common/dashboardRegistry';
+import { registerTab } from 'sql/platform/dashboard/browser/dashboardRegistry';
 import { generateContainerTypeSchemaProperties } from 'sql/platform/dashboard/common/dashboardContainerRegistry';
-import { NAV_SECTION, validateNavSectionContributionAndRegisterIcon } from 'sql/workbench/parts/dashboard/containers/dashboardNavSection.contribution';
-import { WIDGETS_CONTAINER, validateWidgetContainerContribution } from 'sql/workbench/parts/dashboard/containers/dashboardWidgetContainer.contribution';
-import { GRID_CONTAINER, validateGridContainerContribution } from 'sql/workbench/parts/dashboard/containers/dashboardGridContainer.contribution';
+import { NAV_SECTION, validateNavSectionContributionAndRegisterIcon } from 'sql/workbench/parts/dashboard/browser/containers/dashboardNavSection.contribution';
+import { WIDGETS_CONTAINER, validateWidgetContainerContribution } from 'sql/workbench/parts/dashboard/browser/containers/dashboardWidgetContainer.contribution';
+import { GRID_CONTAINER, validateGridContainerContribution } from 'sql/workbench/parts/dashboard/browser/containers/dashboardGridContainer.contribution';
 
 export interface IDashboardTabContrib {
 	id: string;

src/sql/workbench/parts/dashboard/browser/core/dashboardWidget.ts

@@ -7,7 +7,7 @@ import { InjectionToken, OnDestroy } from '@angular/core';
 import { NgGridItemConfig } from 'angular2-grid';
 import { Action } from 'vs/base/common/actions';
 import { Disposable } from 'vs/base/common/lifecycle';
-import { IDashboardTab } from 'sql/platform/dashboard/common/dashboardRegistry';
+import { IDashboardTab } from 'sql/platform/dashboard/browser/dashboardRegistry';
 
 export interface IDashboardWidget {
 	actions: Array<Action>;

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

@@ -8,18 +8,8 @@ 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/electron-browser/ui/panel/tab.component';
-import { SingleConnectionManagementService } from 'sql/platform/bootstrap/node/commonServiceInterface.service';
-
-export enum Conditional {
-	'equals',
-	'notEquals',
-	'greaterThanOrEquals',
-	'greaterThan',
-	'lessThanOrEquals',
-	'lessThan',
-	'always'
-}
+import { TabChild } from 'sql/base/browser/ui/panel/tab.component';
+import { SingleConnectionManagementService } from 'sql/platform/bootstrap/browser/commonServiceInterface.service';
 
 export abstract class DashboardTab extends TabChild implements OnDestroy {
 	public abstract layout(): void;

src/sql/workbench/parts/dashboard/browser/dashboard.component.ts

@@ -8,12 +8,12 @@ import 'vs/css!./dashboard';
 import { OnInit, Component, Inject, forwardRef, ElementRef, ChangeDetectorRef, ViewChild } from '@angular/core';
 import { Router } from '@angular/router';
 
-import { CommonServiceInterface } from 'sql/platform/bootstrap/node/commonServiceInterface.service';
+import { CommonServiceInterface } from 'sql/platform/bootstrap/browser/commonServiceInterface.service';
 import { IConnectionProfile } from 'sql/platform/connection/common/interfaces';
 import * as Utils from 'sql/platform/connection/common/utils';
-import { RefreshWidgetAction, EditDashboardAction } from 'sql/workbench/parts/dashboard/common/actions';
-import { DashboardPage } from 'sql/workbench/parts/dashboard/common/dashboardPage.component';
-import { AngularDisposable } from 'sql/base/node/lifecycle';
+import { RefreshWidgetAction, EditDashboardAction } from 'sql/workbench/parts/dashboard/browser/core/actions';
+import { DashboardPage } from 'sql/workbench/parts/dashboard/browser/core/dashboardPage.component';
+import { AngularDisposable } from 'sql/base/browser/lifecycle';
 
 import { IColorTheme, IWorkbenchThemeService } from 'vs/workbench/services/themes/common/workbenchThemeService';
 import { IDisposable } from 'vs/base/common/lifecycle';

src/sql/workbench/parts/dashboard/browser/dashboard.contribution.ts

@@ -3,8 +3,8 @@
  *  Licensed under the Source EULA. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { DashboardEditor } from 'sql/workbench/parts/dashboard/dashboardEditor';
-import { DashboardInput } from 'sql/workbench/parts/dashboard/dashboardInput';
+import { DashboardEditor } from 'sql/workbench/parts/dashboard/browser/dashboardEditor';
+import { DashboardInput } from 'sql/workbench/parts/dashboard/common/dashboardInput';
 
 import { SyncDescriptor } from 'vs/platform/instantiation/common/descriptors';
 import { EditorDescriptor, IEditorRegistry, Extensions as EditorExtensions } from 'vs/workbench/browser/editor';

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

@@ -11,55 +11,56 @@ import { FormsModule } from '@angular/forms';
 import { NgGridModule } from 'angular2-grid';
 import { ChartsModule } from 'ng2-charts';
 
-import CustomUrlSerializer from 'sql/base/node/urlSerializer';
-import { Extensions, IInsightRegistry } from 'sql/platform/dashboard/common/insightRegistry';
-import { Extensions as ComponentExtensions, IComponentRegistry } from 'sql/platform/dashboard/common/modelComponentRegistry';
-import { IBootstrapParams, ISelector, providerIterator } from 'sql/platform/bootstrap/node/bootstrapService';
+import CustomUrlSerializer from 'sql/base/browser/urlSerializer';
+import { Extensions, IInsightRegistry } from 'sql/platform/dashboard/browser/insightRegistry';
+import { Extensions as ComponentExtensions, IComponentRegistry } from 'sql/platform/dashboard/browser/modelComponentRegistry';
+import { providerIterator } from 'sql/platform/bootstrap/browser/bootstrapService';
+import { IBootstrapParams, ISelector } from 'sql/platform/bootstrap/common/bootstrapParams';
 
 import { Registry } from 'vs/platform/registry/common/platform';
 
 /* Telemetry */
 import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
-import * as TelemetryUtils from 'sql/platform/telemetry/telemetryUtilities';
-import * as TelemetryKeys from 'sql/platform/telemetry/telemetryKeys';
+import * as TelemetryUtils from 'sql/platform/telemetry/common/telemetryUtilities';
+import * as TelemetryKeys from 'sql/platform/telemetry/common/telemetryKeys';
 
 /* Services */
-import { BreadcrumbService } from 'sql/workbench/parts/dashboard/services/breadcrumb.service';
-import { DashboardServiceInterface } from 'sql/workbench/parts/dashboard/services/dashboardServiceInterface.service';
-import { CommonServiceInterface } from 'sql/platform/bootstrap/node/commonServiceInterface.service';
+import { BreadcrumbService } from 'sql/workbench/parts/dashboard/browser/services/breadcrumb.service';
+import { DashboardServiceInterface } from 'sql/workbench/parts/dashboard/browser/services/dashboardServiceInterface.service';
+import { CommonServiceInterface } from 'sql/platform/bootstrap/browser/commonServiceInterface.service';
 
 /* Directives */
-import { ComponentHostDirective } from 'sql/workbench/parts/dashboard/common/componentHost.directive';
+import { ComponentHostDirective } from 'sql/workbench/parts/dashboard/browser/core/componentHost.directive';
 
 /* Base Components */
-import { DashboardComponent } from 'sql/workbench/parts/dashboard/dashboard.component';
-import { DashboardWidgetWrapper } from 'sql/workbench/parts/dashboard/contents/dashboardWidgetWrapper.component';
-import { DashboardWidgetContainer } from 'sql/workbench/parts/dashboard/containers/dashboardWidgetContainer.component';
-import { DashboardGridContainer } from 'sql/workbench/parts/dashboard/containers/dashboardGridContainer.component';
-import { DashboardWebviewContainer } from 'sql/workbench/parts/dashboard/containers/dashboardWebviewContainer.component';
-import { DashboardModelViewContainer } from 'sql/workbench/parts/dashboard/containers/dashboardModelViewContainer.component';
-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/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/electron-browser/ui/breadcrumb/breadcrumb.component';
-import { IBreadcrumbService } from 'sql/base/electron-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/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 LoadingSpinner from 'sql/workbench/electron-browser/modelComponents/loadingSpinner.component';
-import { Checkbox } from 'sql/base/electron-browser/ui/checkbox/checkbox.component';
-import { SelectBox } from 'sql/platform/ui/electron-browser/selectBox/selectBox.component';
-import { InputBox } from 'sql/base/electron-browser/ui/inputBox/inputBox.component';
-import { EditableDropDown } from 'sql/platform/electron-browser/editableDropdown/editableDropdown.component';
+import { DashboardComponent } from 'sql/workbench/parts/dashboard/browser/dashboard.component';
+import { DashboardWidgetWrapper } from 'sql/workbench/parts/dashboard/browser/contents/dashboardWidgetWrapper.component';
+import { DashboardWidgetContainer } from 'sql/workbench/parts/dashboard/browser/containers/dashboardWidgetContainer.component';
+import { DashboardGridContainer } from 'sql/workbench/parts/dashboard/browser/containers/dashboardGridContainer.component';
+import { DashboardWebviewContainer } from 'sql/workbench/parts/dashboard/electron-browser/containers/dashboardWebviewContainer.component';
+import { DashboardModelViewContainer } from 'sql/workbench/parts/dashboard/browser/containers/dashboardModelViewContainer.component';
+import { DashboardErrorContainer } from 'sql/workbench/parts/dashboard/browser/containers/dashboardErrorContainer.component';
+import { DashboardNavSection } from 'sql/workbench/parts/dashboard/browser/containers/dashboardNavSection.component';
+import { WidgetContent } from 'sql/workbench/parts/dashboard/browser/contents/widgetContent.component';
+import { ModelViewContent } from 'sql/workbench/browser/modelComponents/modelViewContent.component';
+import { ModelComponentWrapper } from 'sql/workbench/browser/modelComponents/modelComponentWrapper.component';
+import { WebviewContent } from 'sql/workbench/parts/dashboard/electron-browser/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/browser/containers/dashboardHomeContainer.component';
+import { ControlHostContent } from 'sql/workbench/parts/dashboard/browser/contents/controlHostContent.component';
+import { DashboardControlHostContainer } from 'sql/workbench/parts/dashboard/browser/containers/dashboardControlHostContainer.component';
+import { JobsViewComponent } from 'sql/workbench/parts/jobManagement/browser/jobsView.component';
+import { AgentViewComponent } from 'sql/workbench/parts/jobManagement/browser/agentView.component';
+import { AlertsViewComponent } from 'sql/workbench/parts/jobManagement/browser/alertsView.component';
+import { JobHistoryComponent } from 'sql/workbench/parts/jobManagement/browser/jobHistory.component';
+import { OperatorsViewComponent } from 'sql/workbench/parts/jobManagement/browser/operatorsView.component';
+import { ProxiesViewComponent } from 'sql/workbench/parts/jobManagement/browser/proxiesView.component';
+import LoadingSpinner from 'sql/workbench/browser/modelComponents/loadingSpinner.component';
+import { Checkbox } from 'sql/base/browser/ui/checkbox/checkbox.component';
+import { SelectBox } from 'sql/platform/browser/selectBox/selectBox.component';
+import { InputBox } from 'sql/platform/browser/inputbox/inputBox.component';
+import { EditableDropDown } from 'sql/platform/browser/editableDropdown/editableDropdown.component';
 
 const baseComponents = [DashboardHomeContainer, DashboardComponent, DashboardWidgetWrapper, DashboardWebviewContainer,
 	DashboardWidgetContainer, DashboardGridContainer, DashboardErrorContainer, DashboardNavSection, ModelViewContent, WebviewContent, WidgetContent,
@@ -68,23 +69,23 @@ const baseComponents = [DashboardHomeContainer, DashboardComponent, DashboardWid
 	DashboardModelViewContainer, ModelComponentWrapper, Checkbox, EditableDropDown, SelectBox, InputBox, LoadingSpinner];
 
 /* Panel */
-import { PanelModule } from 'sql/base/electron-browser/ui/panel/panel.module';
+import { PanelModule } from 'sql/base/browser/ui/panel/panel.module';
 
-import { ScrollableModule } from 'sql/base/electron-browser/ui/scrollable/scrollable.module';
+import { ScrollableModule } from 'sql/base/browser/ui/scrollable/scrollable.module';
 
 /* Pages */
-import { ServerDashboardPage } from 'sql/workbench/parts/dashboard/pages/serverDashboardPage.component';
-import { DatabaseDashboardPage } from 'sql/workbench/parts/dashboard/pages/databaseDashboardPage.component';
+import { ServerDashboardPage } from 'sql/workbench/parts/dashboard/browser/pages/serverDashboardPage.component';
+import { DatabaseDashboardPage } from 'sql/workbench/parts/dashboard/browser/pages/databaseDashboardPage.component';
 
 const pageComponents = [ServerDashboardPage, DatabaseDashboardPage];
 
 /* Widget Components */
-import { PropertiesWidgetComponent } from 'sql/workbench/parts/dashboard/widgets/properties/propertiesWidget.component';
-import { ExplorerWidget } from 'sql/workbench/parts/dashboard/widgets/explorer/explorerWidget.component';
-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/workbench/parts/jobManagement/electron-browser/jobStepsView.component';
+import { PropertiesWidgetComponent } from 'sql/workbench/parts/dashboard/browser/widgets/properties/propertiesWidget.component';
+import { ExplorerWidget } from 'sql/workbench/parts/dashboard/browser/widgets/explorer/explorerWidget.component';
+import { TasksWidget } from 'sql/workbench/parts/dashboard/browser/widgets/tasks/tasksWidget.component';
+import { InsightsWidget } from 'sql/workbench/parts/dashboard/browser/widgets/insights/insightsWidget.component';
+import { WebviewWidget } from 'sql/workbench/parts/dashboard/electron-browser/widgets/webview/webviewWidget.component';
+import { JobStepsViewComponent } from 'sql/workbench/parts/jobManagement/browser/jobStepsView.component';
 import { IInstantiationService, _util } from 'vs/platform/instantiation/common/instantiation';
 import { ILogService } from 'vs/platform/log/common/log';
 

src/sql/workbench/parts/dashboard/browser/dashboardConfig.contribution.ts

@@ -5,9 +5,9 @@
 
 import { Registry } from 'vs/platform/registry/common/platform';
 import { IConfigurationRegistry, Extensions, IConfigurationNode } from 'vs/platform/configuration/common/configurationRegistry';
-import { DASHBOARD_CONFIG_ID } from 'sql/workbench/parts/dashboard/pages/dashboardPageContribution';
-import { DATABASE_DASHBOARD_SETTING, DATABASE_DASHBOARD_PROPERTIES, DATABASE_DASHBOARD_TABS, databaseDashboardSettingSchema, databaseDashboardPropertiesSchema, databaseDashboardTabsSchema } from 'sql/workbench/parts/dashboard/pages/databaseDashboardPage.contribution';
-import { SERVER_DASHBOARD_SETTING, SERVER_DASHBOARD_PROPERTIES, SERVER_DASHBOARD_TABS, serverDashboardSettingSchema, serverDashboardPropertiesSchema, serverDashboardTabsSchema } from 'sql/workbench/parts/dashboard/pages/serverDashboardPage.contribution';
+import { DASHBOARD_CONFIG_ID } from 'sql/workbench/parts/dashboard/browser/pages/dashboardPageContribution';
+import { DATABASE_DASHBOARD_SETTING, DATABASE_DASHBOARD_PROPERTIES, DATABASE_DASHBOARD_TABS, databaseDashboardSettingSchema, databaseDashboardPropertiesSchema, databaseDashboardTabsSchema } from 'sql/workbench/parts/dashboard/browser/pages/databaseDashboardPage.contribution';
+import { SERVER_DASHBOARD_SETTING, SERVER_DASHBOARD_PROPERTIES, SERVER_DASHBOARD_TABS, serverDashboardSettingSchema, serverDashboardPropertiesSchema, serverDashboardTabsSchema } from 'sql/workbench/parts/dashboard/browser/pages/serverDashboardPage.contribution';
 
 const configurationRegistry = Registry.as<IConfigurationRegistry>(Extensions.Configuration);
 const dashboardConfig: IConfigurationNode = {

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

@@ -11,11 +11,11 @@ import { IWorkbenchThemeService } from 'vs/workbench/services/themes/common/work
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
 
-import { DashboardInput } from './dashboardInput';
+import { DashboardInput } from '../common/dashboardInput';
 import { DashboardModule } from './dashboard.module';
-import { bootstrapAngular } from 'sql/platform/bootstrap/node/bootstrapService';
-import { IDashboardComponentParams } from 'sql/platform/bootstrap/node/bootstrapParams';
-import { DASHBOARD_SELECTOR } from 'sql/workbench/parts/dashboard/dashboard.component';
+import { bootstrapAngular } from 'sql/platform/bootstrap/browser/bootstrapService';
+import { IDashboardComponentParams } from 'sql/platform/bootstrap/common/bootstrapParams';
+import { DASHBOARD_SELECTOR } from 'sql/workbench/parts/dashboard/browser/dashboard.component';
 import { ConnectionContextKey } from 'sql/workbench/parts/connection/common/connectionContextKey';
 import { IDashboardService } from 'sql/platform/dashboard/browser/dashboardService';
 import { ConnectionProfile } from 'sql/platform/connection/common/connectionProfile';

src/sql/workbench/parts/dashboard/browser/pages/dashboardPageContribution.ts

@@ -3,7 +3,7 @@
  *  Licensed under the Source EULA. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Extensions, IDashboardWidgetRegistry } from 'sql/platform/dashboard/common/widgetRegistry';
+import { Extensions, IDashboardWidgetRegistry } from 'sql/platform/dashboard/browser/widgetRegistry';
 
 import { Registry } from 'vs/platform/registry/common/platform';
 import { IJSONSchema } from 'vs/base/common/jsonSchema';

src/sql/workbench/parts/dashboard/browser/pages/databaseDashboardPage.component.ts

@@ -5,12 +5,12 @@
 
 import { OnInit, Inject, forwardRef, ChangeDetectorRef, ElementRef } from '@angular/core';
 
-import { DashboardPage } from 'sql/workbench/parts/dashboard/common/dashboardPage.component';
-import { BreadcrumbClass } from 'sql/workbench/parts/dashboard/services/breadcrumb.service';
-import { IBreadcrumbService } from 'sql/base/electron-browser/ui/breadcrumb/interfaces';
-import { DashboardServiceInterface } from 'sql/workbench/parts/dashboard/services/dashboardServiceInterface.service';
-import { WidgetConfig } from 'sql/workbench/parts/dashboard/common/dashboardWidget';
-import { CommonServiceInterface } from 'sql/platform/bootstrap/node/commonServiceInterface.service';
+import { DashboardPage } from 'sql/workbench/parts/dashboard/browser/core/dashboardPage.component';
+import { BreadcrumbClass } from 'sql/workbench/parts/dashboard/browser/services/breadcrumb.service';
+import { IBreadcrumbService } from 'sql/base/browser/ui/breadcrumb/interfaces';
+import { DashboardServiceInterface } from 'sql/workbench/parts/dashboard/browser/services/dashboardServiceInterface.service';
+import { WidgetConfig } from 'sql/workbench/parts/dashboard/browser/core/dashboardWidget';
+import { CommonServiceInterface } from 'sql/platform/bootstrap/browser/commonServiceInterface.service';
 import { IAngularEventingService } from 'sql/platform/angularEventing/common/angularEventingService';
 
 import * as colors from 'vs/platform/theme/common/colorRegistry';

src/sql/workbench/parts/dashboard/browser/pages/serverDashboardPage.component.ts

@@ -5,12 +5,12 @@
 
 import { OnInit, Inject, forwardRef, ChangeDetectorRef, ElementRef } from '@angular/core';
 
-import { DashboardPage } from 'sql/workbench/parts/dashboard/common/dashboardPage.component';
-import { BreadcrumbClass } from 'sql/workbench/parts/dashboard/services/breadcrumb.service';
-import { IBreadcrumbService } from 'sql/base/electron-browser/ui/breadcrumb/interfaces';
-import { WidgetConfig } from 'sql/workbench/parts/dashboard/common/dashboardWidget';
-import { DashboardServiceInterface } from 'sql/workbench/parts/dashboard/services/dashboardServiceInterface.service';
-import { CommonServiceInterface } from 'sql/platform/bootstrap/node/commonServiceInterface.service';
+import { DashboardPage } from 'sql/workbench/parts/dashboard/browser/core/dashboardPage.component';
+import { BreadcrumbClass } from 'sql/workbench/parts/dashboard/browser/services/breadcrumb.service';
+import { IBreadcrumbService } from 'sql/base/browser/ui/breadcrumb/interfaces';
+import { WidgetConfig } from 'sql/workbench/parts/dashboard/browser/core/dashboardWidget';
+import { DashboardServiceInterface } from 'sql/workbench/parts/dashboard/browser/services/dashboardServiceInterface.service';
+import { CommonServiceInterface } from 'sql/platform/bootstrap/browser/commonServiceInterface.service';
 import { IAngularEventingService } from 'sql/platform/angularEventing/common/angularEventingService';
 
 import * as colors from 'vs/platform/theme/common/colorRegistry';

src/sql/workbench/parts/dashboard/browser/pages/serverDashboardPage.contribution.ts

@@ -5,7 +5,7 @@
 
 import { IJSONSchema } from 'vs/base/common/jsonSchema';
 import * as nls from 'vs/nls';
-import { generateDashboardWidgetSchema, generateDashboardTabSchema } from 'sql/workbench/parts/dashboard/pages/dashboardPageContribution';
+import { generateDashboardWidgetSchema, generateDashboardTabSchema } from 'sql/workbench/parts/dashboard/browser/pages/dashboardPageContribution';
 
 export interface IPropertiesConfig {
 	edition: number | Array<number>;

src/sql/workbench/parts/dashboard/browser/services/breadcrumb.service.ts

@@ -7,8 +7,8 @@ import { Injectable, forwardRef, Inject } from '@angular/core';
 import { Subject } from 'rxjs/Subject';
 
 import { DashboardServiceInterface } from './dashboardServiceInterface.service';
-import { CommonServiceInterface } from 'sql/platform/bootstrap/node/commonServiceInterface.service';
-import { MenuItem, IBreadcrumbService } from 'sql/base/electron-browser/ui/breadcrumb/interfaces';
+import { CommonServiceInterface } from 'sql/platform/bootstrap/browser/commonServiceInterface.service';
+import { MenuItem, IBreadcrumbService } from 'sql/base/browser/ui/breadcrumb/interfaces';
 import { ConnectionProfile } from 'sql/platform/connection/common/connectionProfile';
 
 import * as nls from 'vs/nls';

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

@@ -8,17 +8,15 @@ import { Injectable, Inject, forwardRef } from '@angular/core';
 import { Router } from '@angular/router';
 
 /* SQL imports */
-import { IDashboardComponentParams } from 'sql/platform/bootstrap/node/bootstrapParams';
-import { IBootstrapParams } from 'sql/platform/bootstrap/node/bootstrapService';
+import { IDashboardComponentParams, IBootstrapParams } from 'sql/platform/bootstrap/common/bootstrapParams';
 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 { toDisposableSubscription } from 'sql/base/node/rxjsUtils';
 import { AngularEventType, IAngularEvent, IAngularEventingService } from 'sql/platform/angularEventing/common/angularEventingService';
-import { IDashboardTab } from 'sql/platform/dashboard/common/dashboardRegistry';
-import { TabSettingConfig } from 'sql/workbench/parts/dashboard/common/dashboardWidget';
-import { CommonServiceInterface } from 'sql/platform/bootstrap/node/commonServiceInterface.service';
+import { IDashboardTab } from 'sql/platform/dashboard/browser/dashboardRegistry';
+import { TabSettingConfig } from 'sql/workbench/parts/dashboard/browser/core/dashboardWidget';
+import { CommonServiceInterface } from 'sql/platform/bootstrap/browser/commonServiceInterface.service';
 
 /* VS imports */
 import { IConfigurationService, ConfigurationTarget } from 'vs/platform/configuration/common/configuration';
@@ -28,6 +26,7 @@ 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';
 
@@ -78,7 +77,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(toDisposableSubscription(this.angularEventingService.onAngularEvent(this._uri, (event) => this.handleDashboardEvent(event))));
+			this._register(subscriptionToDisposable(this.angularEventingService.onAngularEvent(this._uri, (event) => this.handleDashboardEvent(event))));
 		}
 	}
 

src/sql/workbench/parts/dashboard/browser/widgets/explorer/explorerTree.ts

@@ -7,7 +7,7 @@ import { Router } from '@angular/router';
 
 import { IConnectionProfile } from 'sql/platform/connection/common/interfaces';
 import { MetadataType, IConnectionManagementService } from 'sql/platform/connection/common/connectionManagement';
-import { SingleConnectionManagementService } from 'sql/platform/bootstrap/node/commonServiceInterface.service';
+import { SingleConnectionManagementService } from 'sql/platform/bootstrap/browser/commonServiceInterface.service';
 import {
 	NewQueryAction, ScriptSelectAction, EditDataAction, ScriptCreateAction, ScriptExecuteAction, ScriptAlterAction,
 	BackupAction, ManageActionContext, BaseActionContext, ManageAction, RestoreAction
@@ -33,7 +33,7 @@ import { $ } from 'vs/base/browser/dom';
 import { ExecuteCommandAction } from 'vs/platform/actions/common/actions';
 import { IKeyboardEvent } from 'vs/base/browser/keyboardEvent';
 import { IEditorProgressService } from 'vs/platform/progress/common/progress';
-import { NewNotebookAction } from 'sql/workbench/parts/notebook/notebookActions';
+import { NewNotebookAction } from 'sql/workbench/parts/notebook/electron-browser/notebookActions';
 
 export class ObjectMetadataWrapper implements ObjectMetadata {
 	public metadataType: MetadataType;

src/sql/workbench/parts/dashboard/browser/widgets/explorer/explorerWidget.component.ts

@@ -10,9 +10,8 @@ import 'vs/css!./media/explorerWidget';
 import { Component, Inject, forwardRef, OnInit, ViewChild, ElementRef } from '@angular/core';
 import { Router } from '@angular/router';
 
-import { DashboardWidget, IDashboardWidget, WidgetConfig, WIDGET_CONFIG } from 'sql/workbench/parts/dashboard/common/dashboardWidget';
-import { CommonServiceInterface } from 'sql/platform/bootstrap/node/commonServiceInterface.service';
-import { toDisposableSubscription } from 'sql/base/node/rxjsUtils';
+import { DashboardWidget, IDashboardWidget, WidgetConfig, WIDGET_CONFIG } from 'sql/workbench/parts/dashboard/browser/core/dashboardWidget';
+import { CommonServiceInterface } from 'sql/platform/bootstrap/browser/commonServiceInterface.service';
 import { ExplorerFilter, ExplorerRenderer, ExplorerDataSource, ExplorerController, ObjectMetadataWrapper, ExplorerModel } from './explorerTree';
 import { ConnectionProfile } from 'sql/platform/connection/common/connectionProfile';
 import { ICapabilitiesService } from 'sql/platform/capabilities/common/capabilitiesService';
@@ -28,10 +27,11 @@ import { IWorkbenchThemeService } from 'vs/workbench/services/themes/common/work
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 import { IEditorProgressService } from 'vs/platform/progress/common/progress';
 import { ScrollbarVisibility } from 'vs/base/common/scrollable';
+import { subscriptionToDisposable } from 'sql/base/browser/lifecycle';
 
 @Component({
 	selector: 'explorer-widget',
-	templateUrl: decodeURI(require.toUrl('sql/workbench/parts/dashboard/widgets/explorer/explorerWidget.component.html'))
+	templateUrl: decodeURI(require.toUrl('./explorerWidget.component.html'))
 })
 export class ExplorerWidget extends DashboardWidget implements IDashboardWidget, OnInit {
 	private _input: InputBox;
@@ -102,7 +102,7 @@ export class ExplorerWidget extends DashboardWidget implements IDashboardWidget,
 
 	private init(): void {
 		if (this._config.context === 'database') {
-			this._register(toDisposableSubscription(this._bootstrap.metadataService.metadata.subscribe(
+			this._register(subscriptionToDisposable(this._bootstrap.metadataService.metadata.subscribe(
 				data => {
 					if (data) {
 						const objectData = ObjectMetadataWrapper.createFromObjectMetadata(data.objectMetadata);
@@ -117,7 +117,7 @@ export class ExplorerWidget extends DashboardWidget implements IDashboardWidget,
 			)));
 		} else {
 			const currentProfile = this._bootstrap.connectionManagementService.connectionInfo.connectionProfile;
-			this._register(toDisposableSubscription(this._bootstrap.metadataService.databaseNames.subscribe(
+			this._register(subscriptionToDisposable(this._bootstrap.metadataService.databaseNames.subscribe(
 				data => {
 					// Handle the case where there is no metadata service
 					data = data || [];

src/sql/workbench/parts/dashboard/browser/widgets/explorer/explorerWidget.contribution.ts

@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { IJSONSchema } from 'vs/base/common/jsonSchema';
-import { registerDashboardWidget } from 'sql/platform/dashboard/common/widgetRegistry';
+import { registerDashboardWidget } from 'sql/platform/dashboard/browser/widgetRegistry';
 
 const explorerSchema: IJSONSchema = {
 	type: 'object',

src/sql/workbench/parts/dashboard/browser/widgets/insights/insightsWidget.component.ts

@@ -9,13 +9,11 @@ import {
 } from '@angular/core';
 import { Observable } from 'rxjs/Observable';
 
-import { DashboardWidget, IDashboardWidget, WIDGET_CONFIG, WidgetConfig } from 'sql/workbench/parts/dashboard/common/dashboardWidget';
-import { CommonServiceInterface } from 'sql/platform/bootstrap/node/commonServiceInterface.service';
-import { ComponentHostDirective } from 'sql/workbench/parts/dashboard/common/componentHost.directive';
+import { DashboardWidget, IDashboardWidget, WIDGET_CONFIG, WidgetConfig } from 'sql/workbench/parts/dashboard/browser/core/dashboardWidget';
+import { CommonServiceInterface } from 'sql/platform/bootstrap/browser/commonServiceInterface.service';
+import { ComponentHostDirective } from 'sql/workbench/parts/dashboard/browser/core/componentHost.directive';
 import { InsightAction, InsightActionContext } from 'sql/workbench/common/actions';
-import { toDisposableSubscription } from 'sql/base/node/rxjsUtils';
-import { IInsightsConfig, IInsightsView } from './interfaces';
-import { Extensions, IInsightRegistry } from 'sql/platform/dashboard/common/insightRegistry';
+import { Extensions, IInsightRegistry, IInsightsConfig, IInsightsView } from 'sql/platform/dashboard/browser/insightRegistry';
 import { resolveQueryFilePath } from 'sql/workbench/services/insights/common/insightsUtils';
 
 import { RunInsightQueryAction } from './actions';
@@ -34,6 +32,7 @@ import { isPromiseCanceledError } from 'vs/base/common/errors';
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
 import { IFileService } from 'vs/platform/files/common/files';
 import { URI } from 'vs/base/common/uri';
+import { subscriptionToDisposable } from 'sql/base/browser/lifecycle';
 
 const insightRegistry = Registry.as<IInsightRegistry>(Extensions.InsightContribution);
 
@@ -121,7 +120,7 @@ export class InsightsWidget extends DashboardWidget implements IDashboardWidget,
 	ngAfterContentInit() {
 		this._init = true;
 		if (this.queryObv) {
-			this._register(toDisposableSubscription(this.queryObv.subscribe(
+			this._register(subscriptionToDisposable(this.queryObv.subscribe(
 				result => {
 					this._loading = false;
 					this._updateChild(result);

src/sql/workbench/parts/dashboard/browser/widgets/insights/insightsWidget.contribution.ts

@@ -5,10 +5,10 @@
 
 import { join } from 'path';
 
-import { registerDashboardWidget, registerNonCustomDashboardWidget } from 'sql/platform/dashboard/common/widgetRegistry';
-import { Extensions as InsightExtensions, IInsightRegistry } from 'sql/platform/dashboard/common/insightRegistry';
+import { registerDashboardWidget, registerNonCustomDashboardWidget } from 'sql/platform/dashboard/browser/widgetRegistry';
+import { Extensions as InsightExtensions, IInsightRegistry } from 'sql/platform/dashboard/browser/insightRegistry';
 import { IInsightTypeContrib } from './interfaces';
-import { insightsContribution, insightsSchema } from 'sql/workbench/parts/dashboard/widgets/insights/insightsWidgetSchemas';
+import { insightsContribution, insightsSchema } from 'sql/workbench/parts/dashboard/browser/widgets/insights/insightsWidgetSchemas';
 
 import { IExtensionPointUser, ExtensionsRegistry } from 'vs/workbench/services/extensions/common/extensionsRegistry';
 import { Registry } from 'vs/platform/registry/common/platform';

src/sql/workbench/parts/dashboard/browser/widgets/insights/insightsWidgetSchemas.ts

@@ -3,7 +3,7 @@
  *  Licensed under the Source EULA. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IInsightRegistry, Extensions as InsightExtensions } from 'sql/platform/dashboard/common/insightRegistry';
+import { IInsightRegistry, Extensions as InsightExtensions } from 'sql/platform/dashboard/browser/insightRegistry';
 import { IJSONSchema } from 'vs/base/common/jsonSchema';
 import { Registry } from 'vs/platform/registry/common/platform';
 import * as nls from 'vs/nls';

src/sql/workbench/parts/dashboard/browser/widgets/insights/interfaces.ts

@@ -0,0 +1,11 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the Source EULA. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { IInsightsConfig } from 'sql/platform/dashboard/browser/insightRegistry';
+
+export interface IInsightTypeContrib {
+	id: string;
+	contrib: IInsightsConfig;
+}

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

@@ -6,12 +6,11 @@
 import { Component, Input, Inject, ChangeDetectorRef, forwardRef, ViewChild } from '@angular/core';
 import { BaseChartDirective } from 'ng2-charts';
 
-import * as TelemetryKeys from 'sql/platform/telemetry/telemetryKeys';
-import * as TelemetryUtils from 'sql/platform/telemetry/telemetryUtilities';
-import { IInsightsView, IInsightData } from 'sql/workbench/parts/dashboard/widgets/insights/interfaces';
+import * as TelemetryKeys from 'sql/platform/telemetry/common/telemetryKeys';
+import * as TelemetryUtils from 'sql/platform/telemetry/common/telemetryUtilities';
 import { memoize, unmemoize } from 'sql/base/common/decorators';
 import { mixin } from 'sql/base/common/objects';
-import { LegendPosition, ChartType, defaultChartConfig, IChartConfig, IDataSet, IPointDataSet } from 'sql/workbench/parts/dashboard/widgets/insights/views/charts/interfaces';
+import { defaultChartConfig, IChartConfig, IDataSet } from 'sql/workbench/parts/dashboard/browser/widgets/insights/views/charts/interfaces';
 
 import * as colors from 'vs/platform/theme/common/colorRegistry';
 import * as types from 'vs/base/common/types';
@@ -20,6 +19,9 @@ import * as nls from 'vs/nls';
 import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
 import { IThemeService, ITheme } from 'vs/platform/theme/common/themeService';
 import { ILogService } from 'vs/platform/log/common/log';
+import { IInsightData, IPointDataSet } from 'sql/workbench/parts/charts/browser/interfaces';
+import { IInsightsView } from 'sql/platform/dashboard/browser/insightRegistry';
+import { ChartType, LegendPosition } from 'sql/workbench/parts/charts/common/interfaces';
 
 declare const Chart: any;
 

src/sql/workbench/parts/dashboard/browser/widgets/insights/views/charts/interfaces.ts

@@ -0,0 +1,27 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the Source EULA. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { LegendPosition, DataDirection } from 'sql/workbench/parts/charts/common/interfaces';
+
+export interface IDataSet {
+	data: Array<number>;
+	label?: string;
+}
+
+export interface IChartConfig {
+	colorMap?: { [column: string]: string };
+	labelFirstColumn?: boolean;
+	legendPosition?: LegendPosition;
+	dataDirection?: DataDirection;
+	columnsAsLabels?: boolean;
+	showTopNData?: number;
+}
+
+export const defaultChartConfig: IChartConfig = {
+	labelFirstColumn: true,
+	columnsAsLabels: true,
+	legendPosition: LegendPosition.Top,
+	dataDirection: DataDirection.Vertical
+};

src/sql/workbench/parts/dashboard/browser/widgets/insights/views/charts/types/barChart.component.ts

@@ -3,9 +3,9 @@
  *  Licensed under the Source EULA. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { ChartInsight } from 'sql/workbench/parts/dashboard/widgets/insights/views/charts/chartInsight.component';
+import { ChartInsight } from 'sql/workbench/parts/dashboard/browser/widgets/insights/views/charts/chartInsight.component';
 import { mixin } from 'sql/base/common/objects';
-import { ChartType, IChartConfig, customMixin } from 'sql/workbench/parts/dashboard/widgets/insights/views/charts/interfaces';
+import { IChartConfig } from 'sql/workbench/parts/dashboard/browser/widgets/insights/views/charts/interfaces';
 
 import * as colors from 'vs/platform/theme/common/colorRegistry';
 import { editorLineNumbers } from 'vs/editor/common/view/editorColorRegistry';
@@ -13,6 +13,8 @@ import { ChangeDetectorRef, Inject, forwardRef } from '@angular/core';
 import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
 import { IThemeService, ITheme } from 'vs/platform/theme/common/themeService';
 import { ILogService } from 'vs/platform/log/common/log';
+import { customMixin } from 'sql/workbench/parts/charts/browser/interfaces';
+import { ChartType } from 'sql/workbench/parts/charts/common/interfaces';
 
 export interface IBarChartConfig extends IChartConfig {
 	yAxisMin: number;

src/sql/workbench/parts/dashboard/browser/widgets/insights/views/charts/types/barChart.contribution.ts

@@ -7,8 +7,8 @@ import { mixin, deepClone } from 'vs/base/common/objects';
 import { IJSONSchema } from 'vs/base/common/jsonSchema';
 import * as nls from 'vs/nls';
 
-import { registerInsight } from 'sql/platform/dashboard/common/insightRegistry';
-import { chartInsightSchema } from 'sql/workbench/parts/dashboard/widgets/insights/views/charts/chartInsight.contribution';
+import { registerInsight } from 'sql/platform/dashboard/browser/insightRegistry';
+import { chartInsightSchema } from 'sql/workbench/parts/dashboard/browser/widgets/insights/views/charts/chartInsight.contribution';
 
 import BarChart from './barChart.component';
 

src/sql/workbench/parts/dashboard/browser/widgets/insights/views/charts/types/doughnutChart.component.ts

@@ -4,11 +4,11 @@
  *--------------------------------------------------------------------------------------------*/
 
 import PieChart from './pieChart.component';
-import { ChartType } from 'sql/workbench/parts/dashboard/widgets/insights/views/charts/interfaces';
 import { ChangeDetectorRef, Inject, forwardRef } from '@angular/core';
 import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
 import { ILogService } from 'vs/platform/log/common/log';
 import { IThemeService } from 'vs/platform/theme/common/themeService';
+import { ChartType } from 'sql/workbench/parts/charts/common/interfaces';
 
 export default class DoughnutChart extends PieChart {
 	protected readonly chartType: ChartType = ChartType.Doughnut;

src/sql/workbench/parts/dashboard/browser/widgets/insights/views/charts/types/doughnutChart.contribution.ts

@@ -5,8 +5,8 @@
 
 import { mixin, deepClone } from 'vs/base/common/objects';
 import { IJSONSchema } from 'vs/base/common/jsonSchema';
-import { registerInsight } from 'sql/platform/dashboard/common/insightRegistry';
-import { chartInsightSchema } from 'sql/workbench/parts/dashboard/widgets/insights/views/charts/chartInsight.contribution';
+import { registerInsight } from 'sql/platform/dashboard/browser/insightRegistry';
+import { chartInsightSchema } from 'sql/workbench/parts/dashboard/browser/widgets/insights/views/charts/chartInsight.contribution';
 
 import DoughnutChart from './doughnutChart.component';
 

src/sql/workbench/parts/dashboard/browser/widgets/insights/views/charts/types/horizontalBarChart.component.ts

@@ -4,11 +4,11 @@
  *--------------------------------------------------------------------------------------------*/
 
 import BarChart from './barChart.component';
-import { ChartType } from 'sql/workbench/parts/dashboard/widgets/insights/views/charts/interfaces';
 import { forwardRef, Inject, ChangeDetectorRef } from '@angular/core';
 import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
 import { IThemeService } from 'vs/platform/theme/common/themeService';
 import { ILogService } from 'vs/platform/log/common/log';
+import { ChartType } from 'sql/workbench/parts/charts/common/interfaces';
 
 export default class HorizontalBarChart extends BarChart {
 	protected readonly chartType: ChartType = ChartType.HorizontalBar;

src/sql/workbench/parts/dashboard/browser/widgets/insights/views/charts/types/horizontalBarChart.contribution.ts

@@ -6,8 +6,8 @@
 import { mixin, deepClone } from 'vs/base/common/objects';
 import { IJSONSchema } from 'vs/base/common/jsonSchema';
 
-import { registerInsight } from 'sql/platform/dashboard/common/insightRegistry';
-import { barChartSchema } from 'sql/workbench/parts/dashboard/widgets/insights/views/charts/types/barChart.contribution';
+import { registerInsight } from 'sql/platform/dashboard/browser/insightRegistry';
+import { barChartSchema } from 'sql/workbench/parts/dashboard/browser/widgets/insights/views/charts/types/barChart.contribution';
 
 import HorizontalBarChart from './horizontalBarChart.component';
 

src/sql/workbench/parts/dashboard/browser/widgets/insights/views/charts/types/lineChart.component.ts

@@ -7,11 +7,13 @@ import { mixin, deepClone } from 'vs/base/common/objects';
 
 import BarChart, { IBarChartConfig } from './barChart.component';
 import { memoize, unmemoize } from 'sql/base/common/decorators';
-import { ChartType, DataType, defaultChartConfig, IDataSet, IPointDataSet } from 'sql/workbench/parts/dashboard/widgets/insights/views/charts/interfaces';
+import { defaultChartConfig, IDataSet } from 'sql/workbench/parts/dashboard/browser/widgets/insights/views/charts/interfaces';
 import { ChangeDetectorRef, Inject, forwardRef } from '@angular/core';
 import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
 import { IThemeService } from 'vs/platform/theme/common/themeService';
 import { ILogService } from 'vs/platform/log/common/log';
+import { IPointDataSet } from 'sql/workbench/parts/charts/browser/interfaces';
+import { DataType, ChartType } from 'sql/workbench/parts/charts/common/interfaces';
 
 export interface ILineConfig extends IBarChartConfig {
 	dataType?: DataType;

src/sql/workbench/parts/dashboard/browser/widgets/insights/views/charts/types/lineChart.contribution.ts

@@ -7,8 +7,8 @@ import { mixin, deepClone } from 'vs/base/common/objects';
 import { IJSONSchema } from 'vs/base/common/jsonSchema';
 import * as nls from 'vs/nls';
 
-import { registerInsight } from 'sql/platform/dashboard/common/insightRegistry';
-import { barChartSchema } from 'sql/workbench/parts/dashboard/widgets/insights/views/charts/types/barChart.contribution';
+import { registerInsight } from 'sql/platform/dashboard/browser/insightRegistry';
+import { barChartSchema } from 'sql/workbench/parts/dashboard/browser/widgets/insights/views/charts/types/barChart.contribution';
 
 import LineChart from './lineChart.component';
 

src/sql/workbench/parts/dashboard/browser/widgets/insights/views/charts/types/pieChart.component.ts

@@ -3,12 +3,12 @@
  *  Licensed under the Source EULA. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { ChartInsight } from 'sql/workbench/parts/dashboard/widgets/insights/views/charts/chartInsight.component';
-import { ChartType } from 'sql/workbench/parts/dashboard/widgets/insights/views/charts/interfaces';
+import { ChartInsight } from 'sql/workbench/parts/dashboard/browser/widgets/insights/views/charts/chartInsight.component';
 import { ChangeDetectorRef, Inject, forwardRef } from '@angular/core';
 import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
 import { IThemeService } from 'vs/platform/theme/common/themeService';
 import { ILogService } from 'vs/platform/log/common/log';
+import { ChartType } from 'sql/workbench/parts/charts/common/interfaces';
 
 export default class PieChart extends ChartInsight {
 	protected readonly chartType: ChartType = ChartType.Pie;

src/sql/workbench/parts/dashboard/browser/widgets/insights/views/charts/types/pieChart.contribution.ts

@@ -5,8 +5,8 @@
 
 import { mixin, deepClone } from 'vs/base/common/objects';
 import { IJSONSchema } from 'vs/base/common/jsonSchema';
-import { registerInsight } from 'sql/platform/dashboard/common/insightRegistry';
-import { chartInsightSchema } from 'sql/workbench/parts/dashboard/widgets/insights/views/charts/chartInsight.contribution';
+import { registerInsight } from 'sql/platform/dashboard/browser/insightRegistry';
+import { chartInsightSchema } from 'sql/workbench/parts/dashboard/browser/widgets/insights/views/charts/chartInsight.contribution';
 
 import PieChart from './pieChart.component';
 

src/sql/workbench/parts/dashboard/browser/widgets/insights/views/charts/types/scatterChart.component.ts

@@ -4,13 +4,14 @@
  *--------------------------------------------------------------------------------------------*/
 
 import LineChart, { ILineConfig } from './lineChart.component';
-import { ChartType, defaultChartConfig } from 'sql/workbench/parts/dashboard/widgets/insights/views/charts/interfaces';
+import { defaultChartConfig } from 'sql/workbench/parts/dashboard/browser/widgets/insights/views/charts/interfaces';
 
 import { mixin, deepClone } from 'vs/base/common/objects';
 import { ChangeDetectorRef, Inject, forwardRef } from '@angular/core';
 import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
 import { IThemeService } from 'vs/platform/theme/common/themeService';
 import { ILogService } from 'vs/platform/log/common/log';
+import { ChartType } from 'sql/workbench/parts/charts/common/interfaces';
 
 const defaultScatterConfig = mixin(deepClone(defaultChartConfig), { dataType: 'point', dataDirection: 'horizontal' }) as ILineConfig;
 

src/sql/workbench/parts/dashboard/browser/widgets/insights/views/charts/types/scatterChart.contribution.ts

@@ -6,8 +6,8 @@
 import { mixin, deepClone } from 'vs/base/common/objects';
 import { IJSONSchema } from 'vs/base/common/jsonSchema';
 
-import { registerInsight } from 'sql/platform/dashboard/common/insightRegistry';
-import { barChartSchema } from 'sql/workbench/parts/dashboard/widgets/insights/views/charts/types/barChart.contribution';
+import { registerInsight } from 'sql/platform/dashboard/browser/insightRegistry';
+import { barChartSchema } from 'sql/workbench/parts/dashboard/browser/widgets/insights/views/charts/types/barChart.contribution';
 
 import ScatterChart from './scatterChart.component';
 

src/sql/workbench/parts/dashboard/browser/widgets/insights/views/charts/types/timeSeriesChart.component.ts

@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import LineChart, { ILineConfig } from './lineChart.component';
-import { ChartType, defaultChartConfig, IPointDataSet } from 'sql/workbench/parts/dashboard/widgets/insights/views/charts/interfaces';
+import { defaultChartConfig } from 'sql/workbench/parts/dashboard/browser/widgets/insights/views/charts/interfaces';
 
 import { mixin, deepClone } from 'vs/base/common/objects';
 import { Color } from 'vs/base/common/color';
@@ -12,6 +12,8 @@ import { ChangeDetectorRef, Inject, forwardRef } from '@angular/core';
 import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
 import { IThemeService } from 'vs/platform/theme/common/themeService';
 import { ILogService } from 'vs/platform/log/common/log';
+import { IPointDataSet } from 'sql/workbench/parts/charts/browser/interfaces';
+import { ChartType } from 'sql/workbench/parts/charts/common/interfaces';
 
 const defaultTimeSeriesConfig = mixin(deepClone(defaultChartConfig), { dataType: 'point', dataDirection: 'horizontal' }) as ILineConfig;