diff --git a/build/gulpfile.extensions.js b/build/gulpfile.extensions.js
index 46b7c06414..aed13a0f7e 100644
--- a/build/gulpfile.extensions.js
+++ b/build/gulpfile.extensions.js
@@ -26,8 +26,17 @@ const ext = require('./lib/extensions');
 const extensionsPath = path.join(path.dirname(__dirname), 'extensions');
 // {{SQL CARBON EDIT}}
 const sqlLocalizedExtensions = [
+	'admin-tool-ext-win',
+	'agent',
+	'cms',
 	'dacpac',
-	'schema-compare'
+	'import',
+	'machine-learning',
+	'profiler',
+	'schema-compare',
+	'server-report',
+	'sql-assessment',
+	'sql-database-projects'
 ];
 // {{SQL CARBON EDIT}}
 
diff --git a/extensions/cms/tsconfig.json b/extensions/cms/tsconfig.json
index 08c65e88cf..2e41551e3b 100644
--- a/extensions/cms/tsconfig.json
+++ b/extensions/cms/tsconfig.json
@@ -2,6 +2,7 @@
 	"extends": "../shared.tsconfig.json",
 	"compileOnSave": true,
 	"compilerOptions": {
+		"outDir": "./out",
 		"module": "commonjs",
 		"target": "es6",
 		"lib": [
diff --git a/extensions/profiler/.vscodeignore b/extensions/profiler/.vscodeignore
index a48535cae1..7f47d852aa 100644
--- a/extensions/profiler/.vscodeignore
+++ b/extensions/profiler/.vscodeignore
@@ -1,2 +1,2 @@
-client/src/**
-client/tsconfig.json
+src/**
+tsconfig.json
diff --git a/extensions/profiler/package.json b/extensions/profiler/package.json
index b84323ac70..77e631be42 100644
--- a/extensions/profiler/package.json
+++ b/extensions/profiler/package.json
@@ -14,7 +14,7 @@
 	"activationEvents": [
 		"*"
 	],
-	"main": "./client/out/main",
+	"main": "./out/main",
 	"scripts": {
 		"compile": "gulp compile-extension:profiler-client"
 	},
diff --git a/extensions/profiler/client/src/data/createSessionData.ts b/extensions/profiler/src/data/createSessionData.ts
similarity index 100%
rename from extensions/profiler/client/src/data/createSessionData.ts
rename to extensions/profiler/src/data/createSessionData.ts
diff --git a/extensions/profiler/client/src/dialogs/profilerCreateSessionDialog.ts b/extensions/profiler/src/dialogs/profilerCreateSessionDialog.ts
similarity index 100%
rename from extensions/profiler/client/src/dialogs/profilerCreateSessionDialog.ts
rename to extensions/profiler/src/dialogs/profilerCreateSessionDialog.ts
diff --git a/extensions/profiler/client/src/main.ts b/extensions/profiler/src/main.ts
similarity index 100%
rename from extensions/profiler/client/src/main.ts
rename to extensions/profiler/src/main.ts
diff --git a/extensions/profiler/client/src/mainController.ts b/extensions/profiler/src/mainController.ts
similarity index 100%
rename from extensions/profiler/client/src/mainController.ts
rename to extensions/profiler/src/mainController.ts
diff --git a/extensions/profiler/client/src/typings/ref.d.ts b/extensions/profiler/src/typings/ref.d.ts
similarity index 61%
rename from extensions/profiler/client/src/typings/ref.d.ts
rename to extensions/profiler/src/typings/ref.d.ts
index 12430dd85a..cfdf5dd135 100644
--- a/extensions/profiler/client/src/typings/ref.d.ts
+++ b/extensions/profiler/src/typings/ref.d.ts
@@ -3,7 +3,7 @@
  *  Licensed under the Source EULA. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-/// <reference path='../../../../../src/vs/vscode.d.ts'/>
-/// <reference path='../../../../../src/sql/azdata.d.ts'/>
-/// <reference path='../../../../../src/sql/azdata.proposed.d.ts'/>
-/// <reference types='@types/node'/>
\ No newline at end of file
+/// <reference path='../../../../src/vs/vscode.d.ts'/>
+/// <reference path='../../../../src/sql/azdata.d.ts'/>
+/// <reference path='../../../../src/sql/azdata.proposed.d.ts'/>
+/// <reference types='@types/node'/>
diff --git a/extensions/profiler/client/tsconfig.json b/extensions/profiler/tsconfig.json
similarity index 100%
rename from extensions/profiler/client/tsconfig.json
rename to extensions/profiler/tsconfig.json