Layer Object Explorer; query plan; task history (#5030)

* relayer query plan, task history, object-explorer

* formatting

src/sql/parts/common/customInputConverter.ts

@@ -11,7 +11,7 @@ import { URI } from 'vs/base/common/uri';
 import { QueryResultsInput } from 'sql/parts/query/common/queryResultsInput';
 import { QueryInput } from 'sql/parts/query/common/queryInput';
 import { IQueryEditorOptions } from 'sql/workbench/services/queryEditor/common/queryEditorService';
-import { QueryPlanInput } from 'sql/parts/queryPlan/queryPlanInput';
+import { QueryPlanInput } from 'sql/workbench/parts/queryPlan/common/queryPlanInput';
 import { NotebookInput } from 'sql/workbench/parts/notebook/notebookInput';
 import { INotebookService } from 'sql/workbench/services/notebook/common/notebookService';
 import { ResourceEditorInput } from 'vs/workbench/common/editor/resourceEditorInput';

src/sql/parts/objectExplorer/viewlet/templateData.ts

@@ -1,27 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the Source EULA. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-import { ConnectionProfile } from 'sql/platform/connection/common/connectionProfile';
-import { InputBox } from 'vs/base/browser/ui/inputbox/inputBox';
-import { TreeNode } from 'sql/parts/objectExplorer/common/treeNode';
-
-export interface IConnectionTemplateData {
-	root: HTMLElement;
-	label: HTMLSpanElement;
-	icon: HTMLElement;
-	connectionProfile: ConnectionProfile;
-}
-
-export interface IConnectionProfileGroupTemplateData {
-	root: HTMLElement;
-	name: HTMLSpanElement;
-	inputBox: InputBox;
-}
-
-export interface IObjectExplorerTemplateData {
-	root: HTMLElement;
-	label: HTMLSpanElement;
-	icon: HTMLElement;
-	treeNode: TreeNode;
-}

src/sql/parts/profiler/contrib/profilerActions.contribution.ts

@@ -14,7 +14,7 @@ import { IProfilerService } from 'sql/workbench/services/profiler/common/interfa
 import { KeybindingsRegistry, KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry';
 import { KeyCode, KeyMod } from 'vs/editor/editor.api';
 import { ProfilerEditor } from '../editor/profilerEditor';
-import { ObjectExplorerActionsContext } from 'sql/parts/objectExplorer/viewlet/objectExplorerActions';
+import { ObjectExplorerActionsContext } from 'sql/workbench/parts/objectExplorer/browser/objectExplorerActions';
 import { ConnectionProfile } from 'sql/platform/connection/common/connectionProfile';
 import { ICapabilitiesService } from 'sql/platform/capabilities/common/capabilitiesService';
 import { mssqlProviderName } from 'sql/platform/connection/common/constants';

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

@@ -29,8 +29,8 @@ import {
 } from 'sql/parts/query/execution/keyboardQueryActions';
 import * as gridActions from 'sql/workbench/parts/grid/views/gridActions';
 import * as gridCommands from 'sql/workbench/parts/grid/views/gridCommands';
-import { QueryPlanEditor } from 'sql/parts/queryPlan/queryPlanEditor';
+import { QueryPlanEditor } from 'sql/workbench/parts/queryPlan/electron-browser/queryPlanEditor';
-import { QueryPlanInput } from 'sql/parts/queryPlan/queryPlanInput';
+import { QueryPlanInput } from 'sql/workbench/parts/queryPlan/common/queryPlanInput';
 import * as Constants from 'sql/parts/query/common/constants';
 import { localize } from 'vs/nls';
 import { EditDataResultsEditor } from 'sql/parts/editData/editor/editDataResultsEditor';

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

@@ -12,9 +12,9 @@ import { IConfigurationService } from 'vs/platform/configuration/common/configur
 
 import { GridPanelState } from 'sql/parts/query/editor/gridPanel';
 import { MessagePanelState } from 'sql/parts/query/editor/messagePanel';
-import { QueryPlanState } from 'sql/parts/queryPlan/queryPlan';
+import { QueryPlanState } from 'sql/workbench/parts/queryPlan/electron-browser/queryPlan';
 import { ChartState } from 'sql/parts/query/editor/charting/chartView';
-import { TopOperationsState } from 'sql/parts/queryPlan/topOperations';
+import { TopOperationsState } from 'sql/workbench/parts/queryPlan/browser/topOperations';
 
 export class ResultsViewState {
 	public gridPanelState: GridPanelState = new GridPanelState();

src/sql/parts/query/editor/messagePanel.ts

@@ -7,7 +7,7 @@ import 'vs/css!./media/messagePanel';
 import { IMessagesActionContext, CopyMessagesAction, CopyAllMessagesAction } from './actions';
 import QueryRunner from 'sql/platform/query/common/queryRunner';
 import { QueryInput } from 'sql/parts/query/common/queryInput';
-import { IExpandableTree } from 'sql/parts/objectExplorer/viewlet/treeUpdateUtils';
+import { IExpandableTree } from 'sql/workbench/parts/objectExplorer/browser/treeUpdateUtils';
 
 import { IResultMessage, ISelectionData } from 'azdata';
 

src/sql/parts/query/editor/queryResultsView.ts

@@ -11,8 +11,8 @@ import QueryRunner from 'sql/platform/query/common/queryRunner';
 import { MessagePanel } from './messagePanel';
 import { GridPanel } from './gridPanel';
 import { ChartTab } from './charting/chartTab';
-import { QueryPlanTab } from 'sql/parts/queryPlan/queryPlan';
+import { QueryPlanTab } from 'sql/workbench/parts/queryPlan/electron-browser/queryPlan';
-import { TopOperationsTab } from 'sql/parts/queryPlan/topOperations';
+import { TopOperationsTab } from 'sql/workbench/parts/queryPlan/browser/topOperations';
 import { QueryModelViewTab } from 'sql/parts/query/modelViewTab/queryModelViewTab';
 
 import * as nls from 'vs/nls';

src/sql/parts/taskHistory/viewlet/templateData.ts

@@ -1,11 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the Source EULA. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-export interface ITaskHistoryTemplateData {
-	root: HTMLElement;
-	icon: HTMLElement;
-	title: HTMLSpanElement;
-	description: HTMLSpanElement;
-	time: HTMLSpanElement;
-}

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

@@ -20,7 +20,7 @@ import { ProviderConnectionInfo } from 'sql/platform/connection/common/providerC
 import * as Utils from 'sql/platform/connection/common/utils';
 import { IObjectExplorerService } from 'sql/workbench/services/objectExplorer/common/objectExplorerService';
 import { ITaskService } from 'sql/platform/taskHistory/common/taskService';
-import { TaskStatus, TaskNode } from 'sql/parts/taskHistory/common/taskNode';
+import { TaskStatus, TaskNode } from 'sql/workbench/parts/taskHistory/common/taskNode';
 import * as TelemetryKeys from 'sql/platform/telemetry/telemetryKeys';
 import * as TelemetryUtils from 'sql/platform/telemetry/telemetryUtilities';
 import { IConnectionManagementService } from 'sql/platform/connection/common/connectionManagement';

src/sql/platform/taskHistory/common/taskService.ts

@@ -5,7 +5,7 @@
 
 'use strict';
 import * as azdata from 'azdata';
-import { TaskNode, TaskStatus, TaskExecutionMode } from 'sql/parts/taskHistory/common/taskNode';
+import { TaskNode, TaskStatus, TaskExecutionMode } from 'sql/workbench/parts/taskHistory/common/taskNode';
 import { IQueryEditorService } from 'sql/workbench/services/queryEditor/common/queryEditorService';
 import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
 import { Event, Emitter } from 'vs/base/common/event';

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

@@ -15,7 +15,7 @@ import { IEditorService } from 'vs/workbench/services/editor/common/editorServic
 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/parts/objectExplorer/common/treeNode';
+import { TreeItemCollapsibleState } from 'sql/workbench/parts/objectExplorer/common/treeNode';
 
 @extHostNamedCustomer(SqlMainContext.MainThreadObjectExplorer)
 export class MainThreadObjectExplorer implements MainThreadObjectExplorerShape {

src/sql/workbench/browser/parts/views/customView.ts

@@ -43,7 +43,7 @@ import { ILabelService } from 'vs/platform/label/common/label';
 import { dirname } from 'vs/base/common/resources';
 
 import { ITreeItem, ITreeView } from 'sql/workbench/common/views';
-import { IOEShimService } from 'sql/parts/objectExplorer/common/objectExplorerViewTreeShim';
+import { IOEShimService } from 'sql/workbench/parts/objectExplorer/common/objectExplorerViewTreeShim';
 import { equalsIgnoreCase } from 'vs/base/common/strings';
 import { NodeContextKey } from 'sql/workbench/parts/dataExplorer/common/nodeContext';
 

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

@@ -5,7 +5,7 @@
 
 import { IConfigurationRegistry, Extensions as ConfigExtensions } from 'vs/platform/configuration/common/configurationRegistry';
 import { Registry } from 'vs/platform/registry/common/platform';
-import { AddServerGroupAction, AddServerAction } from 'sql/parts/objectExplorer/viewlet/connectionTreeAction';
+import { AddServerGroupAction, AddServerAction } from 'sql/workbench/parts/objectExplorer/browser/connectionTreeAction';
 import { ClearRecentConnectionsAction, GetCurrentConnectionStringAction } from 'sql/workbench/parts/connection/common/connectionActions';
 
 import { IWorkbenchActionRegistry, Extensions } from 'vs/workbench/common/actions';

src/sql/workbench/parts/connection/browser/media/collapsed-dark.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"><path fill="#E8E8E8" d="M6 4v8l4-4-4-4zm1 2.414L8.586 8 7 9.586V6.414z"/></svg>

src/sql/workbench/parts/connection/browser/media/connectionViewlet.css

@@ -0,0 +1,138 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the Source EULA. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+/* --- Registered servers tree viewlet --- */
+.server-explorer-viewlet .monaco-tree .monaco-tree-row .content .server-group {
+	cursor: default;
+	width: 100%;
+	display: flex;
+	align-items: center;
+}
+
+/* Bold font style does not go well with CJK fonts */
+.server-explorer-viewlet:lang(zh-Hans) .monaco-tree .monaco-tree-row .server-group,
+.server-explorer-viewlet:lang(zh-Hant) .monaco-tree .monaco-tree-row .server-group,
+.server-explorer-viewlet:lang(ja) .monaco-tree .monaco-tree-row .server-group,
+.server-explorer-viewlet:lang(ko) .monaco-tree .monaco-tree-row .server-group { font-weight: normal; }
+
+/* High Contrast Theming */
+.hc-black .monaco-workbench .server-explorer-viewlet .server-group {
+	line-height: 20px;
+}
+
+.monaco-workbench > .activitybar .monaco-action-bar .action-label.serverTree {
+	background-size: 22px;
+	background-repeat: no-repeat;
+	background-position: 50% !important;
+}
+
+.server-explorer-viewlet .object-explorer-view {
+	height: calc(100% - 36px);
+}
+
+.server-explorer-viewlet .server-group {
+	height: 38px;
+	line-height: 38px;
+	color: #ffffff;
+}
+
+.server-explorer-viewlet  .monaco-action-bar .action-label {
+	margin-right: 0.3em;
+	margin-left: 0.3em;
+	line-height: 15px;
+	width: 10px !important;
+	height: 10px !important;
+}
+
+/* Add space beneath the button */
+.new-connection .monaco-text-button {
+margin-bottom: 2px;
+}
+
+/* display action buttons on hover */
+.server-explorer-viewlet .monaco-tree .monaco-tree-row > .content {
+	display: flex;
+}
+
+/* Added to display the tree in connection dialog */
+.server-explorer-viewlet {
+	height: 100%;
+}
+
+.explorer-servers {
+	height: 100%;
+}
+
+/* search box */
+.server-explorer-viewlet .search-box {
+	padding-bottom: 4px;
+	margin: auto;
+	width: 95%;
+}
+
+/* OE and connection element group */
+.monaco-tree .monaco-tree-rows > .monaco-tree-row > .content > .connection-tile,
+.monaco-tree .monaco-tree-rows > .monaco-tree-row > .content > .object-element-group {
+	padding: 5px;
+	overflow: hidden;
+}
+
+/* OE and connection label */
+.monaco-tree .monaco-tree-rows > .monaco-tree-row > .content > .connection-tile > .label,
+.monaco-tree .monaco-tree-rows > .monaco-tree-row > .content > .object-element-group > .label {
+	text-overflow: ellipsis;
+	overflow: hidden;
+}
+
+/* OE and connection icon */
+.monaco-tree .monaco-tree-rows > .monaco-tree-row > .content > .connection-tile > .icon,
+.monaco-tree .monaco-tree-rows > .monaco-tree-row > .content > .object-element-group > .icon {
+	float: left;
+	height: 16px;
+	width: 16px;
+	padding-right: 10px;
+}
+
+.monaco-tree .monaco-tree-rows > .monaco-tree-row > .content > .connection-tile > .icon.server-page.connected {
+	background: url('connected_active_server.svg') center center no-repeat;
+}
+
+.vs-dark .monaco-tree .monaco-tree-rows > .monaco-tree-row > .content > .connection-tile > .icon.server-page.connected,
+.hc-black .monaco-tree .monaco-tree-rows > .monaco-tree-row > .content > .connection-tile > .icon.server-page.connected{
+	background: url('connected_active_server_inverse.svg') center center no-repeat;
+}
+
+.monaco-tree .monaco-tree-rows > .monaco-tree-row > .content > .connection-tile > .icon.server-page.disconnected {
+	background: url('disconnected_server.svg') center center no-repeat;
+}
+
+.vs-dark .monaco-tree .monaco-tree-rows > .monaco-tree-row > .content > .connection-tile > .icon.server-page.disconnected,
+.hc-black .monaco-tree .monaco-tree-rows > .monaco-tree-row > .content > .connection-tile > .icon.server-page.disconnected{
+	background: url('disconnected_server_inverse.svg') center center no-repeat;
+}
+
+/* loading for OE node */
+.server-explorer-viewlet .monaco-tree .monaco-tree-rows > .monaco-tree-row > .icon.in-progress .connection-tile:before,
+.server-explorer-viewlet .monaco-tree .monaco-tree-rows > .monaco-tree-row > .icon.in-progress .object-element-group:before {
+	position: absolute;
+	display: block;
+	width: 36px;
+	height: 100%;
+	top: 0;
+	left: -35px;
+}
+
+.monaco-tree .monaco-tree-rows.show-twisties > .monaco-tree-row.expanded.has-children > .content.server-group:before {
+	background: url('expanded-dark.svg') 50% 50% no-repeat;
+}
+
+.monaco-tree .monaco-tree-rows.show-twisties > .monaco-tree-row.has-children > .content.server-group:before {
+	background: url('collapsed-dark.svg') 50% 50% no-repeat;
+}
+
+/* Add connection button */
+.server-explorer-viewlet .button-section {
+	padding: 20px;
+}

src/sql/workbench/parts/connection/browser/media/disconnected_server.svg

@@ -0,0 +1 @@
+<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"><defs><style>.cls-1{fill:#212121;}.cls-2{fill:#d02e00;}</style></defs><title>disconnected_server_16x16</title><path class="cls-1" d="M1.42.06V16H11a3.31,3.31,0,0,1-1.94-1H2.42V11h6a3.31,3.31,0,0,1,.54-.8,1.81,1.81,0,0,1,.19-.2H2.42v-9H11v8a3.68,3.68,0,0,1,.58,0l.39,0h0v-9Z"/><path class="cls-1" d="M3.43,1.79V4.24H5.89V1.79Zm2,2H3.93V2.29H5.39Z"/><path class="cls-2" d="M11.08,16a2.22,2.22,0,0,0,.45,0,2.59,2.59,0,0,0,.4,0Z"/><path class="cls-2" d="M12,9.08h0l-.39,0a3.68,3.68,0,0,0-.58,0A3.41,3.41,0,0,0,9.14,10a1.81,1.81,0,0,0-.19.2,3.46,3.46,0,0,0-.89,2.3,3.4,3.4,0,0,0,.85,2.26,1.29,1.29,0,0,0,.16.17A3.31,3.31,0,0,0,11,16H12a3.46,3.46,0,0,0,2.17-1.13,3.41,3.41,0,0,0,.88-2.3A3.47,3.47,0,0,0,12,9.08Zm0,5.72a1.72,1.72,0,0,1-.39,0,2.23,2.23,0,0,1-.77-.14,2.29,2.29,0,0,1-1.54-2.17A2.22,2.22,0,0,1,9.79,11a2.29,2.29,0,0,1,1-.67,2.23,2.23,0,0,1,.77-.14,1.72,1.72,0,0,1,.39,0h0a2.3,2.3,0,0,1,0,4.53Z"/></svg>

src/sql/workbench/parts/connection/browser/media/disconnected_server_inverse.svg

@@ -0,0 +1 @@
+<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"><defs><style>.cls-1{fill:#fff;}.cls-2{fill:#d02e00;}</style></defs><title>disconnected_server_inverse_16x16</title><path class="cls-1" d="M1.42.06V16H11a3.31,3.31,0,0,1-1.94-1H2.42V11h6a3.31,3.31,0,0,1,.54-.8,1.81,1.81,0,0,1,.19-.2H2.42v-9H11v8a3.68,3.68,0,0,1,.58,0l.39,0h0v-9Z"/><path class="cls-1" d="M3.43,1.79V4.24H5.89V1.79Zm2,2H3.93V2.29H5.39Z"/><path class="cls-2" d="M11.08,16a2.22,2.22,0,0,0,.45,0,2.59,2.59,0,0,0,.4,0Z"/><path class="cls-2" d="M12,9.08h0l-.39,0a3.68,3.68,0,0,0-.58,0A3.41,3.41,0,0,0,9.14,10a1.81,1.81,0,0,0-.19.2,3.46,3.46,0,0,0-.89,2.3,3.4,3.4,0,0,0,.85,2.26,1.29,1.29,0,0,0,.16.17A3.31,3.31,0,0,0,11,16H12a3.46,3.46,0,0,0,2.17-1.13,3.41,3.41,0,0,0,.88-2.3A3.47,3.47,0,0,0,12,9.08Zm0,5.72a1.72,1.72,0,0,1-.39,0,2.23,2.23,0,0,1-.77-.14,2.29,2.29,0,0,1-1.54-2.17A2.22,2.22,0,0,1,9.79,11a2.29,2.29,0,0,1,1-.67,2.23,2.23,0,0,1,.77-.14,1.72,1.72,0,0,1,.39,0h0a2.3,2.3,0,0,1,0,4.53Z"/></svg>

src/sql/workbench/parts/connection/browser/media/expanded-dark.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"><path fill="#E8E8E8" d="M11 10H5.344L11 4.414V10z"/></svg>

src/sql/workbench/parts/dataExplorer/browser/connectionViewletPanel.ts

@@ -18,11 +18,11 @@ import { INotificationService } from 'vs/platform/notification/common/notificati
 import { ViewletPanel, IViewletPanelOptions } from 'vs/workbench/browser/parts/views/panelViewlet';
 import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
 import { IAction } from 'vs/base/common/actions';
-import { ServerTreeView } from 'sql/parts/objectExplorer/viewlet/serverTreeView';
+import { ServerTreeView } from 'sql/workbench/parts/objectExplorer/browser/serverTreeView';
 import {
 	ActiveConnectionsFilterAction,
 	AddServerAction, AddServerGroupAction
-} from 'sql/parts/objectExplorer/viewlet/connectionTreeAction';
+} from 'sql/workbench/parts/objectExplorer/browser/connectionTreeAction';
 import { IObjectExplorerService } from 'sql/workbench/services/objectExplorer/common/objectExplorerService';
 import { IExtensionsWorkbenchService } from 'vs/workbench/contrib/extensions/common/extensions';
 

src/sql/workbench/parts/dataExplorer/common/nodeContext.ts

@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { ConnectionContextKey } from 'sql/workbench/parts/connection/common/connectionContextKey';
-import { IOEShimService } from 'sql/parts/objectExplorer/common/objectExplorerViewTreeShim';
+import { IOEShimService } from 'sql/workbench/parts/objectExplorer/common/objectExplorerViewTreeShim';
 import { ITreeItem } from 'sql/workbench/common/views';
 import { Disposable } from 'vs/base/common/lifecycle';
 import { IContextKey, IContextKeyService, RawContextKey } from 'vs/platform/contextkey/common/contextkey';

src/sql/workbench/parts/dataExplorer/electron-browser/nodeCommands.ts

@@ -3,7 +3,7 @@
  *  Licensed under the Source EULA. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IOEShimService } from 'sql/parts/objectExplorer/common/objectExplorerViewTreeShim';
+import { IOEShimService } from 'sql/workbench/parts/objectExplorer/common/objectExplorerViewTreeShim';
 import { ICapabilitiesService } from 'sql/platform/capabilities/common/capabilitiesService';
 import { ConnectionType, IConnectableInput, IConnectionCompletionOptions, IConnectionManagementService } from 'sql/platform/connection/common/connectionManagement';
 import { ConnectionProfile } from 'sql/platform/connection/common/connectionProfile';

src/sql/workbench/parts/extensions/browser/contributionRenders.ts

@@ -3,8 +3,6 @@
  *  Licensed under the Source EULA. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-'use strict';
-
 import { append, $ } from 'vs/base/browser/dom';
 import { IInsightTypeContrib } from 'sql/workbench/parts/dashboard/widgets/insights/interfaces';
 import { IDashboardTabContrib } from 'sql/workbench/parts/dashboard/common/dashboardTab.contribution';

src/sql/workbench/parts/objectExplorer/browser/connectionTreeAction.ts

@@ -9,19 +9,18 @@ import { ConnectionProfile } from 'sql/platform/connection/common/connectionProf
 import { IConnectionManagementService } from 'sql/platform/connection/common/connectionManagement';
 import { ICapabilitiesService } from 'sql/platform/capabilities/common/capabilitiesService';
 import { IQueryEditorService } from 'sql/workbench/services/queryEditor/common/queryEditorService';
-import { ServerTreeView } from 'sql/parts/objectExplorer/viewlet/serverTreeView';
+import { ServerTreeView } from 'sql/workbench/parts/objectExplorer/browser/serverTreeView';
 import { IConnectionProfile } from 'sql/platform/connection/common/interfaces';
 import { ConnectionProfileGroup } from 'sql/platform/connection/common/connectionProfileGroup';
 import * as TaskUtilities from 'sql/workbench/common/taskUtilities';
 import { ITree } from 'vs/base/parts/tree/browser/tree';
 import * as Constants from 'sql/platform/connection/common/constants';
 import { IObjectExplorerService } from 'sql/workbench/services/objectExplorer/common/objectExplorerService';
-import { TreeNode } from 'sql/parts/objectExplorer/common/treeNode';
+import { TreeNode } from 'sql/workbench/parts/objectExplorer/common/treeNode';
 import Severity from 'vs/base/common/severity';
-import { ObjectExplorerActionsContext } from 'sql/parts/objectExplorer/viewlet/objectExplorerActions';
+import { ObjectExplorerActionsContext } from 'sql/workbench/parts/objectExplorer/browser/objectExplorerActions';
 import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
 import { IErrorMessageService } from 'sql/platform/errorMessage/common/errorMessageService';
-import { ConnectionViewletPanel } from 'sql/workbench/parts/dataExplorer/browser/connectionViewletPanel';
 
 export class RefreshAction extends Action {
 

src/sql/workbench/parts/objectExplorer/browser/dragAndDropController.ts

@@ -3,15 +3,13 @@
  *  Licensed under the Source EULA. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-'use strict';
 import { ConnectionProfileGroup } from 'sql/platform/connection/common/connectionProfileGroup';
 import { ConnectionProfile } from 'sql/platform/connection/common/connectionProfile';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 import { IConnectionManagementService } from 'sql/platform/connection/common/connectionManagement';
 import { ITree, IDragAndDrop, IDragOverReaction, DRAG_OVER_ACCEPT_BUBBLE_DOWN, DRAG_OVER_REJECT } from 'vs/base/parts/tree/browser/tree';
 import * as Constants from 'sql/platform/connection/common/constants';
 import { DragMouseEvent } from 'vs/base/browser/mouseEvent';
-import { TreeUpdateUtils } from 'sql/parts/objectExplorer/viewlet/treeUpdateUtils';
+import { TreeUpdateUtils } from 'sql/workbench/parts/objectExplorer/browser/treeUpdateUtils';
 import { IDragAndDropData } from 'vs/base/browser/dnd';
 
 /**
@@ -19,8 +17,8 @@ import { IDragAndDropData } from 'vs/base/browser/dnd';
  */
 export class ServerTreeDragAndDrop implements IDragAndDrop {
 
-	constructor(@IConnectionManagementService private _connectionManagementService: IConnectionManagementService,
+	constructor(
-		@IInstantiationService private _instantiationService: IInstantiationService
+		@IConnectionManagementService private _connectionManagementService: IConnectionManagementService,
 	) {
 	}
 
@@ -153,11 +151,6 @@ export class ServerTreeDragAndDrop implements IDragAndDrop {
  */
 export class RecentConnectionsDragAndDrop implements IDragAndDrop {
 
-	constructor(@IConnectionManagementService private connectionManagementService: IConnectionManagementService,
-		@IInstantiationService private instantiationService: IInstantiationService
-	) {
-	}
-
 	/**
 	 * Returns a uri if the given element should be allowed to drag.
 	 * Returns null, otherwise.

src/sql/workbench/parts/objectExplorer/browser/media/connected_active_server.svg

@@ -0,0 +1 @@
+<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"><defs><style>.cls-1{fill:#212121;}.cls-2{fill:#3bb44a;}</style></defs><title>connected_active_server_16x16</title><path class="cls-1" d="M1.29.07V16h9.59a3.31,3.31,0,0,1-1.94-1H2.29V11h6a3.31,3.31,0,0,1,.54-.8A1.81,1.81,0,0,1,9,10H2.29v-9h8.53v8a3.68,3.68,0,0,1,.58,0l.39,0h0v-9Z"/><path class="cls-1" d="M3.3,1.8V4.25H5.75V1.8Zm2,2H3.8V2.3H5.25Z"/><circle class="cls-2" cx="11.24" cy="12.52" r="3.47"/></svg>

src/sql/workbench/parts/objectExplorer/browser/media/connected_active_server_inverse.svg

@@ -0,0 +1 @@
+<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"><defs><style>.cls-1{fill:#fff;}.cls-2{fill:#3bb44a;}</style></defs><title>connected_active_server_inverse_16x16</title><path class="cls-1" d="M1.29.07V16h9.59a3.31,3.31,0,0,1-1.94-1H2.29V11h6a3.31,3.31,0,0,1,.54-.8A1.81,1.81,0,0,1,9,10H2.29v-9h8.53v8a3.68,3.68,0,0,1,.58,0l.39,0h0v-9Z"/><path class="cls-1" d="M3.3,1.8V4.25H5.75V1.8Zm2,2H3.8V2.3H5.25Z"/><circle class="cls-2" cx="11.24" cy="12.52" r="3.47"/></svg>

src/sql/workbench/parts/objectExplorer/browser/media/serverGroupDialog.css

@@ -9,9 +9,9 @@
 }
 
 .group-color-options .server-group-color {
-    flex: 1 1 auto;
+	flex: 1 1 auto;
 	height: 20px;
-    margin: 5px;
+	margin: 5px;
 }
 
 .server-group-dialog {

src/sql/workbench/parts/objectExplorer/browser/objectExplorerActions.ts

@@ -3,7 +3,6 @@
  *  Licensed under the Source EULA. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-'use strict';
 import { localize } from 'vs/nls';
 import { Action } from 'vs/base/common/actions';
 import { ITree } from 'vs/base/parts/tree/browser/tree';
@@ -12,14 +11,14 @@ import { ICommandService } from 'vs/platform/commands/common/commands';
 
 import * as azdata from 'azdata';
 import { IConnectionManagementService, IConnectionCompletionOptions } from 'sql/platform/connection/common/connectionManagement';
-import { TreeNode } from 'sql/parts/objectExplorer/common/treeNode';
+import { TreeNode } from 'sql/workbench/parts/objectExplorer/common/treeNode';
 import {
 	ScriptSelectAction, EditDataAction, ScriptCreateAction,
 	ScriptExecuteAction, ScriptDeleteAction, ScriptAlterAction
 } from 'sql/workbench/common/actions';
-import { NodeType } from 'sql/parts/objectExplorer/common/nodeType';
+import { NodeType } from 'sql/workbench/parts/objectExplorer/common/nodeType';
-import { TreeUpdateUtils } from 'sql/parts/objectExplorer/viewlet/treeUpdateUtils';
+import { TreeUpdateUtils } from 'sql/workbench/parts/objectExplorer/browser/treeUpdateUtils';
-import { TreeSelectionHandler } from 'sql/parts/objectExplorer/viewlet/treeSelectionHandler';
+import { TreeSelectionHandler } from 'sql/workbench/parts/objectExplorer/browser/treeSelectionHandler';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 import { IScriptingService } from 'sql/platform/scripting/common/scriptingService';
 import { IQueryEditorService } from 'sql/workbench/services/queryEditor/common/queryEditorService';

src/sql/workbench/parts/objectExplorer/browser/recentConnectionDataSource.ts

@@ -3,7 +3,6 @@
  *  Licensed under the Source EULA. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-'use strict';
 import { ConnectionProfileGroup } from 'sql/platform/connection/common/connectionProfileGroup';
 import { ConnectionProfile } from 'sql/platform/connection/common/connectionProfile';
 import { ITree, IDataSource } from 'vs/base/parts/tree/browser/tree';

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

@@ -22,7 +22,7 @@ import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
 import { Button } from 'sql/base/browser/ui/button/button';
 import { Modal } from 'sql/workbench/browser/modal/modal';
 import { InputBox } from 'sql/base/browser/ui/inputBox/inputBox';
-import { ServerGroupViewModel } from 'sql/parts/objectExplorer/serverGroupDialog/serverGroupViewModel';
+import { ServerGroupViewModel } from 'sql/workbench/parts/objectExplorer/common/serverGroupViewModel';
 import { attachButtonStyler, attachModalDialogStyler } from 'sql/platform/theme/common/styler';
 import * as TelemetryKeys from 'sql/platform/telemetry/telemetryKeys';
 import { IClipboardService } from 'sql/platform/clipboard/common/clipboardService';

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

@@ -3,7 +3,6 @@
  *  Licensed under the Source EULA. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-'use strict';
 import { ITree } from 'vs/base/parts/tree/browser/tree';
 import { ContributableActionProvider } from 'vs/workbench/browser/actions';
 import { IAction } from 'vs/base/common/actions';
@@ -14,21 +13,21 @@ import { fillInActions } from 'vs/platform/actions/browser/menuItemActionItem';
 import {
 	DisconnectConnectionAction, AddServerAction,
 	DeleteConnectionAction, RefreshAction, EditServerGroupAction
-} from 'sql/parts/objectExplorer/viewlet/connectionTreeAction';
+} from 'sql/workbench/parts/objectExplorer/browser/connectionTreeAction';
 import {
 	ObjectExplorerActionUtilities, ManageConnectionAction, OEAction
-} from 'sql/parts/objectExplorer/viewlet/objectExplorerActions';
+} from 'sql/workbench/parts/objectExplorer/browser/objectExplorerActions';
-import { TreeNode } from 'sql/parts/objectExplorer/common/treeNode';
+import { TreeNode } from 'sql/workbench/parts/objectExplorer/common/treeNode';
-import { NodeType } from 'sql/parts/objectExplorer/common/nodeType';
+import { NodeType } from 'sql/workbench/parts/objectExplorer/common/nodeType';
 import { ConnectionProfileGroup } from 'sql/platform/connection/common/connectionProfileGroup';
 import { ConnectionProfile } from 'sql/platform/connection/common/connectionProfile';
-import { TreeUpdateUtils } from 'sql/parts/objectExplorer/viewlet/treeUpdateUtils';
+import { TreeUpdateUtils } from 'sql/workbench/parts/objectExplorer/browser/treeUpdateUtils';
 import { IConnectionManagementService } from 'sql/platform/connection/common/connectionManagement';
 import { MenuId, IMenuService } from 'vs/platform/actions/common/actions';
 import { NewQueryAction, BackupAction, RestoreAction } from 'sql/workbench/common/actions';
 import { ConnectionContextKey } from 'sql/workbench/parts/connection/common/connectionContextKey';
 import { IContextMenuService } from 'vs/platform/contextview/browser/contextView';
-import { TreeNodeContextKey } from 'sql/parts/objectExplorer/viewlet/treeNodeContextKey';
+import { TreeNodeContextKey } from 'sql/workbench/parts/objectExplorer/common/treeNodeContextKey';
 import { IQueryManagementService } from 'sql/platform/query/common/queryManagement';
 import { IScriptingService } from 'sql/platform/scripting/common/scriptingService';
 import { ServerInfoContextKey } from 'sql/workbench/parts/connection/common/serverInfoContextKey';

src/sql/workbench/parts/objectExplorer/browser/serverTreeController.ts

@@ -3,37 +3,30 @@
  *  Licensed under the Source EULA. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-'use strict';
 import { ITree, ContextMenuEvent } from 'vs/base/parts/tree/browser/tree';
-import treedefaults = require('vs/base/parts/tree/browser/treeDefaults');
+import * as treedefaults from 'vs/base/parts/tree/browser/treeDefaults';
-import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
-import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
 import { IContextMenuService } from 'vs/platform/contextview/browser/contextView';
 import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
 import { IMouseEvent } from 'vs/base/browser/mouseEvent';
 import { IKeyboardEvent } from 'vs/base/browser/keyboardEvent';
-import { ConnectionProfileGroup } from 'sql/platform/connection/common/connectionProfileGroup';
 import { ConnectionProfile } from 'sql/platform/connection/common/connectionProfile';
-import { ServerTreeActionProvider } from 'sql/parts/objectExplorer/viewlet/serverTreeActionProvider';
+import { ServerTreeActionProvider } from 'sql/workbench/parts/objectExplorer/browser/serverTreeActionProvider';
-import { ObjectExplorerActionsContext } from 'sql/parts/objectExplorer/viewlet/objectExplorerActions';
+import { ObjectExplorerActionsContext } from 'sql/workbench/parts/objectExplorer/browser/objectExplorerActions';
-import { TreeNode } from 'sql/parts/objectExplorer/common/treeNode';
+import { TreeNode } from 'sql/workbench/parts/objectExplorer/common/treeNode';
-import { OpenMode } from 'vs/base/parts/tree/browser/treeDefaults';
-import { TreeUpdateUtils } from 'sql/parts/objectExplorer/viewlet/treeUpdateUtils';
 
 /**
  * Extends the tree controller to handle clicks on the tree elements
  */
 export class ServerTreeController extends treedefaults.DefaultController {
 
-	constructor(private actionProvider: ServerTreeActionProvider,
+	constructor(
-		@IEditorService private editorService: IEditorService,
+		private actionProvider: ServerTreeActionProvider,
 		@IContextMenuService private contextMenuService: IContextMenuService,
-		@ITelemetryService private telemetryService: ITelemetryService,
 		@IKeybindingService private keybindingService: IKeybindingService
 	) {
 		super({
 			clickBehavior: treedefaults.ClickBehavior.ON_MOUSE_DOWN,
-			openMode: OpenMode.SINGLE_CLICK
+			openMode: treedefaults.OpenMode.SINGLE_CLICK
 		});
 	}
 

src/sql/workbench/parts/objectExplorer/browser/serverTreeDataSource.ts

@@ -3,13 +3,12 @@
  *  Licensed under the Source EULA. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-'use strict';
 import { ConnectionProfileGroup } from 'sql/platform/connection/common/connectionProfileGroup';
 import { ConnectionProfile } from 'sql/platform/connection/common/connectionProfile';
 import { ITree, IDataSource } from 'vs/base/parts/tree/browser/tree';
-import { TreeNode, TreeItemCollapsibleState } from 'sql/parts/objectExplorer/common/treeNode';
+import { TreeNode, TreeItemCollapsibleState } from 'sql/workbench/parts/objectExplorer/common/treeNode';
 import { IObjectExplorerService } from 'sql/workbench/services/objectExplorer/common/objectExplorerService';
-import { TreeUpdateUtils } from 'sql/parts/objectExplorer/viewlet/treeUpdateUtils';
+import { TreeUpdateUtils } from 'sql/workbench/parts/objectExplorer/browser/treeUpdateUtils';
 import { IConnectionManagementService } from 'sql/platform/connection/common/connectionManagement';
 import Severity from 'vs/base/common/severity';
 import { IErrorMessageService } from 'sql/platform/errorMessage/common/errorMessageService';

src/sql/workbench/parts/objectExplorer/browser/serverTreeRenderer.ts

@@ -3,7 +3,6 @@
  *  Licensed under the Source EULA. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-'use strict';
 import 'vs/css!sql/media/objectTypes/objecttypes';
 import 'vs/css!sql/media/icons/common-icons';
 
@@ -11,13 +10,30 @@ import * as dom from 'vs/base/browser/dom';
 import { localize } from 'vs/nls';
 import { ConnectionProfileGroup } from 'sql/platform/connection/common/connectionProfileGroup';
 import { ConnectionProfile } from 'sql/platform/connection/common/connectionProfile';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 import { ITree, IRenderer } from 'vs/base/parts/tree/browser/tree';
-import { IConnectionProfileGroupTemplateData, IConnectionTemplateData, IObjectExplorerTemplateData } from 'sql/parts/objectExplorer/viewlet/templateData';
 import { IConnectionManagementService } from 'sql/platform/connection/common/connectionManagement';
-import { IContextViewService } from 'vs/platform/contextview/browser/contextView';
+import { TreeNode } from 'sql/workbench/parts/objectExplorer/common/treeNode';
-import { IThemeService } from 'vs/platform/theme/common/themeService';
+import { InputBox } from 'vs/base/browser/ui/inputbox/inputBox';
-import { TreeNode } from 'sql/parts/objectExplorer/common/treeNode';
+
+export interface IConnectionTemplateData {
+	root: HTMLElement;
+	label: HTMLSpanElement;
+	icon: HTMLElement;
+	connectionProfile: ConnectionProfile;
+}
+
+export interface IConnectionProfileGroupTemplateData {
+	root: HTMLElement;
+	name: HTMLSpanElement;
+	inputBox: InputBox;
+}
+
+export interface IObjectExplorerTemplateData {
+	root: HTMLElement;
+	label: HTMLSpanElement;
+	icon: HTMLElement;
+	treeNode: TreeNode;
+}
 
 /**
  * Renders the tree items.
@@ -38,11 +54,9 @@ export class ServerTreeRenderer implements IRenderer {
 	 */
 	private _isCompact: boolean = false;
 
-	constructor(isCompact: boolean,
+	constructor(
-		@IInstantiationService private _instantiationService: IInstantiationService,
+		isCompact: boolean,
-		@IContextViewService private _contextViewService: IContextViewService,
+		@IConnectionManagementService private _connectionManagementService: IConnectionManagementService
-		@IConnectionManagementService private _connectionManagementService: IConnectionManagementService,
-		@IThemeService private _themeService: IThemeService
 	) {
 		// isCompact defaults to false unless explicitly set by instantiation call.
 		if (isCompact) {

src/sql/workbench/parts/objectExplorer/browser/serverTreeView.ts

@@ -19,19 +19,19 @@ import { append, $, hide, show } from 'vs/base/browser/dom';
 import { ConnectionProfileGroup } from 'sql/platform/connection/common/connectionProfileGroup';
 import { ConnectionProfile } from 'sql/platform/connection/common/connectionProfile';
 import * as ConnectionUtils from 'sql/platform/connection/common/utils';
-import { ActiveConnectionsFilterAction } from 'sql/parts/objectExplorer/viewlet/connectionTreeAction';
+import { ActiveConnectionsFilterAction } from 'sql/workbench/parts/objectExplorer/browser/connectionTreeAction';
 import { IConnectionManagementService } from 'sql/platform/connection/common/connectionManagement';
-import { TreeCreationUtils } from 'sql/parts/objectExplorer/viewlet/treeCreationUtils';
+import { TreeCreationUtils } from 'sql/workbench/parts/objectExplorer/browser/treeCreationUtils';
-import { TreeUpdateUtils } from 'sql/parts/objectExplorer/viewlet/treeUpdateUtils';
+import { TreeUpdateUtils } from 'sql/workbench/parts/objectExplorer/browser/treeUpdateUtils';
-import { TreeSelectionHandler } from 'sql/parts/objectExplorer/viewlet/treeSelectionHandler';
+import { TreeSelectionHandler } from 'sql/workbench/parts/objectExplorer/browser/treeSelectionHandler';
 import { IObjectExplorerService } from 'sql/workbench/services/objectExplorer/common/objectExplorerService';
 import { IConnectionProfile } from 'sql/platform/connection/common/interfaces';
 import { Button } from 'sql/base/browser/ui/button/button';
 import { attachButtonStyler } from 'sql/platform/theme/common/styler';
-import { TreeNode, TreeItemCollapsibleState } from 'sql/parts/objectExplorer/common/treeNode';
+import { TreeNode, TreeItemCollapsibleState } from 'sql/workbench/parts/objectExplorer/common/treeNode';
-import { SERVER_GROUP_CONFIG, SERVER_GROUP_AUTOEXPAND_CONFIG } from 'sql/parts/objectExplorer/serverGroupDialog/serverGroup.contribution';
+import { SERVER_GROUP_CONFIG, SERVER_GROUP_AUTOEXPAND_CONFIG } from 'sql/workbench/parts/objectExplorer/common/serverGroup.contribution';
 import { IErrorMessageService } from 'sql/platform/errorMessage/common/errorMessageService';
-import { ServerTreeActionProvider } from 'sql/parts/objectExplorer/viewlet/serverTreeActionProvider';
+import { ServerTreeActionProvider } from 'sql/workbench/parts/objectExplorer/browser/serverTreeActionProvider';
 import { ICapabilitiesService } from 'sql/platform/capabilities/common/capabilitiesService';
 import { isHidden } from 'sql/base/browser/dom';
 import { CommandsRegistry } from 'vs/platform/commands/common/commands';

src/sql/workbench/parts/objectExplorer/browser/treeCreationUtils.ts

@@ -4,18 +4,18 @@
  *--------------------------------------------------------------------------------------------*/
 
 import 'vs/css!./media/serverTreeActions';
-import nls = require('vs/nls');
+
+import * as nls from 'vs/nls';
 import { Tree } from 'vs/base/parts/tree/browser/treeImpl';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { ServerTreeRenderer } from 'sql/parts/objectExplorer/viewlet/serverTreeRenderer';
+import { ServerTreeRenderer } from 'sql/workbench/parts/objectExplorer/browser/serverTreeRenderer';
-import { ServerTreeDataSource } from 'sql/parts/objectExplorer/viewlet/serverTreeDataSource';
+import { ServerTreeDataSource } from 'sql/workbench/parts/objectExplorer/browser/serverTreeDataSource';
-import { ServerTreeController } from 'sql/parts/objectExplorer/viewlet/serverTreeController';
+import { ServerTreeController } from 'sql/workbench/parts/objectExplorer/browser/serverTreeController';
-import { ServerTreeActionProvider } from 'sql/parts/objectExplorer/viewlet/serverTreeActionProvider';
+import { ServerTreeActionProvider } from 'sql/workbench/parts/objectExplorer/browser/serverTreeActionProvider';
 import { DefaultFilter, DefaultAccessibilityProvider, DefaultController } from 'vs/base/parts/tree/browser/treeDefaults';
 import { IController } from 'vs/base/parts/tree/browser/tree';
-import { ServerTreeDragAndDrop, RecentConnectionsDragAndDrop } from 'sql/parts/objectExplorer/viewlet/dragAndDropController';
+import { ServerTreeDragAndDrop, RecentConnectionsDragAndDrop } from 'sql/workbench/parts/objectExplorer/browser/dragAndDropController';
-import { RecentConnectionDataSource } from 'sql/parts/objectExplorer/viewlet/recentConnectionDataSource';
+import { RecentConnectionDataSource } from 'sql/workbench/parts/objectExplorer/browser/recentConnectionDataSource';
-import { ScrollbarVisibility } from 'vs/base/common/scrollable';
 
 export class TreeCreationUtils {
 	/**

src/sql/workbench/parts/objectExplorer/browser/treeSelectionHandler.ts

@@ -9,8 +9,8 @@ import { ConnectionProfile } from 'sql/platform/connection/common/connectionProf
 import { IObjectExplorerService } from 'sql/workbench/services/objectExplorer/common/objectExplorerService';
 
 import { IProgressService, IProgressRunner } from 'vs/platform/progress/common/progress';
-import { TreeNode } from 'sql/parts/objectExplorer/common/treeNode';
+import { TreeNode } from 'sql/workbench/parts/objectExplorer/common/treeNode';
-import { TreeUpdateUtils } from 'sql/parts/objectExplorer/viewlet/treeUpdateUtils';
+import { TreeUpdateUtils } from 'sql/workbench/parts/objectExplorer/browser/treeUpdateUtils';
 
 export class TreeSelectionHandler {
 	progressRunner: IProgressRunner;
@@ -18,7 +18,7 @@ export class TreeSelectionHandler {
 	private _clicks: number = 0;
 	private _doubleClickTimeoutTimer: NodeJS.Timer = undefined;
 
-	constructor( @IProgressService private _progressService: IProgressService) {
+	constructor(@IProgressService private _progressService: IProgressService) {
 
 	}
 

src/sql/workbench/parts/objectExplorer/browser/treeUpdateUtils.ts

@@ -8,13 +8,12 @@ import { IConnectionManagementService, IConnectionCompletionOptions, IConnection
 import { ITree } from 'vs/base/parts/tree/browser/tree';
 import { ConnectionProfile } from 'sql/platform/connection/common/connectionProfile';
 import { IObjectExplorerService } from 'sql/workbench/services/objectExplorer/common/objectExplorerService';
-import { NodeType } from 'sql/parts/objectExplorer/common/nodeType';
+import { NodeType } from 'sql/workbench/parts/objectExplorer/common/nodeType';
 
-import { TreeNode } from 'sql/parts/objectExplorer/common/treeNode';
+import { TreeNode } from 'sql/workbench/parts/objectExplorer/common/treeNode';
-import errors = require('vs/base/common/errors');
+import * as errors from 'vs/base/common/errors';
 import { IConnectionProfile } from 'sql/platform/connection/common/interfaces';
 
-
 export interface IExpandableTree extends ITree {
 	// {{SQL CARBON EDIT }}	- add back deleted VS Code tree methods
 	/**

src/sql/workbench/parts/objectExplorer/common/nodeType.ts

@@ -2,7 +2,6 @@
  *  Copyright (c) Microsoft Corporation. All rights reserved.
  *  Licensed under the Source EULA. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
-'use strict';
 
 export class NodeType {
 	public static Folder = 'Folder';

src/sql/workbench/parts/objectExplorer/common/objectExplorerViewTreeShim.ts

@@ -2,10 +2,9 @@
  *  Copyright (c) Microsoft Corporation. All rights reserved.
  *  Licensed under the Source EULA. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
-'use strict';
 
 import { Deferred } from 'sql/base/common/promise';
-import { TreeNode } from 'sql/parts/objectExplorer/common/treeNode';
+import { TreeNode } from 'sql/workbench/parts/objectExplorer/common/treeNode';
 import { ICapabilitiesService } from 'sql/platform/capabilities/common/capabilitiesService';
 import { ConnectionType, IConnectionManagementService } from 'sql/platform/connection/common/connectionManagement';
 import { ConnectionProfile } from 'sql/platform/connection/common/connectionProfile';

src/sql/workbench/parts/objectExplorer/common/serverGroup.contribution.ts

@@ -2,6 +2,7 @@
  *  Copyright (c) Microsoft Corporation. All rights reserved.
  *  Licensed under the Source EULA. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
+
 import { IConfigurationRegistry, Extensions, IConfigurationNode } from 'vs/platform/configuration/common/configurationRegistry';
 import { Registry } from 'vs/platform/registry/common/platform';
 import { IJSONSchema } from 'vs/base/common/jsonSchema';

src/sql/workbench/parts/objectExplorer/common/serverGroupViewModel.ts

@@ -3,7 +3,6 @@
  *  Licensed under the Source EULA. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-'use strict';
 import { IConnectionProfileGroup } from 'sql/platform/connection/common/connectionProfileGroup';
 
 import * as TypeChecker from 'vs/base/common/types';

src/sql/workbench/parts/objectExplorer/common/treeNode.ts

@@ -3,10 +3,8 @@
 *  Licensed under the Source EULA. See License.txt in the project root for license information.
 *--------------------------------------------------------------------------------------------*/
 
-'use strict';
-
 import { ConnectionProfile } from 'sql/platform/connection/common/connectionProfile';
-import { NodeType, SqlThemeIcon } from 'sql/parts/objectExplorer/common/nodeType';
+import { NodeType, SqlThemeIcon } from 'sql/workbench/parts/objectExplorer/common/nodeType';
 import * as azdata from 'sqlops';
 
 import * as UUID from 'vs/base/common/uuid';

src/sql/workbench/parts/objectExplorer/common/treeNodeContextKey.ts

@@ -3,11 +3,8 @@
  *  Licensed under the Source EULA. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-'use strict';
-
 import { RawContextKey, IContextKeyService, IContextKey } from 'vs/platform/contextkey/common/contextkey';
-import { IConnectionProfile } from 'azdata';
+import { TreeNode } from 'sql/workbench/parts/objectExplorer/common/treeNode';
-import { TreeNode } from 'sql/parts/objectExplorer/common/treeNode';
 
 export class TreeNodeContextKey implements IContextKey<TreeNode> {
 

src/sql/workbench/parts/queryPlan/browser/topOperations.ts

@@ -2,14 +2,13 @@
  *  Copyright (c) Microsoft Corporation. All rights reserved.
  *  Licensed under the Source EULA. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
-'use strict';
 
 import { Dimension } from 'vs/base/browser/dom';
 import { localize } from 'vs/nls';
 import { dispose, IDisposable } from 'vs/base/common/lifecycle';
 
 import { Table } from 'sql/base/browser/ui/table/table';
-import { PlanXmlParser } from 'sql/parts/queryPlan/planXmlParser';
+import { PlanXmlParser } from 'sql/workbench/parts/queryPlan/common/planXmlParser';
 import { IPanelView, IPanelTab } from 'sql/base/browser/ui/panel/panel';
 import { IThemeService } from 'vs/platform/theme/common/themeService';
 import { attachTableStyler } from 'sql/platform/theme/common/styler';

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

@@ -8,7 +8,7 @@ import { APP_BASE_HREF, CommonModule } from '@angular/common';
 import { BrowserModule } from '@angular/platform-browser';
 
 import { IBootstrapParams, ISelector, providerIterator } from 'sql/platform/bootstrap/node/bootstrapService';
-import { QueryPlanComponent } from 'sql/parts/queryPlan/queryPlan.component';
+import { QueryPlanComponent } from 'sql/workbench/parts/queryPlan/electron-browser/queryPlan.component';
 
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 

src/sql/workbench/parts/queryPlan/electron-browser/queryPlan.ts

@@ -2,7 +2,6 @@
  *  Copyright (c) Microsoft Corporation. All rights reserved.
  *  Licensed under the Source EULA. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
-'use strict';
 
 import * as QP from 'html-query-plan';
 
@@ -10,7 +9,7 @@ import { IPanelView, IPanelTab } from 'sql/base/browser/ui/panel/panel';
 
 import { Dimension, clearNode } from 'vs/base/browser/dom';
 import { localize } from 'vs/nls';
-import { dispose, Disposable } from 'vs/base/common/lifecycle';
+import { dispose } from 'vs/base/common/lifecycle';
 
 export class QueryPlanState {
 	xml: string;

src/sql/workbench/parts/queryPlan/electron-browser/queryPlanEditor.ts

@@ -10,20 +10,18 @@ import { BaseEditor } from 'vs/workbench/browser/parts/editor/baseEditor';
 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 { QueryPlanInput } from 'sql/parts/queryPlan/queryPlanInput';
+import { QueryPlanInput } from 'sql/workbench/parts/queryPlan/common/queryPlanInput';
-import { QueryPlanModule } from 'sql/parts/queryPlan/queryPlan.module';
+import { QueryPlanModule } from 'sql/workbench/parts/queryPlan/electron-browser/queryPlan.module';
 import { IConnectionManagementService } from 'sql/platform/connection/common/connectionManagement';
 import { IMetadataService } from 'sql/platform/metadata/common/metadataService';
 import { IScriptingService } from 'sql/platform/scripting/common/scriptingService';
 import { IQueryEditorService } from 'sql/workbench/services/queryEditor/common/queryEditorService';
 import { bootstrapAngular } from 'sql/platform/bootstrap/node/bootstrapService';
 import { IQueryPlanParams } from 'sql/platform/bootstrap/node/bootstrapParams';
-import { QUERYPLAN_SELECTOR } from 'sql/parts/queryPlan/queryPlan.component';
+import { QUERYPLAN_SELECTOR } from 'sql/workbench/parts/queryPlan/electron-browser/queryPlan.component';
 import { CancellationToken } from 'vs/base/common/cancellation';
 import { IStorageService } from 'vs/platform/storage/common/storage';
 
-declare let QP;
-
 export class QueryPlanEditor extends BaseEditor {
 
 	public static ID: string = 'workbench.editor.queryplan';

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

@@ -3,21 +3,19 @@
  *  Licensed under the Source EULA. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import nls = require('vs/nls');
 import 'vs/css!sql/media/actionBarLabel';
 import { KeyMod, KeyCode } from 'vs/base/common/keyCodes';
 import { localize } from 'vs/nls';
 import { SyncActionDescriptor, MenuRegistry, MenuId } from 'vs/platform/actions/common/actions';
 import { ViewletRegistry, Extensions as ViewletExtensions, ViewletDescriptor } from 'vs/workbench/browser/viewlet';
 import { IWorkbenchActionRegistry, Extensions as ActionExtensions } from 'vs/workbench/common/actions';
-import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
 import { IViewlet } from 'vs/workbench/common/viewlet';
 import { IViewletService } from 'vs/workbench/services/viewlet/browser/viewlet';
 import { Registry } from 'vs/platform/registry/common/platform';
 import { Extensions, IConfigurationRegistry } from 'vs/platform/configuration/common/configurationRegistry';
-import { VIEWLET_ID, TaskHistoryViewlet } from 'sql/parts/taskHistory/viewlet/taskHistoryViewlet';
+import { VIEWLET_ID, TaskHistoryViewlet } from 'sql/workbench/parts/taskHistory/browser/taskHistoryViewlet';
-import lifecycle = require('vs/base/common/lifecycle');
+import * as lifecycle from 'vs/base/common/lifecycle';
-import ext = require('vs/workbench/common/contributions');
+import * as ext from 'vs/workbench/common/contributions';
 import { ITaskService } from 'sql/platform/taskHistory/common/taskService';
 import { IActivityService, NumberBadge } from 'vs/workbench/services/activity/common/activity';
 import { LifecyclePhase } from 'vs/platform/lifecycle/common/lifecycle';
@@ -76,7 +74,7 @@ export class StatusUpdater implements ext.IWorkbenchContribution {
 // Viewlet Action
 export class TaskHistoryViewletAction extends ToggleViewletAction {
 	public static ID = VIEWLET_ID;
-	public static LABEL = nls.localize({ key: 'showTaskHistory', comment: ['Show Task History'] }, 'Show Task History');
+	public static LABEL = localize({ key: 'showTaskHistory', comment: ['Show Task History'] }, 'Show Task History');
 
 	constructor(
 		id: string,

src/sql/workbench/parts/taskHistory/browser/taskHistoryActionProvider.ts

@@ -3,13 +3,12 @@
  *  Licensed under the Source EULA. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-'use strict';
 import { ITree } from 'vs/base/parts/tree/browser/tree';
 import { ContributableActionProvider } from 'vs/workbench/browser/actions';
 import { IAction } from 'vs/base/common/actions';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { TaskNode, TaskStatus, TaskExecutionMode } from 'sql/parts/taskHistory/common/taskNode';
+import { TaskNode, TaskStatus, TaskExecutionMode } from 'sql/workbench/parts/taskHistory/common/taskNode';
-import { CancelAction, ScriptAction } from 'sql/parts/taskHistory/viewlet/taskAction';
+import { CancelAction, ScriptAction } from 'sql/workbench/parts/taskHistory/common/taskAction';
 
 /**
  *  Provides actions for the history tasks

src/sql/workbench/parts/taskHistory/browser/taskHistoryController.ts

@@ -3,26 +3,22 @@
  *  Licensed under the Source EULA. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-'use strict';
 import { ITree, ContextMenuEvent } from 'vs/base/parts/tree/browser/tree';
-import treedefaults = require('vs/base/parts/tree/browser/treeDefaults');
+import * as treedefaults from 'vs/base/parts/tree/browser/treeDefaults';
-import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
-import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
 import { IContextMenuService } from 'vs/platform/contextview/browser/contextView';
 import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
 import { IMouseEvent } from 'vs/base/browser/mouseEvent';
 import { IKeyboardEvent } from 'vs/base/browser/keyboardEvent';
-import { TaskHistoryActionProvider } from 'sql/parts/taskHistory/viewlet/taskHistoryActionProvider';
+import { TaskHistoryActionProvider } from 'sql/workbench/parts/taskHistory/browser/taskHistoryActionProvider';
 
 /**
  * Extends the tree controller to handle clicks on the tree elements
  */
 export class TaskHistoryController extends treedefaults.DefaultController {
 
-	constructor(private actionProvider: TaskHistoryActionProvider,
+	constructor(
-		@IEditorService private editorService: IEditorService,
+		private actionProvider: TaskHistoryActionProvider,
 		@IContextMenuService private contextMenuService: IContextMenuService,
-		@ITelemetryService private telemetryService: ITelemetryService,
 		@IKeybindingService private keybindingService: IKeybindingService
 	) {
 		super({ clickBehavior: treedefaults.ClickBehavior.ON_MOUSE_DOWN });

src/sql/workbench/parts/taskHistory/browser/taskHistoryDataSource.ts

@@ -3,10 +3,8 @@
  *  Licensed under the Source EULA. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-'use strict';
-
 import { ITree, IDataSource } from 'vs/base/parts/tree/browser/tree';
-import { TaskNode } from 'sql/parts/taskHistory/common/taskNode';
+import { TaskNode } from 'sql/workbench/parts/taskHistory/common/taskNode';
 
 /**
  * Implements the DataSource(that returns a parent/children of an element) for the task history

src/sql/workbench/parts/taskHistory/browser/taskHistoryRenderer.ts

@@ -3,15 +3,22 @@
  *  Licensed under the Source EULA. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-'use strict';
-import { $ } from 'vs/base/browser/dom';
 import { ITree, IRenderer } from 'vs/base/parts/tree/browser/tree';
-import { ITaskHistoryTemplateData } from 'sql/parts/taskHistory/viewlet/templateData';
+import { TaskNode, TaskStatus } from 'sql/workbench/parts/taskHistory/common/taskNode';
-import { TaskNode, TaskStatus } from 'sql/parts/taskHistory/common/taskNode';
+import * as dom from 'vs/base/browser/dom';
-import dom = require('vs/base/browser/dom');
 import { localize } from 'vs/nls';
 import * as Utils from 'sql/platform/connection/common/utils';
 
+const $ = dom.$;
+
+export interface ITaskHistoryTemplateData {
+	root: HTMLElement;
+	icon: HTMLElement;
+	title: HTMLSpanElement;
+	description: HTMLSpanElement;
+	time: HTMLSpanElement;
+}
+
 /**
  * Renders the tree items.
  * Uses the dom template to render task history.

src/sql/workbench/parts/taskHistory/browser/taskHistoryView.ts

@@ -3,8 +3,7 @@
  *  Licensed under the Source EULA. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import nls = require('vs/nls');
+import * as errors from 'vs/base/common/errors';
-import errors = require('vs/base/common/errors');
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 import Severity from 'vs/base/common/severity';
 import { Tree } from 'vs/base/parts/tree/browser/treeImpl';
@@ -16,14 +15,14 @@ import { DefaultFilter, DefaultDragAndDrop, DefaultAccessibilityProvider } from
 import { localize } from 'vs/nls';
 import { hide, $, append } from 'vs/base/browser/dom';
 
-import { TaskHistoryRenderer } from 'sql/parts/taskHistory/viewlet/taskHistoryRenderer';
+import { TaskHistoryRenderer } from 'sql/workbench/parts/taskHistory/browser/taskHistoryRenderer';
-import { TaskHistoryDataSource } from 'sql/parts/taskHistory/viewlet/taskHistoryDataSource';
+import { TaskHistoryDataSource } from 'sql/workbench/parts/taskHistory/browser/taskHistoryDataSource';
-import { TaskHistoryController } from 'sql/parts/taskHistory/viewlet/taskHistoryController';
+import { TaskHistoryController } from 'sql/workbench/parts/taskHistory/browser/taskHistoryController';
-import { TaskHistoryActionProvider } from 'sql/parts/taskHistory/viewlet/taskHistoryActionProvider';
+import { TaskHistoryActionProvider } from 'sql/workbench/parts/taskHistory/browser/taskHistoryActionProvider';
 import { ITaskService } from 'sql/platform/taskHistory/common/taskService';
-import { TaskNode, TaskStatus } from 'sql/parts/taskHistory/common/taskNode';
+import { TaskNode, TaskStatus } from 'sql/workbench/parts/taskHistory/common/taskNode';
 import { IErrorMessageService } from 'sql/platform/errorMessage/common/errorMessageService';
-import { IExpandableTree } from 'sql/parts/objectExplorer/viewlet/treeUpdateUtils';
+import { IExpandableTree } from 'sql/workbench/parts/objectExplorer/browser/treeUpdateUtils';
 
 /**
  * TaskHistoryView implements the dynamic tree view.
@@ -93,7 +92,7 @@ export class TaskHistoryView {
 		}, {
 				indentPixels: 10,
 				twistiePixels: 20,
-				ariaLabel: nls.localize({ key: 'taskHistory.regTreeAriaLabel', comment: ['TaskHistory'] }, 'Task history')
+				ariaLabel: localize({ key: 'taskHistory.regTreeAriaLabel', comment: ['TaskHistory'] }, 'Task history')
 			});
 	}
 
@@ -144,7 +143,7 @@ export class TaskHistoryView {
 			if (isDoubleClick) {
 				if (task.status === TaskStatus.Failed) {
 					var err = task.taskName + ': ' + task.message;
-					this._errorMessageService.showDialog(Severity.Error, nls.localize('taskError', 'Task error'), err);
+					this._errorMessageService.showDialog(Severity.Error, localize('taskError', 'Task error'), err);
 				}
 			}
 		}

src/sql/workbench/parts/taskHistory/browser/taskHistoryViewlet.ts

@@ -3,19 +3,16 @@
  *  Licensed under the Source EULA. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-'use strict';
 import 'vs/css!sql/media/icons/common-icons';
 import 'vs/css!./media/taskHistoryViewlet';
 import { Viewlet } from 'vs/workbench/browser/viewlet';
-import { IViewletService } from 'vs/workbench/services/viewlet/browser/viewlet';
 import { toggleClass, Dimension } from 'vs/base/browser/dom';
 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 { isPromiseCanceledError } from 'vs/base/common/errors';
 import Severity from 'vs/base/common/severity';
-import { IConnectionManagementService } from 'sql/platform/connection/common/connectionManagement';
+import { TaskHistoryView } from 'sql/workbench/parts/taskHistory/browser/taskHistoryView';
-import { TaskHistoryView } from 'sql/parts/taskHistory/viewlet/taskHistoryView';
 import { IDisposable, dispose } from 'vs/base/common/lifecycle';
 import { INotificationService } from 'vs/platform/notification/common/notification';
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';

src/sql/workbench/parts/taskHistory/common/taskAction.ts

@@ -6,7 +6,7 @@
 import { localize } from 'vs/nls';
 import { Action } from 'vs/base/common/actions';
 import { ITaskService } from 'sql/platform/taskHistory/common/taskService';
-import { TaskNode } from 'sql/parts/taskHistory/common/taskNode';
+import { TaskNode } from 'sql/workbench/parts/taskHistory/common/taskNode';
 import { IQueryEditorService } from 'sql/workbench/services/queryEditor/common/queryEditorService';
 import Severity from 'vs/base/common/severity';
 import { IErrorMessageService } from 'sql/platform/errorMessage/common/errorMessageService';

src/sql/workbench/parts/taskHistory/common/taskNode.ts

@@ -2,7 +2,7 @@
 *  Copyright (c) Microsoft Corporation. All rights reserved.
 *  Licensed under the Source EULA. See License.txt in the project root for license information.
 *--------------------------------------------------------------------------------------------*/
-'use strict';
+
 import { StopWatch } from 'vs/base/common/stopwatch';
 import { generateUuid } from 'vs/base/common/uuid';
 
@@ -70,13 +70,13 @@ export class TaskNode {
 	public hasChildren: boolean;
 
 	/**
- 	 * Children of this node
+	 * Children of this node
- 	 */
+	 */
 	public children: TaskNode[];
 
 	/**
- 	 * Task's message
+	 * Task's message
- 	 */
+	 */
 	public message: string;
 
 	/**

src/sql/workbench/services/connection/browser/connectionDialogWidget.ts

@@ -11,8 +11,8 @@ import { IConnectionProfile } from 'sql/platform/connection/common/interfaces';
 import { Modal } from 'sql/workbench/browser/modal/modal';
 import { IConnectionManagementService, INewConnectionParams } from 'sql/platform/connection/common/connectionManagement';
 import * as DialogHelper from 'sql/workbench/browser/modal/dialogHelper';
-import { TreeCreationUtils } from 'sql/parts/objectExplorer/viewlet/treeCreationUtils';
+import { TreeCreationUtils } from 'sql/workbench/parts/objectExplorer/browser/treeCreationUtils';
-import { TreeUpdateUtils, IExpandableTree } from 'sql/parts/objectExplorer/viewlet/treeUpdateUtils';
+import { TreeUpdateUtils, IExpandableTree } from 'sql/workbench/parts/objectExplorer/browser/treeUpdateUtils';
 import { ConnectionProfile } from 'sql/platform/connection/common/connectionProfile';
 import { TabbedPanel, PanelTabIdentifier } from 'sql/base/browser/ui/panel/panel';
 import { RecentConnectionTreeController, RecentConnectionActionsProvider } from 'sql/workbench/parts/connection/browser/recentConnectionTreeController';

src/sql/workbench/services/fileBrowser/browser/fileBrowserTreeView.ts

@@ -18,7 +18,7 @@ import { IInstantiationService } from 'vs/platform/instantiation/common/instanti
 import { attachListStyler } from 'vs/platform/theme/common/styler';
 import { IThemeService } from 'vs/platform/theme/common/themeService';
 import { ITree } from 'vs/base/parts/tree/browser/tree';
-import { IExpandableTree } from 'sql/parts/objectExplorer/viewlet/treeUpdateUtils';
+import { IExpandableTree } from 'sql/workbench/parts/objectExplorer/browser/treeUpdateUtils';
 
 /**
  * Implements tree view for file browser

src/sql/workbench/services/objectExplorer/common/objectExplorerService.ts

@@ -4,8 +4,8 @@
  *--------------------------------------------------------------------------------------------*/
 'use strict';
 
-import { NodeType } from 'sql/parts/objectExplorer/common/nodeType';
+import { NodeType } from 'sql/workbench/parts/objectExplorer/common/nodeType';
-import { TreeNode, TreeItemCollapsibleState } from 'sql/parts/objectExplorer/common/treeNode';
+import { TreeNode, TreeItemCollapsibleState } from 'sql/workbench/parts/objectExplorer/common/treeNode';
 import { ConnectionProfile } from 'sql/platform/connection/common/connectionProfile';
 import { IDisposable, dispose } from 'vs/base/common/lifecycle';
 import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
@@ -18,7 +18,7 @@ import * as TelemetryKeys from 'sql/platform/telemetry/telemetryKeys';
 import * as TelemetryUtils from 'sql/platform/telemetry/telemetryUtilities';
 import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
 import { warn, error } from 'sql/base/common/log';
-import { ServerTreeView } from 'sql/parts/objectExplorer/viewlet/serverTreeView';
+import { ServerTreeView } from 'sql/workbench/parts/objectExplorer/browser/serverTreeView';
 import { ICapabilitiesService } from 'sql/platform/capabilities/common/capabilitiesService';
 import * as Utils from 'sql/platform/connection/common/utils';
 import { entries } from 'sql/base/common/objects';

src/sql/workbench/services/queryEditor/browser/queryEditorService.ts

@@ -8,7 +8,7 @@ import { QueryInput } from 'sql/parts/query/common/queryInput';
 import { EditDataInput } from 'sql/parts/editData/common/editDataInput';
 import { IConnectableInput, IConnectionManagementService } from 'sql/platform/connection/common/connectionManagement';
 import { IQueryEditorService, IQueryEditorOptions } from 'sql/workbench/services/queryEditor/common/queryEditorService';
-import { QueryPlanInput } from 'sql/parts/queryPlan/queryPlanInput';
+import { QueryPlanInput } from 'sql/workbench/parts/queryPlan/common/queryPlanInput';
 import { sqlModeId, untitledFilePrefix, getSupportedInputResource } from 'sql/parts/common/customInputConverter';
 import * as TaskUtilities from 'sql/workbench/common/taskUtilities';
 

src/sql/workbench/services/serverGroup/browser/serverGroupController.ts

@@ -8,12 +8,12 @@ import Severity from 'vs/base/common/severity';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
 
-import { SERVER_GROUP_CONFIG, SERVER_GROUP_COLORS_CONFIG } from 'sql/parts/objectExplorer/serverGroupDialog/serverGroup.contribution';
+import { SERVER_GROUP_CONFIG, SERVER_GROUP_COLORS_CONFIG } from 'sql/workbench/parts/objectExplorer/common/serverGroup.contribution';
 import { IErrorMessageService } from 'sql/platform/errorMessage/common/errorMessageService';
 import { IServerGroupController, IServerGroupDialogCallbacks } from 'sql/platform/serverGroup/common/serverGroupController';
 import { IConnectionManagementService } from 'sql/platform/connection/common/connectionManagement';
-import { ServerGroupDialog } from 'sql/parts/objectExplorer/serverGroupDialog/serverGroupDialog';
+import { ServerGroupDialog } from 'sql/workbench/parts/objectExplorer/browser/serverGroupDialog';
-import { ServerGroupViewModel } from 'sql/parts/objectExplorer/serverGroupDialog/serverGroupViewModel';
+import { ServerGroupViewModel } from 'sql/workbench/parts/objectExplorer/common/serverGroupViewModel';
 import { ConnectionProfileGroup, IConnectionProfileGroup } from 'sql/platform/connection/common/connectionProfileGroup';
 
 export class ServerGroupController implements IServerGroupController {

src/sqltest/parts/connection/connectionTreeActions.test.ts

@@ -13,23 +13,23 @@ import {
 	RefreshAction, AddServerAction, DeleteConnectionAction, DisconnectConnectionAction,
 	ActiveConnectionsFilterAction, RecentConnectionsFilterAction
 }
-	from 'sql/parts/objectExplorer/viewlet/connectionTreeAction';
+	from 'sql/workbench/parts/objectExplorer/browser/connectionTreeAction';
 import { TestConnectionManagementService } from 'sqltest/stubs/connectionManagementService.test';
 import { ErrorMessageServiceStub } from 'sqltest/stubs/errorMessageServiceStub';
 import { InstantiationService } from 'vs/platform/instantiation/common/instantiationService';
-import { ServerTreeView } from 'sql/parts/objectExplorer/viewlet/serverTreeView';
+import { ServerTreeView } from 'sql/workbench/parts/objectExplorer/browser/serverTreeView';
 import * as Constants from 'sql/platform/connection/common/constants';
 import * as  LocalizedConstants from 'sql/workbench/parts/connection/common/localizedConstants';
 import { ObjectExplorerService, ObjectExplorerNodeEventArgs } from 'sql/workbench/services/objectExplorer/common/objectExplorerService';
-import { TreeNode } from 'sql/parts/objectExplorer/common/treeNode';
+import { TreeNode } from 'sql/workbench/parts/objectExplorer/common/treeNode';
-import { NodeType } from 'sql/parts/objectExplorer/common/nodeType';
+import { NodeType } from 'sql/workbench/parts/objectExplorer/common/nodeType';
 import { Tree } from 'vs/base/parts/tree/browser/treeImpl';
-import { ServerTreeDataSource } from 'sql/parts/objectExplorer/viewlet/serverTreeDataSource';
+import { ServerTreeDataSource } from 'sql/workbench/parts/objectExplorer/browser/serverTreeDataSource';
 import { Emitter } from 'vs/base/common/event';
 import Severity from 'vs/base/common/severity';
-import { ObjectExplorerActionsContext, ManageConnectionAction } from 'sql/parts/objectExplorer/viewlet/objectExplorerActions';
+import { ObjectExplorerActionsContext, ManageConnectionAction } from 'sql/workbench/parts/objectExplorer/browser/objectExplorerActions';
 import { IConnectionResult, IConnectionParams } from 'sql/platform/connection/common/connectionManagement';
-import { TreeSelectionHandler } from 'sql/parts/objectExplorer/viewlet/treeSelectionHandler';
+import { TreeSelectionHandler } from 'sql/workbench/parts/objectExplorer/browser/treeSelectionHandler';
 import { CapabilitiesTestService } from 'sqltest/stubs/capabilitiesTestService';
 import { $ } from 'vs/base/browser/dom';
 

src/sqltest/parts/connection/objectExplorerService.test.ts

@@ -9,13 +9,13 @@ import { TestConnectionManagementService } from 'sqltest/stubs/connectionManagem
 import { ConnectionProfile } from 'sql/platform/connection/common/connectionProfile';
 import { ConnectionProfileGroup } from 'sql/platform/connection/common/connectionProfileGroup';
 import { ObjectExplorerService, NodeExpandInfoWithProviderId } from 'sql/workbench/services/objectExplorer/common/objectExplorerService';
-import { NodeType } from 'sql/parts/objectExplorer/common/nodeType';
+import { NodeType } from 'sql/workbench/parts/objectExplorer/common/nodeType';
-import { TreeNode, TreeItemCollapsibleState } from 'sql/parts/objectExplorer/common/treeNode';
+import { TreeNode, TreeItemCollapsibleState } from 'sql/workbench/parts/objectExplorer/common/treeNode';
 
 import * as azdata from 'azdata';
 import * as TypeMoq from 'typemoq';
 import * as assert from 'assert';
-import { ServerTreeView } from 'sql/parts/objectExplorer/viewlet/serverTreeView';
+import { ServerTreeView } from 'sql/workbench/parts/objectExplorer/browser/serverTreeView';
 import { ConnectionOptionSpecialType, ServiceOptionType } from 'sql/workbench/api/common/sqlExtHostTypes';
 import { Event, Emitter } from 'vs/base/common/event';
 import { CapabilitiesTestService } from 'sqltest/stubs/capabilitiesTestService';

src/sqltest/parts/registeredServer/viewlet/serverTreeView.test.ts

@@ -6,7 +6,7 @@
 'use strict';
 
 import { IConnectionProfile } from 'sql/platform/connection/common/interfaces';
-import { ServerTreeView } from 'sql/parts/objectExplorer/viewlet/serverTreeView';
+import { ServerTreeView } from 'sql/workbench/parts/objectExplorer/browser/serverTreeView';
 import { ConnectionManagementService } from 'sql/platform/connection/common/connectionManagementService';
 
 import { Tree } from 'vs/base/parts/tree/browser/treeImpl';

src/sqltest/workbench/api/mainThreadBackgroundTaskManagement.test.ts

@@ -11,7 +11,7 @@ import { MainThreadBackgroundTaskManagement, TaskStatus } from 'sql/workbench/ap
 import { ExtHostBackgroundTaskManagementShape } from 'sql/workbench/api/node/sqlExtHost.protocol';
 import { ITaskService } from 'sql/platform/taskHistory/common/taskService';
 import { IExtHostContext } from 'vs/workbench/api/common/extHost.protocol';
-import { TaskNode } from 'sql/parts/taskHistory/common/taskNode';
+import { TaskNode } from 'sql/workbench/parts/taskHistory/common/taskNode';
 import { Emitter } from 'vs/base/common/event';
 
 

src/vs/workbench/contrib/extensions/electron-browser/extensionEditor.ts

@@ -53,7 +53,7 @@ import { isUndefined, withUndefinedAsNull } from 'vs/base/common/types';
 import { IWorkbenchThemeService } from 'vs/workbench/services/themes/common/workbenchThemeService';
 
 // {{SQL CARBON EDIT}}
-import { renderDashboardContributions } from 'sql/parts/extensions/sqlExtensionsHelper';
+import { renderDashboardContributions } from 'sql/workbench/parts/extensions/browser/contributionRenders';
 // {{SQL CARBON EDIT}} - End
 
 function renderBody(body: string): string {

src/vs/workbench/workbench.main.ts

@@ -230,7 +230,7 @@ import { IDashboardService } from 'sql/platform/dashboard/browser/dashboardServi
 import { DashboardService } from 'sql/platform/dashboard/browser/dashboardServiceImpl';
 import { NotebookService } from 'sql/workbench/services/notebook/common/notebookServiceImpl';
 import { INotebookService } from 'sql/workbench/services/notebook/common/notebookService';
-import { OEShimService, IOEShimService } from 'sql/parts/objectExplorer/common/objectExplorerViewTreeShim';
+import { OEShimService, IOEShimService } from 'sql/workbench/parts/objectExplorer/common/objectExplorerViewTreeShim';
 
 registerSingleton(IDashboardService, DashboardService);
 registerSingleton(IDashboardViewService, DashboardViewService);
@@ -438,8 +438,8 @@ import 'vs/workbench/contrib/issue/electron-browser/issue.contribution';
 
 // {{SQL CARBON EDIT}}
 // SQL
-import 'sql/parts/taskHistory/common/taskHistory.contribution';
+import 'sql/workbench/parts/taskHistory/browser/taskHistory.contribution';
-import 'sql/parts/taskHistory/viewlet/taskHistoryViewlet';
+import 'sql/workbench/parts/taskHistory/browser/taskHistoryViewlet';
 
 // data explorer
 import 'sql/workbench/parts/dataExplorer/browser/dataExplorer.contribution';
@@ -454,7 +454,7 @@ import 'sql/parts/query/common/query.contribution';
 import 'sql/parts/query/editor/resultsGridContribution';
 import 'sql/parts/profiler/contrib/profiler.contribution';
 import 'sql/parts/profiler/contrib/profilerActions.contribution';
-import 'sql/parts/objectExplorer/serverGroupDialog/serverGroup.contribution';
+import 'sql/workbench/parts/objectExplorer/common/serverGroup.contribution';
 import 'sql/platform/accounts/browser/accountManagement.contribution';
 
 // dashboard