diff --git a/src/sql/workbench/contrib/welcome/gettingStarted/electron-browser/gettingStarted.contribution.ts b/src/sql/workbench/contrib/welcome/gettingStarted/electron-browser/gettingStarted.contribution.ts
index 4030609fcc..0c0f1d32a4 100644
--- a/src/sql/workbench/contrib/welcome/gettingStarted/electron-browser/gettingStarted.contribution.ts
+++ b/src/sql/workbench/contrib/welcome/gettingStarted/electron-browser/gettingStarted.contribution.ts
@@ -7,7 +7,11 @@ import { Registry } from 'vs/platform/registry/common/platform';
 import { IWorkbenchContributionsRegistry, Extensions as WorkbenchExtensions } from 'vs/workbench/common/contributions';
 import { LifecyclePhase } from 'vs/workbench/services/lifecycle/common/lifecycle';
 import { NativeEnablePreviewFeatures } from 'sql/workbench/contrib/welcome/gettingStarted/electron-browser/enablePreviewFeatures';
+import { ShowGettingStartedAction } from 'sql/workbench/contrib/welcome/gettingStarted/electron-browser/gettingStarted';
+import { registerAction2 } from 'vs/platform/actions/common/actions';
 
 Registry
 	.as<IWorkbenchContributionsRegistry>(WorkbenchExtensions.Workbench)
 	.registerWorkbenchContribution(NativeEnablePreviewFeatures, LifecyclePhase.Eventually);
+
+registerAction2(ShowGettingStartedAction);
diff --git a/src/sql/workbench/update/electron-browser/gettingStarted.ts b/src/sql/workbench/contrib/welcome/gettingStarted/electron-browser/gettingStarted.ts
similarity index 100%
rename from src/sql/workbench/update/electron-browser/gettingStarted.ts
rename to src/sql/workbench/contrib/welcome/gettingStarted/electron-browser/gettingStarted.ts
diff --git a/src/sql/workbench/services/accountManagement/browser/accountDialog.ts b/src/sql/workbench/services/accountManagement/browser/accountDialog.ts
index 19e89c60ec..f60ff3aea1 100644
--- a/src/sql/workbench/services/accountManagement/browser/accountDialog.ts
+++ b/src/sql/workbench/services/accountManagement/browser/accountDialog.ts
@@ -47,7 +47,7 @@ import { Iterable } from 'vs/base/common/iterator';
 import { LoadingSpinner } from 'sql/base/browser/ui/loadingSpinner/loadingSpinner';
 import { Tenant, TenantListDelegate, TenantListRenderer } from 'sql/workbench/services/accountManagement/browser/tenantListRenderer';
 import { IAccountManagementService } from 'sql/platform/accounts/common/interfaces';
-import { ADAL_AUTH_LIBRARY, AuthLibrary, getAuthLibrary } from 'sql/workbench/services/accountManagement/utils';
+import { ADAL_AUTH_LIBRARY, AuthLibrary, getAuthLibrary } from 'sql/workbench/services/accountManagement/common/utils';
 import { defaultButtonStyles } from 'vs/platform/theme/browser/defaultStyles';
 
 export const VIEWLET_ID = 'workbench.view.accountpanel';
diff --git a/src/sql/workbench/services/accountManagement/browser/accountManagementService.ts b/src/sql/workbench/services/accountManagement/browser/accountManagementService.ts
index 4ccef56f59..52811a50c9 100644
--- a/src/sql/workbench/services/accountManagement/browser/accountManagementService.ts
+++ b/src/sql/workbench/services/accountManagement/browser/accountManagementService.ts
@@ -27,7 +27,7 @@ import { Action } from 'vs/base/common/actions';
 import { DisposableStore } from 'vs/base/common/lifecycle';
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
 import { filterAccounts } from 'sql/workbench/services/accountManagement/browser/accountDialog';
-import { ADAL_AUTH_LIBRARY, MSAL_AUTH_LIBRARY, AuthLibrary, AZURE_AUTH_LIBRARY_CONFIG, getAuthLibrary } from 'sql/workbench/services/accountManagement/utils';
+import { ADAL_AUTH_LIBRARY, MSAL_AUTH_LIBRARY, AuthLibrary, AZURE_AUTH_LIBRARY_CONFIG, getAuthLibrary } from 'sql/workbench/services/accountManagement/common/utils';
 import { IAdsTelemetryService } from 'sql/platform/telemetry/common/telemetry';
 import { TelemetryAction, TelemetryError, TelemetryPropertyName, TelemetryView } from 'sql/platform/telemetry/common/telemetryKeys';
 
diff --git a/src/sql/workbench/services/accountManagement/utils.ts b/src/sql/workbench/services/accountManagement/common/utils.ts
similarity index 100%
rename from src/sql/workbench/services/accountManagement/utils.ts
rename to src/sql/workbench/services/accountManagement/common/utils.ts
diff --git a/src/sql/workbench/services/connection/browser/connectionWidget.ts b/src/sql/workbench/services/connection/browser/connectionWidget.ts
index e408197b2c..ad93348f99 100644
--- a/src/sql/workbench/services/connection/browser/connectionWidget.ts
+++ b/src/sql/workbench/services/connection/browser/connectionWidget.ts
@@ -39,7 +39,7 @@ import { filterAccounts } from 'sql/workbench/services/accountManagement/browser
 import { AuthenticationType, Actions, mssqlApplicationNameOption, applicationName, mssqlProviderName, mssqlCmsProviderName } from 'sql/platform/connection/common/constants';
 import { AdsWidget } from 'sql/base/browser/ui/adsWidget';
 import { createCSSRule } from 'vs/base/browser/dom';
-import { AuthLibrary, getAuthLibrary } from 'sql/workbench/services/accountManagement/utils';
+import { AuthLibrary, getAuthLibrary } from 'sql/workbench/services/accountManagement/common/utils';
 import { adjustForMssqlAppName } from 'sql/platform/connection/common/utils';
 import { isMssqlAuthProviderEnabled } from 'sql/workbench/services/connection/browser/utils';
 import { RequiredIndicatorClassName } from 'sql/base/browser/ui/label/label';
diff --git a/src/sql/workbench/services/connection/browser/utils.ts b/src/sql/workbench/services/connection/browser/utils.ts
index 30bbacf6df..4e988f566b 100644
--- a/src/sql/workbench/services/connection/browser/utils.ts
+++ b/src/sql/workbench/services/connection/browser/utils.ts
@@ -5,7 +5,7 @@
 
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
 import { azureAuthenticationLibraryConfig, enableSqlAuthenticationProviderConfig, mssqlProviderName } from 'sql/platform/connection/common/constants';
-import { MSAL_AUTH_LIBRARY } from 'sql/workbench/services/accountManagement/utils';
+import { MSAL_AUTH_LIBRARY } from 'sql/workbench/services/accountManagement/common/utils';
 
 /**
  * Reads setting 'mssql.enableSqlAuthenticationProvider' returns true if it's enabled.
diff --git a/src/sql/workbench/update/electron-browser/gettingStarted.contribution.ts b/src/sql/workbench/update/electron-browser/gettingStarted.contribution.ts
deleted file mode 100644
index 5c399ec02e..0000000000
--- a/src/sql/workbench/update/electron-browser/gettingStarted.contribution.ts
+++ /dev/null
@@ -1,9 +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 { ShowGettingStartedAction } from 'sql/workbench/update/electron-browser/gettingStarted';
-import { registerAction2 } from 'vs/platform/actions/common/actions';
-
-registerAction2(ShowGettingStartedAction);