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/api/browser/mainThreadAccountManagement.ts

@@ -11,7 +11,7 @@ import {
 	MainThreadAccountManagementShape,
 	SqlExtHostContext,
 	SqlMainContext
-} from 'sql/workbench/api/node/sqlExtHost.protocol';
+} from 'sql/workbench/api/common/sqlExtHost.protocol';
 import { IExtHostContext } from 'vs/workbench/api/common/extHost.protocol';
 import { extHostNamedCustomer } from 'vs/workbench/api/common/extHostCustomers';
 import { UpdateAccountListEventParams } from 'sql/platform/accounts/common/eventTypes';

src/sql/workbench/api/browser/mainThreadBackgroundTaskManagement.ts

@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { ITaskService } from 'sql/platform/tasks/common/tasksService';
-import { MainThreadBackgroundTaskManagementShape, SqlMainContext, ExtHostBackgroundTaskManagementShape, SqlExtHostContext } from 'sql/workbench/api/node/sqlExtHost.protocol';
+import { MainThreadBackgroundTaskManagementShape, SqlMainContext, ExtHostBackgroundTaskManagementShape, SqlExtHostContext } from 'sql/workbench/api/common/sqlExtHost.protocol';
 
 import { extHostNamedCustomer } from 'vs/workbench/api/common/extHostCustomers';
 import { IExtHostContext } from 'vs/workbench/api/common/extHost.protocol';

src/sql/workbench/api/browser/mainThreadConnectionManagement.ts

@@ -3,7 +3,7 @@
  *  Licensed under the Source EULA. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { SqlExtHostContext, SqlMainContext, ExtHostConnectionManagementShape, MainThreadConnectionManagementShape } from 'sql/workbench/api/node/sqlExtHost.protocol';
+import { SqlExtHostContext, SqlMainContext, ExtHostConnectionManagementShape, MainThreadConnectionManagementShape } from 'sql/workbench/api/common/sqlExtHost.protocol';
 import * as azdata from 'azdata';
 import { IExtHostContext } from 'vs/workbench/api/common/extHost.protocol';
 import { extHostNamedCustomer } from 'vs/workbench/api/common/extHostCustomers';

src/sql/workbench/api/browser/mainThreadCredentialManagement.ts

@@ -7,7 +7,7 @@ import { IDisposable, dispose } from 'vs/base/common/lifecycle';
 import {
 	SqlExtHostContext, ExtHostCredentialManagementShape,
 	MainThreadCredentialManagementShape, SqlMainContext
-} from 'sql/workbench/api/node/sqlExtHost.protocol';
+} from 'sql/workbench/api/common/sqlExtHost.protocol';
 import { ICredentialsService } from 'sql/platform/credentials/common/credentialsService';
 import * as azdata from 'azdata';
 import { IExtHostContext } from 'vs/workbench/api/common/extHost.protocol';

src/sql/workbench/api/browser/mainThreadDashboard.ts

@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { extHostNamedCustomer } from 'vs/workbench/api/common/extHostCustomers';
-import { SqlMainContext, MainThreadDashboardShape, ExtHostDashboardShape, SqlExtHostContext } from 'sql/workbench/api/node/sqlExtHost.protocol';
+import { SqlMainContext, MainThreadDashboardShape, ExtHostDashboardShape, SqlExtHostContext } from 'sql/workbench/api/common/sqlExtHost.protocol';
 import { IExtHostContext } from 'vs/workbench/api/common/extHost.protocol';
 import { IDashboardService } from 'sql/platform/dashboard/browser/dashboardService';
 

src/sql/workbench/api/browser/mainThreadDashboardWebview.ts

@@ -3,7 +3,7 @@
  *  Licensed under the Source EULA. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { MainThreadDashboardWebviewShape, SqlMainContext, ExtHostDashboardWebviewsShape, SqlExtHostContext } from 'sql/workbench/api/node/sqlExtHost.protocol';
+import { MainThreadDashboardWebviewShape, SqlMainContext, ExtHostDashboardWebviewsShape, SqlExtHostContext } from 'sql/workbench/api/common/sqlExtHost.protocol';
 import { extHostNamedCustomer } from 'vs/workbench/api/common/extHostCustomers';
 import { IExtHostContext } from 'vs/workbench/api/common/extHost.protocol';
 import { IDashboardViewService, IDashboardWebview } from 'sql/platform/dashboard/common/dashboardViewService';

src/sql/workbench/api/browser/mainThreadDataProtocol.ts

@@ -7,7 +7,7 @@ import { IDisposable, dispose } from 'vs/base/common/lifecycle';
 import {
 	SqlExtHostContext, ExtHostDataProtocolShape,
 	MainThreadDataProtocolShape, SqlMainContext
-} from 'sql/workbench/api/node/sqlExtHost.protocol';
+} from 'sql/workbench/api/common/sqlExtHost.protocol';
 import { IConnectionManagementService } from 'sql/platform/connection/common/connectionManagement';
 import { ICapabilitiesService } from 'sql/platform/capabilities/common/capabilitiesService';
 import { IQueryManagementService } from 'sql/platform/query/common/queryManagement';

src/sql/workbench/api/browser/mainThreadExtensionManagement.ts

@@ -3,7 +3,7 @@
  *  Licensed under the Source EULA. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { SqlMainContext, MainThreadExtensionManagementShape } from 'sql/workbench/api/node/sqlExtHost.protocol';
+import { SqlMainContext, MainThreadExtensionManagementShape } from 'sql/workbench/api/common/sqlExtHost.protocol';
 import { IExtHostContext } from 'vs/workbench/api/common/extHost.protocol';
 import { extHostNamedCustomer } from 'vs/workbench/api/common/extHostCustomers';
 import { dispose, IDisposable } from 'vs/base/common/lifecycle';

src/sql/workbench/api/browser/mainThreadModalDialog.ts

@@ -6,7 +6,7 @@
 import 'vs/css!sql/media/icons/common-icons';
 
 import { WebViewDialog } from 'sql/workbench/parts/webview/electron-browser/webViewDialog';
-import { MainThreadModalDialogShape, SqlMainContext, SqlExtHostContext, ExtHostModalDialogsShape } from 'sql/workbench/api/node/sqlExtHost.protocol';
+import { MainThreadModalDialogShape, SqlMainContext, SqlExtHostContext, ExtHostModalDialogsShape } from 'sql/workbench/api/common/sqlExtHost.protocol';
 
 import { IExtHostContext } from 'vs/workbench/api/common/extHost.protocol';
 import { extHostNamedCustomer } from 'vs/workbench/api/common/extHostCustomers';

src/sql/workbench/api/browser/mainThreadModelView.ts

@@ -3,7 +3,7 @@
  *  Licensed under the Source EULA. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { MainThreadModelViewShape, SqlMainContext, ExtHostModelViewShape, SqlExtHostContext } from 'sql/workbench/api/node/sqlExtHost.protocol';
+import { MainThreadModelViewShape, SqlMainContext, ExtHostModelViewShape, SqlExtHostContext } from 'sql/workbench/api/common/sqlExtHost.protocol';
 import { extHostNamedCustomer } from 'vs/workbench/api/common/extHostCustomers';
 import { IExtHostContext } from 'vs/workbench/api/common/extHost.protocol';
 import { Disposable } from 'vs/base/common/lifecycle';

src/sql/workbench/api/browser/mainThreadNotebook.ts

@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import * as azdata from 'azdata';
-import { SqlExtHostContext, SqlMainContext, ExtHostNotebookShape, MainThreadNotebookShape } from 'sql/workbench/api/node/sqlExtHost.protocol';
+import { SqlExtHostContext, SqlMainContext, ExtHostNotebookShape, MainThreadNotebookShape } from 'sql/workbench/api/common/sqlExtHost.protocol';
 import { extHostNamedCustomer } from 'vs/workbench/api/common/extHostCustomers';
 import { Disposable } from 'vs/base/common/lifecycle';
 import { IExtHostContext } from 'vs/workbench/api/common/extHost.protocol';
@@ -15,7 +15,7 @@ import { INotebookService, INotebookProvider, INotebookManager } from 'sql/workb
 import { INotebookManagerDetails, INotebookSessionDetails, INotebookKernelDetails, FutureMessageType, INotebookFutureDetails, INotebookFutureDone } from 'sql/workbench/api/common/sqlExtHostTypes';
 import { LocalContentManager } from 'sql/workbench/services/notebook/node/localContentManager';
 import { Deferred } from 'sql/base/common/promise';
-import { FutureInternal } from 'sql/workbench/parts/notebook/models/modelInterfaces';
+import { FutureInternal } from 'sql/workbench/parts/notebook/node/models/modelInterfaces';
 
 @extHostNamedCustomer(SqlMainContext.MainThreadNotebook)
 export class MainThreadNotebook extends Disposable implements MainThreadNotebookShape {

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

@@ -20,13 +20,13 @@ import * as types from 'vs/base/common/types';
 import {
 	SqlMainContext, MainThreadNotebookDocumentsAndEditorsShape, SqlExtHostContext, ExtHostNotebookDocumentsAndEditorsShape,
 	INotebookDocumentsAndEditorsDelta, INotebookEditorAddData, INotebookShowOptions, INotebookModelAddedData, INotebookModelChangedData
-} from 'sql/workbench/api/node/sqlExtHost.protocol';
-import { NotebookInput } from 'sql/workbench/parts/notebook/notebookInput';
+} from 'sql/workbench/api/common/sqlExtHost.protocol';
+import { NotebookInput } from 'sql/workbench/parts/notebook/node/notebookInput';
 import { INotebookService, INotebookEditor, IProviderInfo } from 'sql/workbench/services/notebook/common/notebookService';
 import { ISingleNotebookEditOperation, NotebookChangeKind } from 'sql/workbench/api/common/sqlExtHostTypes';
 import { disposed } from 'vs/base/common/errors';
-import { ICellModel, NotebookContentChange, INotebookModel } from 'sql/workbench/parts/notebook/models/modelInterfaces';
-import { NotebookChangeType, CellTypes } from 'sql/workbench/parts/notebook/models/contracts';
+import { ICellModel, NotebookContentChange, INotebookModel } from 'sql/workbench/parts/notebook/node/models/modelInterfaces';
+import { NotebookChangeType, CellTypes } from 'sql/workbench/parts/notebook/common/models/contracts';
 import { ICapabilitiesService } from 'sql/platform/capabilities/common/capabilitiesService';
 import { IUntitledEditorService } from 'vs/workbench/services/untitled/common/untitledEditorService';
 import { IEditorGroupsService } from 'vs/workbench/services/editor/common/editorGroupsService';

src/sql/workbench/api/browser/mainThreadObjectExplorer.ts

@@ -3,18 +3,13 @@
  *  Licensed under the Source EULA. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { SqlExtHostContext, SqlMainContext, ExtHostObjectExplorerShape, MainThreadObjectExplorerShape } from 'sql/workbench/api/node/sqlExtHost.protocol';
+import { SqlExtHostContext, SqlMainContext, ExtHostObjectExplorerShape, MainThreadObjectExplorerShape } from 'sql/workbench/api/common/sqlExtHost.protocol';
 import * as azdata from 'azdata';
 import * as vscode from 'vscode';
 import { IExtHostContext } from 'vs/workbench/api/common/extHost.protocol';
 import { extHostNamedCustomer } from 'vs/workbench/api/common/extHostCustomers';
-import { IConnectionManagementService } from 'sql/platform/connection/common/connectionManagement';
 import { IObjectExplorerService, NodeInfoWithConnection } from 'sql/workbench/services/objectExplorer/common/objectExplorerService';
-import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
-import * as TaskUtilities from 'sql/workbench/common/taskUtilities';
-import { IConnectionProfile } from 'sql/platform/connection/common/interfaces';
 import { dispose, IDisposable } from 'vs/base/common/lifecycle';
-import { TreeItemCollapsibleState } from 'sql/workbench/parts/objectExplorer/common/treeNode';
 
 @extHostNamedCustomer(SqlMainContext.MainThreadObjectExplorer)
 export class MainThreadObjectExplorer implements MainThreadObjectExplorerShape {
@@ -24,9 +19,7 @@ export class MainThreadObjectExplorer implements MainThreadObjectExplorerShape {
 
 	constructor(
 		extHostContext: IExtHostContext,
-		@IConnectionManagementService private _connectionManagementService: IConnectionManagementService,
 		@IObjectExplorerService private _objectExplorerService: IObjectExplorerService,
-		@IEditorService private _workbenchEditorService: IEditorService
 	) {
 		if (extHostContext) {
 			this._proxy = extHostContext.getProxy(SqlExtHostContext.ExtHostObjectExplorer);

src/sql/workbench/api/browser/mainThreadQueryEditor.ts

@@ -3,7 +3,7 @@
  *  Licensed under the Source EULA. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { SqlExtHostContext, SqlMainContext, ExtHostQueryEditorShape, MainThreadQueryEditorShape } from 'sql/workbench/api/node/sqlExtHost.protocol';
+import { SqlExtHostContext, SqlMainContext, ExtHostQueryEditorShape, MainThreadQueryEditorShape } from 'sql/workbench/api/common/sqlExtHost.protocol';
 import { IExtHostContext } from 'vs/workbench/api/common/extHost.protocol';
 import { extHostNamedCustomer } from 'vs/workbench/api/common/extHostCustomers';
 import { IConnectionManagementService, IConnectionCompletionOptions, ConnectionType, RunQueryOnConnectionMode } from 'sql/platform/connection/common/connectionManagement';

src/sql/workbench/api/browser/mainThreadResourceProvider.ts

@@ -11,7 +11,7 @@ import {
 	MainThreadResourceProviderShape,
 	SqlExtHostContext,
 	SqlMainContext
-} from 'sql/workbench/api/node/sqlExtHost.protocol';
+} from 'sql/workbench/api/common/sqlExtHost.protocol';
 import { IExtHostContext } from 'vs/workbench/api/common/extHost.protocol';
 import { extHostNamedCustomer } from 'vs/workbench/api/common/extHostCustomers';
 

src/sql/workbench/api/browser/mainThreadSerializationProvider.ts

@@ -7,7 +7,7 @@ import { IDisposable, dispose } from 'vs/base/common/lifecycle';
 import {
 	SqlExtHostContext, ExtHostSerializationProviderShape,
 	MainThreadSerializationProviderShape, SqlMainContext
-} from 'sql/workbench/api/node/sqlExtHost.protocol';
+} from 'sql/workbench/api/common/sqlExtHost.protocol';
 import { ISerializationService } from 'sql/platform/serialization/common/serializationService';
 import * as azdata from 'azdata';
 import { IExtHostContext } from 'vs/workbench/api/common/extHost.protocol';

src/sql/workbench/api/browser/mainThreadTasks.ts

@@ -4,7 +4,6 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { extHostNamedCustomer } from 'vs/workbench/api/common/extHostCustomers';
-import { TaskRegistry, ITaskHandlerDescription } from 'sql/platform/tasks/common/tasks';
 import { IDisposable } from 'vs/base/common/lifecycle';
 import { IExtHostContext } from 'vs/workbench/api/common/extHost.protocol';
 
@@ -13,11 +12,12 @@ import {
 	SqlMainContext,
 	ExtHostTasksShape,
 	MainThreadTasksShape
-} from 'sql/workbench/api/node/sqlExtHost.protocol';
+} from 'sql/workbench/api/common/sqlExtHost.protocol';
 
 import { IConnectionProfile } from 'azdata';
 
 import { ConnectionProfile } from 'sql/platform/connection/common/connectionProfile';
+import { TaskRegistry } from 'sql/platform/tasks/browser/tasksRegistry';
 
 @extHostNamedCustomer(SqlMainContext.MainThreadTasks)
 export class MainThreadTasks implements MainThreadTasksShape {

src/sql/workbench/api/common/extHostAccountManagement.ts

@@ -9,7 +9,7 @@ import {
 	ExtHostAccountManagementShape,
 	MainThreadAccountManagementShape,
 	SqlMainContext,
-} from 'sql/workbench/api/node/sqlExtHost.protocol';
+} from 'sql/workbench/api/common/sqlExtHost.protocol';
 import { AzureResource } from 'sql/workbench/api/common/sqlExtHostTypes';
 import { IMainContext } from 'vs/workbench/api/common/extHost.protocol';
 import { Event, Emitter } from 'vs/base/common/event';

src/sql/workbench/api/common/extHostBackgroundTaskManagement.ts

@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { IMainContext } from 'vs/workbench/api/common/extHost.protocol';
-import { ExtHostBackgroundTaskManagementShape, SqlMainContext, MainThreadBackgroundTaskManagementShape } from 'sql/workbench/api/node/sqlExtHost.protocol';
+import { ExtHostBackgroundTaskManagementShape, SqlMainContext, MainThreadBackgroundTaskManagementShape } from 'sql/workbench/api/common/sqlExtHost.protocol';
 import * as azdata from 'azdata';
 import * as vscode from 'vscode';
 import { Emitter } from 'vs/base/common/event';

src/sql/workbench/api/common/extHostConnectionManagement.ts

@@ -3,7 +3,7 @@
  *  Licensed under the Source EULA. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { ExtHostConnectionManagementShape, SqlMainContext, MainThreadConnectionManagementShape } from 'sql/workbench/api/node/sqlExtHost.protocol';
+import { ExtHostConnectionManagementShape, SqlMainContext, MainThreadConnectionManagementShape } from 'sql/workbench/api/common/sqlExtHost.protocol';
 import { IMainContext } from 'vs/workbench/api/common/extHost.protocol';
 import * as azdata from 'azdata';
 

src/sql/workbench/api/common/extHostCredentialManagement.ts

@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { IMainContext } from 'vs/workbench/api/common/extHost.protocol';
-import { SqlMainContext, MainThreadCredentialManagementShape, ExtHostCredentialManagementShape } from 'sql/workbench/api/node/sqlExtHost.protocol';
+import { SqlMainContext, MainThreadCredentialManagementShape, ExtHostCredentialManagementShape } from 'sql/workbench/api/common/sqlExtHost.protocol';
 import * as vscode from 'vscode';
 import * as azdata from 'azdata';
 import { Disposable } from 'vs/workbench/api/common/extHostTypes';

src/sql/workbench/api/common/extHostDashboardWebview.ts

@@ -3,7 +3,7 @@
  *  Licensed under the Source EULA. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { SqlMainContext, ExtHostDashboardWebviewsShape, MainThreadDashboardWebviewShape } from 'sql/workbench/api/node/sqlExtHost.protocol';
+import { SqlMainContext, ExtHostDashboardWebviewsShape, MainThreadDashboardWebviewShape } from 'sql/workbench/api/common/sqlExtHost.protocol';
 
 import { IMainContext } from 'vs/workbench/api/common/extHost.protocol';
 import { Emitter } from 'vs/base/common/event';

src/sql/workbench/api/common/extHostDataProtocol.ts

@@ -8,7 +8,7 @@ import * as azdata from 'azdata';
 import { Event, Emitter } from 'vs/base/common/event';
 import { IMainContext } from 'vs/workbench/api/common/extHost.protocol';
 import { Disposable } from 'vs/workbench/api/common/extHostTypes';
-import { SqlMainContext, MainThreadDataProtocolShape, ExtHostDataProtocolShape } from 'sql/workbench/api/node/sqlExtHost.protocol';
+import { SqlMainContext, MainThreadDataProtocolShape, ExtHostDataProtocolShape } from 'sql/workbench/api/common/sqlExtHost.protocol';
 import { DataProviderType } from 'sql/workbench/api/common/sqlExtHostTypes';
 
 export class ExtHostDataProtocol extends ExtHostDataProtocolShape {

src/sql/workbench/api/common/extHostExtensionManagement.ts

@@ -5,7 +5,7 @@
 
 import { IMainContext } from 'vs/workbench/api/common/extHost.protocol';
 
-import { ExtHostExtensionManagementShape, MainThreadExtensionManagementShape, SqlMainContext } from 'sql/workbench/api/node/sqlExtHost.protocol';
+import { ExtHostExtensionManagementShape, MainThreadExtensionManagementShape, SqlMainContext } from 'sql/workbench/api/common/sqlExtHost.protocol';
 
 
 export class ExtHostExtensionManagement implements ExtHostExtensionManagementShape {

src/sql/workbench/api/common/extHostModalDialog.ts

@@ -3,7 +3,7 @@
  *  Licensed under the Source EULA. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { SqlMainContext, MainThreadModalDialogShape, ExtHostModalDialogsShape } from 'sql/workbench/api/node/sqlExtHost.protocol';
+import { SqlMainContext, MainThreadModalDialogShape, ExtHostModalDialogsShape } from 'sql/workbench/api/common/sqlExtHost.protocol';
 import { IMainContext } from 'vs/workbench/api/common/extHost.protocol';
 import * as vscode from 'vscode';
 import * as azdata from 'azdata';

src/sql/workbench/api/common/extHostModelView.ts

@@ -12,7 +12,7 @@ import * as nls from 'vs/nls';
 import * as vscode from 'vscode';
 import * as azdata from 'azdata';
 
-import { SqlMainContext, ExtHostModelViewShape, MainThreadModelViewShape, ExtHostModelViewTreeViewsShape } from 'sql/workbench/api/node/sqlExtHost.protocol';
+import { SqlMainContext, ExtHostModelViewShape, MainThreadModelViewShape, ExtHostModelViewTreeViewsShape } from 'sql/workbench/api/common/sqlExtHost.protocol';
 import { IItemConfig, ModelComponentTypes, IComponentShape, IComponentEventArgs, ComponentEventType } from 'sql/workbench/api/common/sqlExtHostTypes';
 import { IExtensionDescription } from 'vs/platform/extensions/common/extensions';
 

src/sql/workbench/api/common/extHostModelViewDialog.ts

@@ -11,7 +11,7 @@ import { generateUuid } from 'vs/base/common/uuid';
 import * as vscode from 'vscode';
 import * as azdata from 'azdata';
 
-import { SqlMainContext, ExtHostModelViewDialogShape, MainThreadModelViewDialogShape, ExtHostModelViewShape, ExtHostBackgroundTaskManagementShape } from 'sql/workbench/api/node/sqlExtHost.protocol';
+import { SqlMainContext, ExtHostModelViewDialogShape, MainThreadModelViewDialogShape, ExtHostModelViewShape, ExtHostBackgroundTaskManagementShape } from 'sql/workbench/api/common/sqlExtHost.protocol';
 import { IExtensionDescription } from 'vs/platform/extensions/common/extensions';
 
 const DONE_LABEL = nls.localize('dialogDoneLabel', 'Done');

src/sql/workbench/api/common/extHostModelViewTree.ts

@@ -5,7 +5,7 @@
 
 import { localize } from 'vs/nls';
 import * as vscode from 'vscode';
-import { SqlMainContext, ExtHostModelViewTreeViewsShape, MainThreadModelViewShape } from 'sql/workbench/api/node/sqlExtHost.protocol';
+import { SqlMainContext, ExtHostModelViewTreeViewsShape, MainThreadModelViewShape } from 'sql/workbench/api/common/sqlExtHost.protocol';
 import { ITreeComponentItem } from 'sql/workbench/common/views';
 import { CommandsConverter } from 'vs/workbench/api/common/extHostCommands';
 import { IMainContext } from 'vs/workbench/api/common/extHost.protocol';

src/sql/workbench/api/common/extHostNotebook.ts

@@ -11,7 +11,7 @@ import { Disposable } from 'vs/workbench/api/common/extHostTypes';
 import { localize } from 'vs/nls';
 import { URI, UriComponents } from 'vs/base/common/uri';
 
-import { ExtHostNotebookShape, MainThreadNotebookShape, SqlMainContext } from 'sql/workbench/api/node/sqlExtHost.protocol';
+import { ExtHostNotebookShape, MainThreadNotebookShape, SqlMainContext } from 'sql/workbench/api/common/sqlExtHost.protocol';
 import { INotebookManagerDetails, INotebookSessionDetails, INotebookKernelDetails, INotebookFutureDetails, FutureMessageType } from 'sql/workbench/api/common/sqlExtHostTypes';
 
 type Adapter = azdata.nb.NotebookProvider | azdata.nb.NotebookManager | azdata.nb.ISession | azdata.nb.IKernel | azdata.nb.IFuture;

src/sql/workbench/api/common/extHostNotebookDocumentData.ts

@@ -10,7 +10,7 @@ import { URI } from 'vs/base/common/uri';
 import { ok } from 'vs/base/common/assert';
 import { Schemas } from 'vs/base/common/network';
 
-import { MainThreadNotebookDocumentsAndEditorsShape, INotebookModelChangedData } from 'sql/workbench/api/node/sqlExtHost.protocol';
+import { MainThreadNotebookDocumentsAndEditorsShape, INotebookModelChangedData } from 'sql/workbench/api/common/sqlExtHost.protocol';
 import { CellRange } from 'sql/workbench/api/common/sqlExtHostTypes';
 
 

src/sql/workbench/api/common/extHostNotebookDocumentsAndEditors.ts

@@ -18,9 +18,9 @@ import { localize } from 'vs/nls';
 import {
 	SqlMainContext, INotebookDocumentsAndEditorsDelta, ExtHostNotebookDocumentsAndEditorsShape,
 	MainThreadNotebookDocumentsAndEditorsShape, INotebookShowOptions, INotebookModelChangedData
-} from 'sql/workbench/api/node/sqlExtHost.protocol';
-import { ExtHostNotebookDocumentData } from 'sql/workbench/api/node/extHostNotebookDocumentData';
-import { ExtHostNotebookEditor } from 'sql/workbench/api/node/extHostNotebookEditor';
+} from 'sql/workbench/api/common/sqlExtHost.protocol';
+import { ExtHostNotebookDocumentData } from 'sql/workbench/api/common/extHostNotebookDocumentData';
+import { ExtHostNotebookEditor } from 'sql/workbench/api/common/extHostNotebookEditor';
 
 type Adapter = azdata.nb.NavigationProvider;
 

src/sql/workbench/api/common/extHostNotebookEditor.ts

@@ -10,8 +10,8 @@ import { ok } from 'vs/base/common/assert';
 import { IDisposable } from 'vs/base/common/lifecycle';
 import { readonly } from 'vs/base/common/errors';
 
-import { MainThreadNotebookDocumentsAndEditorsShape } from 'sql/workbench/api/node/sqlExtHost.protocol';
-import { ExtHostNotebookDocumentData } from 'sql/workbench/api/node/extHostNotebookDocumentData';
+import { MainThreadNotebookDocumentsAndEditorsShape } from 'sql/workbench/api/common/sqlExtHost.protocol';
+import { ExtHostNotebookDocumentData } from 'sql/workbench/api/common/extHostNotebookDocumentData';
 import { CellRange, ISingleNotebookEditOperation, ICellRange } from 'sql/workbench/api/common/sqlExtHostTypes';
 
 export interface INotebookEditOperation {

src/sql/workbench/api/common/extHostObjectExplorer.ts

@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { IMainContext } from 'vs/workbench/api/common/extHost.protocol';
-import { ExtHostObjectExplorerShape, SqlMainContext, MainThreadObjectExplorerShape } from 'sql/workbench/api/node/sqlExtHost.protocol';
+import { ExtHostObjectExplorerShape, SqlMainContext, MainThreadObjectExplorerShape } from 'sql/workbench/api/common/sqlExtHost.protocol';
 import * as azdata from 'azdata';
 import * as vscode from 'vscode';
 

src/sql/workbench/api/common/extHostQueryEditor.ts

@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { IMainContext } from 'vs/workbench/api/common/extHost.protocol';
-import { ExtHostQueryEditorShape, SqlMainContext, MainThreadQueryEditorShape } from 'sql/workbench/api/node/sqlExtHost.protocol';
+import { ExtHostQueryEditorShape, SqlMainContext, MainThreadQueryEditorShape } from 'sql/workbench/api/common/sqlExtHost.protocol';
 import * as azdata from 'azdata';
 import { IQueryEvent } from 'sql/platform/query/common/queryModel';
 import { mssqlProviderName } from 'sql/platform/connection/common/constants';

src/sql/workbench/api/common/extHostResourceProvider.ts

@@ -10,7 +10,7 @@ import {
 	ExtHostResourceProviderShape,
 	MainThreadResourceProviderShape,
 	SqlMainContext,
-} from 'sql/workbench/api/node/sqlExtHost.protocol';
+} from 'sql/workbench/api/common/sqlExtHost.protocol';
 
 export class ExtHostResourceProvider extends ExtHostResourceProviderShape {
 	private _handlePool: number = 0;

src/sql/workbench/api/common/extHostSerializationProvider.ts

@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { IMainContext } from 'vs/workbench/api/common/extHost.protocol';
-import { SqlMainContext, MainThreadSerializationProviderShape, ExtHostSerializationProviderShape } from 'sql/workbench/api/node/sqlExtHost.protocol';
+import { SqlMainContext, MainThreadSerializationProviderShape, ExtHostSerializationProviderShape } from 'sql/workbench/api/common/sqlExtHost.protocol';
 import * as vscode from 'vscode';
 import * as azdata from 'azdata';
 import { Disposable } from 'vs/workbench/api/common/extHostTypes';

src/sql/workbench/api/common/extHostTasks.ts

@@ -11,7 +11,7 @@ import * as extHostTypes from 'vs/workbench/api/common/extHostTypes';
 import * as azdata from 'azdata';
 
 import { ITaskHandlerDescription } from 'sql/platform/tasks/common/tasks';
-import { SqlMainContext, MainThreadTasksShape, ExtHostTasksShape } from 'sql/workbench/api/node/sqlExtHost.protocol';
+import { SqlMainContext, MainThreadTasksShape, ExtHostTasksShape } from 'sql/workbench/api/common/sqlExtHost.protocol';
 
 interface TaskHandler {
 	callback: Function;

src/sql/workbench/api/electron-browser/extensionHost.contribution.ts

@@ -3,4 +3,44 @@
  *  Licensed under the Source EULA. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import '../browser/extensionHost.contribution.common';
+import { IWorkbenchContribution, IWorkbenchContributionsRegistry, Extensions as WorkbenchExtensions } from 'vs/workbench/common/contributions';
+import { Registry } from 'vs/platform/registry/common/platform';
+import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
+
+// --- SQL contributions
+import 'sql/workbench/api/browser/mainThreadConnectionManagement';
+import 'sql/workbench/api/browser/mainThreadCredentialManagement';
+import 'sql/workbench/api/browser/mainThreadDataProtocol';
+import 'sql/workbench/api/browser/mainThreadObjectExplorer';
+import 'sql/workbench/api/browser/mainThreadBackgroundTaskManagement';
+import 'sql/workbench/api/browser/mainThreadSerializationProvider';
+import 'sql/workbench/api/browser/mainThreadResourceProvider';
+import 'sql/workbench/api/browser/mainThreadTasks';
+import 'sql/workbench/api/browser/mainThreadDashboard';
+import 'sql/workbench/api/browser/mainThreadDashboardWebview';
+import 'sql/workbench/api/browser/mainThreadQueryEditor';
+import 'sql/workbench/api/browser/mainThreadModelView';
+import 'sql/workbench/api/electron-browser/mainThreadModelViewDialog';
+import 'sql/workbench/api/browser/mainThreadNotebook';
+import 'sql/workbench/api/browser/mainThreadNotebookDocumentsAndEditors';
+import 'sql/workbench/api/browser/mainThreadAccountManagement';
+import 'sql/workbench/api/browser/mainThreadExtensionManagement';
+import { LifecyclePhase } from 'vs/platform/lifecycle/common/lifecycle';
+
+export class SqlExtHostContribution implements IWorkbenchContribution {
+
+	constructor(
+		@IInstantiationService private instantiationService: IInstantiationService
+	) {
+	}
+
+	public getId(): string {
+		return 'sql.api.sqlExtHost';
+	}
+}
+
+// Register File Tracker
+Registry.as<IWorkbenchContributionsRegistry>(WorkbenchExtensions.Workbench).registerWorkbenchContribution(
+	SqlExtHostContribution,
+	LifecyclePhase.Restored
+);

src/sql/workbench/api/electron-browser/mainThreadModelViewDialog.ts

@@ -8,11 +8,11 @@ import { extHostNamedCustomer } from 'vs/workbench/api/common/extHostCustomers';
 import { IExtHostContext } from 'vs/workbench/api/common/extHost.protocol';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 
-import { MainThreadModelViewDialogShape, SqlMainContext, ExtHostModelViewDialogShape, SqlExtHostContext } from 'sql/workbench/api/node/sqlExtHost.protocol';
-import { Dialog, DialogTab, DialogButton, WizardPage, Wizard } from 'sql/platform/dialog/dialogTypes';
-import { CustomDialogService } from 'sql/platform/dialog/customDialogService';
+import { MainThreadModelViewDialogShape, SqlMainContext, ExtHostModelViewDialogShape, SqlExtHostContext } from 'sql/workbench/api/common/sqlExtHost.protocol';
+import { Dialog, DialogTab, DialogButton, WizardPage, Wizard } from 'sql/platform/dialog/common/dialogTypes';
+import { CustomDialogService } from 'sql/platform/dialog/browser/customDialogService';
 import { IModelViewDialogDetails, IModelViewTabDetails, IModelViewButtonDetails, IModelViewWizardPageDetails, IModelViewWizardDetails } from 'sql/workbench/api/common/sqlExtHostTypes';
-import { ModelViewInput, ModelViewInputModel, ModeViewSaveHandler } from 'sql/workbench/electron-browser/modelComponents/modelViewInput';
+import { ModelViewInput, ModelViewInputModel, ModeViewSaveHandler } from 'sql/workbench/browser/modelComponents/modelViewInput';
 
 import * as vscode from 'vscode';
 import * as azdata from 'azdata';

src/sql/workbench/api/node/sqlExtHost.api.impl.ts

@@ -11,29 +11,29 @@ import { URI } from 'vs/base/common/uri';
 import * as azdata from 'azdata';
 import * as sqlops from 'sqlops';
 import * as vscode from 'vscode';
-import { SqlExtHostContext } from 'sql/workbench/api/node/sqlExtHost.protocol';
-import { ExtHostAccountManagement } from 'sql/workbench/api/node/extHostAccountManagement';
-import { ExtHostCredentialManagement } from 'sql/workbench/api/node/extHostCredentialManagement';
-import { ExtHostDataProtocol } from 'sql/workbench/api/node/extHostDataProtocol';
-import { ExtHostSerializationProvider } from 'sql/workbench/api/node/extHostSerializationProvider';
-import { ExtHostResourceProvider } from 'sql/workbench/api/node/extHostResourceProvider';
+import { SqlExtHostContext } from 'sql/workbench/api/common/sqlExtHost.protocol';
+import { ExtHostAccountManagement } from 'sql/workbench/api/common/extHostAccountManagement';
+import { ExtHostCredentialManagement } from 'sql/workbench/api/common/extHostCredentialManagement';
+import { ExtHostDataProtocol } from 'sql/workbench/api/common/extHostDataProtocol';
+import { ExtHostSerializationProvider } from 'sql/workbench/api/common/extHostSerializationProvider';
+import { ExtHostResourceProvider } from 'sql/workbench/api/common/extHostResourceProvider';
 import * as sqlExtHostTypes from 'sql/workbench/api/common/sqlExtHostTypes';
-import { ExtHostModalDialogs } from 'sql/workbench/api/node/extHostModalDialog';
-import { ExtHostTasks } from 'sql/workbench/api/node/extHostTasks';
-import { ExtHostDashboardWebviews } from 'sql/workbench/api/node/extHostDashboardWebview';
-import { ExtHostModelView } from 'sql/workbench/api/node/extHostModelView';
-import { ExtHostConnectionManagement } from 'sql/workbench/api/node/extHostConnectionManagement';
-import { ExtHostDashboard } from 'sql/workbench/api/node/extHostDashboard';
-import { ExtHostObjectExplorer } from 'sql/workbench/api/node/extHostObjectExplorer';
+import { ExtHostModalDialogs } from 'sql/workbench/api/common/extHostModalDialog';
+import { ExtHostTasks } from 'sql/workbench/api/common/extHostTasks';
+import { ExtHostDashboardWebviews } from 'sql/workbench/api/common/extHostDashboardWebview';
+import { ExtHostModelView } from 'sql/workbench/api/common/extHostModelView';
+import { ExtHostConnectionManagement } from 'sql/workbench/api/common/extHostConnectionManagement';
+import { ExtHostDashboard } from 'sql/workbench/api/common/extHostDashboard';
+import { ExtHostObjectExplorer } from 'sql/workbench/api/common/extHostObjectExplorer';
 import { ExtHostLogService } from 'vs/workbench/api/common/extHostLogService';
-import { ExtHostModelViewDialog } from 'sql/workbench/api/node/extHostModelViewDialog';
-import { ExtHostModelViewTreeViews } from 'sql/workbench/api/node/extHostModelViewTree';
-import { ExtHostQueryEditor } from 'sql/workbench/api/node/extHostQueryEditor';
-import { ExtHostBackgroundTaskManagement } from './extHostBackgroundTaskManagement';
-import { ExtHostNotebook } from 'sql/workbench/api/node/extHostNotebook';
-import { ExtHostNotebookDocumentsAndEditors } from 'sql/workbench/api/node/extHostNotebookDocumentsAndEditors';
+import { ExtHostModelViewDialog } from 'sql/workbench/api/common/extHostModelViewDialog';
+import { ExtHostModelViewTreeViews } from 'sql/workbench/api/common/extHostModelViewTree';
+import { ExtHostQueryEditor } from 'sql/workbench/api/common/extHostQueryEditor';
+import { ExtHostBackgroundTaskManagement } from 'sql/workbench/api/common/extHostBackgroundTaskManagement';
+import { ExtHostNotebook } from 'sql/workbench/api/common/extHostNotebook';
+import { ExtHostNotebookDocumentsAndEditors } from 'sql/workbench/api/common/extHostNotebookDocumentsAndEditors';
 import { ExtensionDescriptionRegistry } from 'vs/workbench/services/extensions/common/extensionDescriptionRegistry';
-import { ExtHostExtensionManagement } from 'sql/workbench/api/node/extHostExtensionManagement';
+import { ExtHostExtensionManagement } from 'sql/workbench/api/common/extHostExtensionManagement';
 import { ExtensionIdentifier, IExtensionDescription } from 'vs/platform/extensions/common/extensions';
 import { TernarySearchTree } from 'vs/base/common/map';
 import { ExtHostWorkspace } from 'vs/workbench/api/common/extHostWorkspace';

src/sql/workbench/browser/modal/modal.ts

@@ -16,8 +16,8 @@ import { IContextKeyService, RawContextKey, IContextKey } from 'vs/platform/cont
 import { IClipboardService } from 'vs/platform/clipboard/common/clipboardService';
 
 import { Button } from 'sql/base/browser/ui/button/button';
-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';
 import { localize } from 'vs/nls';
 import { MessageLevel } from 'sql/workbench/api/common/sqlExtHostTypes';
 import * as os from 'os';

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

@@ -10,8 +10,8 @@ import {
 
 import * as azdata from 'azdata';
 
-import { ComponentWithIconBase } from 'sql/workbench/electron-browser/modelComponents/componentWithIconBase';
-import { IComponent, IComponentDescriptor, IModelStore, ComponentEventType } from 'sql/workbench/electron-browser/modelComponents/interfaces';
+import { ComponentWithIconBase } from 'sql/workbench/browser/modelComponents/componentWithIconBase';
+import { IComponent, IComponentDescriptor, IModelStore, ComponentEventType } from 'sql/workbench/browser/modelComponents/interfaces';
 import { attachButtonStyler } from 'sql/platform/theme/common/styler';
 
 import { SIDE_BAR_BACKGROUND, SIDE_BAR_TITLE_FOREGROUND } from 'vs/workbench/common/theme';

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

@@ -13,12 +13,12 @@ import * as azdata from 'azdata';
 import * as colors from 'vs/platform/theme/common/colorRegistry';
 import { IColorTheme, IWorkbenchThemeService } from 'vs/workbench/services/themes/common/workbenchThemeService';
 
-import { ComponentWithIconBase } from 'sql/workbench/electron-browser/modelComponents/componentWithIconBase';
-import { IComponent, IComponentDescriptor, IModelStore, ComponentEventType } from 'sql/workbench/electron-browser/modelComponents/interfaces';
+import { ComponentWithIconBase } from 'sql/workbench/browser/modelComponents/componentWithIconBase';
+import { IComponent, IComponentDescriptor, IModelStore, ComponentEventType } from 'sql/workbench/browser/modelComponents/interfaces';
 import { StatusIndicator, CardProperties, ActionDescriptor } from 'sql/workbench/api/common/sqlExtHostTypes';
 
 @Component({
-	templateUrl: decodeURI(require.toUrl('sql/workbench/electron-browser/modelComponents/card.component.html'))
+	templateUrl: decodeURI(require.toUrl('./card.component.html'))
 })
 export default class CardComponent extends ComponentWithIconBase implements IComponent, OnDestroy {
 	@Input() descriptor: IComponentDescriptor;

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

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

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

@@ -10,11 +10,11 @@ import {
 
 import * as types from 'vs/base/common/types';
 
-import { IComponent, IComponentDescriptor, IModelStore, IComponentEventArgs, ComponentEventType } from 'sql/workbench/electron-browser/modelComponents/interfaces';
+import { IComponent, IComponentDescriptor, IModelStore, IComponentEventArgs, ComponentEventType } from 'sql/workbench/browser/modelComponents/interfaces';
 import * as azdata from 'azdata';
 import { Emitter } from 'vs/base/common/event';
 import { IDisposable, Disposable } from 'vs/base/common/lifecycle';
-import { ModelComponentWrapper } from 'sql/workbench/electron-browser/modelComponents/modelComponentWrapper.component';
+import { ModelComponentWrapper } from 'sql/workbench/browser/modelComponents/modelComponentWrapper.component';
 import { URI } from 'vs/base/common/uri';
 import * as nls from 'vs/nls';
 

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

@@ -5,12 +5,12 @@
 
 import { ChangeDetectorRef, ElementRef } from '@angular/core';
 
-import { IComponentDescriptor } from 'sql/workbench/electron-browser/modelComponents/interfaces';
+import { IComponentDescriptor } from 'sql/workbench/browser/modelComponents/interfaces';
 import * as azdata from 'azdata';
 import { URI } from 'vs/base/common/uri';
 import { IdGenerator } from 'vs/base/common/idGenerator';
 import { createCSSRule, removeCSSRulesContainingSelector } from 'vs/base/browser/dom';
-import { ComponentBase } from 'sql/workbench/electron-browser/modelComponents/componentBase';
+import { ComponentBase } from 'sql/workbench/browser/modelComponents/componentBase';
 
 
 export type IUserFriendlyIcon = string | URI | { light: string | URI; dark: string | URI };

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

@@ -16,7 +16,7 @@ import ButtonComponent from './button.component';
 import CheckBoxComponent from './checkbox.component';
 import TreeComponent from './tree.component';
 import RadioButtonComponent from './radioButton.component';
-import WebViewComponent from './webview.component';
+import WebViewComponent from '../../electron-browser/modelComponents/webview.component';
 import TableComponent from './table.component';
 import TextComponent from './text.component';
 import LoadingComponent from './loadingComponent.component';
@@ -24,10 +24,10 @@ import FileBrowserTreeComponent from './fileBrowserTree.component';
 import EditorComponent from './editor.component';
 import DiffEditorComponent from './diffeditor.component';
 import DomComponent from './dom.component';
-import { registerComponentType } from 'sql/platform/dashboard/common/modelComponentRegistry';
+import { registerComponentType } from 'sql/platform/dashboard/browser/modelComponentRegistry';
 import { ModelComponentTypes } from 'sql/workbench/api/common/sqlExtHostTypes';
-import HyperlinkComponent from 'sql/workbench/electron-browser/modelComponents/hyperlink.component';
-import SplitViewContainer from 'sql/workbench/electron-browser/modelComponents/splitviewContainer.component';
+import HyperlinkComponent from 'sql/workbench/browser/modelComponents/hyperlink.component';
+import SplitViewContainer from 'sql/workbench/browser/modelComponents/splitviewContainer.component';
 
 export const DIV_CONTAINER = 'div-container';
 registerComponentType(DIV_CONTAINER, ModelComponentTypes.DivContainer, DivContainer);
@@ -100,4 +100,4 @@ export const DOM_COMPONENT = 'dom-component';
 registerComponentType(DOM_COMPONENT, ModelComponentTypes.Dom, DomComponent);
 
 export const HYPERLINK_COMPONENT = 'hyperlink-component';
-registerComponentType(HYPERLINK_COMPONENT, ModelComponentTypes.Hyperlink, HyperlinkComponent);
+registerComponentType(HYPERLINK_COMPONENT, ModelComponentTypes.Hyperlink, HyperlinkComponent);

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

@@ -11,8 +11,8 @@ import {
 
 import * as azdata from 'azdata';
 
-import { ComponentBase } from 'sql/workbench/electron-browser/modelComponents/componentBase';
-import { IComponent, IComponentDescriptor, IModelStore, ComponentEventType } from 'sql/workbench/electron-browser/modelComponents/interfaces';
+import { ComponentBase } from 'sql/workbench/browser/modelComponents/componentBase';
+import { IComponent, IComponentDescriptor, IModelStore, ComponentEventType } from 'sql/workbench/browser/modelComponents/interfaces';
 import { ISelectData } from 'vs/base/browser/ui/selectBox/selectBox';
 
 export enum DeclarativeDataType {

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

@@ -15,8 +15,8 @@ import { URI } from 'vs/base/common/uri';
 import { IModeService } from 'vs/editor/common/services/modeService';
 import { IModelService } from 'vs/editor/common/services/modelService';
 
-import { ComponentBase } from 'sql/workbench/electron-browser/modelComponents/componentBase';
-import { IComponent, IComponentDescriptor, IModelStore } from 'sql/workbench/electron-browser/modelComponents/interfaces';
+import { ComponentBase } from 'sql/workbench/browser/modelComponents/componentBase';
+import { IComponent, IComponentDescriptor, IModelStore } from 'sql/workbench/browser/modelComponents/interfaces';
 import { ServiceCollection } from 'vs/platform/instantiation/common/serviceCollection';
 import { SimpleEditorProgressService } from 'vs/editor/standalone/browser/simpleServices';
 import { IProgressService } from 'vs/platform/progress/common/progress';

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

@@ -9,10 +9,10 @@ import {
 	ViewChild, ElementRef, OnDestroy,
 } from '@angular/core';
 
-import { IComponent, IComponentDescriptor, IModelStore, ComponentEventType } from 'sql/workbench/electron-browser/modelComponents/interfaces';
+import { IComponent, IComponentDescriptor, IModelStore, ComponentEventType } from 'sql/workbench/browser/modelComponents/interfaces';
 import * as azdata from 'azdata';
 
-import { ContainerBase } from 'sql/workbench/electron-browser/modelComponents/componentBase';
+import { ContainerBase } from 'sql/workbench/browser/modelComponents/componentBase';
 
 import { StandardKeyboardEvent } from 'vs/base/browser/keyboardEvent';
 import { KeyCode } from 'vs/base/common/keyCodes';

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

@@ -13,8 +13,8 @@ import {
 import * as azdata from 'azdata';
 import * as DOM from 'vs/base/browser/dom';
 
-import { ComponentBase } from 'sql/workbench/electron-browser/modelComponents/componentBase';
-import { IComponent, IComponentDescriptor, IModelStore } from 'sql/workbench/electron-browser/modelComponents/interfaces';
+import { ComponentBase } from 'sql/workbench/browser/modelComponents/componentBase';
+import { IComponent, IComponentDescriptor, IModelStore } from 'sql/workbench/browser/modelComponents/interfaces';
 
 @Component({
 	template: '',

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

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

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

@@ -17,9 +17,9 @@ import { Schemas } from 'vs/base/common/network';
 import { IModeService } from 'vs/editor/common/services/modeService';
 import { IModelService } from 'vs/editor/common/services/modelService';
 
-import { ComponentBase } from 'sql/workbench/electron-browser/modelComponents/componentBase';
-import { IComponent, IComponentDescriptor, IModelStore, ComponentEventType } from 'sql/workbench/electron-browser/modelComponents/interfaces';
-import { QueryTextEditor } from 'sql/workbench/electron-browser/modelComponents/queryTextEditor';
+import { ComponentBase } from 'sql/workbench/browser/modelComponents/componentBase';
+import { IComponent, IComponentDescriptor, IModelStore, ComponentEventType } from 'sql/workbench/browser/modelComponents/interfaces';
+import { QueryTextEditor } from 'sql/workbench/browser/modelComponents/queryTextEditor';
 import { ServiceCollection } from 'vs/platform/instantiation/common/serviceCollection';
 import { SimpleEditorProgressService } from 'vs/editor/standalone/browser/simpleServices';
 import { IProgressService } from 'vs/platform/progress/common/progress';

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

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

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

@@ -9,10 +9,10 @@ import {
 	ElementRef, OnDestroy
 } from '@angular/core';
 
-import { IComponent, IComponentDescriptor, IModelStore } from 'sql/workbench/electron-browser/modelComponents/interfaces';
+import { IComponent, IComponentDescriptor, IModelStore } from 'sql/workbench/browser/modelComponents/interfaces';
 import { FlexLayout, FlexItemLayout } from 'azdata';
 
-import { ContainerBase } from 'sql/workbench/electron-browser/modelComponents/componentBase';
+import { ContainerBase } from 'sql/workbench/browser/modelComponents/componentBase';
 
 export class FlexItem {
 	constructor(public descriptor: IComponentDescriptor, public config: FlexItemLayout) { }

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

@@ -9,11 +9,11 @@ import {
 	ViewChild, ElementRef, OnDestroy, AfterViewInit
 } from '@angular/core';
 
-import { IComponent, IComponentDescriptor, IModelStore } from 'sql/workbench/electron-browser/modelComponents/interfaces';
+import { IComponent, IComponentDescriptor, IModelStore } from 'sql/workbench/browser/modelComponents/interfaces';
 import { FormLayout, FormItemLayout } from 'azdata';
 
-import { ContainerBase } from 'sql/workbench/electron-browser/modelComponents/componentBase';
-import { CommonServiceInterface } from 'sql/platform/bootstrap/node/commonServiceInterface.service';
+import { ContainerBase } from 'sql/workbench/browser/modelComponents/componentBase';
+import { CommonServiceInterface } from 'sql/platform/bootstrap/browser/commonServiceInterface.service';
 
 export interface TitledFormItemLayout {
 	title: string;

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

@@ -9,10 +9,10 @@ import {
 	ViewChild, ElementRef, OnDestroy, AfterViewInit
 } from '@angular/core';
 
-import { IComponent, IComponentDescriptor, IModelStore } from 'sql/workbench/electron-browser/modelComponents/interfaces';
+import { IComponent, IComponentDescriptor, IModelStore } from 'sql/workbench/browser/modelComponents/interfaces';
 import { GroupLayout } from 'azdata';
 
-import { ContainerBase } from 'sql/workbench/electron-browser/modelComponents/componentBase';
+import { ContainerBase } from 'sql/workbench/browser/modelComponents/componentBase';
 
 @Component({
 	selector: 'modelview-groupContainer',

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

@@ -10,8 +10,8 @@ import {
 
 import * as azdata from 'azdata';
 
-import { ComponentBase } from 'sql/workbench/electron-browser/modelComponents/componentBase';
-import { IComponent, IComponentDescriptor, IModelStore } from 'sql/workbench/electron-browser/modelComponents/interfaces';
+import { ComponentBase } from 'sql/workbench/browser/modelComponents/componentBase';
+import { IComponent, IComponentDescriptor, IModelStore } from 'sql/workbench/browser/modelComponents/interfaces';
 
 @Component({
 	selector: 'modelview-hyperlink',

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

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

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

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

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

@@ -10,8 +10,8 @@ import {
 
 import * as azdata from 'azdata';
 
-import { ComponentBase } from 'sql/workbench/electron-browser/modelComponents/componentBase';
-import { IComponent, IComponentDescriptor, IModelStore } from 'sql/workbench/electron-browser/modelComponents/interfaces';
+import { ComponentBase } from 'sql/workbench/browser/modelComponents/componentBase';
+import { IComponent, IComponentDescriptor, IModelStore } from 'sql/workbench/browser/modelComponents/interfaces';
 import * as nls from 'vs/nls';
 
 @Component({

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

@@ -8,21 +8,21 @@ import {
 	ElementRef, OnInit, ChangeDetectorRef, ReflectiveInjector, Injector, ComponentRef
 } from '@angular/core';
 
-import { ComponentHostDirective } from 'sql/workbench/parts/dashboard/common/componentHost.directive';
-import { AngularDisposable } from 'sql/base/node/lifecycle';
+import { ComponentHostDirective } from 'sql/workbench/parts/dashboard/browser/core/componentHost.directive';
+import { AngularDisposable } from 'sql/base/browser/lifecycle';
 import { IComponent, IComponentConfig, IComponentDescriptor, IModelStore, COMPONENT_CONFIG } from './interfaces';
-import { Extensions, IComponentRegistry } from 'sql/platform/dashboard/common/modelComponentRegistry';
+import { Extensions, IComponentRegistry } from 'sql/platform/dashboard/browser/modelComponentRegistry';
 
 import * as colors from 'vs/platform/theme/common/colorRegistry';
 import * as themeColors from 'vs/workbench/common/theme';
 import { Registry } from 'vs/platform/registry/common/platform';
 import { memoize } from 'vs/base/common/decorators';
 import { generateUuid } from 'vs/base/common/uuid';
-import { IBootstrapParams } from 'sql/platform/bootstrap/node/bootstrapService';
 import { Event } from 'vs/base/common/event';
-import { LayoutRequestParams } from 'sql/platform/dialog/dialogContainer.component';
+import { LayoutRequestParams } from 'sql/platform/dialog/browser/dialogContainer.component';
 import { IThemeService, ITheme } from 'vs/platform/theme/common/themeService';
 import { ILogService } from 'vs/platform/log/common/log';
+import { IBootstrapParams } from 'sql/platform/bootstrap/common/bootstrapParams';
 
 const componentRegistry = <IComponentRegistry>Registry.as(Extensions.ComponentContribution);
 

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

@@ -10,9 +10,9 @@ import { IDisposable } from 'vs/base/common/lifecycle';
 import { addDisposableListener, EventType } from 'vs/base/browser/dom';
 import { memoize } from 'vs/base/common/decorators';
 
-import { CommonServiceInterface } from 'sql/platform/bootstrap/node/commonServiceInterface.service';
+import { CommonServiceInterface } from 'sql/platform/bootstrap/browser/commonServiceInterface.service';
 import { IModelView } from 'sql/platform/model/common/modelViewService';
-import { ViewBase } from 'sql/workbench/electron-browser/modelComponents/viewBase';
+import { ViewBase } from 'sql/workbench/browser/modelComponents/viewBase';
 import { IModelViewService } from 'sql/platform/modelComponents/common/modelViewService';
 
 import * as azdata from 'azdata';

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

@@ -6,8 +6,8 @@ import { Registry } from 'vs/platform/registry/common/platform';
 import { EditorDescriptor, IEditorRegistry, Extensions as EditorExtensions } from 'vs/workbench/browser/editor';
 import { SyncDescriptor } from 'vs/platform/instantiation/common/descriptors';
 
-import { ModelViewInput } from 'sql/workbench/electron-browser/modelComponents/modelViewInput';
-import { ModelViewEditor } from 'sql/workbench/electron-browser/modelComponents/modelViewEditor';
+import { ModelViewInput } from 'sql/workbench/browser/modelComponents/modelViewInput';
+import { ModelViewEditor } from 'sql/workbench/browser/modelComponents/modelViewEditor';
 
 // Model View editor registration
 const viewModelEditorDescriptor = new EditorDescriptor(
@@ -17,4 +17,4 @@ const viewModelEditorDescriptor = new EditorDescriptor(
 );
 
 Registry.as<IEditorRegistry>(EditorExtensions.Editors)
-	.registerEditor(viewModelEditorDescriptor, [new SyncDescriptor(ModelViewInput)]);
+	.registerEditor(viewModelEditorDescriptor, [new SyncDescriptor(ModelViewInput)]);

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

@@ -10,7 +10,7 @@ import { BaseEditor } from 'vs/workbench/browser/parts/editor/baseEditor';
 import { EditorOptions } from 'vs/workbench/common/editor';
 import * as DOM from 'vs/base/browser/dom';
 
-import { ModelViewInput } from 'sql/workbench/electron-browser/modelComponents/modelViewInput';
+import { ModelViewInput } from 'sql/workbench/browser/modelComponents/modelViewInput';
 import { CancellationToken } from 'vs/base/common/cancellation';
 import { IStorageService } from 'vs/platform/storage/common/storage';
 

src/sql/workbench/browser/modelComponents/modelViewInput.ts

@@ -10,7 +10,7 @@ import { EditorInput, EditorModel, ConfirmResult } from 'vs/workbench/common/edi
 import * as DOM from 'vs/base/browser/dom';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 
-import { DialogPane } from 'sql/platform/dialog/dialogPane';
+import { DialogPane } from 'sql/platform/dialog/browser/dialogPane';
 import { Emitter, Event } from 'vs/base/common/event';
 import { IWorkbenchLayoutService, Parts } from 'vs/workbench/services/layout/browser/layoutService';
 import { IThemeService } from 'vs/platform/theme/common/themeService';

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

@@ -11,8 +11,8 @@ import {
 
 import * as azdata from 'azdata';
 
-import { ComponentBase } from 'sql/workbench/electron-browser/modelComponents/componentBase';
-import { IComponent, IComponentDescriptor, IModelStore, ComponentEventType } from 'sql/workbench/electron-browser/modelComponents/interfaces';
+import { ComponentBase } from 'sql/workbench/browser/modelComponents/componentBase';
+import { IComponent, IComponentDescriptor, IModelStore, ComponentEventType } from 'sql/workbench/browser/modelComponents/interfaces';
 import { RadioButton } from 'sql/base/browser/ui/radioButton/radioButton';
 
 @Component({

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

@@ -6,10 +6,10 @@ import 'vs/css!./media/flexContainer';
 
 import { Component, Input, Inject, ChangeDetectorRef, forwardRef, ElementRef, OnDestroy } from '@angular/core';
 
-import { IComponent, IComponentDescriptor, IModelStore } from 'sql/workbench/electron-browser/modelComponents/interfaces';
+import { IComponent, IComponentDescriptor, IModelStore } from 'sql/workbench/browser/modelComponents/interfaces';
 import { FlexItemLayout, SplitViewLayout } from 'azdata';
 import { FlexItem } from './flexContainer.component';
-import { ContainerBase, ComponentBase } from 'sql/workbench/electron-browser/modelComponents/componentBase';
+import { ContainerBase, ComponentBase } from 'sql/workbench/browser/modelComponents/componentBase';
 import { Event } from 'vs/base/common/event';
 import { SplitView, Orientation, Sizing, IView } from 'vs/base/browser/ui/splitview/splitview';
 

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

@@ -11,8 +11,8 @@ import {
 
 import * as azdata from 'azdata';
 
-import { ComponentBase } from 'sql/workbench/electron-browser/modelComponents/componentBase';
-import { IComponent, IComponentDescriptor, IModelStore, ComponentEventType } from 'sql/workbench/electron-browser/modelComponents/interfaces';
+import { ComponentBase } from 'sql/workbench/browser/modelComponents/componentBase';
+import { IComponent, IComponentDescriptor, IModelStore, ComponentEventType } from 'sql/workbench/browser/modelComponents/interfaces';
 
 import { Table } from 'sql/base/browser/ui/table/table';
 import { TableDataView } from 'sql/base/browser/ui/table/tableDataView';