move code from parts to contrib (#8319)

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

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

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

@@ -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/common/localContentManager';
 import { Deferred } from 'sql/base/common/promise';
-import { FutureInternal } from 'sql/workbench/parts/notebook/browser/models/modelInterfaces';
+import { FutureInternal } from 'sql/workbench/contrib/notebook/browser/models/modelInterfaces';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 
 @extHostNamedCustomer(SqlMainContext.MainThreadNotebook)

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

@@ -20,12 +20,12 @@ import {
 	SqlMainContext, MainThreadNotebookDocumentsAndEditorsShape, SqlExtHostContext, ExtHostNotebookDocumentsAndEditorsShape,
 	INotebookDocumentsAndEditorsDelta, INotebookEditorAddData, INotebookShowOptions, INotebookModelAddedData, INotebookModelChangedData
 } from 'sql/workbench/api/common/sqlExtHost.protocol';
-import { NotebookInput } from 'sql/workbench/parts/notebook/browser/models/notebookInput';
+import { NotebookInput } from 'sql/workbench/contrib/notebook/browser/models/notebookInput';
 import { INotebookService, INotebookEditor } from 'sql/workbench/services/notebook/browser/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/browser/models/modelInterfaces';
-import { NotebookChangeType, CellTypes } from 'sql/workbench/parts/notebook/common/models/contracts';
+import { ICellModel, NotebookContentChange, INotebookModel } from 'sql/workbench/contrib/notebook/browser/models/modelInterfaces';
+import { NotebookChangeType, CellTypes } from 'sql/workbench/contrib/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/mainThreadQueryEditor.ts

@@ -7,7 +7,7 @@ import { SqlExtHostContext, SqlMainContext, ExtHostQueryEditorShape, MainThreadQ
 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';
-import { QueryEditor } from 'sql/workbench/parts/query/browser/queryEditor';
+import { QueryEditor } from 'sql/workbench/contrib/query/browser/queryEditor';
 import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
 import { Disposable } from 'vs/base/common/lifecycle';
 import { IQueryModelService } from 'sql/platform/query/common/queryModel';

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

@@ -13,7 +13,7 @@ import { readonly } from 'vs/base/common/errors';
 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';
-import { HideInputTag } from 'sql/workbench/parts/notebook/browser/models/cell';
+import { HideInputTag } from 'sql/workbench/contrib/notebook/browser/models/cell';
 import { find } from 'vs/base/common/arrays';
 
 export interface INotebookEditOperation {

src/sql/workbench/browser/customInputConverter.ts

@@ -8,11 +8,11 @@ import { IInstantiationService, ServiceIdentifier } from 'vs/platform/instantiat
 import { UntitledEditorInput } from 'vs/workbench/common/editor/untitledEditorInput';
 import { URI } from 'vs/base/common/uri';
 
-import { QueryResultsInput } from 'sql/workbench/parts/query/common/queryResultsInput';
-import { QueryInput } from 'sql/workbench/parts/query/common/queryInput';
+import { QueryResultsInput } from 'sql/workbench/contrib/query/common/queryResultsInput';
+import { QueryInput } from 'sql/workbench/contrib/query/common/queryInput';
 import { IQueryEditorOptions } from 'sql/workbench/services/queryEditor/common/queryEditorService';
-import { QueryPlanInput } from 'sql/workbench/parts/queryPlan/common/queryPlanInput';
-import { NotebookInput } from 'sql/workbench/parts/notebook/browser/models/notebookInput';
+import { QueryPlanInput } from 'sql/workbench/contrib/queryPlan/common/queryPlanInput';
+import { NotebookInput } from 'sql/workbench/contrib/notebook/browser/models/notebookInput';
 import { INotebookService } from 'sql/workbench/services/notebook/browser/notebookService';
 import { ResourceEditorInput } from 'vs/workbench/common/editor/resourceEditorInput';
 import { FileEditorInput } from 'vs/workbench/contrib/files/common/editors/fileEditorInput';

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

@@ -8,7 +8,7 @@ import {
 	ElementRef, OnInit, ChangeDetectorRef, ReflectiveInjector, Injector, ComponentRef
 } from '@angular/core';
 
-import { ComponentHostDirective } from 'sql/workbench/parts/dashboard/browser/core/componentHost.directive';
+import { ComponentHostDirective } from 'sql/workbench/contrib/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/browser/modelComponentRegistry';

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

@@ -46,8 +46,8 @@ import { FuzzyScore, createMatches } from 'vs/base/common/filters';
 import { CollapseAllAction } from 'vs/base/browser/ui/tree/treeDefaults';
 
 import { ITreeItem, ITreeView } from 'sql/workbench/common/views';
-import { IOEShimService } from 'sql/workbench/parts/objectExplorer/browser/objectExplorerViewTreeShim';
-import { NodeContextKey } from 'sql/workbench/parts/dataExplorer/browser/nodeContext';
+import { IOEShimService } from 'sql/workbench/contrib/objectExplorer/browser/objectExplorerViewTreeShim';
+import { NodeContextKey } from 'sql/workbench/contrib/dataExplorer/browser/nodeContext';
 import { UserCancelledConnectionError } from 'sql/base/common/errors';
 import { firstIndex } from 'vs/base/common/arrays';
 

src/sql/workbench/browser/taskUtilities.ts

@@ -9,12 +9,12 @@ import {
 	IConnectionCompletionOptions, ConnectionType,
 	RunQueryOnConnectionMode, IConnectionResult
 } from 'sql/platform/connection/common/connectionManagement';
-import { EditDataInput } from 'sql/workbench/parts/editData/browser/editDataInput';
+import { EditDataInput } from 'sql/workbench/contrib/editData/browser/editDataInput';
 import { IInsightsDialogService } from 'sql/workbench/services/insights/browser/insightsDialogService';
 import { IObjectExplorerService } from 'sql/workbench/services/objectExplorer/browser/objectExplorerService';
-import { QueryInput } from 'sql/workbench/parts/query/common/queryInput';
-import { DashboardInput } from 'sql/workbench/parts/dashboard/browser/dashboardInput';
-import { ProfilerInput } from 'sql/workbench/parts/profiler/browser/profilerInput';
+import { QueryInput } from 'sql/workbench/contrib/query/common/queryInput';
+import { DashboardInput } from 'sql/workbench/contrib/dashboard/browser/dashboardInput';
+import { ProfilerInput } from 'sql/workbench/contrib/profiler/browser/profilerInput';
 
 import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
 import { IInsightsConfig } from 'sql/platform/dashboard/browser/insightRegistry';

src/sql/workbench/common/sqlWorkbenchUtils.ts

@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import * as ConnectionConstants from 'sql/platform/connection/common/constants';
-import { QueryInput } from 'sql/workbench/parts/query/common/queryInput';
+import { QueryInput } from 'sql/workbench/contrib/query/common/queryInput';
 
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
 import { URI } from 'vs/base/common/uri';

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

@@ -28,7 +28,7 @@ import { Modal } from 'sql/workbench/browser/modal/modal';
 import { attachModalDialogStyler, attachButtonStyler, attachPanelStyler } from 'sql/platform/theme/common/styler';
 import { AccountViewModel } from 'sql/platform/accounts/common/accountViewModel';
 import { AddAccountAction } from 'sql/platform/accounts/common/accountActions';
-import { AccountListRenderer, AccountListDelegate } from 'sql/workbench/parts/accounts/browser/accountListRenderer';
+import { AccountListRenderer, AccountListDelegate } from 'sql/workbench/contrib/accounts/browser/accountListRenderer';
 import { AccountProviderAddedEventParams, UpdateAccountListEventParams } from 'sql/platform/accounts/common/eventTypes';
 import { IClipboardService } from 'sql/platform/clipboard/common/clipboardService';
 import * as TelemetryKeys from 'sql/platform/telemetry/common/telemetryKeys';

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

@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import Severity from 'vs/base/common/severity';
-import { AccountDialog } from 'sql/workbench/parts/accounts/browser/accountDialog';
+import { AccountDialog } from 'sql/workbench/contrib/accounts/browser/accountDialog';
 import { localize } from 'vs/nls';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 import { IErrorMessageService } from 'sql/platform/errorMessage/common/errorMessageService';

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

@@ -21,7 +21,7 @@ import * as azdata from 'azdata';
 import { DropdownList } from 'sql/base/browser/ui/dropdownList/dropdownList';
 import { attachDropdownStyler } from 'sql/platform/theme/common/styler';
 import { AddAccountAction, RefreshAccountAction } from 'sql/platform/accounts/common/accountActions';
-import { AccountPickerListRenderer, AccountListDelegate } from 'sql/workbench/parts/accounts/browser/accountListRenderer';
+import { AccountPickerListRenderer, AccountListDelegate } from 'sql/workbench/contrib/accounts/browser/accountListRenderer';
 import { AccountPickerViewModel } from 'sql/platform/accounts/common/accountPickerViewModel';
 import { firstIndex } from 'vs/base/common/arrays';
 

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

@@ -7,8 +7,8 @@ import { IInstantiationService } from 'vs/platform/instantiation/common/instanti
 import { Event, Emitter } from 'vs/base/common/event';
 import * as azdata from 'azdata';
 
-import { IAccountPickerService } from 'sql/workbench/parts/accounts/browser/accountPicker';
-import { AccountPicker } from 'sql/workbench/parts/accounts/browser/accountPickerImpl';
+import { IAccountPickerService } from 'sql/workbench/contrib/accounts/browser/accountPicker';
+import { AccountPicker } from 'sql/workbench/contrib/accounts/browser/accountPickerImpl';
 
 export class AccountPickerService implements IAccountPickerService {
 	_serviceBrand: undefined;

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

@@ -7,7 +7,7 @@ import { IInstantiationService } from 'vs/platform/instantiation/common/instanti
 import Severity from 'vs/base/common/severity';
 import { localize } from 'vs/nls';
 
-import { AutoOAuthDialog } from 'sql/workbench/parts/accounts/browser/autoOAuthDialog';
+import { AutoOAuthDialog } from 'sql/workbench/contrib/accounts/browser/autoOAuthDialog';
 import { IAccountManagementService } from 'sql/platform/accounts/common/interfaces';
 import { IErrorMessageService } from 'sql/platform/errorMessage/common/errorMessageService';
 

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

@@ -24,7 +24,7 @@ import { Modal } from 'sql/workbench/browser/modal/modal';
 import { FirewallRuleViewModel } from 'sql/platform/accounts/common/firewallRuleViewModel';
 import { attachModalDialogStyler, attachButtonStyler } from 'sql/platform/theme/common/styler';
 import { InputBox } from 'sql/base/browser/ui/inputBox/inputBox';
-import { IAccountPickerService } from 'sql/workbench/parts/accounts/browser/accountPicker';
+import { IAccountPickerService } from 'sql/workbench/contrib/accounts/browser/accountPicker';
 import * as TelemetryKeys from 'sql/platform/telemetry/common/telemetryKeys';
 import { ILogService } from 'vs/platform/log/common/log';
 import { IWorkbenchLayoutService } from 'vs/workbench/services/layout/browser/layoutService';

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

@@ -9,7 +9,7 @@ import { localize } from 'vs/nls';
 import * as azdata from 'azdata';
 
 import { IConnectionProfile } from 'sql/platform/connection/common/interfaces';
-import { FirewallRuleDialog } from 'sql/workbench/parts/accounts/browser/firewallRuleDialog';
+import { FirewallRuleDialog } from 'sql/workbench/contrib/accounts/browser/firewallRuleDialog';
 import { IAccountManagementService, AzureResource } from 'sql/platform/accounts/common/interfaces';
 import { IResourceProviderService } from 'sql/workbench/services/resourceProvider/common/resourceProviderService';
 import { Deferred } from 'sql/base/common/promise';

src/sql/workbench/contrib/accounts/test/browser/accountDialogController.test.ts

@@ -6,13 +6,13 @@
 import * as assert from 'assert';
 import * as TypeMoq from 'typemoq';
 import { Emitter } from 'vs/base/common/event';
-import { AccountDialog } from 'sql/workbench/parts/accounts/browser/accountDialog';
-import { AccountDialogController } from 'sql/workbench/parts/accounts/browser/accountDialogController';
+import { AccountDialog } from 'sql/workbench/contrib/accounts/browser/accountDialog';
+import { AccountDialogController } from 'sql/workbench/contrib/accounts/browser/accountDialogController';
 import { AccountViewModel } from 'sql/platform/accounts/common/accountViewModel';
 import { TestAccountManagementService } from 'sql/platform/accounts/test/common/testAccountManagementService';
 import { TestErrorMessageService } from 'sql/platform/errorMessage/test/common/testErrorMessageService';
 import { InstantiationService } from 'vs/platform/instantiation/common/instantiationService';
-import { AccountListRenderer } from 'sql/workbench/parts/accounts/browser/accountListRenderer';
+import { AccountListRenderer } from 'sql/workbench/contrib/accounts/browser/accountListRenderer';
 import { MockContextKeyService } from 'vs/platform/keybinding/test/common/mockKeybindingService';
 
 // TESTS ///////////////////////////////////////////////////////////////////

src/sql/workbench/contrib/accounts/test/browser/accountPickerService.test.ts

@@ -8,8 +8,8 @@ import * as assert from 'assert';
 import * as TypeMoq from 'typemoq';
 import { EventVerifierSingle } from 'sql/base/test/common/event';
 import { Emitter } from 'vs/base/common/event';
-import { AccountPicker } from 'sql/workbench/parts/accounts/browser/accountPickerImpl';
-import { AccountPickerService } from 'sql/workbench/parts/accounts/browser/accountPickerService';
+import { AccountPicker } from 'sql/workbench/contrib/accounts/browser/accountPickerImpl';
+import { AccountPickerService } from 'sql/workbench/contrib/accounts/browser/accountPickerService';
 import { AccountPickerViewModel } from 'sql/platform/accounts/common/accountPickerViewModel';
 import { TestAccountManagementService } from 'sql/platform/accounts/test/common/testAccountManagementService';
 import { InstantiationService } from 'vs/platform/instantiation/common/instantiationService';

src/sql/workbench/contrib/accounts/test/browser/autoOAuthDialogController.test.ts

@@ -7,8 +7,8 @@ import * as TypeMoq from 'typemoq';
 import { Emitter } from 'vs/base/common/event';
 import { InstantiationService } from 'vs/platform/instantiation/common/instantiationService';
 
-import { AutoOAuthDialog } from 'sql/workbench/parts/accounts/browser/autoOAuthDialog';
-import { AutoOAuthDialogController } from 'sql/workbench/parts/accounts/browser/autoOAuthDialogController';
+import { AutoOAuthDialog } from 'sql/workbench/contrib/accounts/browser/autoOAuthDialog';
+import { AutoOAuthDialogController } from 'sql/workbench/contrib/accounts/browser/autoOAuthDialogController';
 import { TestAccountManagementService } from 'sql/platform/accounts/test/common/testAccountManagementService';
 import { TestErrorMessageService } from 'sql/platform/errorMessage/test/common/testErrorMessageService';
 import { MockContextKeyService } from 'vs/platform/keybinding/test/common/mockKeybindingService';

src/sql/workbench/contrib/accounts/test/browser/firewallRuleDialogController.test.ts

@@ -7,9 +7,9 @@ import * as azdata from 'azdata';
 import * as TypeMoq from 'typemoq';
 import { Emitter } from 'vs/base/common/event';
 import { IConnectionProfile } from 'sql/platform/connection/common/interfaces';
-import { FirewallRuleDialog } from 'sql/workbench/parts/accounts/browser/firewallRuleDialog';
+import { FirewallRuleDialog } from 'sql/workbench/contrib/accounts/browser/firewallRuleDialog';
 import { FirewallRuleViewModel } from 'sql/platform/accounts/common/firewallRuleViewModel';
-import { FirewallRuleDialogController } from 'sql/workbench/parts/accounts/browser/firewallRuleDialogController';
+import { FirewallRuleDialogController } from 'sql/workbench/contrib/accounts/browser/firewallRuleDialogController';
 import { TestAccountManagementService } from 'sql/platform/accounts/test/common/testAccountManagementService';
 import { TestResourceProvider } from 'sql/workbench/services/resourceProvider/test/common/testResourceProviderService';
 import { TestErrorMessageService } from 'sql/platform/errorMessage/test/common/testErrorMessageService';

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

@@ -13,7 +13,7 @@ import { ListBox } from 'sql/base/browser/ui/listBox/listBox';
 import { SelectBox } from 'sql/base/browser/ui/selectBox/selectBox';
 import { attachButtonStyler, attachListBoxStyler, attachInputBoxStyler, attachSelectBoxStyler, attachCheckboxStyler } from 'sql/platform/theme/common/styler';
 import { IConnectionProfile } from 'sql/platform/connection/common/interfaces';
-import * as BackupConstants from 'sql/workbench/parts/backup/common/constants';
+import * as BackupConstants from 'sql/workbench/contrib/backup/common/constants';
 import { IBackupService, TaskExecutionMode } from 'sql/platform/backup/common/backupService';
 import * as FileValidationConstants from 'sql/workbench/services/fileBrowser/common/fileValidationServiceConstants';
 import { IConnectionManagementService } from 'sql/platform/connection/common/connectionManagement';

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

@@ -5,19 +5,19 @@
 
 import { CommandsRegistry, ICommandService } from 'vs/platform/commands/common/commands';
 import { TreeViewItemHandleArg } from 'sql/workbench/common/views';
-import { BackupAction } from 'sql/workbench/parts/backup/browser/backupActions';
+import { BackupAction } from 'sql/workbench/contrib/backup/browser/backupActions';
 import { MenuRegistry, MenuId } from 'vs/platform/actions/common/actions';
 import { ManageActionContext } from 'sql/workbench/browser/actions';
 import { ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey';
-import { ItemContextKey } from 'sql/workbench/parts/dashboard/browser/widgets/explorer/explorerTreeContext';
-import { MssqlNodeContext } from 'sql/workbench/parts/dataExplorer/browser/mssqlNodeContext';
-import { NodeType } from 'sql/workbench/parts/objectExplorer/common/nodeType';
+import { ItemContextKey } from 'sql/workbench/contrib/dashboard/browser/widgets/explorer/explorerTreeContext';
+import { MssqlNodeContext } from 'sql/workbench/contrib/dataExplorer/browser/mssqlNodeContext';
+import { NodeType } from 'sql/workbench/contrib/objectExplorer/common/nodeType';
 import { mssqlProviderName } from 'sql/platform/connection/common/constants';
 import { localize } from 'vs/nls';
-import { OEAction } from 'sql/workbench/parts/objectExplorer/browser/objectExplorerActions';
-import { TreeNodeContextKey } from 'sql/workbench/parts/objectExplorer/common/treeNodeContextKey';
-import { ConnectionContextKey } from 'sql/workbench/parts/connection/common/connectionContextKey';
-import { ServerInfoContextKey } from 'sql/workbench/parts/connection/common/serverInfoContextKey';
+import { OEAction } from 'sql/workbench/contrib/objectExplorer/browser/objectExplorerActions';
+import { TreeNodeContextKey } from 'sql/workbench/contrib/objectExplorer/common/treeNodeContextKey';
+import { ConnectionContextKey } from 'sql/workbench/contrib/connection/common/connectionContextKey';
+import { ServerInfoContextKey } from 'sql/workbench/contrib/connection/common/serverInfoContextKey';
 import { ServicesAccessor, IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 import { DatabaseEngineEdition } from 'sql/workbench/api/common/sqlExtHostTypes';
 

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

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

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

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

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

@@ -3,8 +3,8 @@
  *  Licensed under the Source EULA. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IInsight } from 'sql/workbench/parts/charts/browser/interfaces';
-import { Graph } from 'sql/workbench/parts/charts/browser/graphInsight';
+import { IInsight } from 'sql/workbench/contrib/charts/browser/interfaces';
+import { Graph } from 'sql/workbench/contrib/charts/browser/graphInsight';
 import { IClipboardService } from 'sql/platform/clipboard/common/clipboardService';
 
 import { localize } from 'vs/nls';
@@ -13,9 +13,9 @@ import { INotificationService, Severity } from 'vs/platform/notification/common/
 import { URI } from 'vs/base/common/uri';
 import { IUntitledEditorService } from 'vs/workbench/services/untitled/common/untitledEditorService';
 import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
-import { QueryInput } from 'sql/workbench/parts/query/common/queryInput';
+import { QueryInput } from 'sql/workbench/contrib/query/common/queryInput';
 import { IInsightsConfig } from 'sql/platform/dashboard/browser/insightRegistry';
-import { IInsightOptions } from 'sql/workbench/parts/charts/common/interfaces';
+import { IInsightOptions } from 'sql/workbench/contrib/charts/common/interfaces';
 import { IFileService } from 'vs/platform/files/common/files';
 import { IFileDialogService, FileFilter } from 'vs/platform/dialogs/common/dialogs';
 import { VSBuffer } from 'vs/base/common/buffer';

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

@@ -7,7 +7,7 @@ import { localize } from 'vs/nls';
 import { Registry } from 'vs/platform/registry/common/platform';
 
 import { Extensions, IInsightRegistry } from 'sql/platform/dashboard/browser/insightRegistry';
-import { IInsightOptions, DataDirection, DataType, LegendPosition, ChartType, InsightType } from 'sql/workbench/parts/charts/common/interfaces';
+import { IInsightOptions, DataDirection, DataType, LegendPosition, ChartType, InsightType } from 'sql/workbench/contrib/charts/common/interfaces';
 import { values } from 'vs/base/common/collections';
 
 const insightRegistry = Registry.as<IInsightRegistry>(Extensions.InsightContribution);

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

@@ -21,10 +21,10 @@ import { attachSelectBoxStyler, attachInputBoxStyler } from 'vs/platform/theme/c
 import { IThemeService } from 'vs/platform/theme/common/themeService';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 import { isUndefinedOrNull } from 'vs/base/common/types';
-import { CreateInsightAction, CopyAction, SaveImageAction, IChartActionContext } from 'sql/workbench/parts/charts/browser/actions';
+import { CreateInsightAction, CopyAction, SaveImageAction, IChartActionContext } from 'sql/workbench/contrib/charts/browser/actions';
 import { Taskbar } from 'sql/base/browser/ui/taskbar/taskbar';
 import { Checkbox } from 'sql/base/browser/ui/checkbox/checkbox';
-import { ChartState, IInsightOptions, ChartType } from 'sql/workbench/parts/charts/common/interfaces';
+import { ChartState, IInsightOptions, ChartType } from 'sql/workbench/contrib/charts/common/interfaces';
 import * as nls from 'vs/nls';
 import { find } from 'vs/base/common/arrays';
 

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

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

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

@@ -12,7 +12,7 @@ import { editorLineNumbers } from 'vs/editor/common/view/editorColorRegistry';
 import { IThemeService, ITheme } from 'vs/platform/theme/common/themeService';
 
 import { IInsight, IInsightData, IPointDataSet, customMixin } from './interfaces';
-import { IInsightOptions, DataDirection, ChartType, LegendPosition, DataType } from 'sql/workbench/parts/charts/common/interfaces';
+import { IInsightOptions, DataDirection, ChartType, LegendPosition, DataType } from 'sql/workbench/contrib/charts/common/interfaces';
 import { values } from 'vs/base/common/collections';
 import { find } from 'vs/base/common/arrays';
 

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

@@ -7,7 +7,7 @@ import { IInsight, IInsightData } from './interfaces';
 import { INotificationService } from 'vs/platform/notification/common/notification';
 import { $ } from 'vs/base/browser/dom';
 import { mixin } from 'vs/base/common/objects';
-import { IInsightOptions, InsightType } from 'sql/workbench/parts/charts/common/interfaces';
+import { IInsightOptions, InsightType } from 'sql/workbench/contrib/charts/common/interfaces';
 import * as nls from 'vs/nls';
 import { startsWith } from 'vs/base/common/strings';
 

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

@@ -12,7 +12,7 @@ import { CountInsight } from './countInsight';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 import { Dimension, clearNode } from 'vs/base/browser/dom';
 import { deepClone } from 'vs/base/common/objects';
-import { IInsightOptions, ChartType, DataDirection, InsightType } from 'sql/workbench/parts/charts/common/interfaces';
+import { IInsightOptions, ChartType, DataDirection, InsightType } from 'sql/workbench/contrib/charts/common/interfaces';
 import { find } from 'vs/base/common/arrays';
 
 const defaultOptions: IInsightOptions = {

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

@@ -6,7 +6,7 @@
 import { Dimension } from 'vs/base/browser/dom';
 import { mixin } from 'sql/base/common/objects';
 import * as types from 'vs/base/common/types';
-import { IInsightOptions, InsightType, ChartType } from 'sql/workbench/parts/charts/common/interfaces';
+import { IInsightOptions, InsightType, ChartType } from 'sql/workbench/contrib/charts/common/interfaces';
 
 export interface IPointDataSet {
 	data: Array<{ x: number | string, y: number }>;

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

@@ -12,7 +12,7 @@ import { CellSelectionModel } from 'sql/base/browser/ui/table/plugins/cellSelect
 import { $, Dimension } from 'vs/base/browser/dom';
 import { Disposable } from 'vs/base/common/lifecycle';
 import { IThemeService } from 'vs/platform/theme/common/themeService';
-import { InsightType } from 'sql/workbench/parts/charts/common/interfaces';
+import { InsightType } from 'sql/workbench/contrib/charts/common/interfaces';
 
 export class TableInsight extends Disposable implements IInsight {
 	public static readonly types = [InsightType.Table];

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

@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import * as assert from 'assert';
-import { ChartView } from 'sql/workbench/parts/charts/browser/chartView';
+import { ChartView } from 'sql/workbench/contrib/charts/browser/chartView';
 import { ContextViewService } from 'vs/platform/contextview/browser/contextViewService';
 import { TestLayoutService } from 'vs/workbench/test/workbenchTestServices';
 import { TestThemeService } from 'vs/platform/theme/test/common/testThemeService';

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

@@ -6,6 +6,6 @@
 import { Registry } from 'vs/platform/registry/common/platform';
 import { IWorkbenchContributionsRegistry, Extensions as WorkbenchExtensions } from 'vs/workbench/common/contributions';
 import { LifecyclePhase } from 'vs/platform/lifecycle/common/lifecycle';
-import { CommandLineWorkbenchContribution } from 'sql/workbench/parts/commandLine/electron-browser/commandLine';
+import { CommandLineWorkbenchContribution } from 'sql/workbench/contrib/commandLine/electron-browser/commandLine';
 
 Registry.as<IWorkbenchContributionsRegistry>(WorkbenchExtensions.Workbench).registerWorkbenchContribution(CommandLineWorkbenchContribution, LifecyclePhase.Restored);

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

@@ -13,20 +13,20 @@ import { ICapabilitiesService } from 'sql/platform/capabilities/common/capabilit
 import { IEnvironmentService, ParsedArgs } from 'vs/platform/environment/common/environment';
 import * as Constants from 'sql/platform/connection/common/constants';
 import * as platform from 'vs/platform/registry/common/platform';
-import { IConnectionProviderRegistry, Extensions as ConnectionProviderExtensions } from 'sql/workbench/parts/connection/common/connectionProviderExtension';
+import { IConnectionProviderRegistry, Extensions as ConnectionProviderExtensions } from 'sql/workbench/contrib/connection/common/connectionProviderExtension';
 import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
 import { ICommandService } from 'vs/platform/commands/common/commands';
 import { ipcRenderer as ipc } from 'electron';
 import { IConnectionProfile } from 'sql/platform/connection/common/interfaces';
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
 import { localize } from 'vs/nls';
-import { QueryInput } from 'sql/workbench/parts/query/common/queryInput';
+import { QueryInput } from 'sql/workbench/contrib/query/common/queryInput';
 import { URI } from 'vs/base/common/uri';
 import { ILogService } from 'vs/platform/log/common/log';
 import { INotificationService } from 'vs/platform/notification/common/notification';
 import { IWorkbenchContribution } from 'vs/workbench/common/contributions';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { openNewQuery } from 'sql/workbench/parts/query/browser/queryActions';
+import { openNewQuery } from 'sql/workbench/contrib/query/browser/queryActions';
 import { IURLService, IURLHandler } from 'vs/platform/url/common/url';
 import { getErrorMessage } from 'vs/base/common/errors';
 import { IDialogService } from 'vs/platform/dialogs/common/dialogs';

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

@@ -8,7 +8,7 @@ import * as TypeMoq from 'typemoq';
 import * as azdata from 'azdata';
 import { ConnectionProfile } from 'sql/platform/connection/common/connectionProfile';
 import { ConnectionProfileGroup } from 'sql/platform/connection/common/connectionProfileGroup';
-import { CommandLineWorkbenchContribution } from 'sql/workbench/parts/commandLine/electron-browser/commandLine';
+import { CommandLineWorkbenchContribution } from 'sql/workbench/contrib/commandLine/electron-browser/commandLine';
 import * as Constants from 'sql/platform/connection/common/constants';
 import { ParsedArgs } from 'vs/platform/environment/common/environment';
 import { ICapabilitiesService } from 'sql/platform/capabilities/common/capabilitiesService';
@@ -22,7 +22,7 @@ import { IConnectionProfile } from 'sql/platform/connection/common/interfaces';
 import { assertThrowsAsync } from 'sql/base/test/common/async';
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
 import { TestEditorService, TestDialogService } from 'vs/workbench/test/workbenchTestServices';
-import { QueryInput, QueryEditorState } from 'sql/workbench/parts/query/common/queryInput';
+import { QueryInput, QueryEditorState } from 'sql/workbench/contrib/query/common/queryInput';
 import { URI } from 'vs/base/common/uri';
 import { ILogService, NullLogService } from 'vs/platform/log/common/log';
 import { TestConfigurationService } from 'vs/platform/configuration/test/common/testConfigurationService';

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

@@ -5,13 +5,13 @@
 
 import { IConfigurationRegistry, Extensions as ConfigExtensions } from 'vs/platform/configuration/common/configurationRegistry';
 import { Registry } from 'vs/platform/registry/common/platform';
-import { AddServerGroupAction, AddServerAction } from 'sql/workbench/parts/objectExplorer/browser/connectionTreeAction';
-import { ClearRecentConnectionsAction, GetCurrentConnectionStringAction } from 'sql/workbench/parts/connection/browser/connectionActions';
+import { AddServerGroupAction, AddServerAction } from 'sql/workbench/contrib/objectExplorer/browser/connectionTreeAction';
+import { ClearRecentConnectionsAction, GetCurrentConnectionStringAction } from 'sql/workbench/contrib/connection/browser/connectionActions';
 import * as azdata from 'azdata';
 import { IWorkbenchActionRegistry, Extensions } from 'vs/workbench/common/actions';
 import { SyncActionDescriptor } from 'vs/platform/actions/common/actions';
 import { localize } from 'vs/nls';
-import { ConnectionStatusbarItem } from 'sql/workbench/parts/connection/browser/connectionStatus';
+import { ConnectionStatusbarItem } from 'sql/workbench/contrib/connection/browser/connectionStatus';
 import { CommandsRegistry } from 'vs/platform/commands/common/commands';
 import { IConnectionManagementService } from 'sql/platform/connection/common/connectionManagement';
 import { ConnectionProfile } from 'sql/platform/connection/common/connectionProfile';

src/sql/workbench/contrib/connection/browser/connectionActions.ts

@@ -12,9 +12,9 @@ import { INotificationService, INotificationActions } from 'vs/platform/notifica
 import Severity from 'vs/base/common/severity';
 import { IDialogService, IConfirmation, IConfirmationResult } from 'vs/platform/dialogs/common/dialogs';
 import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
-import { QueryInput } from 'sql/workbench/parts/query/common/queryInput';
-import { EditDataInput } from 'sql/workbench/parts/editData/browser/editDataInput';
-import { DashboardInput } from 'sql/workbench/parts/dashboard/browser/dashboardInput';
+import { QueryInput } from 'sql/workbench/contrib/query/common/queryInput';
+import { EditDataInput } from 'sql/workbench/contrib/editData/browser/editDataInput';
+import { DashboardInput } from 'sql/workbench/contrib/dashboard/browser/dashboardInput';
 import { IClipboardService } from 'vs/platform/clipboard/common/clipboardService';
 import { IQuickInputService } from 'vs/platform/quickinput/common/quickInput';
 import { find } from 'vs/base/common/arrays';

src/sql/workbench/contrib/connection/browser/recentConnectionTreeController.ts

@@ -7,7 +7,7 @@ import { DefaultController, ICancelableEvent } from 'vs/base/parts/tree/browser/
 import { IContextMenuService } from 'vs/platform/contextview/browser/contextView';
 import { ITree } from 'vs/base/parts/tree/browser/tree';
 import { IKeyboardEvent } from 'vs/base/browser/keyboardEvent';
-import { ClearSingleRecentConnectionAction } from 'sql/workbench/parts/connection/browser/connectionActions';
+import { ClearSingleRecentConnectionAction } from 'sql/workbench/contrib/connection/browser/connectionActions';
 import { ContributableActionProvider } from 'vs/workbench/browser/actions';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 import { IConnectionManagementService } from 'sql/platform/connection/common/connectionManagement';

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

@@ -3,7 +3,7 @@
  *  Licensed under the Source EULA. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 import { ConnectionSummary } from 'azdata';
-import * as LocalizedConstants from 'sql/workbench/parts/connection/common/localizedConstants';
+import * as LocalizedConstants from 'sql/workbench/contrib/connection/common/localizedConstants';
 import { INotificationService } from 'vs/platform/notification/common/notification';
 
 // Status when making connections from the viewlet

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

@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { OptionsDialog } from 'sql/workbench/browser/modal/optionsDialog';
-import { AdvancedPropertiesController } from 'sql/workbench/parts/connection/browser/advancedPropertiesController';
+import { AdvancedPropertiesController } from 'sql/workbench/contrib/connection/browser/advancedPropertiesController';
 import * as azdata from 'azdata';
 import * as TypeMoq from 'typemoq';
 import * as assert from 'assert';

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

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

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

@@ -9,9 +9,9 @@ import { Component, forwardRef, Input, AfterContentInit, ViewChild } from '@angu
 
 import { Event, Emitter } from 'vs/base/common/event';
 
-import { DashboardTab } from 'sql/workbench/parts/dashboard/browser/core/interfaces';
-import { TabConfig } from 'sql/workbench/parts/dashboard/browser/core/dashboardWidget';
-import { ControlHostContent } from 'sql/workbench/parts/dashboard/browser/contents/controlHostContent.component';
+import { DashboardTab } from 'sql/workbench/contrib/dashboard/browser/core/interfaces';
+import { TabConfig } from 'sql/workbench/contrib/dashboard/browser/core/dashboardWidget';
+import { ControlHostContent } from 'sql/workbench/contrib/dashboard/browser/contents/controlHostContent.component';
 import { TabChild } from 'sql/base/browser/ui/panel/tab.component';
 
 @Component({

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

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

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

@@ -8,10 +8,10 @@ import 'vs/css!./dashboardGridContainer';
 import { Component, Inject, Input, forwardRef, ElementRef, ViewChildren, QueryList, OnDestroy, ChangeDetectorRef, ContentChild } from '@angular/core';
 
 import { CommonServiceInterface } from 'sql/workbench/services/bootstrap/browser/commonServiceInterface.service';
-import { TabConfig, WidgetConfig } from 'sql/workbench/parts/dashboard/browser/core/dashboardWidget';
-import { DashboardWidgetWrapper } from 'sql/workbench/parts/dashboard/browser/contents/dashboardWidgetWrapper.component';
-import { DashboardTab } from 'sql/workbench/parts/dashboard/browser/core/interfaces';
-import { WebviewContent } from 'sql/workbench/parts/dashboard/browser/contents/webviewContent.component';
+import { TabConfig, WidgetConfig } from 'sql/workbench/contrib/dashboard/browser/core/dashboardWidget';
+import { DashboardWidgetWrapper } from 'sql/workbench/contrib/dashboard/browser/contents/dashboardWidgetWrapper.component';
+import { DashboardTab } from 'sql/workbench/contrib/dashboard/browser/core/interfaces';
+import { WebviewContent } from 'sql/workbench/contrib/dashboard/browser/contents/webviewContent.component';
 import { TabChild } from 'sql/base/browser/ui/panel/tab.component';
 
 import { Event, Emitter } from 'vs/base/common/event';

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

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

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

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

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

@@ -7,8 +7,8 @@ import { Component, forwardRef, Input, AfterContentInit, ViewChild } from '@angu
 
 import { Event, Emitter } from 'vs/base/common/event';
 
-import { DashboardTab } from 'sql/workbench/parts/dashboard/browser/core/interfaces';
-import { TabConfig } from 'sql/workbench/parts/dashboard/browser/core/dashboardWidget';
+import { DashboardTab } from 'sql/workbench/contrib/dashboard/browser/core/interfaces';
+import { TabConfig } from 'sql/workbench/contrib/dashboard/browser/core/dashboardWidget';
 import { ModelViewContent } from 'sql/workbench/browser/modelComponents/modelViewContent.component';
 import { TabChild } from 'sql/base/browser/ui/panel/tab.component';
 

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

@@ -8,13 +8,13 @@ import 'vs/css!./dashboardNavSection';
 import { Component, Inject, Input, forwardRef, ViewChild, ViewChildren, QueryList, OnDestroy, ChangeDetectorRef, OnChanges, AfterContentInit } from '@angular/core';
 
 import { CommonServiceInterface, SingleConnectionManagementService } from 'sql/workbench/services/bootstrap/browser/commonServiceInterface.service';
-import { WidgetConfig, TabConfig, NavSectionConfig } from 'sql/workbench/parts/dashboard/browser/core/dashboardWidget';
+import { WidgetConfig, TabConfig, NavSectionConfig } from 'sql/workbench/contrib/dashboard/browser/core/dashboardWidget';
 import { PanelComponent, IPanelOptions, NavigationBarLayout } from 'sql/base/browser/ui/panel/panel.component';
 import { TabChild } from 'sql/base/browser/ui/panel/tab.component';
-import { DashboardTab, IConfigModifierCollection } from 'sql/workbench/parts/dashboard/browser/core/interfaces';
-import { WIDGETS_CONTAINER } from 'sql/workbench/parts/dashboard/browser/containers/dashboardWidgetContainer.contribution';
-import { GRID_CONTAINER } from 'sql/workbench/parts/dashboard/browser/containers/dashboardGridContainer.contribution';
-import * as dashboardHelper from 'sql/workbench/parts/dashboard/browser/core/dashboardHelper';
+import { DashboardTab, IConfigModifierCollection } from 'sql/workbench/contrib/dashboard/browser/core/interfaces';
+import { WIDGETS_CONTAINER } from 'sql/workbench/contrib/dashboard/browser/containers/dashboardWidgetContainer.contribution';
+import { GRID_CONTAINER } from 'sql/workbench/contrib/dashboard/browser/containers/dashboardGridContainer.contribution';
+import * as dashboardHelper from 'sql/workbench/contrib/dashboard/browser/core/dashboardHelper';
 
 import { Event, Emitter } from 'vs/base/common/event';
 import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';