diff --git a/Composer/package.json b/Composer/package.json
index f2e93589c4..04ad660b95 100644
--- a/Composer/package.json
+++ b/Composer/package.json
@@ -27,27 +27,21 @@
     "packages/extension-client",
     "packages/form-dialogs",
     "packages/intellisense",
-    "packages/lib",
     "packages/lib/*",
     "packages/server",
     "packages/test-utils",
-    "packages/tools",
     "packages/tools/built-in-functions",
-    "packages/tools/language-servers",
     "packages/tools/language-servers/*",
+    "packages/types",
     "packages/ui-plugins/*"
   ],
   "scripts": {
-    "build": "node scripts/begin.js && yarn build:prod",
-    "build:prod": "yarn build:dev && yarn build:server && yarn build:client && yarn build:electron",
-    "build:dev": "yarn build:test && yarn build:lib && yarn build:tools && yarn build:extensions && yarn build:plugins && yarn l10n",
-    "build:test": "yarn workspace @bfc/test-utils build",
-    "build:lib": "yarn workspace @bfc/libs build:all",
+    "build": "node scripts/begin.js && yarn build:prod && yarn l10n",
+    "build:prod": "yarn build:dev && yarn build:client && yarn build:server && yarn build:electron",
+    "build:dev": "wsrun -ltm -x @bfc/electron-server -x @bfc/client -x @bfc/server -p @bfc/* -c build && yarn build:plugins",
     "build:electron": "yarn workspace @bfc/electron-server build && yarn workspace @bfc/electron-server l10n",
-    "build:extensions": "wsrun -lt -p @bfc/extension @bfc/intellisense @bfc/extension-client @bfc/adaptive-form @bfc/adaptive-flow @bfc/ui-plugin-* @bfc/form-dialogs -c build",
     "build:server": "yarn workspace @bfc/server build",
     "build:client": "yarn workspace @bfc/client build",
-    "build:tools": "yarn workspace @bfc/tools build:all",
     "build:plugins": "yarn build:plugins:localpublish && yarn build:plugins:samples && yarn build:plugins:azurePublish && yarn build:plugins:runtimes",
     "build:plugins:localpublish": "cd plugins/localPublish && yarn install && yarn build",
     "build:plugins:samples": "cd plugins/samples && yarn install && yarn build",
diff --git a/Composer/packages/adaptive-flow/__tests__/adaptive-flow-editor/utils/getCustomSchema.test.ts b/Composer/packages/adaptive-flow/__tests__/adaptive-flow-editor/utils/getCustomSchema.test.ts
index cd7e39d8be..320800e809 100644
--- a/Composer/packages/adaptive-flow/__tests__/adaptive-flow-editor/utils/getCustomSchema.test.ts
+++ b/Composer/packages/adaptive-flow/__tests__/adaptive-flow-editor/utils/getCustomSchema.test.ts
@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
-import { OBISchema } from '@bfc/shared';
+import { JSONSchema7 } from '@bfc/shared';
 
 import { getCustomSchema } from '../../../src/adaptive-flow-editor/utils/getCustomSchema';
 
@@ -23,7 +23,7 @@ describe('getCustomSchema', () => {
           description: 'Send an activity.',
         },
       },
-    } as OBISchema;
+    } as JSONSchema7;
     expect(getCustomSchema({ oneOf: [], definitions: {} }, ejected)).toEqual({
       actions: {
         oneOf: [
@@ -59,7 +59,7 @@ describe('getCustomSchema', () => {
           description: 'My Trigger.',
         },
       },
-    } as OBISchema;
+    } as JSONSchema7;
     expect(getCustomSchema({ oneOf: [], definitions: {} }, ejected)).toEqual({
       actions: {
         oneOf: [
diff --git a/Composer/packages/adaptive-flow/src/adaptive-flow-editor/AdaptiveFlowEditor.tsx b/Composer/packages/adaptive-flow/src/adaptive-flow-editor/AdaptiveFlowEditor.tsx
index 61c04ec80c..5377920e93 100644
--- a/Composer/packages/adaptive-flow/src/adaptive-flow-editor/AdaptiveFlowEditor.tsx
+++ b/Composer/packages/adaptive-flow/src/adaptive-flow-editor/AdaptiveFlowEditor.tsx
@@ -105,7 +105,7 @@ const VisualDesigner: React.FC<VisualDesignerProps> = ({ onFocus, onBlur, schema
   };
 
   const customFlowSchema: FlowUISchema = nodeContext.customSchemas.reduce((result, s) => {
-    const definitionKeys: string[] = Object.keys(s.definitions);
+    const definitionKeys = Object.keys(s.definitions ?? {});
     definitionKeys.forEach(($kind) => {
       result[$kind] = {
         widget: 'ActionHeader',
diff --git a/Composer/packages/adaptive-flow/src/adaptive-flow-editor/contexts/NodeRendererContext.ts b/Composer/packages/adaptive-flow/src/adaptive-flow-editor/contexts/NodeRendererContext.ts
index d78c9e64e5..8f2f5f703c 100644
--- a/Composer/packages/adaptive-flow/src/adaptive-flow-editor/contexts/NodeRendererContext.ts
+++ b/Composer/packages/adaptive-flow/src/adaptive-flow-editor/contexts/NodeRendererContext.ts
@@ -2,7 +2,7 @@
 // Licensed under the MIT License.
 
 import React from 'react';
-import { DialogFactory, OBISchema } from '@bfc/shared';
+import { DialogFactory, JSONSchema7 } from '@bfc/shared';
 
 export interface NodeRendererContextValue {
   focusedId?: string;
@@ -10,7 +10,7 @@ export interface NodeRendererContextValue {
   focusedTab?: string;
   clipboardActions: any[];
   dialogFactory: DialogFactory;
-  customSchemas: OBISchema[];
+  customSchemas: JSONSchema7[];
 }
 
 export const defaultRendererContextValue = {
diff --git a/Composer/packages/adaptive-flow/src/adaptive-flow-editor/utils/getCustomSchema.ts b/Composer/packages/adaptive-flow/src/adaptive-flow-editor/utils/getCustomSchema.ts
index 959cec5e7f..e88810fef8 100644
--- a/Composer/packages/adaptive-flow/src/adaptive-flow-editor/utils/getCustomSchema.ts
+++ b/Composer/packages/adaptive-flow/src/adaptive-flow-editor/utils/getCustomSchema.ts
@@ -1,24 +1,24 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
-import { OBISchema, SDKKinds } from '@bfc/shared';
+import { JSONSchema7, SDKKinds } from '@bfc/shared';
 import pickBy from 'lodash/pickBy';
 
 interface CustomSchemaSet {
-  actions?: OBISchema;
-  triggers?: OBISchema;
-  recognizers?: OBISchema;
+  actions?: JSONSchema7;
+  triggers?: JSONSchema7;
+  recognizers?: JSONSchema7;
 }
 
-const pickSchema = (
-  picked$kinds: SDKKinds[],
-  sourceSchema: { [key in SDKKinds]: OBISchema }
-): OBISchema | undefined => {
+type SourceSchema = { [key in SDKKinds]: JSONSchema7 };
+
+const pickSchema = (picked$kinds: SDKKinds[], sourceSchema: SourceSchema): JSONSchema7 | undefined => {
   if (!Array.isArray(picked$kinds) || picked$kinds.length === 0) return undefined;
 
   const pickedSchema = picked$kinds.reduce(
     (schema, $kind) => {
       const definition = sourceSchema[$kind];
+      schema.definitions = schema.definitions ?? {};
       schema.definitions[$kind] = definition;
       schema.oneOf?.push({
         title: definition.title || $kind,
@@ -30,11 +30,13 @@ const pickSchema = (
     {
       oneOf: [],
       definitions: {},
-    } as OBISchema
+    } as JSONSchema7
   );
 
   // Sort `oneOf` list alphabetically
-  pickedSchema.oneOf?.sort((a, b) => (a.$ref < b.$ref ? -1 : 1));
+  pickedSchema.oneOf?.sort((a, b) => {
+    return (a.$ref ?? '') < (b.$ref ?? '') ? -1 : 1;
+  });
 
   return pickedSchema;
 };
@@ -47,18 +49,18 @@ const roleImplementsInterface = (interfaceName: SDKKinds, $role?: SchemaRole): b
   return false;
 };
 
-const isActionSchema = (schema: OBISchema) => roleImplementsInterface(SDKKinds.IDialog, schema.$role);
-const isTriggerSchema = (schema: OBISchema) => roleImplementsInterface(SDKKinds.ITrigger, schema.$role);
-const isRecognizerSchema = (schema: OBISchema) =>
+const isActionSchema = (schema: JSONSchema7) => roleImplementsInterface(SDKKinds.IDialog, schema.$role);
+const isTriggerSchema = (schema: JSONSchema7) => roleImplementsInterface(SDKKinds.ITrigger, schema.$role);
+const isRecognizerSchema = (schema: JSONSchema7) =>
   roleImplementsInterface(SDKKinds.IRecognizer, schema.$role) ||
   roleImplementsInterface(SDKKinds.IEntityRecognizer, schema.$role);
 
-export const getCustomSchema = (baseSchema?: OBISchema, ejectedSchema?: OBISchema): CustomSchemaSet => {
+export const getCustomSchema = (baseSchema?: JSONSchema7, ejectedSchema?: JSONSchema7): CustomSchemaSet => {
   if (!baseSchema || !ejectedSchema) return {};
   if (typeof baseSchema.definitions !== 'object' || typeof ejectedSchema.definitions !== 'object') return {};
 
   const baseDefinitions = baseSchema.definitions;
-  const ejectedDefinitions = ejectedSchema.definitions;
+  const ejectedDefinitions = ejectedSchema.definitions ?? {};
 
   const baseKindHash = Object.keys(baseDefinitions).reduce((hash, $kind) => {
     hash[$kind] = true;
@@ -75,9 +77,9 @@ export const getCustomSchema = (baseSchema?: OBISchema, ejectedSchema?: OBISchem
 
   return pickBy(
     {
-      actions: pickSchema(actionKinds, ejectedDefinitions),
-      triggers: pickSchema(triggerKinds, ejectedDefinitions),
-      recognizers: pickSchema(recognizerKinds, ejectedDefinitions),
+      actions: pickSchema(actionKinds, ejectedDefinitions as SourceSchema),
+      triggers: pickSchema(triggerKinds, ejectedDefinitions as SourceSchema),
+      recognizers: pickSchema(recognizerKinds, ejectedDefinitions as SourceSchema),
     },
     (v) => v !== undefined
   );
diff --git a/Composer/packages/adaptive-form/src/components/fields/ExpressionField/utils.ts b/Composer/packages/adaptive-form/src/components/fields/ExpressionField/utils.ts
index 1bf98d71f2..5a4448fcf7 100644
--- a/Composer/packages/adaptive-form/src/components/fields/ExpressionField/utils.ts
+++ b/Composer/packages/adaptive-form/src/components/fields/ExpressionField/utils.ts
@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
-import { JSONSchema7, JSONSchema7Definition, SchemaDefinitions } from '@bfc/extension-client';
+import { JSONSchema7, SchemaDefinitions } from '@bfc/extension-client';
 import { IDropdownOption } from 'office-ui-fabric-react/lib/Dropdown';
 
 import { resolveRef, getValueType } from '../../../utils';
@@ -43,7 +43,7 @@ function getOptionLabel(schema: JSONSchema7, parent: JSONSchema7): string {
 }
 
 export function getOneOfOptions(
-  oneOf: JSONSchema7Definition[],
+  oneOf: JSONSchema7[],
   parentSchema: JSONSchema7,
   definitions?: SchemaDefinitions
 ): SchemaOption[] {
diff --git a/Composer/packages/adaptive-form/src/components/fields/ObjectArrayField.tsx b/Composer/packages/adaptive-form/src/components/fields/ObjectArrayField.tsx
index 169c0a7ef9..51cd4ebedc 100644
--- a/Composer/packages/adaptive-form/src/components/fields/ObjectArrayField.tsx
+++ b/Composer/packages/adaptive-form/src/components/fields/ObjectArrayField.tsx
@@ -6,7 +6,6 @@ import { jsx } from '@emotion/core';
 import React, { useState, useMemo, useRef } from 'react';
 import { FieldProps, useShellApi } from '@bfc/extension-client';
 import { DefaultButton } from 'office-ui-fabric-react/lib/Button';
-import { JSONSchema7 } from 'json-schema';
 import { IconButton } from 'office-ui-fabric-react/lib/Button';
 import { TextField, ITextField } from 'office-ui-fabric-react/lib/TextField';
 import { TooltipHost } from 'office-ui-fabric-react/lib/Tooltip';
@@ -91,7 +90,7 @@ const ObjectArrayField: React.FC<FieldProps<any[]>> = (props) => {
       allOrderProps.length > 2 ||
       orderedProperties.some((property) => Array.isArray(property)) ||
       Object.entries(properties).some(([key, propSchema]) => {
-        const resolved = resolveRef(propSchema as JSONSchema7, props.definitions);
+        const resolved = resolveRef(propSchema, props.definitions);
         return allOrderProps.includes(key) && resolved.$role === 'expression';
       })
     );
@@ -134,7 +133,7 @@ const ObjectArrayField: React.FC<FieldProps<any[]>> = (props) => {
             {...props}
             transparentBorder
             id={`${id}.${idx}`}
-            schema={itemSchema as JSONSchema7}
+            schema={itemSchema}
             stackArrayItems={stackArrayItems}
             value={item.value}
             {...getArrayItemProps(arrayItems, idx, handleChange)}
diff --git a/Composer/packages/adaptive-form/src/components/fields/OneOfField/utils.ts b/Composer/packages/adaptive-form/src/components/fields/OneOfField/utils.ts
index 0bfbadf8b7..1e744e55cc 100644
--- a/Composer/packages/adaptive-form/src/components/fields/OneOfField/utils.ts
+++ b/Composer/packages/adaptive-form/src/components/fields/OneOfField/utils.ts
@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
-import { FieldProps, JSONSchema7, JSONSchema7Definition } from '@bfc/extension-client';
+import { FieldProps, JSONSchema7, SchemaDefinitions } from '@bfc/extension-client';
 import merge from 'lodash/merge';
 import omit from 'lodash/omit';
 import { IDropdownOption } from 'office-ui-fabric-react/lib/Dropdown';
@@ -23,10 +23,7 @@ function getOptionLabel(schema: JSONSchema7): string {
   return type || 'unknown';
 }
 
-export function getOptions(
-  schema: JSONSchema7,
-  definitions?: { [key: string]: JSONSchema7Definition }
-): IDropdownOption[] {
+export function getOptions(schema: JSONSchema7, definitions?: SchemaDefinitions): IDropdownOption[] {
   const { type, oneOf } = schema;
 
   if (type && Array.isArray(type)) {
diff --git a/Composer/packages/adaptive-form/src/utils/resolvePropSchema.ts b/Composer/packages/adaptive-form/src/utils/resolvePropSchema.ts
index 12fb4b1027..7bc605f5d6 100644
--- a/Composer/packages/adaptive-form/src/utils/resolvePropSchema.ts
+++ b/Composer/packages/adaptive-form/src/utils/resolvePropSchema.ts
@@ -1,15 +1,13 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
-import { JSONSchema7, JSONSchema7Definition } from '@bfc/extension-client';
+import { JSONSchema7, SchemaDefinitions } from '@bfc/extension-client';
 
 import { resolveRef } from './resolveRef';
 
 export function resolvePropSchema(
   schema: JSONSchema7,
   path: string,
-  definitions: {
-    [k: string]: JSONSchema7Definition;
-  } = {}
+  definitions: SchemaDefinitions = {}
 ): JSONSchema7 | undefined {
   const propSchema = schema.properties?.[path];
 
diff --git a/Composer/packages/adaptive-form/src/utils/resolveRef.ts b/Composer/packages/adaptive-form/src/utils/resolveRef.ts
index 5fa870f4d1..433ff85adb 100644
--- a/Composer/packages/adaptive-form/src/utils/resolveRef.ts
+++ b/Composer/packages/adaptive-form/src/utils/resolveRef.ts
@@ -1,12 +1,9 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
-import { JSONSchema7, JSONSchema7Definition } from '@bfc/extension-client';
+import { JSONSchema7, SchemaDefinitions } from '@bfc/extension-client';
 import formatMessage from 'format-message';
 
-export function resolveRef(
-  schema: JSONSchema7 = {},
-  definitions: { [key: string]: JSONSchema7Definition } = {}
-): JSONSchema7 {
+export function resolveRef(schema: JSONSchema7 = {}, definitions: SchemaDefinitions = {}): JSONSchema7 {
   if (typeof schema?.$ref === 'string') {
     if (!schema?.$ref?.startsWith('#/definitions/')) {
       return schema;
diff --git a/Composer/packages/client/.gitignore b/Composer/packages/client/.gitignore
index de820129fc..b612041ef0 100644
--- a/Composer/packages/client/.gitignore
+++ b/Composer/packages/client/.gitignore
@@ -1,2 +1,3 @@
 build/
 public/*-bundle.js
+public/plugin-host-preload.js
diff --git a/Composer/packages/client/config/extensions.config.js b/Composer/packages/client/config/extensions.config.js
new file mode 100644
index 0000000000..c1fe1357a8
--- /dev/null
+++ b/Composer/packages/client/config/extensions.config.js
@@ -0,0 +1,103 @@
+const path = require('path');
+
+const PnpWebpackPlugin = require('pnp-webpack-plugin');
+const TerserPlugin = require('terser-webpack-plugin');
+
+const paths = require('./paths');
+
+module.exports = (webpackEnv) => {
+  const isEnvDevelopment = webpackEnv === 'development';
+  const isEnvProduction = webpackEnv === 'production';
+
+  return [
+    {
+      entry: {
+        'react-bundle': 'react',
+      },
+      mode: isEnvProduction ? 'production' : 'development',
+      // export react globally under a variable named React
+      output: {
+        path: path.resolve(__dirname, '../public'),
+        library: 'React',
+        libraryTarget: 'var',
+      },
+      resolve: {
+        extensions: ['.js'],
+      },
+      optimization: {
+        minimize: isEnvProduction,
+        minimizer: [
+          new TerserPlugin({
+            extractComments: false,
+          }),
+        ],
+      },
+    },
+    {
+      entry: {
+        'react-dom-bundle': 'react-dom',
+      },
+      mode: isEnvProduction ? 'production' : 'development',
+      // export react-dom globally under a variable named ReactDOM
+      output: {
+        path: path.resolve(__dirname, '../public'),
+        library: 'ReactDOM',
+        libraryTarget: 'var',
+      },
+      externals: {
+        // ReactDOM depends on React, but we need this to resolve to the globally-exposed React variable in react-bundle.js (created by extensions.config.js).
+        // If we don't do this, ReactDom will bundle its own copy of React and we will have 2 copies which breaks hooks.
+        react: 'React',
+      },
+      resolve: {
+        extensions: ['.js'],
+      },
+      optimization: {
+        minimize: isEnvProduction,
+        minimizer: [
+          new TerserPlugin({
+            extractComments: false,
+          }),
+        ],
+      },
+    },
+    {
+      mode: isEnvProduction ? 'production' : 'development',
+      entry: {
+        'plugin-host-preload': path.resolve(__dirname, '../extension-container/plugin-host-preload.tsx'),
+      },
+      output: {
+        path: path.resolve(__dirname, '../public'),
+      },
+      externals: {
+        // expect react & react-dom to be available in the extension host iframe globally under "React" and "ReactDOM" variables
+        react: 'React',
+        'react-dom': 'ReactDOM',
+      },
+      resolve: {
+        extensions: ['.js'],
+        plugins: [PnpWebpackPlugin],
+      },
+      resolveLoader: {
+        plugins: [
+          // Also related to Plug'n'Play, but this time it tells Webpack to load its loaders
+          // from the current package.
+          PnpWebpackPlugin.moduleLoader(module),
+        ],
+      },
+      module: {
+        rules: [
+          {
+            test: /\.tsx?$/,
+            loader: require.resolve('ts-loader'),
+            include: [path.resolve(__dirname, '../extension-container')],
+            options: PnpWebpackPlugin.tsLoaderOptions({
+              transpileOnly: true,
+              configFile: path.resolve(__dirname, '../tsconfig.build.json'),
+            }),
+          },
+        ],
+      },
+    },
+  ];
+};
diff --git a/Composer/packages/client/config/webpack-react-dom.config.js b/Composer/packages/client/config/webpack-react-dom.config.js
deleted file mode 100644
index 4e325e745c..0000000000
--- a/Composer/packages/client/config/webpack-react-dom.config.js
+++ /dev/null
@@ -1,22 +0,0 @@
-const { resolve } = require('path');
-
-module.exports = {
-  entry: {
-    'react-dom-bundle': 'react-dom',
-  },
-  mode: 'production',
-  // export react-dom globally under a variable named ReactDOM
-  output: {
-    path: resolve(__dirname, '../public'),
-    library: 'ReactDOM',
-    libraryTarget: 'var',
-  },
-  externals: {
-    // ReactDOM depends on React, but we need this to resolve to the globally-exposed React variable in react-bundle.js (created by webpack-react.config.js).
-    // If we don't do this, ReactDom will bundle its own copy of React and we will have 2 copies which breaks hooks.
-    react: 'React',
-  },
-  resolve: {
-    extensions: ['.js'],
-  },
-};
diff --git a/Composer/packages/client/config/webpack-react.config.js b/Composer/packages/client/config/webpack-react.config.js
deleted file mode 100644
index 711737994a..0000000000
--- a/Composer/packages/client/config/webpack-react.config.js
+++ /dev/null
@@ -1,17 +0,0 @@
-const { resolve } = require('path');
-
-module.exports = {
-  entry: {
-    'react-bundle': 'react',
-  },
-  mode: 'production',
-  // export react globally under a variable named React
-  output: {
-    path: resolve(__dirname, '../public'),
-    library: 'React',
-    libraryTarget: 'var',
-  },
-  resolve: {
-    extensions: ['.js'],
-  },
-};
diff --git a/Composer/packages/client/public/plugin-host-preload.js b/Composer/packages/client/extension-container/plugin-host-preload.tsx
similarity index 72%
rename from Composer/packages/client/public/plugin-host-preload.js
rename to Composer/packages/client/extension-container/plugin-host-preload.tsx
index 688fa7b79f..13117fd1ac 100644
--- a/Composer/packages/client/public/plugin-host-preload.js
+++ b/Composer/packages/client/extension-container/plugin-host-preload.tsx
@@ -1,3 +1,14 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+
+import ReactDOM from 'react-dom';
+
+if (!document.head.title) {
+  const title = document.createElement('title');
+  title.innerHTML = 'Plugin Host';
+  document.head.append(title);
+}
+
 // add default doc styles
 if (!document.getElementById('plugin-host-default-styles')) {
   const styles = document.createElement('style');
@@ -23,7 +34,8 @@ if (!document.getElementById('plugin-root')) {
 }
 // initialize the API object
 window.Composer = {};
+
 // init the render function
-window.Composer['render'] = function (component) {
+window.Composer.render = function (component) {
   ReactDOM.render(component, document.getElementById('plugin-root'));
 };
diff --git a/Composer/packages/client/package.json b/Composer/packages/client/package.json
index b9417f2435..4c0aab0466 100644
--- a/Composer/packages/client/package.json
+++ b/Composer/packages/client/package.json
@@ -8,9 +8,9 @@
     "node": ">=12"
   },
   "scripts": {
-    "start": "yarn build:react-bundles && node scripts/start.js",
+    "start": "yarn build:extension-bundles && node scripts/start.js",
     "build": "node --max_old_space_size=4096 scripts/build.js",
-    "build:react-bundles": "webpack --config ./config/webpack-react.config.js && webpack --config ./config/webpack-react-dom.config.js",
+    "build:extension-bundles": "webpack --config ./config/extensions.config.js",
     "clean": "rimraf build",
     "test": "jest",
     "lint": "eslint --quiet --ext .js,.jsx,.ts,.tsx ./src ./__tests__",
diff --git a/Composer/packages/client/public/index.html b/Composer/packages/client/public/index.html
index f07ec70b3f..047330b0d4 100644
--- a/Composer/packages/client/public/index.html
+++ b/Composer/packages/client/public/index.html
@@ -36,7 +36,7 @@
           };
 
           window.CSPSettings = {
-            nonce:  window.__nonce__
+            nonce: window.__nonce__
           };
         </script>
       <? } ?>
diff --git a/Composer/packages/client/src/components/PluginHost/PluginHost.tsx b/Composer/packages/client/src/components/PluginHost/PluginHost.tsx
index 1b801b878e..07957cd8df 100644
--- a/Composer/packages/client/src/components/PluginHost/PluginHost.tsx
+++ b/Composer/packages/client/src/components/PluginHost/PluginHost.tsx
@@ -13,8 +13,9 @@ import { iframeStyle } from './styles';
 
 interface PluginHostProps {
   extraIframeStyles?: SerializedStyles[];
-  pluginName?: string;
-  pluginType?: PluginType;
+  pluginName: string;
+  pluginType: PluginType;
+  bundleId: string;
 }
 
 /** Binds closures around Composer client code to plugin iframe's window object */
@@ -41,7 +42,7 @@ export const PluginHost: React.FC<PluginHostProps> = (props) => {
   const { extraIframeStyles = [] } = props;
 
   useEffect(() => {
-    const { pluginName, pluginType } = props;
+    const { pluginName, pluginType, bundleId } = props;
     // renders the plugin's UI inside of the iframe
     const renderPluginView = async () => {
       if (pluginName && pluginType) {
@@ -62,13 +63,14 @@ export const PluginHost: React.FC<PluginHostProps> = (props) => {
           const cb = () => {
             resolve();
           };
+          const bundleUri = `/api/extensions/${pluginName}/${bundleId}`;
           // If plugin bundles end up being too large and block the client thread due to the load, enable the async flag on this call
-          injectScript(iframeDocument, pluginScriptId, `/api/extensions/${pluginName}/view/${pluginType}`, false, cb);
+          injectScript(iframeDocument, pluginScriptId, bundleUri, false, cb);
         });
       }
     };
     renderPluginView();
-  }, [props.pluginName, props.pluginType, targetRef]);
+  }, [props.pluginName, props.pluginType, props.bundleId, targetRef]);
 
   return <iframe ref={targetRef} css={[iframeStyle, ...extraIframeStyles]} title={`${props.pluginName} host`}></iframe>;
 };
diff --git a/Composer/packages/client/src/pages/language-generation/code-editor.tsx b/Composer/packages/client/src/pages/language-generation/code-editor.tsx
index 30e5ec6aba..aa6cfd03ac 100644
--- a/Composer/packages/client/src/pages/language-generation/code-editor.tsx
+++ b/Composer/packages/client/src/pages/language-generation/code-editor.tsx
@@ -13,7 +13,7 @@ import { RouteComponentProps } from '@reach/router';
 import querystring from 'query-string';
 import { CodeEditorSettings } from '@bfc/shared';
 import { useRecoilValue } from 'recoil';
-import { LgFile } from '@bfc/shared/src/types/indexers';
+import { LgFile } from '@bfc/extension-client';
 
 import { localeState, lgFilesState, settingsState } from '../../recoilModel/atoms/botState';
 import { userSettingsState, dispatcherState } from '../../recoilModel';
diff --git a/Composer/packages/client/src/pages/plugin/pluginPageContainer.tsx b/Composer/packages/client/src/pages/plugin/pluginPageContainer.tsx
index 662b0ca484..c589300d45 100644
--- a/Composer/packages/client/src/pages/plugin/pluginPageContainer.tsx
+++ b/Composer/packages/client/src/pages/plugin/pluginPageContainer.tsx
@@ -6,10 +6,14 @@ import { RouteComponentProps } from '@reach/router';
 
 import { PluginHost } from '../../components/PluginHost/PluginHost';
 
-const PluginPageContainer: React.FC<RouteComponentProps<{ pluginId: string }>> = (props) => {
-  const { pluginId } = props;
+const PluginPageContainer: React.FC<RouteComponentProps<{ pluginId: string; bundleId: string }>> = (props) => {
+  const { pluginId, bundleId } = props;
 
-  return <PluginHost pluginName={pluginId} pluginType={'page'}></PluginHost>;
+  if (!pluginId || !bundleId) {
+    return null;
+  }
+
+  return <PluginHost bundleId={bundleId} pluginName={pluginId} pluginType="page"></PluginHost>;
 };
 
 export { PluginPageContainer };
diff --git a/Composer/packages/client/src/pages/publish/createPublishTarget.tsx b/Composer/packages/client/src/pages/publish/createPublishTarget.tsx
index cc9fe43042..f897f60595 100644
--- a/Composer/packages/client/src/pages/publish/createPublishTarget.tsx
+++ b/Composer/packages/client/src/pages/publish/createPublishTarget.tsx
@@ -73,8 +73,8 @@ const CreatePublishTarget: React.FC<CreatePublishTargetProps> = (props) => {
     return targetType ? props.types.find((t) => t.name === targetType)?.schema : undefined;
   }, [props.targets, targetType]);
 
-  const hasView = useMemo(() => {
-    return targetType ? props.types.find((t) => t.name === targetType)?.hasView : undefined;
+  const targetBundleId = useMemo(() => {
+    return targetType ? props.types.find((t) => t.name === targetType)?.bundleId : undefined;
   }, [props.targets, targetType]);
 
   const updateName = (e, newName) => {
@@ -85,7 +85,7 @@ const CreatePublishTarget: React.FC<CreatePublishTargetProps> = (props) => {
 
   const saveDisabled = useMemo(() => {
     const disabled = !targetType || !name || !!errorMessage;
-    if (hasView) {
+    if (targetBundleId) {
       // plugin config must also be valid
       return disabled || !pluginConfigIsValid;
     }
@@ -107,13 +107,14 @@ const CreatePublishTarget: React.FC<CreatePublishTargetProps> = (props) => {
   };
 
   const publishTargetContent = useMemo(() => {
-    if (hasView && targetType) {
+    if (targetBundleId && targetType) {
       // render custom plugin view
       return (
         <PluginHost
+          bundleId={targetBundleId}
           extraIframeStyles={[customPublishUISurface]}
           pluginName={targetType}
-          pluginType={'publish'}
+          pluginType="publish"
         ></PluginHost>
       );
     }
@@ -133,7 +134,7 @@ const CreatePublishTarget: React.FC<CreatePublishTargetProps> = (props) => {
         <button hidden disabled={saveDisabled} type="submit" />
       </Fragment>
     );
-  }, [targetType, instructions, schema, hasView, saveDisabled]);
+  }, [targetType, instructions, schema, targetBundleId, saveDisabled]);
 
   return (
     <Fragment>
diff --git a/Composer/packages/client/src/pages/setting/extensions/ExtensionSearchResults.tsx b/Composer/packages/client/src/pages/setting/extensions/ExtensionSearchResults.tsx
index e687032207..16913d5f23 100644
--- a/Composer/packages/client/src/pages/setting/extensions/ExtensionSearchResults.tsx
+++ b/Composer/packages/client/src/pages/setting/extensions/ExtensionSearchResults.tsx
@@ -16,15 +16,7 @@ import {
 import { ScrollablePane } from 'office-ui-fabric-react/lib/ScrollablePane';
 import { Sticky } from 'office-ui-fabric-react/lib/Sticky';
 import { ShimmeredDetailsList } from 'office-ui-fabric-react/lib/ShimmeredDetailsList';
-
-// TODO: extract to shared?
-export type ExtensionSearchResult = {
-  id: string;
-  keywords: string[];
-  version: string;
-  description: string;
-  url: string;
-};
+import { ExtensionSearchResult } from '@bfc/extension-client';
 
 type ExtensionSearchResultsProps = {
   results: ExtensionSearchResult[];
diff --git a/Composer/packages/client/src/pages/setting/extensions/Extensions.tsx b/Composer/packages/client/src/pages/setting/extensions/Extensions.tsx
index fc15946802..a2b26e6913 100644
--- a/Composer/packages/client/src/pages/setting/extensions/Extensions.tsx
+++ b/Composer/packages/client/src/pages/setting/extensions/Extensions.tsx
@@ -20,13 +20,12 @@ import { ShimmeredDetailsList } from 'office-ui-fabric-react/lib/ShimmeredDetail
 import formatMessage from 'format-message';
 import { useRecoilValue, selector } from 'recoil';
 import { NeutralColors } from '@uifabric/fluent-theme';
+import { ExtensionMetadata, ExtensionSearchResult } from '@bfc/extension-client';
 
-import { ExtensionConfig } from '../../../recoilModel/types';
 import { Toolbar, IToolbarItem } from '../../../components/Toolbar';
 import { dispatcherState, extensionsState } from '../../../recoilModel';
 
 import { InstallExtensionDialog } from './InstallExtensionDialog';
-import { ExtensionSearchResult } from './ExtensionSearchResults';
 
 const remoteExtensionsState = selector({
   key: 'remoteExtensions',
@@ -45,11 +44,11 @@ const Extensions: React.FC<RouteComponentProps> = () => {
   // if a string, its the id of the extension being updated
   const [isUpdating, setIsUpdating] = useState<string | boolean>(false);
   const [showNewModal, setShowNewModal] = useState(false);
-  const [selectedExtensions, setSelectedExtensions] = useState<ExtensionConfig[]>([]);
+  const [selectedExtensions, setSelectedExtensions] = useState<ExtensionMetadata[]>([]);
   const selection = useRef(
     new Selection({
       onSelectionChanged: () => {
-        setSelectedExtensions(selection.getSelection() as ExtensionConfig[]);
+        setSelectedExtensions(selection.getSelection() as ExtensionMetadata[]);
       },
     })
   ).current;
@@ -91,7 +90,7 @@ const Extensions: React.FC<RouteComponentProps> = () => {
       minWidth: 100,
       maxWidth: 150,
       isResizable: true,
-      onRender: (item: ExtensionConfig) => {
+      onRender: (item: ExtensionMetadata) => {
         return (
           <Toggle
             ariaLabel={formatMessage('Toggle extension')}
diff --git a/Composer/packages/client/src/pages/setting/extensions/InstallExtensionDialog.tsx b/Composer/packages/client/src/pages/setting/extensions/InstallExtensionDialog.tsx
index 0f4e721be4..5326741f6a 100644
--- a/Composer/packages/client/src/pages/setting/extensions/InstallExtensionDialog.tsx
+++ b/Composer/packages/client/src/pages/setting/extensions/InstallExtensionDialog.tsx
@@ -9,10 +9,11 @@ import { SearchBox } from 'office-ui-fabric-react/lib/SearchBox';
 import { DefaultButton, PrimaryButton } from 'office-ui-fabric-react/lib/Button';
 import axios, { CancelToken } from 'axios';
 import formatMessage from 'format-message';
+import { ExtensionSearchResult } from '@bfc/extension-client';
 
 import httpClient from '../../../utils/httpUtil';
 
-import { ExtensionSearchResult, ExtensionSearchResults } from './ExtensionSearchResults';
+import { ExtensionSearchResults } from './ExtensionSearchResults';
 
 type InstallExtensionDialogProps = {
   isOpen: boolean;
diff --git a/Composer/packages/client/src/recoilModel/atoms/appState.ts b/Composer/packages/client/src/recoilModel/atoms/appState.ts
index ffa97d2f58..cb10514fdb 100644
--- a/Composer/packages/client/src/recoilModel/atoms/appState.ts
+++ b/Composer/packages/client/src/recoilModel/atoms/appState.ts
@@ -3,6 +3,7 @@
 
 import { atom, atomFamily } from 'recoil';
 import { ProjectTemplate, UserSettings } from '@bfc/shared';
+import { ExtensionMetadata } from '@bfc/extension-client';
 
 import {
   StorageFolder,
@@ -11,7 +12,6 @@ import {
   AppUpdateState,
   BoilerplateVersion,
   Notification,
-  ExtensionConfig,
 } from '../../recoilModel/types';
 import { getUserSettings } from '../utils';
 import onboardingStorage from '../../utils/onboardingStorage';
@@ -165,7 +165,7 @@ export const notificationsState = atomFamily<Notification, string>({
   },
 });
 
-export const extensionsState = atom<ExtensionConfig[]>({
+export const extensionsState = atom<Omit<ExtensionMetadata, 'path'>[]>({
   key: getFullyQualifiedKey('extensions'),
   default: [],
 });
diff --git a/Composer/packages/client/src/recoilModel/dispatchers/extensions.ts b/Composer/packages/client/src/recoilModel/dispatchers/extensions.ts
index b7196583f5..c89454c4fb 100644
--- a/Composer/packages/client/src/recoilModel/dispatchers/extensions.ts
+++ b/Composer/packages/client/src/recoilModel/dispatchers/extensions.ts
@@ -3,10 +3,10 @@
 // Licensed under the MIT License.
 
 import { CallbackInterface, useRecoilCallback } from 'recoil';
+import { ExtensionMetadata } from '@bfc/extension-client';
 
 import httpClient from '../../utils/httpUtil';
 import { extensionsState } from '../atoms';
-import { ExtensionConfig } from '../types';
 
 export const extensionsDispatcher = () => {
   const fetchExtensions = useRecoilCallback((callbackHelpers: CallbackInterface) => async () => {
@@ -16,6 +16,7 @@ export const extensionsDispatcher = () => {
 
       set(extensionsState, res.data);
     } catch (err) {
+      // eslint-disable-next-line no-console
       console.error(err);
     }
   });
@@ -25,7 +26,7 @@ export const extensionsDispatcher = () => {
       const { set } = callbackHelpers;
       try {
         const res = await httpClient.post('/extensions', { id: extensionName, version });
-        const addedExtension: ExtensionConfig = res.data;
+        const addedExtension: ExtensionMetadata = res.data;
 
         set(extensionsState, (extensions) => {
           if (extensions.find((p) => p.id === addedExtension.id)) {
@@ -40,6 +41,7 @@ export const extensionsDispatcher = () => {
           }
         });
       } catch (err) {
+        // eslint-disable-next-line no-console
         console.error(err);
       }
     }
@@ -52,6 +54,7 @@ export const extensionsDispatcher = () => {
 
       set(extensionsState, res.data);
     } catch (err) {
+      // eslint-disable-next-line no-console
       console.error(err);
     }
   });
@@ -64,7 +67,7 @@ export const extensionsDispatcher = () => {
           id: extensionId,
           enabled: Boolean(enabled),
         });
-        const toggledExtension: ExtensionConfig = res.data;
+        const toggledExtension: ExtensionMetadata = res.data;
 
         set(extensionsState, (extensions) => {
           return (extensions = extensions.map((p) => {
@@ -76,7 +79,7 @@ export const extensionsDispatcher = () => {
           }));
         });
       } catch (err) {
-        // do nothing
+        // eslint-disable-next-line no-console
         console.error(err);
       }
     }
diff --git a/Composer/packages/client/src/recoilModel/persistence/FilePersistence.ts b/Composer/packages/client/src/recoilModel/persistence/FilePersistence.ts
index 16a098ea40..a28b100468 100644
--- a/Composer/packages/client/src/recoilModel/persistence/FilePersistence.ts
+++ b/Composer/packages/client/src/recoilModel/persistence/FilePersistence.ts
@@ -4,8 +4,8 @@ import keys from 'lodash/keys';
 import differenceWith from 'lodash/differenceWith';
 import isEqual from 'lodash/isEqual';
 import { DialogInfo, DialogSchemaFile, DialogSetting, SkillManifest, BotAssets } from '@bfc/shared';
+import { LuFile, LgFile, QnAFile } from '@bfc/types';
 
-import { LuFile, LgFile, QnAFile } from './../../../../lib/shared/src/types/indexers';
 import * as client from './http';
 import { IFileChange, ChangeType, FileExtensions } from './types';
 
diff --git a/Composer/packages/client/src/recoilModel/types.ts b/Composer/packages/client/src/recoilModel/types.ts
index 63ddebe513..f5ce133627 100644
--- a/Composer/packages/client/src/recoilModel/types.ts
+++ b/Composer/packages/client/src/recoilModel/types.ts
@@ -30,7 +30,7 @@ export interface StorageFolder extends File {
 export interface PublishType {
   name: string;
   description: string;
-  hasView?: boolean;
+  bundleId?: string;
   instructions?: string;
   schema?: JSONSchema7;
   features: {
@@ -41,38 +41,6 @@ export interface PublishType {
   };
 }
 
-type ExtensionPublishContribution = {
-  bundleId: string;
-};
-
-export type ExtensionPageContribution = {
-  /** plugin id */
-  id: string;
-  bundleId: string;
-  label: string;
-  icon?: string;
-};
-
-// TODO: move this definition to a shared spot
-export interface ExtensionConfig {
-  id: string;
-  name: string;
-  description: string;
-  enabled: boolean;
-  version: string;
-  /** Special property only used in the in-memory representation of extensions to flag as a built-in. Not written to disk. */
-  builtIn?: boolean;
-  /** Path where module is installed */
-  path: string;
-  bundles: any; // TODO: needed?
-  contributes?: {
-    views?: {
-      publish?: ExtensionPublishContribution;
-      pages?: ExtensionPageContribution[];
-    };
-  };
-}
-
 export interface RuntimeTemplate {
   /** internal use key */
   key: string;
diff --git a/Composer/packages/client/src/router.tsx b/Composer/packages/client/src/router.tsx
index f24f4013a8..b29e392b2d 100644
--- a/Composer/packages/client/src/router.tsx
+++ b/Composer/packages/client/src/router.tsx
@@ -60,7 +60,7 @@ const Routes = (props) => {
           <SettingPage path="settings/*" />
           <BotCreationFlowRouter path="projects/*" />
           <BotCreationFlowRouter path="home" />
-          <PluginPageContainer path="page/:pluginId" />
+          <PluginPageContainer path="plugin/:pluginId/:bundleId" />
           <NotFound default />
         </Router>
       </Suspense>
diff --git a/Composer/packages/client/src/shell/lgApi.ts b/Composer/packages/client/src/shell/lgApi.ts
index 76168af704..ab7f47e70b 100644
--- a/Composer/packages/client/src/shell/lgApi.ts
+++ b/Composer/packages/client/src/shell/lgApi.ts
@@ -84,7 +84,7 @@ function createLgApi(
     addLgTemplate: updateLgTemplate,
     getLgTemplates,
     updateLgTemplate,
-    deboucedUpdateLgTemplate: debounce(updateLgTemplate, 250),
+    debouncedUpdateLgTemplate: debounce(updateLgTemplate, 250),
     removeLgTemplate,
     removeLgTemplates,
     copyLgTemplate,
diff --git a/Composer/packages/client/src/shell/luApi.ts b/Composer/packages/client/src/shell/luApi.ts
index 7581c402ba..5c7ac05231 100644
--- a/Composer/packages/client/src/shell/luApi.ts
+++ b/Composer/packages/client/src/shell/luApi.ts
@@ -77,7 +77,7 @@ function createLuApi(
     getLuIntents,
     getLuIntent,
     updateLuIntent,
-    deboucedUpdateLuIntent: debounce(updateLuIntent, 250),
+    debouncedUpdateLuIntent: debounce(updateLuIntent, 250),
     renameLuIntent,
     removeLuIntent,
   };
diff --git a/Composer/packages/client/src/utils/hooks.ts b/Composer/packages/client/src/utils/hooks.ts
index 102486f49e..c24bc5e8b7 100644
--- a/Composer/packages/client/src/utils/hooks.ts
+++ b/Composer/packages/client/src/utils/hooks.ts
@@ -7,10 +7,9 @@ import replace from 'lodash/replace';
 import find from 'lodash/find';
 import { useRecoilValue } from 'recoil';
 
-import { ExtensionPageContribution } from '../recoilModel/types';
 import { designPageLocationState, enabledExtensionsSelector, currentProjectIdState } from '../recoilModel';
 
-import { bottomLinks, topLinks } from './pageLinks';
+import { bottomLinks, topLinks, ExtensionPageConfig } from './pageLinks';
 import routerCache from './routerCache';
 import { projectIdCache } from './projectCache';
 
@@ -36,7 +35,7 @@ export const useLinks = () => {
       pages.push(...pagesConfig.map((page) => ({ ...page, id: p.id })));
     }
     return pages;
-  }, [] as ExtensionPageContribution[]);
+  }, [] as ExtensionPageConfig[]);
 
   return { topLinks: topLinks(projectId, openedDialogId, pluginPages), bottomLinks };
 };
diff --git a/Composer/packages/client/src/utils/pageLinks.ts b/Composer/packages/client/src/utils/pageLinks.ts
index 3573c6993a..034212596c 100644
--- a/Composer/packages/client/src/utils/pageLinks.ts
+++ b/Composer/packages/client/src/utils/pageLinks.ts
@@ -1,10 +1,11 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 import formatMessage from 'format-message';
+import { ExtensionPageContribution } from '@bfc/extension-client';
 
-import { ExtensionPageContribution } from '../recoilModel/types';
+export type ExtensionPageConfig = ExtensionPageContribution & { id: string };
 
-export const topLinks = (projectId: string, openedDialogId: string, pluginPages: ExtensionPageContribution[]) => {
+export const topLinks = (projectId: string, openedDialogId: string, pluginPages: ExtensionPageConfig[]) => {
   const botLoaded = !!projectId;
   let links = [
     {
@@ -72,7 +73,7 @@ export const topLinks = (projectId: string, openedDialogId: string, pluginPages:
   if (pluginPages.length > 0) {
     pluginPages.forEach((p) => {
       links.push({
-        to: `page/${p.id}`,
+        to: `plugin/${p.id}/${p.bundleId}`,
         iconName: p.icon ?? 'StatusCircleQuestionMark',
         labelName: p.label,
         exact: true,
diff --git a/Composer/packages/client/tsconfig.build.json b/Composer/packages/client/tsconfig.build.json
index 4f74314591..9b67f35799 100644
--- a/Composer/packages/client/tsconfig.build.json
+++ b/Composer/packages/client/tsconfig.build.json
@@ -1,5 +1,5 @@
 {
   "extends": "./tsconfig.json",
   "include": ["./src/**/*"],
-  "exclude": ["__mocks__"]
+  "exclude": ["__mocks__", "./extension-container"]
 }
diff --git a/Composer/packages/client/tsconfig.json b/Composer/packages/client/tsconfig.json
index 0022640b44..2db7715527 100644
--- a/Composer/packages/client/tsconfig.json
+++ b/Composer/packages/client/tsconfig.json
@@ -5,5 +5,5 @@
     "allowJs": true,
     "module": "esnext"
   },
-  "include": ["./src/**/*", "./__tests__/**/*"]
+  "include": ["./src/**/*", "./__tests__/**/*", "./extension-container/**/*"]
 }
diff --git a/Composer/packages/extension-client/package.json b/Composer/packages/extension-client/package.json
index 0948d57580..b430f710ee 100644
--- a/Composer/packages/extension-client/package.json
+++ b/Composer/packages/extension-client/package.json
@@ -15,6 +15,7 @@
     "react-dom": "16.13.1"
   },
   "devDependencies": {
+    "@bfc/types": "*",
     "@bfc/test-utils": "*",
     "@types/react": "16.9.23",
     "react": "16.13.1",
diff --git a/Composer/packages/extension-client/src/EditorExtensionContext.ts b/Composer/packages/extension-client/src/EditorExtensionContext.ts
index 64b2052719..b68428ffc9 100644
--- a/Composer/packages/extension-client/src/EditorExtensionContext.ts
+++ b/Composer/packages/extension-client/src/EditorExtensionContext.ts
@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 import React from 'react';
-import { ShellApi, ShellData } from '@bfc/shared';
+import { ShellApi, ShellData } from '@bfc/types';
 
 import { PluginConfig } from './types';
 
diff --git a/Composer/packages/extension-client/src/components/EditorExtension.tsx b/Composer/packages/extension-client/src/components/EditorExtension.tsx
index a46a72f200..0d268f1cce 100644
--- a/Composer/packages/extension-client/src/components/EditorExtension.tsx
+++ b/Composer/packages/extension-client/src/components/EditorExtension.tsx
@@ -2,7 +2,7 @@
 // Licensed under the MIT License.
 
 import React, { useMemo } from 'react';
-import { Shell } from '@bfc/shared';
+import { Shell } from '@bfc/types';
 
 import { EditorExtensionContext } from '../EditorExtensionContext';
 import { PluginConfig } from '../types';
diff --git a/Composer/packages/extension-client/src/hooks/index.ts b/Composer/packages/extension-client/src/hooks/index.ts
index 232e81e2e5..5bc77489c7 100644
--- a/Composer/packages/extension-client/src/hooks/index.ts
+++ b/Composer/packages/extension-client/src/hooks/index.ts
@@ -1,7 +1,6 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 export * from './useActionApi';
-export * from './useDebounce';
 export * from './useDialogApi';
 export * from './useDialogEditApi';
 export * from './useFlowConfig';
diff --git a/Composer/packages/extension-client/src/hooks/useActionApi.ts b/Composer/packages/extension-client/src/hooks/useActionApi.ts
index 0d1208b9a4..947dc542ab 100644
--- a/Composer/packages/extension-client/src/hooks/useActionApi.ts
+++ b/Composer/packages/extension-client/src/hooks/useActionApi.ts
@@ -2,14 +2,13 @@
 // Licensed under the MIT License.
 
 import {
-  BaseSchema,
   deepCopyActions,
   deleteAction as destructAction,
   deleteActions as destructActions,
   FieldProcessorAsync,
   walkAdaptiveActionList,
-  ShellApi,
 } from '@bfc/shared';
+import { BaseSchema, ShellApi } from '@bfc/types';
 
 import { useLgApi } from './useLgApi';
 import { useLuApi } from './useLuApi';
diff --git a/Composer/packages/extension-client/src/hooks/useDebounce.ts b/Composer/packages/extension-client/src/hooks/useDebounce.ts
deleted file mode 100644
index 47b4f79c5f..0000000000
--- a/Composer/packages/extension-client/src/hooks/useDebounce.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-// Copyright (c) Microsoft Corporation.
-// Licensed under the MIT License.
-import { useMemo } from 'react';
-import debounce from 'lodash/debounce';
-
-export const useDebounce: typeof debounce = (fn, options) => {
-  return useMemo(() => debounce(fn, options), [fn]);
-};
diff --git a/Composer/packages/extension-client/src/hooks/useDialogApi.ts b/Composer/packages/extension-client/src/hooks/useDialogApi.ts
index 302d52eb85..70f7748ec3 100644
--- a/Composer/packages/extension-client/src/hooks/useDialogApi.ts
+++ b/Composer/packages/extension-client/src/hooks/useDialogApi.ts
@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
-import { ShellApi } from '@bfc/shared';
+import { ShellApi } from '@bfc/types';
 
 export const useDialogApi = (shellApi: ShellApi) => {
   const { getDialog, saveDialog, createDialog } = shellApi;
diff --git a/Composer/packages/extension-client/src/hooks/useDialogEditApi.ts b/Composer/packages/extension-client/src/hooks/useDialogEditApi.ts
index 0474e00945..689df57ff5 100644
--- a/Composer/packages/extension-client/src/hooks/useDialogEditApi.ts
+++ b/Composer/packages/extension-client/src/hooks/useDialogEditApi.ts
@@ -1,8 +1,8 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
-import { BaseSchema, DialogUtils, ShellApi } from '@bfc/shared';
-import { disableNodes, enableNodes } from '@bfc/shared/lib/dialogUtils';
+import { BaseSchema, ShellApi } from '@bfc/types';
+import { DialogUtils } from '@bfc/shared';
 
 import { useActionApi } from './useActionApi';
 
@@ -13,7 +13,7 @@ export interface DialogApiContext {
   deleteActions: (actionIds: BaseSchema[]) => BaseSchema[];
 }
 
-const { appendNodesAfter, queryNodes, insertNodes, deleteNode, deleteNodes } = DialogUtils;
+const { disableNodes, enableNodes, appendNodesAfter, queryNodes, insertNodes, deleteNode, deleteNodes } = DialogUtils;
 
 export function useDialogEditApi(shellApi: ShellApi) {
   const { constructActions, copyActions, deleteAction, deleteActions } = useActionApi(shellApi);
diff --git a/Composer/packages/extension-client/src/hooks/useLgApi.ts b/Composer/packages/extension-client/src/hooks/useLgApi.ts
index dc914c4c8a..909aa1e77d 100644
--- a/Composer/packages/extension-client/src/hooks/useLgApi.ts
+++ b/Composer/packages/extension-client/src/hooks/useLgApi.ts
@@ -1,7 +1,8 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
-import { LgTemplateRef, LgMetaData, BaseSchema, LgType, ShellApi } from '@bfc/shared';
+import { LgType, LgTemplateRef, LgMetaData } from '@bfc/shared';
+import { BaseSchema, ShellApi } from '@bfc/types';
 
 /**
  * LG CRUD lib
diff --git a/Composer/packages/extension-client/src/hooks/useLuApi.ts b/Composer/packages/extension-client/src/hooks/useLuApi.ts
index 74c1d0d724..1e12cb416a 100644
--- a/Composer/packages/extension-client/src/hooks/useLuApi.ts
+++ b/Composer/packages/extension-client/src/hooks/useLuApi.ts
@@ -1,7 +1,8 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
-import { LuIntentSection, BaseSchema, LuMetaData, LuType, ShellApi } from '@bfc/shared';
+import { LuMetaData, LuType } from '@bfc/shared';
+import { LuIntentSection, BaseSchema, ShellApi } from '@bfc/types';
 
 /**
  * LU CRUD API
diff --git a/Composer/packages/extension-client/src/hooks/useRecognizerConfig.ts b/Composer/packages/extension-client/src/hooks/useRecognizerConfig.ts
index a90127aa55..cf6a74dd1a 100644
--- a/Composer/packages/extension-client/src/hooks/useRecognizerConfig.ts
+++ b/Composer/packages/extension-client/src/hooks/useRecognizerConfig.ts
@@ -2,7 +2,7 @@
 // Licensed under the MIT License.
 
 import { useContext, useMemo } from 'react';
-import { MicrosoftIRecognizer, SDKKinds } from '@bfc/shared';
+import { MicrosoftIRecognizer, SDKKinds } from '@bfc/types';
 import get from 'lodash/get';
 
 import { EditorExtensionContext } from '../EditorExtensionContext';
diff --git a/Composer/packages/extension-client/src/hooks/useShellApi.ts b/Composer/packages/extension-client/src/hooks/useShellApi.ts
index a2887200a1..e6acf863c2 100644
--- a/Composer/packages/extension-client/src/hooks/useShellApi.ts
+++ b/Composer/packages/extension-client/src/hooks/useShellApi.ts
@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 import { useContext } from 'react';
-import { ShellApi, ShellData } from '@bfc/shared';
+import { ShellApi, ShellData } from '@bfc/types';
 
 import { EditorExtensionContext } from '../EditorExtensionContext';
 import { PluginConfig } from '../types';
diff --git a/Composer/packages/extension-client/src/hooks/useTriggerApi.ts b/Composer/packages/extension-client/src/hooks/useTriggerApi.ts
index 4a6f35fc57..e4d5dbd135 100644
--- a/Composer/packages/extension-client/src/hooks/useTriggerApi.ts
+++ b/Composer/packages/extension-client/src/hooks/useTriggerApi.ts
@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
-import { ShellApi, SDKKinds, ITriggerCondition, BaseSchema } from '@bfc/shared';
+import { ShellApi, SDKKinds, ITriggerCondition, BaseSchema } from '@bfc/types';
 import get from 'lodash/get';
 
 import { useActionApi } from './useActionApi';
diff --git a/Composer/packages/extension-client/src/index.ts b/Composer/packages/extension-client/src/index.ts
index e0a8bf146b..ec87761835 100644
--- a/Composer/packages/extension-client/src/index.ts
+++ b/Composer/packages/extension-client/src/index.ts
@@ -1,6 +1,8 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
+export * from '@bfc/types';
+
 export * from './auth';
 export * from './common';
 export * from './components';
diff --git a/Composer/packages/extension-client/src/types/extension.ts b/Composer/packages/extension-client/src/types/extension.ts
index fe1a047371..3a0d212e94 100644
--- a/Composer/packages/extension-client/src/types/extension.ts
+++ b/Composer/packages/extension-client/src/types/extension.ts
@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
-import { SDKKinds } from '@bfc/shared';
+import { SDKKinds } from '@bfc/types';
 
 import { UIOptions } from './formSchema';
 import { FlowEditorWidgetMap, FlowWidget } from './flowSchema';
diff --git a/Composer/packages/extension-client/src/types/flowSchema.ts b/Composer/packages/extension-client/src/types/flowSchema.ts
index 44560009eb..317543fb62 100644
--- a/Composer/packages/extension-client/src/types/flowSchema.ts
+++ b/Composer/packages/extension-client/src/types/flowSchema.ts
@@ -2,7 +2,7 @@
 // Licensed under the MIT License.
 
 import { FC, ComponentClass } from 'react';
-import { BaseSchema, SDKKinds } from '@bfc/shared';
+import { BaseSchema, SDKKinds } from '@bfc/types';
 
 export type FlowEditorWidgetMap = { [widgetName: string]: WidgetComponent<any> };
 export enum FlowSchemaBuiltinKeys {
diff --git a/Composer/packages/extension-client/src/types/form.ts b/Composer/packages/extension-client/src/types/form.ts
index 2de9d5a4d3..4c0cae7fb9 100644
--- a/Composer/packages/extension-client/src/types/form.ts
+++ b/Composer/packages/extension-client/src/types/form.ts
@@ -1,30 +1,10 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
-import { JSONSchema7, JSONSchema7Definition } from 'json-schema';
+import { JSONSchema7, SchemaDefinitions } from '@bfc/types';
 import React from 'react';
 
 import { UIOptions } from './formSchema';
 
-declare module 'json-schema' {
-  interface JSONSchema7 {
-    $copy?: string;
-    $id?: string;
-    $kind?: string;
-    $role?: string;
-    $designer?: {
-      id: string;
-      [key: string]: any;
-    };
-  }
-}
-
-export interface SchemaDefinitions {
-  [key: string]: JSONSchema7Definition;
-}
-
-// Re-export monkey patched json schema interfaces
-export { JSONSchema7, JSONSchema7Definition };
-
 export type FormErrors = {
   [key: string]: string | FormErrors;
 };
@@ -34,7 +14,7 @@ export type ChangeHandler<T = any> = (newValue?: T) => void;
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 export interface FieldProps<T = any> {
   className?: string;
-  definitions: { [key: string]: JSONSchema7Definition } | undefined;
+  definitions: SchemaDefinitions | undefined;
   depth: number;
   description?: string;
   disabled?: boolean;
diff --git a/Composer/packages/extension-client/src/types/formSchema.ts b/Composer/packages/extension-client/src/types/formSchema.ts
index bebf908b80..631a937ce6 100644
--- a/Composer/packages/extension-client/src/types/formSchema.ts
+++ b/Composer/packages/extension-client/src/types/formSchema.ts
@@ -1,6 +1,6 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
-import { MicrosoftIRecognizer, SDKKinds, SDKRoles, ShellApi, ShellData } from '@bfc/shared';
+import { MicrosoftIRecognizer, SDKKinds, SDKRoles, ShellApi, ShellData } from '@bfc/types';
 
 import { FieldWidget } from './form';
 
diff --git a/Composer/packages/extension-client/src/types/menuSchema.ts b/Composer/packages/extension-client/src/types/menuSchema.ts
index b27094c4a3..380ed3aa1a 100644
--- a/Composer/packages/extension-client/src/types/menuSchema.ts
+++ b/Composer/packages/extension-client/src/types/menuSchema.ts
@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
-import { SDKKinds } from '@bfc/shared';
+import { SDKKinds } from '@bfc/types';
 
 export interface MenuOptions {
   label?: string;
diff --git a/Composer/packages/extension-client/src/types/recognizerSchema.ts b/Composer/packages/extension-client/src/types/recognizerSchema.ts
index e1585ec68e..03071dbf44 100644
--- a/Composer/packages/extension-client/src/types/recognizerSchema.ts
+++ b/Composer/packages/extension-client/src/types/recognizerSchema.ts
@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
-import { SDKKinds } from '@bfc/shared';
+import { SDKKinds } from '@bfc/types';
 
 import { RecognizerSchema } from './formSchema';
 
diff --git a/Composer/packages/extension-client/src/utils/__tests__/mergePluginConfigs.test.ts b/Composer/packages/extension-client/src/utils/__tests__/mergePluginConfigs.test.ts
index 125e0006c1..2576aefbbd 100644
--- a/Composer/packages/extension-client/src/utils/__tests__/mergePluginConfigs.test.ts
+++ b/Composer/packages/extension-client/src/utils/__tests__/mergePluginConfigs.test.ts
@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
-import { SDKKinds } from '@bfc/shared';
+import { SDKKinds } from '@bfc/types';
 
 import { PluginConfig } from '../../types';
 import { mergePluginConfigs } from '../mergePluginConfigs';
diff --git a/Composer/packages/extension/package.json b/Composer/packages/extension/package.json
index e10292e83c..d28a486bb7 100644
--- a/Composer/packages/extension/package.json
+++ b/Composer/packages/extension/package.json
@@ -13,6 +13,7 @@
     "test": "jest"
   },
   "devDependencies": {
+    "@bfc/types": "*",
     "@bfc/test-utils": "*",
     "@types/express": "^4.17.6",
     "@types/fs-extra": "^9.0.1",
diff --git a/Composer/packages/extension/src/extensionContext.ts b/Composer/packages/extension/src/extensionContext.ts
index 5df54cb426..e862ee3353 100644
--- a/Composer/packages/extension/src/extensionContext.ts
+++ b/Composer/packages/extension/src/extensionContext.ts
@@ -9,12 +9,13 @@ import { Express } from 'express';
 import { pathToRegexp } from 'path-to-regexp';
 import glob from 'globby';
 import formatMessage from 'format-message';
+import { UserIdentity, ExtensionCollection, RuntimeTemplate } from '@bfc/types';
 
-import { UserIdentity, ExtensionCollection, RuntimeTemplate, DEFAULT_RUNTIME } from './types/types';
 import logger from './logger';
 import { ExtensionRegistration } from './extensionRegistration';
 
 const log = logger.extend('extension-context');
+export const DEFAULT_RUNTIME = 'csharp-azurewebapp';
 
 class ExtensionContext {
   private _passport: passport.PassportStatic;
@@ -63,7 +64,7 @@ class ExtensionContext {
           return this.extensions.authentication.middleware(req, res, next);
         }
       }
-      next();
+      next && next();
     });
   }
 
diff --git a/Composer/packages/extension/src/extensionRegistration.ts b/Composer/packages/extension/src/extensionRegistration.ts
index 8a3d90de86..23f3408d5c 100644
--- a/Composer/packages/extension/src/extensionRegistration.ts
+++ b/Composer/packages/extension/src/extensionRegistration.ts
@@ -3,9 +3,9 @@
 
 import { RequestHandler } from 'express-serve-static-core';
 import { Debugger } from 'debug';
+import { PublishPlugin, RuntimeTemplate, BotTemplate } from '@bfc/types';
 
 import logger from './logger';
-import { PublishPlugin, RuntimeTemplate, BotTemplate } from './types/types';
 import { ExtensionContext } from './extensionContext';
 
 const log = logger.extend('extension-registration');
@@ -64,7 +64,7 @@ export class ExtensionRegistration {
         name: plugin.customName || this.name,
         description: plugin.customDescription || this.description,
         instructions: plugin.instructions,
-        hasView: plugin.hasView,
+        bundleId: plugin.bundleId,
         schema: plugin.schema,
       },
       methods: plugin,
@@ -157,7 +157,7 @@ export class ExtensionRegistration {
     // bind a basic auth middleware. this can be overridden. see setAuthMiddleware below
     this.context.extensions.authentication.middleware = (req, res, next) => {
       if (req.isAuthenticated()) {
-        next();
+        next && next();
       } else {
         log('Rejecting access to ', req.url);
         res.redirect(this.context.loginUri);
diff --git a/Composer/packages/extension/src/index.ts b/Composer/packages/extension/src/index.ts
index 1c381ecc22..6ff5004de3 100644
--- a/Composer/packages/extension/src/index.ts
+++ b/Composer/packages/extension/src/index.ts
@@ -3,8 +3,9 @@
 
 export { JSONSchema7 } from 'json-schema';
 
+export * from '@bfc/types';
+
 export * from './manager';
 export * from './storage';
-export * from './types/types';
 export * from './extensionContext';
 export * from './extensionRegistration';
diff --git a/Composer/packages/extension/src/manager/manager.ts b/Composer/packages/extension/src/manager/manager.ts
index 74cc9fba1f..198d04dd4c 100644
--- a/Composer/packages/extension/src/manager/manager.ts
+++ b/Composer/packages/extension/src/manager/manager.ts
@@ -5,11 +5,11 @@ import path from 'path';
 
 import glob from 'globby';
 import { readJson, ensureDir, remove } from 'fs-extra';
+import { ExtensionBundle, PackageJSON, ExtensionMetadata } from '@bfc/types';
 
 import { ExtensionContext } from '../extensionContext';
 import logger from '../logger';
 import { ExtensionManifestStore } from '../storage/extensionManifestStore';
-import { ExtensionBundle, PackageJSON, ExtensionMetadata } from '../types/extension';
 import { search, downloadPackage } from '../utils/npm';
 import { isSubdirectory } from '../utils/isSubdirectory';
 
diff --git a/Composer/packages/extension/src/storage/extensionManifestStore.ts b/Composer/packages/extension/src/storage/extensionManifestStore.ts
index 4483d9555c..99b633e62a 100644
--- a/Composer/packages/extension/src/storage/extensionManifestStore.ts
+++ b/Composer/packages/extension/src/storage/extensionManifestStore.ts
@@ -2,9 +2,9 @@
 // Licensed under the MIT License.
 
 import { existsSync, writeJsonSync, readJsonSync } from 'fs-extra';
+import { ExtensionMap, ExtensionMetadata } from '@bfc/types';
 
 import logger from '../logger';
-import { ExtensionMap, ExtensionMetadata } from '../types/extension';
 
 const log = logger.extend('plugins');
 
diff --git a/Composer/packages/extension/src/types/types.ts b/Composer/packages/extension/src/types/types.ts
deleted file mode 100644
index 888ce72c08..0000000000
--- a/Composer/packages/extension/src/types/types.ts
+++ /dev/null
@@ -1,171 +0,0 @@
-// Copyright (c) Microsoft Corporation.
-// Licensed under the MIT License.
-
-import { RequestHandler } from 'express-serve-static-core';
-import { JSONSchema7 } from 'json-schema';
-import { DialogSetting } from '@bfc/shared';
-import { IBotProject } from '@bfc/shared';
-
-// TODO: this will be possible when ifilestorage is in a shared module
-
-export interface PublishResult {
-  message: string;
-  comment?: string;
-  log?: string;
-  id?: string;
-  time?: Date;
-  endpointURL?: string;
-  status?: number;
-}
-
-export interface PublishResponse {
-  status: number;
-  result: PublishResult;
-}
-
-export interface BotTemplate {
-  id: string;
-  name: string;
-  description: string;
-  /* absolute path */
-  path: string;
-  /* tags for further grouping and search secenario */
-  tags?: string[];
-  /* list of supported runtime versions */
-  support?: string[];
-}
-
-// TODO: Add types for project, metadata
-export interface PublishPlugin<Config = any> {
-  // methods plugins should support
-  publish: (config: Config, project: IBotProject, metadata: any, user?: UserIdentity) => Promise<PublishResponse>;
-  getStatus?: (config: Config, project: IBotProject, user?: UserIdentity) => Promise<PublishResponse>;
-  getHistory?: (config: Config, project: IBotProject, user?: UserIdentity) => Promise<PublishResult[]>;
-  rollback?: (
-    config: Config,
-    project: IBotProject,
-    rollbackToVersion: string,
-    user?: UserIdentity
-  ) => Promise<PublishResponse>;
-
-  // other properties
-  schema?: JSONSchema7;
-  instructions?: string;
-  customName?: string;
-  customDescription?: string;
-  hasView?: boolean;
-  [key: string]: any;
-}
-
-export const DEFAULT_RUNTIME = 'csharp-azurewebapp';
-
-export interface RuntimeTemplate {
-  /** method used to eject the runtime into a project. returns resulting path of runtime! */
-  eject: (project: IBotProject, localDisk?: any, isReplace?: boolean) => Promise<string>;
-
-  /** build method used for local publish */
-  build: (runtimePath: string, project: IBotProject) => Promise<void>;
-
-  run: (project: IBotProject, localDisk?: any) => Promise<void>;
-
-  /** build for deploy method */
-  buildDeploy: (
-    runtimePath: string,
-    project: IBotProject,
-    settings: DialogSetting,
-    profileName: string
-  ) => Promise<string>;
-
-  /** set skill manifest, different folder for different runtime  */
-  setSkillManifest: (
-    dstRuntimePath: string,
-    dstStorage: IFileStorage,
-    srcManifestDir: string,
-    srcStorage: IFileStorage,
-    mode: string
-  ) => Promise<void>;
-
-  /** path to code template */
-  path: string;
-
-  /** internal use key */
-  key: string;
-
-  /** name of runtime template to display in interface */
-  name: string;
-
-  /** command used to start runtime */
-  startCommand: string;
-}
-
-// todo: is there some existing Passport user typedef?
-export interface UserIdentity {
-  [key: string]: any;
-}
-
-export interface ExtensionCollection {
-  storage: {
-    [key: string]: any;
-  };
-  publish: {
-    [key: string]: {
-      plugin: {
-        name: string;
-        description: string;
-        /** (Optional instructions displayed in the UI) */
-        instructions?: string;
-        /** (Optional) Schema for publishing configuration. */
-        schema?: JSONSchema7;
-        /** Whether or not the plugin has custom UI to host in the publish surface */
-        hasView?: boolean;
-      };
-      methods: PublishPlugin;
-    };
-  };
-  authentication: {
-    middleware?: RequestHandler;
-    serializeUser?: (user: any, next: any) => void;
-    deserializeUser?: (user: any, next: any) => void;
-    allowedUrls: string[];
-    [key: string]: any;
-  };
-  runtimeTemplates: RuntimeTemplate[];
-  botTemplates: BotTemplate[];
-  baseTemplates: BotTemplate[];
-}
-
-export interface FileInfo {
-  name: string;
-  content: string;
-  path: string;
-  relativePath: string;
-  lastModified: string;
-}
-
-interface IFileStorage {
-  stat(path: string): Promise<Stat>;
-  readFile(path: string): Promise<string>;
-  readDir(path: string): Promise<string[]>;
-  exists(path: string): Promise<boolean>;
-  writeFile(path: string, content: any): Promise<void>;
-  removeFile(path: string): Promise<void>;
-  mkDir(path: string, options?: MakeDirectoryOptions): Promise<void>;
-  rmDir(path: string): Promise<void>;
-  rmrfDir(path: string): Promise<void>;
-  glob(pattern: string | string[], path: string): Promise<string[]>;
-  copyFile(src: string, dest: string): Promise<void>;
-  rename(oldPath: string, newPath: string): Promise<void>;
-  zip(source: string, cb: any): unknown;
-}
-
-interface Stat {
-  isDir: boolean;
-  isFile: boolean;
-  isWritable: boolean;
-  lastModified: string;
-  size: string;
-}
-
-interface MakeDirectoryOptions {
-  recursive?: boolean;
-}
diff --git a/Composer/packages/extension/src/utils/npm.ts b/Composer/packages/extension/src/utils/npm.ts
index 79dfcadeaf..0029c10f1a 100644
--- a/Composer/packages/extension/src/utils/npm.ts
+++ b/Composer/packages/extension/src/utils/npm.ts
@@ -6,9 +6,9 @@ import { promisify } from 'util';
 import { mkdir, remove } from 'fs-extra';
 import fetch from 'node-fetch';
 import tar from 'tar';
+import { ExtensionSearchResult } from '@bfc/types';
 
 import logger from '../logger';
-import { ExtensionSearchResult } from '../types/extension';
 
 const streamPipeline = promisify(require('stream').pipeline);
 
diff --git a/Composer/packages/lib/indexers/package.json b/Composer/packages/lib/indexers/package.json
index 7fdc41656f..738837eab2 100644
--- a/Composer/packages/lib/indexers/package.json
+++ b/Composer/packages/lib/indexers/package.json
@@ -9,12 +9,10 @@
   "repository": "https://github.com/microsoft/BotFramework-Composer",
   "license": "MIT",
   "scripts": {
-    "build": "yarn clean && yarn build:css && yarn build:ts",
+    "build": "yarn clean && yarn build:ts",
     "build:ts": "tsc --build tsconfig.build.json",
-    "build:css": "copyfiles --up 1 \"src/**/*.css\" \"src/**/*.scss\" lib",
-    "clean": "rimraf lib demo/dist",
+    "clean": "rimraf lib",
     "prepublishOnly": "npm run build",
-    "start": "webpack-dev-server --config demo/webpack.config.demo.js",
     "test": "jest",
     "lint": "eslint --quiet ./src",
     "lint:fix": "yarn lint --fix",
@@ -22,6 +20,7 @@
     "watch": "yarn build:ts --watch"
   },
   "devDependencies": {
+    "@bfc/shared": "*",
     "@bfc/test-utils": "*",
     "@types/lodash": "^4.14.146",
     "rimraf": "^2.6.3"
diff --git a/Composer/packages/lib/package.json b/Composer/packages/lib/package.json
deleted file mode 100644
index fbe53b233b..0000000000
--- a/Composer/packages/lib/package.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  "name": "@bfc/libs",
-  "version": "1.0.0",
-  "description": "",
-  "main": "index.js",
-  "engines": {
-    "node": ">=12"
-  },
-  "scripts": {
-    "build:code-editor": "cd code-editor && yarn build",
-    "build:shared": "cd shared && yarn build",
-    "build:indexers": "cd indexers && yarn build",
-    "build:uishared": "cd ui-shared && yarn build",
-    "build:all": "yarn build:shared && yarn build:indexers && yarn build:code-editor && yarn build:uishared"
-  },
-  "author": "",
-  "license": "ISC"
-}
\ No newline at end of file
diff --git a/Composer/packages/lib/shared/package.json b/Composer/packages/lib/shared/package.json
index c9a10931f0..5991653147 100644
--- a/Composer/packages/lib/shared/package.json
+++ b/Composer/packages/lib/shared/package.json
@@ -9,9 +9,8 @@
     "node": ">=12"
   },
   "scripts": {
-    "build": "yarn clean && yarn build:css && yarn build:ts",
+    "build": "yarn clean && yarn build:ts",
     "build:ts": "tsc --build tsconfig.build.json",
-    "build:css": "copyfiles --up 1 \"src/**/*.css\" \"src/**/*.scss\" lib",
     "clean": "rimraf lib demo/dist",
     "prepublishOnly": "npm run build",
     "test": "jest",
@@ -25,6 +24,7 @@
     "react-dom": "16.13.1"
   },
   "devDependencies": {
+    "@bfc/types": "*",
     "@bfc/test-utils": "*",
     "@types/nanoid": "^2.1.0",
     "@types/react": "16.9.23",
diff --git a/Composer/packages/lib/shared/src/types/EditorAPI.ts b/Composer/packages/lib/shared/src/EditorAPI.ts
similarity index 100%
rename from Composer/packages/lib/shared/src/types/EditorAPI.ts
rename to Composer/packages/lib/shared/src/EditorAPI.ts
diff --git a/Composer/packages/lib/shared/src/copyUtils/CopyConstructorMap.ts b/Composer/packages/lib/shared/src/copyUtils/CopyConstructorMap.ts
index 3bd0a07805..15d031460b 100644
--- a/Composer/packages/lib/shared/src/copyUtils/CopyConstructorMap.ts
+++ b/Composer/packages/lib/shared/src/copyUtils/CopyConstructorMap.ts
@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
-import { SDKKinds } from '../types/schema';
+import { SDKKinds } from '@bfc/types';
 
 import { copySendActivity } from './copySendActivity';
 import { copyInputDialog } from './copyInputDialog';
diff --git a/Composer/packages/lib/shared/src/copyUtils/ExternalApi.ts b/Composer/packages/lib/shared/src/copyUtils/ExternalApi.ts
index 7bf727ecdf..9dac4ce882 100644
--- a/Composer/packages/lib/shared/src/copyUtils/ExternalApi.ts
+++ b/Composer/packages/lib/shared/src/copyUtils/ExternalApi.ts
@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
-import { DesignerData, BaseSchema } from '../types';
+import { DesignerData, BaseSchema } from '@bfc/types';
 
 export type FieldProcessor<T> = (
   fromActionId: string,
diff --git a/Composer/packages/lib/shared/src/copyUtils/copyAdaptiveAction.ts b/Composer/packages/lib/shared/src/copyUtils/copyAdaptiveAction.ts
index c544d52d87..7090a36f27 100644
--- a/Composer/packages/lib/shared/src/copyUtils/copyAdaptiveAction.ts
+++ b/Composer/packages/lib/shared/src/copyUtils/copyAdaptiveAction.ts
@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
-import { MicrosoftIDialog } from '../types';
+import { MicrosoftIDialog } from '@bfc/types';
 
 import { ExternalApi } from './ExternalApi';
 import CopyConstructorMap from './CopyConstructorMap';
diff --git a/Composer/packages/lib/shared/src/copyUtils/copyAdaptiveActionList.ts b/Composer/packages/lib/shared/src/copyUtils/copyAdaptiveActionList.ts
index c6c5290df6..544b0f7521 100644
--- a/Composer/packages/lib/shared/src/copyUtils/copyAdaptiveActionList.ts
+++ b/Composer/packages/lib/shared/src/copyUtils/copyAdaptiveActionList.ts
@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
-import { MicrosoftIDialog } from '../types';
+import { MicrosoftIDialog } from '@bfc/types';
 
 import { copyAdaptiveAction } from './copyAdaptiveAction';
 import { ExternalApi } from './ExternalApi';
diff --git a/Composer/packages/lib/shared/src/copyUtils/copyEditActions.ts b/Composer/packages/lib/shared/src/copyUtils/copyEditActions.ts
index d35bb76d5c..19e4ff9dd1 100644
--- a/Composer/packages/lib/shared/src/copyUtils/copyEditActions.ts
+++ b/Composer/packages/lib/shared/src/copyUtils/copyEditActions.ts
@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
-import { EditActions } from '../types';
+import { EditActions } from '@bfc/types';
 
 import { ExternalApi } from './ExternalApi';
 import { shallowCopyAdaptiveAction } from './shallowCopyAdaptiveAction';
diff --git a/Composer/packages/lib/shared/src/copyUtils/copyForeach.ts b/Composer/packages/lib/shared/src/copyUtils/copyForeach.ts
index 1c4b71c499..ee3179314c 100644
--- a/Composer/packages/lib/shared/src/copyUtils/copyForeach.ts
+++ b/Composer/packages/lib/shared/src/copyUtils/copyForeach.ts
@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
-import { Foreach, ForeachPage } from '../types';
+import { Foreach, ForeachPage } from '@bfc/types';
 
 import { ExternalApi } from './ExternalApi';
 import { shallowCopyAdaptiveAction } from './shallowCopyAdaptiveAction';
diff --git a/Composer/packages/lib/shared/src/copyUtils/copyIfCondition.ts b/Composer/packages/lib/shared/src/copyUtils/copyIfCondition.ts
index b5aa2bce9a..c3ad369ac1 100644
--- a/Composer/packages/lib/shared/src/copyUtils/copyIfCondition.ts
+++ b/Composer/packages/lib/shared/src/copyUtils/copyIfCondition.ts
@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
-import { IfCondition } from '../types';
+import { IfCondition } from '@bfc/types';
 
 import { ExternalApi } from './ExternalApi';
 import { copyAdaptiveActionList } from './copyAdaptiveActionList';
diff --git a/Composer/packages/lib/shared/src/copyUtils/copyInputDialog.ts b/Composer/packages/lib/shared/src/copyUtils/copyInputDialog.ts
index c6914dcf01..789d72f10e 100644
--- a/Composer/packages/lib/shared/src/copyUtils/copyInputDialog.ts
+++ b/Composer/packages/lib/shared/src/copyUtils/copyInputDialog.ts
@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
-import { InputDialog } from '../types';
+import { InputDialog } from '@bfc/types';
 
 import { ExternalApi } from './ExternalApi';
 import { shallowCopyAdaptiveAction } from './shallowCopyAdaptiveAction';
diff --git a/Composer/packages/lib/shared/src/copyUtils/copySendActivity.ts b/Composer/packages/lib/shared/src/copyUtils/copySendActivity.ts
index cc6be06b53..4629efcd19 100644
--- a/Composer/packages/lib/shared/src/copyUtils/copySendActivity.ts
+++ b/Composer/packages/lib/shared/src/copyUtils/copySendActivity.ts
@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
-import { SendActivity } from '../types';
+import { SendActivity } from '@bfc/types';
 
 import { ExternalApi } from './ExternalApi';
 import { shallowCopyAdaptiveAction } from './shallowCopyAdaptiveAction';
diff --git a/Composer/packages/lib/shared/src/copyUtils/copySwitchCondition.ts b/Composer/packages/lib/shared/src/copyUtils/copySwitchCondition.ts
index 02c4af4e76..d74c5ac386 100644
--- a/Composer/packages/lib/shared/src/copyUtils/copySwitchCondition.ts
+++ b/Composer/packages/lib/shared/src/copyUtils/copySwitchCondition.ts
@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
-import { SwitchCondition, CaseCondition } from '../types';
+import { SwitchCondition, CaseCondition } from '@bfc/types';
 
 import { ExternalApi } from './ExternalApi';
 import { copyAdaptiveActionList } from './copyAdaptiveActionList';
diff --git a/Composer/packages/lib/shared/src/copyUtils/shallowCopyAdaptiveAction.ts b/Composer/packages/lib/shared/src/copyUtils/shallowCopyAdaptiveAction.ts
index b5c198a39c..90cab1838b 100644
--- a/Composer/packages/lib/shared/src/copyUtils/shallowCopyAdaptiveAction.ts
+++ b/Composer/packages/lib/shared/src/copyUtils/shallowCopyAdaptiveAction.ts
@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
-import { BaseSchema } from '../types';
+import { BaseSchema } from '@bfc/types';
 
 import { ExternalApi } from './ExternalApi';
 
diff --git a/Composer/packages/lib/shared/src/deleteUtils/index.ts b/Composer/packages/lib/shared/src/deleteUtils/index.ts
index 0fa4d4c1ac..27eca298c5 100644
--- a/Composer/packages/lib/shared/src/deleteUtils/index.ts
+++ b/Composer/packages/lib/shared/src/deleteUtils/index.ts
@@ -1,7 +1,8 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License
 
-import { MicrosoftIDialog, SDKKinds } from '../types';
+import { MicrosoftIDialog, SDKKinds } from '@bfc/types';
+
 import { LuMetaData, LuType } from '../luNameBuilder';
 import { walkAdaptiveAction } from '../walkerUtils/walkAdaptiveAction';
 import { walkAdaptiveActionList } from '../walkerUtils/walkAdaptiveActionList';
diff --git a/Composer/packages/lib/shared/src/types/diagnostic.ts b/Composer/packages/lib/shared/src/diagnostic.ts
similarity index 85%
rename from Composer/packages/lib/shared/src/types/diagnostic.ts
rename to Composer/packages/lib/shared/src/diagnostic.ts
index da9946f9d6..8542400a87 100644
--- a/Composer/packages/lib/shared/src/types/diagnostic.ts
+++ b/Composer/packages/lib/shared/src/diagnostic.ts
@@ -1,7 +1,9 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
-export class Range {
+import { IRange, IPosition, IDiagnostic, DiagnosticSeverity } from '@bfc/types';
+
+export class Range implements IRange {
   start: Position;
   end: Position;
 
@@ -11,7 +13,7 @@ export class Range {
   }
 }
 
-export class Position {
+export class Position implements IPosition {
   line: number;
   character: number;
 
@@ -21,14 +23,7 @@ export class Position {
   }
 }
 
-export enum DiagnosticSeverity {
-  Error = 0,
-  Warning = 1,
-  Information = 2,
-  Hint = 3,
-}
-
-export class Diagnostic {
+export class Diagnostic implements IDiagnostic {
   /**
    * Error
    * Warning
diff --git a/Composer/packages/lib/shared/src/dialogFactory.ts b/Composer/packages/lib/shared/src/dialogFactory.ts
index 62207e8a14..9d237d5c04 100644
--- a/Composer/packages/lib/shared/src/dialogFactory.ts
+++ b/Composer/packages/lib/shared/src/dialogFactory.ts
@@ -4,12 +4,10 @@
 import { JSONSchema7 } from 'json-schema';
 import merge from 'lodash/merge';
 import formatMessage from 'format-message';
+import { DesignerData, MicrosoftIDialog, LuIntentSection, SDKKinds } from '@bfc/types';
 
-import { DesignerData } from './types/sdk';
 import { copyAdaptiveAction } from './copyUtils';
 import { deleteAdaptiveAction, deleteAdaptiveActionList } from './deleteUtils';
-import { MicrosoftIDialog, LuIntentSection } from './types';
-import { SDKKinds } from './types';
 import { FieldProcessorAsync } from './copyUtils/ExternalApi';
 import { generateDesignerId } from './generateUniqueId';
 
diff --git a/Composer/packages/lib/shared/src/index.ts b/Composer/packages/lib/shared/src/index.ts
index 0b726ece36..a5d72c06cf 100644
--- a/Composer/packages/lib/shared/src/index.ts
+++ b/Composer/packages/lib/shared/src/index.ts
@@ -7,10 +7,14 @@ import * as dialogUtils from './dialogUtils';
 
 formatMessage.setup({ missingTranslation: 'ignore' });
 
+export * from '@bfc/types';
+
 export * from './constant';
 export * from './copyUtils';
+export * from './diagnostic';
 export * from './dialogFactory';
 export * from './functionUtils';
+export * from './EditorAPI';
 export * from './generateUniqueId';
 export * from './labelMap';
 export * from './lgUtils';
@@ -18,7 +22,6 @@ export * from './luNameBuilder';
 export * from './promptTabs';
 export * from './resolverFactory';
 export * from './schemaUtils';
-export * from './types';
 export * from './viewUtils';
 export * from './walkerUtils';
 export * from './skillsUtils';
diff --git a/Composer/packages/lib/shared/src/labelMap.ts b/Composer/packages/lib/shared/src/labelMap.ts
index 19d864ff38..a021349a79 100644
--- a/Composer/packages/lib/shared/src/labelMap.ts
+++ b/Composer/packages/lib/shared/src/labelMap.ts
@@ -2,8 +2,7 @@
 // Licensed under the MIT License.
 
 import formatMessage from 'format-message';
-
-import { SDKKinds } from './types';
+import { SDKKinds } from '@bfc/types';
 
 interface LabelOverride {
   title?: string | false;
diff --git a/Composer/packages/lib/shared/src/lgUtils/stringBuilders/buildLgType.ts b/Composer/packages/lib/shared/src/lgUtils/stringBuilders/buildLgType.ts
index 586639559c..fe5f29392b 100644
--- a/Composer/packages/lib/shared/src/lgUtils/stringBuilders/buildLgType.ts
+++ b/Composer/packages/lib/shared/src/lgUtils/stringBuilders/buildLgType.ts
@@ -1,8 +1,9 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License
 
-import { SDKKinds } from '../../types';
-import { LgType } from '..';
+import { SDKKinds } from '@bfc/types';
+
+import LgType from '../models/LgType';
 
 /**
  * { hostKind: 'Microsoft.TextInput', hostField: 'prompt' } => 'SendActivity_Prompt'
diff --git a/Composer/packages/lib/shared/src/schemaUtils/dereference.ts b/Composer/packages/lib/shared/src/schemaUtils/dereference.ts
index 36656e972b..813351fd4c 100644
--- a/Composer/packages/lib/shared/src/schemaUtils/dereference.ts
+++ b/Composer/packages/lib/shared/src/schemaUtils/dereference.ts
@@ -1,17 +1,16 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
-import { JSONSchema7, JSONSchema7Definition } from 'json-schema';
+import { SchemaDefinitions, DefinitionCache, JSONSchema7 } from '@bfc/types';
 
-import { SchemaDefinitions, DefinitionCache } from './types';
 import { getRef } from './getRef';
 import { CIRCULAR_REFS, isCircular } from './circular';
 
-export function dereference<S extends JSONSchema7 | JSONSchema7[] | JSONSchema7Definition>(
+export function dereference<S extends JSONSchema7 | JSONSchema7[]>(
   schema: S,
   definitions: SchemaDefinitions,
   cache: DefinitionCache
-): S extends JSONSchema7[] ? JSONSchema7[] : S extends JSONSchema7 ? JSONSchema7 : JSONSchema7Definition {
+): S extends JSONSchema7[] ? JSONSchema7[] : JSONSchema7 {
   if (Array.isArray(schema)) {
     const arraySchema: JSONSchema7[] = [];
 
diff --git a/Composer/packages/lib/shared/src/schemaUtils/getRef.ts b/Composer/packages/lib/shared/src/schemaUtils/getRef.ts
index e5774cf418..7dbc39f75a 100644
--- a/Composer/packages/lib/shared/src/schemaUtils/getRef.ts
+++ b/Composer/packages/lib/shared/src/schemaUtils/getRef.ts
@@ -2,28 +2,27 @@
 // Licensed under the MIT License.
 
 import get from 'lodash/get';
-import { JSONSchema7Definition } from 'json-schema';
 import formatMessage from 'format-message';
+import { SchemaDefinitions, DefinitionCache, JSONSchema7 } from '@bfc/types';
 
-import { SchemaDefinitions, DefinitionCache } from './types';
 import { isCircular } from './circular';
 import { dereference } from './dereference';
 
-export function getRef(ref: string, definitions: SchemaDefinitions, cache: DefinitionCache): JSONSchema7Definition {
+export function getRef(ref: string, definitions: SchemaDefinitions, cache: DefinitionCache): JSONSchema7 {
   const defName = ref.replace('#/definitions/', '');
 
   if (cache.has(defName)) {
-    return cache.get(defName) as JSONSchema7Definition;
+    return cache.get(defName) as JSONSchema7;
   }
 
-  let def = get(definitions, defName.split('/')) as JSONSchema7Definition | undefined;
+  let def = get(definitions, defName.split('/')) as JSONSchema7 | undefined;
 
   if (!def) {
     throw new Error(formatMessage('Definition not found for {defName}', { defName }));
   }
 
   if (!isCircular(defName)) {
-    def = dereference(def as JSONSchema7Definition, definitions, cache);
+    def = dereference(def, definitions, cache);
   }
   cache.set(defName, def);
 
diff --git a/Composer/packages/lib/shared/src/skillsUtils/index.ts b/Composer/packages/lib/shared/src/skillsUtils/index.ts
index dd977a19e2..aa89b8ad8a 100644
--- a/Composer/packages/lib/shared/src/skillsUtils/index.ts
+++ b/Composer/packages/lib/shared/src/skillsUtils/index.ts
@@ -3,8 +3,7 @@
 
 import get from 'lodash/get';
 import keyBy from 'lodash/keyBy';
-
-import { DialogSetting, Skill } from '../types';
+import { DialogSetting, Skill } from '@bfc/types';
 
 export function fetchFromSettings(path: string, settings: DialogSetting): string {
   if (path) {
diff --git a/Composer/packages/lib/shared/src/viewUtils.ts b/Composer/packages/lib/shared/src/viewUtils.ts
index e57db0f852..e0a2e539b9 100644
--- a/Composer/packages/lib/shared/src/viewUtils.ts
+++ b/Composer/packages/lib/shared/src/viewUtils.ts
@@ -3,8 +3,8 @@
 
 import get from 'lodash/get';
 import formatMessage from 'format-message';
+import { SDKKinds } from '@bfc/types';
 
-import { SDKKinds } from './types';
 import { conceptLabels as conceptLabelsFn } from './labelMap';
 import { PromptTab, PromptTabTitles } from './promptTabs';
 
diff --git a/Composer/packages/lib/shared/src/walkerUtils/AdaptiveActionVisitor.ts b/Composer/packages/lib/shared/src/walkerUtils/AdaptiveActionVisitor.ts
index 7390c56fb8..03ef28290f 100644
--- a/Composer/packages/lib/shared/src/walkerUtils/AdaptiveActionVisitor.ts
+++ b/Composer/packages/lib/shared/src/walkerUtils/AdaptiveActionVisitor.ts
@@ -1,6 +1,6 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License
 
-import { MicrosoftIDialog } from '../types';
+import { MicrosoftIDialog } from '@bfc/types';
 
 export type AdaptiveActionVisitor = (action: MicrosoftIDialog) => void;
diff --git a/Composer/packages/lib/shared/src/walkerUtils/walkAdaptiveAction.ts b/Composer/packages/lib/shared/src/walkerUtils/walkAdaptiveAction.ts
index 751830a569..b2149bf185 100644
--- a/Composer/packages/lib/shared/src/walkerUtils/walkAdaptiveAction.ts
+++ b/Composer/packages/lib/shared/src/walkerUtils/walkAdaptiveAction.ts
@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License
 
-import { MicrosoftIDialog, SDKKinds } from '../types';
+import { MicrosoftIDialog, SDKKinds } from '@bfc/types';
 
 import { walkIfCondition } from './walkIfCondition';
 import { walkSwitchCondition } from './walkSwitchCondition';
diff --git a/Composer/packages/lib/shared/src/walkerUtils/walkAdaptiveActionList.ts b/Composer/packages/lib/shared/src/walkerUtils/walkAdaptiveActionList.ts
index 583ed5fe23..6dcd10b3a7 100644
--- a/Composer/packages/lib/shared/src/walkerUtils/walkAdaptiveActionList.ts
+++ b/Composer/packages/lib/shared/src/walkerUtils/walkAdaptiveActionList.ts
@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License
 
-import { MicrosoftIDialog } from '../types';
+import { MicrosoftIDialog } from '@bfc/types';
 
 import { walkAdaptiveAction } from './walkAdaptiveAction';
 export const walkAdaptiveActionList = (inputs: MicrosoftIDialog[], visit: (action: MicrosoftIDialog) => void): void => {
diff --git a/Composer/packages/lib/shared/src/walkerUtils/walkLgResources.ts b/Composer/packages/lib/shared/src/walkerUtils/walkLgResources.ts
index 5e4d964985..bca680d5b1 100644
--- a/Composer/packages/lib/shared/src/walkerUtils/walkLgResources.ts
+++ b/Composer/packages/lib/shared/src/walkerUtils/walkLgResources.ts
@@ -1,8 +1,7 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 import get from 'lodash/get';
-
-import { SDKKinds } from '../types';
+import { SDKKinds } from '@bfc/types';
 
 import { walkAdaptiveAction } from './walkAdaptiveAction';
 import { walkAdaptiveActionList } from './walkAdaptiveActionList';
diff --git a/Composer/packages/server/src/controllers/__tests__/extensions.test.ts b/Composer/packages/server/src/controllers/__tests__/extensions.test.ts
index 021e4dbeaa..25c2f6683b 100644
--- a/Composer/packages/server/src/controllers/__tests__/extensions.test.ts
+++ b/Composer/packages/server/src/controllers/__tests__/extensions.test.ts
@@ -2,8 +2,7 @@
 // Licensed under the MIT License.
 
 import { Request, Response } from 'express';
-import { ExtensionManager } from '@bfc/extension';
-import { ExtensionMetadata } from '@bfc/extension/lib/types/extension';
+import { ExtensionManager, ExtensionMetadata } from '@bfc/extension';
 
 import * as ExtensionsController from '../extensions';
 
@@ -47,9 +46,11 @@ const mockExtension1 = {
   ],
   contributes: {
     views: {
-      publish: {
-        bundleId: '',
-      },
+      publish: [
+        {
+          bundleId: '',
+        },
+      ],
       pages: [
         {
           bundleId: 'page1',
@@ -79,9 +80,11 @@ const allExtensions: ExtensionMetadata[] = [
     ],
     contributes: {
       views: {
-        publish: {
-          bundleId: '',
-        },
+        publish: [
+          {
+            bundleId: '',
+          },
+        ],
         pages: [
           {
             bundleId: 'page2',
@@ -107,9 +110,11 @@ describe('listing all extensions', () => {
         description: 'description text',
         contributes: {
           views: {
-            publish: {
-              bundleId: '',
-            },
+            publish: [
+              {
+                bundleId: '',
+              },
+            ],
             pages: [
               {
                 bundleId: 'page1',
@@ -131,9 +136,11 @@ describe('listing all extensions', () => {
         description: 'description text',
         contributes: {
           views: {
-            publish: {
-              bundleId: '',
-            },
+            publish: [
+              {
+                bundleId: '',
+              },
+            ],
             pages: [
               {
                 bundleId: 'page2',
@@ -306,23 +313,12 @@ describe('searching extensions', () => {
 });
 
 describe('getting a view bundle', () => {
-  it('validates id parameter', async () => {
-    await ExtensionsController.getBundleForView({ params: { id: '' } } as Request, res);
-
-    expect(res.status).toHaveBeenCalledWith(400);
-    expect(res.json).toHaveBeenCalledWith({ error: expect.any(String) });
-  });
-
-  it('validates view parameter', async () => {
-    await ExtensionsController.getBundleForView({ params: { id: 'some-id', view: '' } } as Request, res);
-
-    expect(res.status).toHaveBeenCalledWith(400);
-    expect(res.json).toHaveBeenCalledWith({ error: expect.any(String) });
-  });
-
   it('returns 404 if extension not found', async () => {
     (ExtensionManager.find as jest.Mock).mockReturnValue(null);
-    await ExtensionsController.getBundleForView({ params: { id: 'does-not-exist', view: 'some-id' } } as Request, res);
+    await ExtensionsController.getBundleForView(
+      { params: { id: 'does-not-exist', bundleId: 'some-id' } } as Request,
+      res
+    );
 
     expect(res.status).toHaveBeenCalledWith(404);
     expect(res.json).toHaveBeenCalledWith({ error: expect.any(String) });
@@ -330,24 +326,15 @@ describe('getting a view bundle', () => {
 
   describe('when extension found', () => {
     const id = 'extension-id';
-    const viewId = 'view-id';
     const bundleId = 'bundle-id';
 
     beforeEach(() => {
-      (ExtensionManager.find as jest.Mock).mockReturnValue({
-        contributes: {
-          views: {
-            [viewId]: {
-              bundleId,
-            },
-          },
-        },
-      });
+      (ExtensionManager.find as jest.Mock).mockReturnValue(id);
     });
 
     it('returns a 404 if bundle not found', async () => {
       (ExtensionManager.getBundle as jest.Mock).mockReturnValue(null);
-      await ExtensionsController.getBundleForView({ params: { id, view: viewId } } as Request, res);
+      await ExtensionsController.getBundleForView({ params: { id, bundleId } } as Request, res);
 
       expect(res.status).toHaveBeenCalledWith(404);
       expect(res.json).toHaveBeenCalledWith({ error: expect.any(String) });
@@ -355,7 +342,7 @@ describe('getting a view bundle', () => {
 
     it('sends the javascript bundle', async () => {
       (ExtensionManager.getBundle as jest.Mock).mockReturnValue('js bundle path');
-      await ExtensionsController.getBundleForView({ params: { id, view: viewId } } as Request, res);
+      await ExtensionsController.getBundleForView({ params: { id, bundleId } } as Request, res);
 
       expect(res.sendFile).toHaveBeenCalledWith('js bundle path');
     });
diff --git a/Composer/packages/server/src/controllers/extensions.ts b/Composer/packages/server/src/controllers/extensions.ts
index f007179bfd..046c4a335a 100644
--- a/Composer/packages/server/src/controllers/extensions.ts
+++ b/Composer/packages/server/src/controllers/extensions.ts
@@ -2,8 +2,7 @@
 // Licensed under the MIT License.
 
 import { Request, Response } from 'express';
-import { ExtensionManager } from '@bfc/extension';
-import { ExtensionMetadata } from '@bfc/extension/lib/types/extension';
+import { ExtensionManager, ExtensionMetadata } from '@bfc/extension';
 
 interface AddExtensionRequest extends Request {
   body: {
@@ -35,7 +34,7 @@ interface SearchExtensionsRequest extends Request {
 interface ExtensionViewBundleRequest extends Request {
   params: {
     id: string;
-    view: string;
+    bundleId: string;
   };
 }
 
@@ -120,22 +119,11 @@ export async function searchExtensions(req: SearchExtensionsRequest, res: Respon
 }
 
 export async function getBundleForView(req: ExtensionViewBundleRequest, res: Response) {
-  const { id, view } = req.params;
-
-  if (!id) {
-    res.status(400).json({ error: '`id` is missing from body' });
-    return;
-  }
-
-  if (!view) {
-    res.status(400).json({ error: '`view` is missing from body' });
-    return;
-  }
+  const { id, bundleId } = req.params;
 
   const extension = ExtensionManager.find(id);
 
   if (extension) {
-    const bundleId = extension.contributes.views?.[view].bundleId as string;
     const bundle = ExtensionManager.getBundle(id, bundleId);
     if (bundle) {
       res.sendFile(bundle);
diff --git a/Composer/packages/server/src/controllers/publisher.ts b/Composer/packages/server/src/controllers/publisher.ts
index fb5e03d566..86bdac48c6 100644
--- a/Composer/packages/server/src/controllers/publisher.ts
+++ b/Composer/packages/server/src/controllers/publisher.ts
@@ -20,7 +20,7 @@ export const PublishController = {
             description: plugin.description,
             instructions: plugin.instructions,
             schema: plugin.schema,
-            hasView: plugin.hasView,
+            bundleId: plugin.bundleId,
             features: {
               history: typeof methods.history === 'function',
               publish: typeof methods.publish === 'function',
diff --git a/Composer/packages/server/src/locales/en-US.json b/Composer/packages/server/src/locales/en-US.json
index 2c0001ce63..9e26dfeeb6 100644
--- a/Composer/packages/server/src/locales/en-US.json
+++ b/Composer/packages/server/src/locales/en-US.json
@@ -1,2573 +1 @@
-{
-  "0_bytes_a1e1cdb3": {
-    "message": "0 Bytes"
-  },
-  "5_minute_intro_7ea06d2b": {
-    "message": "5 Minute Intro"
-  },
-  "ErrorInfo_part1": {
-    "message": "An error occured in the form editor!"
-  },
-  "ErrorInfo_part2": {
-    "message": "This is likely due to malformed data or missing functionality in Composer."
-  },
-  "ErrorInfo_part3": {
-    "message": "Try navigating to another node in the visual editor."
-  },
-  "a_dialog_file_must_have_a_name_123ff67d": {
-    "message": "a dialog file must have a name"
-  },
-  "a_minimap_gives_an_overview_of_your_source_code_fo_9a897f4f": {
-    "message": "A minimap gives an overview of your source code for quick navigation and code understanding."
-  },
-  "a_newer_version_of_the_provisioning_scripts_has_be_85d3ad94": {
-    "message": "A newer version of the provisioning scripts has been found, and this project can be updated to the latest."
-  },
-  "a_profile_with_that_name_already_exists_7c559958": {
-    "message": "A profile with that name already exists."
-  },
-  "a_subscription_key_is_created_when_you_create_a_qn_37a6926f": {
-    "message": "A subscription key is created when you create a QnA Maker resource."
-  },
-  "a_valid_url_should_start_with_http_or_https_d24b3591": {
-    "message": "A valid url should start with http:// or https://"
-  },
-  "about_70c18bba": {
-    "message": "About"
-  },
-  "accepted_values_b4224bcd": {
-    "message": "Accepted values"
-  },
-  "accepts_multiple_values_73658f63": {
-    "message": "Accepts multiple values"
-  },
-  "access_external_resources_7e37fe21": {
-    "message": "Access external resources"
-  },
-  "action_created_f80af9a0": {
-    "message": "Action created"
-  },
-  "action_deleted_a10c002b": {
-    "message": "Action deleted"
-  },
-  "action_focused_400ee4af": {
-    "message": "Action focused"
-  },
-  "action_unfocused_18a2800e": {
-    "message": "Action unfocused"
-  },
-  "actions_copied_2821ab27": {
-    "message": "Actions copied"
-  },
-  "actions_created_6c5acc11": {
-    "message": "Actions created"
-  },
-  "actions_cut_929f4c37": {
-    "message": "Actions cut"
-  },
-  "actions_define_b_how_the_bot_responds_b_to_a_certa_890a71f4": {
-    "message": "Actions define <b>how the bot responds</b> to a certain trigger."
-  },
-  "actions_deleted_355c359a": {
-    "message": "Actions deleted"
-  },
-  "actions_disabled_c1accfb6": {
-    "message": "Actions disabled"
-  },
-  "actions_efcde10d": {
-    "message": "Actions"
-  },
-  "actions_enabled_8e9ec02d": {
-    "message": "Actions enabled"
-  },
-  "actions_moved_d7777b29": {
-    "message": "Actions moved"
-  },
-  "activities_125193f7": {
-    "message": "Activities"
-  },
-  "activity_13915493": {
-    "message": "Activity"
-  },
-  "activity_received_2f20fa9d": {
-    "message": "Activity received"
-  },
-  "adaptive_dialog_61a05dde": {
-    "message": "Adaptive dialog"
-  },
-  "add_8523c19b": {
-    "message": "Add"
-  },
-  "add_a_new_key_5c208c29": {
-    "message": "Add a new key"
-  },
-  "add_a_new_skill_dialog_aaaafa9c": {
-    "message": "Add a new Skill Dialog"
-  },
-  "add_a_new_trigger_a82d3db8": {
-    "message": "Add a new trigger"
-  },
-  "add_a_new_value_24ca14ac": {
-    "message": "Add a new value"
-  },
-  "add_a_publish_profile_fca2263a": {
-    "message": "Add a publish profile"
-  },
-  "add_a_skill_46d2b71c": {
-    "message": "Add a skill"
-  },
-  "add_a_welcome_message_9e1480b2": {
-    "message": "Add a welcome message"
-  },
-  "add_additional_url_bdfac25d": {
-    "message": "Add additional URL"
-  },
-  "add_alternative_phrasing_47234f77": {
-    "message": "add alternative phrasing"
-  },
-  "add_an_intent_trigger_a9acc149": {
-    "message": "Add an intent trigger"
-  },
-  "add_custom_runtime_6b73dc44": {
-    "message": "Add custom runtime"
-  },
-  "add_language_75dee49e": {
-    "message": "Add language"
-  },
-  "add_multiple_comma_separated_synonyms_2639283f": {
-    "message": "Add multiple comma-separated synonyms"
-  },
-  "add_new_dialog_25f12c9": {
-    "message": "Add new dialog"
-  },
-  "add_new_extension_19b82b77": {
-    "message": "Add new extension"
-  },
-  "add_new_knowledge_base_on_displayname_7f44609c": {
-    "message": " Add new knowledge base on { displayName }"
-  },
-  "add_new_profile_47b225e6": {
-    "message": "Add new profile"
-  },
-  "add_new_propertyname_bedf7dc6": {
-    "message": "Add new { propertyName }"
-  },
-  "add_new_trigger_on_displayname_2aaf6e4c": {
-    "message": "Add new trigger on { displayName }"
-  },
-  "add_new_validation_rule_here_eb675ccf": {
-    "message": "Add new validation rule here"
-  },
-  "add_property_d381eba3": {
-    "message": "Add Property"
-  },
-  "add_qna_pair_bcb1624": {
-    "message": "Add QnA Pair"
-  },
-  "add_some_example_phrases_to_trigger_this_intent_pl_568eaf51": {
-    "message": "> add some example phrases to trigger this intent:\n> - please tell me the weather\n> - what is the weather like in '{'city=Seattle'}'\n\n> entity definitions:\n> @ ml city"
-  },
-  "add_some_expected_user_responses_please_remind_me__31dc5c07": {
-    "message": "> add some expected user responses:\n> - Please remind me to '{'itemTitle=buy milk'}'\n> - remind me to '{'itemTitle'}'\n> - add '{'itemTitle'}' to my todo list\n>\n> entity definitions:\n> @ ml itemTitle\n"
-  },
-  "add_welcome_message_49d9ded9": {
-    "message": "Add welcome message"
-  },
-  "advanced_events_2cbfa47d": {
-    "message": "Advanced Events"
-  },
-  "advanced_options_4dcc8385": {
-    "message": "Advanced options"
-  },
-  "all_4321c3a1": {
-    "message": "All"
-  },
-  "all_language_generation_files_ef778f24": {
-    "message": "all language generation files"
-  },
-  "all_language_understanding_files_714b33eb": {
-    "message": "all language understanding files"
-  },
-  "all_profiles_8321b1aa": {
-    "message": "All profiles"
-  },
-  "all_qna_files_349d7fe1": {
-    "message": "all qna files"
-  },
-  "an_authoring_key_is_created_automatically_when_you_21cf77aa": {
-    "message": "An authoring key is created automatically when you create a LUIS account."
-  },
-  "answer_4620913f": {
-    "message": "Answer"
-  },
-  "answer_is_answer_799483f0": {
-    "message": "Answer is { answer }"
-  },
-  "any_constant_or_expression_to_evaluate_ba2017b1": {
-    "message": "Any constant or expression to evaluate."
-  },
-  "any_or_expression_acad7d37": {
-    "message": "Any or expression"
-  },
-  "any_string_f22dc2e1": {
-    "message": "any string"
-  },
-  "append_choices_35c45a2d": {
-    "message": "Append choices"
-  },
-  "application_language_87691b6": {
-    "message": "Application Language"
-  },
-  "application_language_f100f3e0": {
-    "message": "Application language"
-  },
-  "application_settings_39e840c6": {
-    "message": "Application Settings"
-  },
-  "application_updates_bdf5f8b6": {
-    "message": "Application Updates"
-  },
-  "apr_9_2020_3c8b47d7": {
-    "message": "Apr 9, 2020"
-  },
-  "are_you_sure_you_want_to_exit_the_onboarding_produ_c2de1b23": {
-    "message": "Are you sure you want to exit the Onboarding Product Tour? You can restart the tour in the onboarding settings."
-  },
-  "are_you_sure_you_want_to_remove_propertyname_8a793e4f": {
-    "message": "Are you sure you want to remove \"{ propertyName }\"?"
-  },
-  "are_you_sure_you_want_to_start_over_your_progress__3b7cde9b": {
-    "message": "Are you sure you want to start over? Your progress will be lost."
-  },
-  "are_you_sure_you_want_to_stop_current_runtime_and__a5f883b2": {
-    "message": "Are you sure you want to stop current runtime and replace them?"
-  },
-  "are_you_sure_you_want_to_uninstall_these_extension_cf6265e8": {
-    "message": "Are you sure you want to uninstall these extensions?"
-  },
-  "array_643947ee": {
-    "message": "Array"
-  },
-  "array_constant_8829b2ec": {
-    "message": "Array constant."
-  },
-  "array_or_expression_c52b2ecc": {
-    "message": "Array or expression"
-  },
-  "array_or_expression_to_evaluate_87d9328b": {
-    "message": "Array or expression to evaluate."
-  },
-  "ask_a_question_92ef7e0c": {
-    "message": "Ask a question"
-  },
-  "attachment_input_e0ece49c": {
-    "message": "Attachment Input"
-  },
-  "australia_6a25c95b": {
-    "message": "australia"
-  },
-  "authoring_canvas_18802e39": {
-    "message": "Authoring canvas"
-  },
-  "authoring_region_to_use_e_g_westus_westeurope_aust_d43d5245": {
-    "message": "Authoring region to use (e.g. westus, westeurope, australiaeast)"
-  },
-  "authoring_region_to_use_westus_qna_maker_resource__4588c2f9": {
-    "message": "Authoring region to use (westus)  (QnA maker resource location)"
-  },
-  "auto_update_86eb33b0": {
-    "message": "Auto update"
-  },
-  "available_skills_95c114ac": {
-    "message": "Available Skills"
-  },
-  "been_used_5daccdb2": {
-    "message": "Been used"
-  },
-  "begin_a_new_dialog_60249bd8": {
-    "message": "Begin a new dialog"
-  },
-  "begin_a_remote_skill_dialog_93e47189": {
-    "message": "Begin a remote skill dialog."
-  },
-  "begin_dialog_12e2becf": {
-    "message": "Begin Dialog"
-  },
-  "begin_dialog_event_285bc650": {
-    "message": "Begin dialog event"
-  },
-  "begindialog_a5594562": {
-    "message": "BeginDialog"
-  },
-  "ben_brown_99c12d19": {
-    "message": "Ben Brown"
-  },
-  "boolean_6000988a": {
-    "message": "Boolean"
-  },
-  "boolean_condition_b65450ca": {
-    "message": "Boolean condition"
-  },
-  "boolean_constant_7d3fcbf6": {
-    "message": "Boolean constant"
-  },
-  "boolean_constant_8d950af8": {
-    "message": "Boolean constant."
-  },
-  "boolean_constant_or_expression_to_evaluate_86d77849": {
-    "message": "Boolean constant or expression to evaluate."
-  },
-  "boolean_field_602934c9": {
-    "message": "boolean field"
-  },
-  "boolean_or_expression_6bd88208": {
-    "message": "Boolean or expression"
-  },
-  "boolean_value_98d39ea1": {
-    "message": "Boolean value."
-  },
-  "bot_asks_5e9f0202": {
-    "message": "Bot Asks"
-  },
-  "bot_framework_composer_enables_developers_and_mult_ce0e42a9": {
-    "message": "Bot Framework Composer enables developers and multi-disciplinary teams to build all kinds of conversational experiences, using the latest components from the Bot Framework: SDK, LG, LU, and declarative file formats, all without writing code."
-  },
-  "bot_framework_composer_fae721be": {
-    "message": "Bot Framework Composer"
-  },
-  "bot_framework_composer_icon_gray_fa72d3d6": {
-    "message": "bot framework composer icon gray"
-  },
-  "bot_framework_composer_is_a_visual_authoring_canva_c3947d91": {
-    "message": "Bot Framework Composer is a visual authoring canvas for building bots and other types of conversational application with the Microsoft Bot Framework technology stack. With Composer you will find everything you need to build a modern, state-of-the-art conversational experience."
-  },
-  "bot_framework_composer_is_an_open_source_visual_au_2be2e02b": {
-    "message": "Bot Framework Composer is an open-source visual authoring canvas for developers and multi-disciplinary teams to build bots. Composer integrates LUIS and QnA Maker, and allows sophisticated composition of bot replies using language generation."
-  },
-  "bot_framework_provides_the_most_comprehensive_expe_e34a7f5d": {
-    "message": "Bot Framework provides the most comprehensive experience for building conversational applications."
-  },
-  "bot_language_6cf30c2": {
-    "message": "Bot language"
-  },
-  "bot_language_active_7cf9dc78": {
-    "message": "Bot language (active)"
-  },
-  "bot_name_is_botname_a28c2d05": {
-    "message": "Bot name is { botName }"
-  },
-  "bot_responses_4617b4a2": {
-    "message": "Bot responses"
-  },
-  "bot_responses_c4e63601": {
-    "message": "Bot Responses"
-  },
-  "bot_settings_3751e1b2": {
-    "message": "Bot settings"
-  },
-  "bot_settings_ce2783e4": {
-    "message": "Bot Settings"
-  },
-  "branch_if_else_391e5681": {
-    "message": "Branch: If/else"
-  },
-  "branch_if_else_992cf9bf": {
-    "message": "Branch: If/Else"
-  },
-  "branch_if_else_f6a36f1d": {
-    "message": "Branch: if/else"
-  },
-  "branch_switch_multiple_options_95c6a326": {
-    "message": "Branch: Switch (multiple options)"
-  },
-  "break_out_of_loop_ab30157c": {
-    "message": "Break out of loop"
-  },
-  "build_your_first_bot_f9c3e427": {
-    "message": "Build your first bot"
-  },
-  "bytes_74acea97": {
-    "message": "Bytes"
-  },
-  "calculating_17b21be7": {
-    "message": "Calculating..."
-  },
-  "cancel_all_active_dialogs_335b1623": {
-    "message": "Cancel all active dialogs"
-  },
-  "cancel_all_dialogs_32144c45": {
-    "message": "Cancel All Dialogs"
-  },
-  "cancel_caeb1e68": {
-    "message": "Cancel"
-  },
-  "cancel_dialog_event_cc671dee": {
-    "message": "Cancel dialog event"
-  },
-  "change_recognizer_3145b93d": {
-    "message": "Change Recognizer"
-  },
-  "check_for_updates_and_install_them_automatically_50337340": {
-    "message": "Check for updates and install them automatically."
-  },
-  "choice_input_f75a2353": {
-    "message": "Choice Input"
-  },
-  "choice_name_fe8411f4": {
-    "message": "Choice Name"
-  },
-  "choose_a_location_for_your_new_bot_project_e979f2d5": {
-    "message": "Choose a location for your new bot project."
-  },
-  "choose_how_to_create_your_bot_a97f7b3e": {
-    "message": "Choose how to create your bot"
-  },
-  "choose_one_2c4277df": {
-    "message": "Choose One"
-  },
-  "chris_whitten_11df1f35": {
-    "message": "Chris Whitten"
-  },
-  "clear_all_da755751": {
-    "message": "Clear all"
-  },
-  "click_on_the_b_add_b_button_in_the_toolbar_and_sel_4daf351a": {
-    "message": "Click on the <b>Add</b> button in the toolbar, and select <b>Add a new trigger</b>. In the <b>Create a trigger</b> wizard, set the <b>Trigger Type</b> to <i>Intent recognized</i> and configure the <b>Trigger Name</b> and <b>Trigger Phrases</b>. Then add actions in the Visual Editor."
-  },
-  "click_the_b_add_b_button_in_the_toolbar_and_select_79001156": {
-    "message": "Click the <b>Add</b> button in the toolbar, and select <b>Add a new trigger</b> from the dropdown menu."
-  },
-  "click_to_sort_by_file_type_1b0c9bd": {
-    "message": "Click to sort by file type"
-  },
-  "close_d634289d": {
-    "message": "Close"
-  },
-  "collapse_34080b4d": {
-    "message": "Collapse"
-  },
-  "collapse_navigation_17228b95": {
-    "message": "Collapse Navigation"
-  },
-  "comment_7ef1428e": {
-    "message": "Comment"
-  },
-  "component_stacktrace_e24b1983": {
-    "message": "Component Stacktrace:"
-  },
-  "composer_cannot_yet_translate_your_bot_automatical_2d54081b": {
-    "message": "Composer cannot yet translate your bot automatically.\nTo create a translation manually, Composer will create a copy of your bot’s content with the name of the additional language. This content can then be translated without affecting the original bot logic or flow and you can switch between languages to ensure the responses are correctly and appropriately translated."
-  },
-  "composer_introduction_98a93701": {
-    "message": "Composer introduction"
-  },
-  "composer_is_up_to_date_9118257d": {
-    "message": "Composer is up to date."
-  },
-  "composer_logo_ba2048a0": {
-    "message": "Composer Logo"
-  },
-  "composer_needs_net_core_sdk_46e2a8ae": {
-    "message": "Composer needs .NET Core SDK"
-  },
-  "composer_will_restart_88ee8dc3": {
-    "message": "Composer will restart."
-  },
-  "composer_will_update_the_next_time_you_close_the_a_d74264a1": {
-    "message": "Composer will update the next time you close the app."
-  },
-  "conditionalselector_ed2031f0": {
-    "message": "ConditionalSelector"
-  },
-  "configure_composer_to_start_your_bot_using_runtime_fe37dadf": {
-    "message": "Configure Composer to start your bot using runtime code you can customize and control."
-  },
-  "configures_default_language_model_to_use_if_there__f09f1acd": {
-    "message": "Configures default language model to use if there is no culture code in the file name (Default: en-us)"
-  },
-  "confirm_6556b3a6": {
-    "message": "Confirm"
-  },
-  "confirm_choices_db8e99fb": {
-    "message": "Confirm Choices"
-  },
-  "confirm_input_bf996e7a": {
-    "message": "Confirm Input"
-  },
-  "confirmation_fec87d65": {
-    "message": "Confirmation"
-  },
-  "confirmation_modal_must_have_a_title_b0816e0b": {
-    "message": "Confirmation modal must have a title."
-  },
-  "congratulations_your_model_is_successfully_publish_52ebc297": {
-    "message": "Congratulations! Your model is successfully published."
-  },
-  "connect_to_a_new_skill_34d582ab": {
-    "message": "Connect to a new skill"
-  },
-  "connect_to_a_skill_53c9dff0": {
-    "message": "Connect to a skill"
-  },
-  "connect_to_qna_knowledgebase_4b324132": {
-    "message": "Connect to QnA Knowledgebase"
-  },
-  "continue_loop_22635585": {
-    "message": "Continue loop"
-  },
-  "conversation_ended_a8bd37dd": {
-    "message": "Conversation ended"
-  },
-  "conversation_invoked_e960884e": {
-    "message": "Conversation invoked"
-  },
-  "conversationupdate_activity_9e94bff5": {
-    "message": "ConversationUpdate activity"
-  },
-  "copy_9748f9f": {
-    "message": "Copy"
-  },
-  "copy_content_for_translation_7affbcbb": {
-    "message": "Copy content for translation"
-  },
-  "could_not_connect_to_storage_50411de0": {
-    "message": "Could not connect to storage."
-  },
-  "could_not_init_plugin_1f1c29cd": {
-    "message": "Could not init plugin"
-  },
-  "couldn_t_complete_the_update_a337a359": {
-    "message": "Couldn''t complete the update:"
-  },
-  "create_132b3be1": {
-    "message": "Create"
-  },
-  "create_a_bot_project_73e6ce33": {
-    "message": "Create a bot project"
-  },
-  "create_a_condition_8686fd5": {
-    "message": "Create a condition"
-  },
-  "create_a_dialog_9f6c8618": {
-    "message": "Create a dialog"
-  },
-  "create_a_name_for_the_project_which_will_be_used_t_57e9b690": {
-    "message": "Create a name for the project which will be used to name the application: (projectname-environment-LUfilename)"
-  },
-  "create_a_new_dialog_21d84b82": {
-    "message": "Create a new dialog"
-  },
-  "create_a_new_skill_manifest_or_select_which_one_yo_a97e9616": {
-    "message": "Create a new skill manifest or select which one you want to edit"
-  },
-  "create_a_trigger_40e74743": {
-    "message": "Create a trigger"
-  },
-  "create_bot_from_template_or_scratch_92f0fefa": {
-    "message": "Create bot from template or scratch?"
-  },
-  "create_copy_to_translate_bot_content_efc872c": {
-    "message": "Create copy to translate bot content"
-  },
-  "create_folder_error_38aa86f5": {
-    "message": "Create Folder Error"
-  },
-  "create_from_knowledge_base_qna_maker_7422486": {
-    "message": "Create from knowledge base (QnA Maker)"
-  },
-  "create_from_qna_7aa9dcbb": {
-    "message": "Create from QnA"
-  },
-  "create_from_scratch_485c3045": {
-    "message": "Create from scratch"
-  },
-  "create_from_template_87e12c94": {
-    "message": "Create from template"
-  },
-  "create_knowledge_base_db6d66c4": {
-    "message": "Create knowledge base"
-  },
-  "create_knowledge_base_from_scratch_afe4d2a2": {
-    "message": "Create knowledge base from scratch"
-  },
-  "create_new_empty_bot_21cf0ea3": {
-    "message": "Create new empty bot"
-  },
-  "create_new_folder_19d3faa4": {
-    "message": "Create new folder"
-  },
-  "create_new_knowledge_base_e14d07a5": {
-    "message": "Create New Knowledge Base"
-  },
-  "create_or_edit_skill_manifest_8ad98da9": {
-    "message": "Create or edit skill manifest"
-  },
-  "creating_your_knowledge_base_ef4f9872": {
-    "message": "Creating your knowledge base"
-  },
-  "current_40c0812f": {
-    "message": " - Current"
-  },
-  "custom_actions_5d396747": {
-    "message": "Custom Actions"
-  },
-  "custom_events_d6f0e45b": {
-    "message": "Custom events"
-  },
-  "custom_name_optional_60ee6a1a": {
-    "message": "Custom name (optional)"
-  },
-  "custom_recognizer_951bab90": {
-    "message": "Custom recognizer"
-  },
-  "cut_c8c92681": {
-    "message": "Cut"
-  },
-  "data_loading_4c9bb9f6": {
-    "message": "Data loading..."
-  },
-  "date_ee500367": {
-    "message": "Date"
-  },
-  "date_modified_18beced9": {
-    "message": "Date modified"
-  },
-  "date_modified_e1c8ac8f": {
-    "message": "Date Modified"
-  },
-  "date_or_time_d30bcc7d": {
-    "message": "Date or time"
-  },
-  "date_time_input_2416ffc1": {
-    "message": "Date Time Input"
-  },
-  "debug_break_46cb5adb": {
-    "message": "Debug Break"
-  },
-  "debug_break_870a75df": {
-    "message": "Debug break"
-  },
-  "debugging_options_20e2e9da": {
-    "message": "Debugging options"
-  },
-  "decrement_by_step_9b6c2fa3": {
-    "message": "decrement by { step }"
-  },
-  "default_language_486a558d": {
-    "message": "Default language"
-  },
-  "default_language_b11c37db": {
-    "message": "Default Language"
-  },
-  "default_recognizer_9c06c1a3": {
-    "message": "Default recognizer"
-  },
-  "define_by_value_type_3cd3d1a8": {
-    "message": "Define by value type"
-  },
-  "define_conversation_objective_146d1cc6": {
-    "message": "Define conversation objective"
-  },
-  "defined_in_475568fb": {
-    "message": "Defined in:"
-  },
-  "definition_not_found_for_defname_7194fd07": {
-    "message": "Definition not found for { defName }"
-  },
-  "delete_a6efa79d": {
-    "message": "Delete"
-  },
-  "delete_a_property_f2d70f79": {
-    "message": "Delete a property"
-  },
-  "delete_activity_6d881872": {
-    "message": "Delete activity"
-  },
-  "delete_bot_73586104": {
-    "message": "Delete Bot"
-  },
-  "delete_language_1527609d": {
-    "message": "Delete language"
-  },
-  "delete_properties_8bc77b42": {
-    "message": "Delete Properties"
-  },
-  "delete_properties_c49a7892": {
-    "message": "Delete properties"
-  },
-  "delete_property_b3786fa0": {
-    "message": "Delete Property"
-  },
-  "describe_your_skill_88554792": {
-    "message": "Describe your skill"
-  },
-  "description_436c48d7": {
-    "message": "Description"
-  },
-  "design_51b2812a": {
-    "message": "Design"
-  },
-  "dialog_68ba69ba": {
-    "message": "(Dialog)"
-  },
-  "dialog_cancelled_767b512a": {
-    "message": "Dialog cancelled"
-  },
-  "dialog_data_61d5539b": {
-    "message": "Dialog data"
-  },
-  "dialog_dialogid_not_found_5e8214c3": {
-    "message": "dialog { dialogId } not found"
-  },
-  "dialog_events_f1b2e2a0": {
-    "message": "Dialog events"
-  },
-  "dialog_input_schema_c7864fbd": {
-    "message": "Dialog input schema."
-  },
-  "dialog_interface_398bc493": {
-    "message": "Dialog Interface"
-  },
-  "dialog_management_2980578": {
-    "message": "Dialog management"
-  },
-  "dialog_opened_f6392b1": {
-    "message": "Dialog opened"
-  },
-  "dialog_output_schema_acfe2186": {
-    "message": "Dialog output schema."
-  },
-  "dialog_started_912507c": {
-    "message": "Dialog started"
-  },
-  "dialogfactory_missing_schema_5c3255c4": {
-    "message": "DialogFactory missing schema."
-  },
-  "dialognum_plural_0_no_dialogs_1_one_dialog_other_d_1b86909b": {
-    "message": "{ dialogNum, plural,\n     =0 {No dialogs}\n     =1 {One dialog}\n  other {# dialogs}\n} have been found.\n            { dialogNum, select,\n      0 {}\n  other {Press down arrow key to navigate the search results}\n}"
-  },
-  "disable_a5c05db3": {
-    "message": "Disable"
-  },
-  "display_lines_that_extends_beyond_the_width_of_the_9e500f3c": {
-    "message": "Display lines that extends beyond the width of the editor on the next line."
-  },
-  "do_you_wish_to_continue_96469eaf": {
-    "message": "Do you wish to continue?"
-  },
-  "does_not_exist_3a34b418": {
-    "message": "Does Not Exist"
-  },
-  "done_1a4a010a": {
-    "message": "Done!"
-  },
-  "done_54e3d4b6": {
-    "message": "Done"
-  },
-  "download_now_and_install_when_you_close_composer_e241ed74": {
-    "message": "Download now and install when you close Composer."
-  },
-  "downloading_bb6fb34b": {
-    "message": "Downloading..."
-  },
-  "duplicate_dialog_name_824f9fce": {
-    "message": "Duplicate dialog name"
-  },
-  "duplicate_fields_9fd0d3c2": {
-    "message": "duplicate fields"
-  },
-  "duplicate_name_d295a09d": {
-    "message": "Duplicate name"
-  },
-  "duplicate_skill_manifest_url_74d85839": {
-    "message": "Duplicate skill manifest Url"
-  },
-  "duplicate_skill_name_d9f6eb8d": {
-    "message": "Duplicate skill name"
-  },
-  "duplicated_intents_recognized_d3908424": {
-    "message": "Duplicated intents recognized"
-  },
-  "each_page_of_pagesizestring_in_propstring_a7e23b00": {
-    "message": "Each page of { pageSizeString } in { propString }"
-  },
-  "each_value_in_ae285cd9": {
-    "message": "Each value in"
-  },
-  "early_adopters_e8db7999": {
-    "message": "Early adopters"
-  },
-  "edit_a_publish_profile_30ebab3e": {
-    "message": "Edit a publish profile"
-  },
-  "edit_a_skill_5665d9ac": {
-    "message": "Edit a skill"
-  },
-  "edit_actions_b38e9fac": {
-    "message": "Edit Actions"
-  },
-  "edit_an_array_property_5d886011": {
-    "message": "Edit an array property"
-  },
-  "edit_array_4ab37c8": {
-    "message": "Edit Array"
-  },
-  "edit_c5fbea07": {
-    "message": "Edit"
-  },
-  "edit_displayname_dialog_description_986a7d60": {
-    "message": "Edit { displayName } dialog description"
-  },
-  "edit_in_json_75d0d754": {
-    "message": "Edit in JSON"
-  },
-  "edit_mode_7e07cfdf": {
-    "message": "Edit mode"
-  },
-  "edit_property_dd6a1172": {
-    "message": "Edit Property"
-  },
-  "ejecting_runtime_f6c90614": {
-    "message": "Ejecting runtime..."
-  },
-  "emit_a_custom_event_78cf318b": {
-    "message": "Emit a custom event"
-  },
-  "emit_a_telemetry_track_event_e2442842": {
-    "message": "Emit a telemetry track event"
-  },
-  "emit_a_trace_event_f653ae84": {
-    "message": "Emit a trace event"
-  },
-  "emit_event_32aa6583": {
-    "message": "Emit Event"
-  },
-  "enable_6f5d1328": {
-    "message": "Enable"
-  },
-  "enable_line_numbers_to_refer_to_code_lines_by_numb_e5ba66ea": {
-    "message": "Enable line numbers to refer to code lines by number."
-  },
-  "enabled_ba7cab66": {
-    "message": "Enabled"
-  },
-  "end_dialog_8f562a4c": {
-    "message": "End Dialog"
-  },
-  "end_this_dialog_3ed0d50b": {
-    "message": "End this dialog"
-  },
-  "end_turn_6ab71cea": {
-    "message": "End Turn"
-  },
-  "end_turn_ca85b3d4": {
-    "message": "End turn"
-  },
-  "endofconversation_activity_4aa21306": {
-    "message": "EndOfConversation activity"
-  },
-  "english_us_1d884ccd": {
-    "message": "English (US)"
-  },
-  "enter_a_manifest_url_to_add_a_new_skill_to_your_bo_57e9d660": {
-    "message": "Enter a manifest url to add a new skill to your bot."
-  },
-  "enter_a_max_value_14e8ba52": {
-    "message": "Enter a max value"
-  },
-  "enter_a_min_value_c3030813": {
-    "message": "Enter a min value"
-  },
-  "enter_a_question_74f2e045": {
-    "message": "Enter a question"
-  },
-  "enter_an_answer_84152a83": {
-    "message": "Enter an answer"
-  },
-  "entities_ef09392c": {
-    "message": "Entities"
-  },
-  "enum_help_text_434bd44f": {
-    "message": "Enum help text"
-  },
-  "environment_68aed6d3": {
-    "message": "Environment"
-  },
-  "equals_expression_47199f4e": {
-    "message": "Equals Expression"
-  },
-  "error_98e81528": {
-    "message": "Error"
-  },
-  "error_afac7133": {
-    "message": "Error:"
-  },
-  "error_event_c079b608": {
-    "message": "Error event"
-  },
-  "error_func_does_not_have_an_evaluator_it_s_not_a_b_8c660980": {
-    "message": "Error: { func } does not have an evaluator, it''s not a built-in function or a custom function"
-  },
-  "error_in_ui_schema_for_title_errormsg_options_7f3c22f2": {
-    "message": "Error in UI schema for { title }: { errorMsg }\n{ options }"
-  },
-  "error_occured_ejecting_runtime_76bb48e7": {
-    "message": "Error occured ejecting runtime!"
-  },
-  "error_occurred_5549a6b4": {
-    "message": "Error occurred"
-  },
-  "error_processing_schema_2c707cf3": {
-    "message": "Error Processing Schema"
-  },
-  "event_48c2be6e": {
-    "message": " (Event)"
-  },
-  "event_activity_2067a94b": {
-    "message": "Event activity"
-  },
-  "event_created_e9e05afc": {
-    "message": "Event created"
-  },
-  "event_focused_51e447f3": {
-    "message": "Event focused"
-  },
-  "event_received_457f99d6": {
-    "message": "Event received"
-  },
-  "events_cf7a8c50": {
-    "message": "Events"
-  },
-  "example_bot_list_9be1d563": {
-    "message": "Example bot list"
-  },
-  "examples_c435f08c": {
-    "message": "Examples"
-  },
-  "existing_files_in_scripts_folder_will_be_overwritt_afa8d787": {
-    "message": "Existing files in scripts/folder will be overwritten. Are you sure you want to continue?"
-  },
-  "expand_2f2fadbd": {
-    "message": "Expand"
-  },
-  "expand_navigation_20330d1d": {
-    "message": "Expand Navigation"
-  },
-  "expected_responses_intent_intentname_44b051c": {
-    "message": "Expected responses (intent: #{ intentName })"
-  },
-  "export_as_skill_764cf284": {
-    "message": "Export as skill"
-  },
-  "export_assets_to_zip_d2d798ab": {
-    "message": "Export assets to .zip"
-  },
-  "export_de71cd8e": {
-    "message": "Export"
-  },
-  "export_json_2e2981f5": {
-    "message": "Export JSON"
-  },
-  "expression_7f906a13": {
-    "message": "Expression"
-  },
-  "expression_starting_with_a750efc8": {
-    "message": "Expression starting with =."
-  },
-  "expression_to_evaluate_ce4095b1": {
-    "message": "Expression to evaluate."
-  },
-  "extensions_7250a0bb": {
-    "message": "Extensions"
-  },
-  "external_resources_will_not_be_changed_c08b0009": {
-    "message": "External resources will not be changed."
-  },
-  "extract_question_and_answer_pairs_from_an_online_f_7316548e": {
-    "message": "Extract question-and-answer pairs from an online FAQ, product manuals, or other files. Supported formats are .tsv, .pdf, .doc, .docx, .xlsx, containing questions and answers in sequence. Learn more about knowledge base sources. Skip this step to add questions and answers manually after creation. The number of sources and file size you can add depends on the QnA service SKU you choose. Learn more about QnA Maker SKUs."
-  },
-  "extract_question_and_answer_pairs_from_an_online_f_c1e12724": {
-    "message": "Extract question-and-answer pairs from an online FAQ, product manuals, or other files. Supported formats are .tsv, .pdf, .doc, .docx, .xlsx, containing questions and answers in sequence. "
-  },
-  "extracting_qna_pairs_from_urls_eaed1b1c": {
-    "message": "Extracting QNA pairs from { urls }"
-  },
-  "false_2f39ee6d": {
-    "message": "false"
-  },
-  "false_eef8c169": {
-    "message": "False"
-  },
-  "field_set_6e7d7f67": {
-    "message": "Field Set"
-  },
-  "file_name_8fd421ff": {
-    "message": "File name"
-  },
-  "file_not_found_9eec054c": {
-    "message": "File not found"
-  },
-  "file_or_attachment_5467e604": {
-    "message": "File or attachment"
-  },
-  "file_type_fd1ba7ee": {
-    "message": "File Type"
-  },
-  "filter_dialog_de3ce43f": {
-    "message": "Filter Dialog"
-  },
-  "firstselector_a3daca5d": {
-    "message": "FirstSelector"
-  },
-  "folder_foldername_already_exists_4a2260e9": {
-    "message": "folder { folderName } already exists"
-  },
-  "for_each_def04c48": {
-    "message": "For Each"
-  },
-  "for_each_page_3b4d4b69": {
-    "message": "For Each Page"
-  },
-  "form_editor_7c2b02f0": {
-    "message": "form editor"
-  },
-  "form_title_baf85c7e": {
-    "message": "form title"
-  },
-  "fromtemplatename_does_not_exist_d429483c": {
-    "message": "fromTemplateName does not exist"
-  },
-  "gb_7570760e": {
-    "message": "GB"
-  },
-  "general_24ac26a8": {
-    "message": "General"
-  },
-  "generate_44e33e72": {
-    "message": "Generate"
-  },
-  "generate_dialog_b80a85b2": {
-    "message": "Generate dialog"
-  },
-  "get_a_new_copy_of_the_runtime_code_84970bf": {
-    "message": "Get a new copy of the runtime code"
-  },
-  "get_started_50c13c6c": {
-    "message": "Get started!"
-  },
-  "getting_help_ab6811b0": {
-    "message": "Getting Help"
-  },
-  "getting_started_f45a7e87": {
-    "message": "Getting Started"
-  },
-  "go_to_qna_all_up_view_page_d475333d": {
-    "message": "Go to QnA all-up view page."
-  },
-  "got_it_2c06b54a": {
-    "message": "Got it!"
-  },
-  "greeting_f906f962": {
-    "message": "Greeting"
-  },
-  "handle_a_condition_f32eb8d": {
-    "message": "Handle a Condition"
-  },
-  "handoff_activity_14363a20": {
-    "message": "Handoff activity"
-  },
-  "handover_to_human_1a619574": {
-    "message": "Handover to human"
-  },
-  "here_s_what_we_know_4e9c1731": {
-    "message": "Here’s what we know…"
-  },
-  "hide_code_5dcffa94": {
-    "message": "Hide code"
-  },
-  "home_351838cd": {
-    "message": "Home"
-  },
-  "host_ef9acfae": {
-    "message": "Host "
-  },
-  "http_request_79847109": {
-    "message": "HTTP Request"
-  },
-  "i_want_to_delete_this_bot_f81a4735": {
-    "message": "I want to delete this bot"
-  },
-  "icon_name_is_file_c80dacae": {
-    "message": "{ icon } name is { file }"
-  },
-  "iconname_file_icon_29976c8e": {
-    "message": "{ iconName } file icon"
-  },
-  "id_already_exists_please_enter_a_unique_file_name_174913a3": {
-    "message": "{ id } already exists. Please enter a unique file name."
-  },
-  "id_is_id_c0fc7a7d": {
-    "message": "id is { id }"
-  },
-  "if_condition_56c9be4a": {
-    "message": "If Condition"
-  },
-  "if_this_problem_persists_please_file_an_issue_on_6fbc8e2b": {
-    "message": "If this problem persists, please file an issue on"
-  },
-  "if_you_already_have_a_luis_account_provide_the_inf_bede07a4": {
-    "message": "If you already have a LUIS account, provide the information below. If you do not have an account yet, create a (free) account first."
-  },
-  "if_you_already_have_a_qna_account_provide_the_info_466d6a4b": {
-    "message": "If you already have a QNA account, provide the information below. If you do not have an account yet, create a (free) account first."
-  },
-  "import_qna_from_url_26a99161": {
-    "message": "Import QnA From Url"
-  },
-  "import_schema_75659c5f": {
-    "message": "Import schema"
-  },
-  "in_production_5a70b8b4": {
-    "message": "In production"
-  },
-  "in_test_63c32694": {
-    "message": "In test"
-  },
-  "in_the_b_create_a_trigger_b_wizard_set_the_trigger_f9b23519": {
-    "message": "In the <b>Create a trigger</b> wizard, set the trigger type to <i>Activities</i> in the dropdown. Then set the <b>Activity Type</b> to <i>Greeting (ConversationUpdate activity)</i>, and click the <b>Submit</b> button."
-  },
-  "increment_by_step_1cf3a88": {
-    "message": "increment by { step }"
-  },
-  "input_1d1d9b8e": {
-    "message": "Input"
-  },
-  "install_microsoft_net_core_sdk_2de509f0": {
-    "message": "Install Microsoft .NET Core SDK"
-  },
-  "install_pre_release_versions_of_composer_daily_to__ceb41b54": {
-    "message": "Install pre-release versions of Composer, daily, to access and test the latest features. <a>Learn more</a>."
-  },
-  "install_the_update_and_restart_composer_fac30a61": {
-    "message": "Install the update and restart Composer."
-  },
-  "integer_7f378275": {
-    "message": "integer"
-  },
-  "integer_b08abbe9": {
-    "message": "Integer"
-  },
-  "integer_constant_650191ba": {
-    "message": "Integer constant."
-  },
-  "integer_constant_or_expression_to_evaluate_ec4a17da": {
-    "message": "Integer constant or expression to evaluate."
-  },
-  "integer_or_expression_107f60fb": {
-    "message": "Integer or expression"
-  },
-  "intent_2291200b": {
-    "message": "Intent"
-  },
-  "intent_recognized_c3840853": {
-    "message": "Intent recognized"
-  },
-  "intentname_is_missing_or_empty_e49db2f8": {
-    "message": "intentName is missing or empty"
-  },
-  "interpolated_string_c96053f2": {
-    "message": "Interpolated string."
-  },
-  "interpolated_string_e04923d3": {
-    "message": "Interpolated string"
-  },
-  "interpolated_string_or_expression_to_evaluate_ba0b0ba": {
-    "message": "Interpolated string or expression to evaluate."
-  },
-  "introduction_of_key_concepts_and_user_experience_e_971b32e9": {
-    "message": "Introduction of key concepts and user experience elements for Composer."
-  },
-  "invoke_activity_87df4903": {
-    "message": "Invoke activity"
-  },
-  "is_missing_or_empty_a551462e": {
-    "message": "is missing or empty"
-  },
-  "it_s_not_a_built_in_function_or_a_custom_function_1527ed83": {
-    "message": "it''s not a built-in function or a custom function."
-  },
-  "item_actions_22d0242": {
-    "message": "Item Actions"
-  },
-  "item_actions_cd903bde": {
-    "message": "Item actions"
-  },
-  "item_added_f3910bed": {
-    "message": "item added"
-  },
-  "jan_28_2020_8beb36dc": {
-    "message": "Jan 28, 2020"
-  },
-  "kb_d9c53902": {
-    "message": "KB"
-  },
-  "key_cannot_be_blank_dccc1b46": {
-    "message": "Key cannot be blank"
-  },
-  "key_f2a919d5": {
-    "message": "Key"
-  },
-  "keys_must_be_unique_2028cef3": {
-    "message": "Keys must be unique"
-  },
-  "l_startline_startcharacter_l_endline_endcharacter_72bc2e5d": {
-    "message": "L{ startLine }:{ startCharacter } - L{ endLine }:{ endCharacter } "
-  },
-  "language_generation_1876f6d6": {
-    "message": "Language Generation"
-  },
-  "language_generation_file_80c08efe": {
-    "message": "language generation file"
-  },
-  "language_understanding_9ae3f1f6": {
-    "message": "Language Understanding"
-  },
-  "language_understanding_file_a65abc2c": {
-    "message": "language understanding file"
-  },
-  "languagepolicy_e754ad28": {
-    "message": "LanguagePolicy"
-  },
-  "last_modified_time_is_time_b1497d3": {
-    "message": "Last modified time is { time }"
-  },
-  "learn_more_a79a7918": {
-    "message": "Learn more"
-  },
-  "learn_more_about_knowledge_base_sources_24369b09": {
-    "message": "Learn more about knowledge base sources. "
-  },
-  "learn_more_about_qna_maker_skus_998c567": {
-    "message": "Learn more about QnA Maker SKUs."
-  },
-  "learn_more_about_title_d1d3edbe": {
-    "message": "Learn more about { title }"
-  },
-  "learn_more_c08939e8": {
-    "message": "Learn more."
-  },
-  "learn_the_basics_2d9ae7df": {
-    "message": "Learn the basics"
-  },
-  "leave_product_tour_49585718": {
-    "message": "Leave Product Tour?"
-  },
-  "lg_editor_ee0184e6": {
-    "message": "LG editor"
-  },
-  "lg_file_already_exist_55195d20": {
-    "message": "lg file already exist"
-  },
-  "lg_file_id_not_found_6bd6869b": {
-    "message": "LG file { id } not found"
-  },
-  "lg_language_client_7892c4c1": {
-    "message": "LG Language Client"
-  },
-  "lg_navigation_pane_97b15c3d": {
-    "message": "LG Navigation Pane"
-  },
-  "line_numbers_1bfa7fb": {
-    "message": "Line numbers"
-  },
-  "line_startline_startcharacter_line_endline_endchar_372bb2f4": {
-    "message": "line { startLine }:{ startCharacter } - line { endLine }:{ endCharacter }"
-  },
-  "link_to_where_this_luis_intent_is_defined_9be25fb7": {
-    "message": "link to where this LUIS intent is defined"
-  },
-  "list_a034633b": {
-    "message": "list"
-  },
-  "list_count_values_33ea7088": {
-    "message": "list - { count } values"
-  },
-  "list_view_e33843f0": {
-    "message": "List view"
-  },
-  "loading_25990131": {
-    "message": "Loading..."
-  },
-  "loading_bde52856": {
-    "message": "Loading"
-  },
-  "location_e17bd402": {
-    "message": "Location"
-  },
-  "location_is_location_8c17b5de": {
-    "message": "location is { location }"
-  },
-  "log_to_console_4fc23e34": {
-    "message": "Log to console"
-  },
-  "login_6f3d6249": {
-    "message": "Login"
-  },
-  "login_to_composer_eb42b41": {
-    "message": "Login to Composer"
-  },
-  "loop_for_each_item_53eb7c5b": {
-    "message": "Loop: for each item"
-  },
-  "loop_for_each_item_e09537ae": {
-    "message": "Loop: For each item"
-  },
-  "loop_for_each_page_multiple_items_733e7f41": {
-    "message": "Loop: For each page (multiple items)"
-  },
-  "looping_ddae56ff": {
-    "message": "Looping"
-  },
-  "lu_editor_d09fb2b0": {
-    "message": "LU editor"
-  },
-  "lu_file_id_not_found_8732d33e": {
-    "message": "LU file { id } not found"
-  },
-  "lu_language_client_bbffcd7b": {
-    "message": "LU Language Client"
-  },
-  "lu_navigation_pane_54dc5587": {
-    "message": "LU Navigation Pane"
-  },
-  "luis_add4bbe3": {
-    "message": "LUIS"
-  },
-  "luis_authoring_key_cfaba7dd": {
-    "message": "LUIS Authoring key:"
-  },
-  "luis_authoring_region_b142f97b": {
-    "message": "Luis Authoring Region"
-  },
-  "main_dialog_eed5c847": {
-    "message": "Main dialog"
-  },
-  "make_a_copy_77d1233": {
-    "message": "Make a copy"
-  },
-  "manage_properties_c9fa4456": {
-    "message": "Manage properties"
-  },
-  "manifest_url_30824e88": {
-    "message": "Manifest url"
-  },
-  "manifest_url_can_not_be_accessed_a7f147b2": {
-    "message": "Manifest url can not be accessed"
-  },
-  "manifest_version_1edc004a": {
-    "message": "Manifest Version"
-  },
-  "maximum_f0e8e5e4": {
-    "message": "Maximum"
-  },
-  "maximum_help_text_7f3e6562": {
-    "message": "Maximum help text"
-  },
-  "mb_8f9f9e84": {
-    "message": "MB"
-  },
-  "message_5c38209d": {
-    "message": "Message"
-  },
-  "message_deleted_628eef3a": {
-    "message": "Message deleted"
-  },
-  "message_deleted_activity_85dd8915": {
-    "message": "Message deleted activity"
-  },
-  "message_reaction_3704d790": {
-    "message": "Message reaction"
-  },
-  "message_reaction_activity_379944e7": {
-    "message": "Message reaction activity"
-  },
-  "message_received_5abfe9a0": {
-    "message": "Message received"
-  },
-  "message_received_activity_1ff7c2a4": {
-    "message": "Message received activity"
-  },
-  "message_updated_4f2e37fe": {
-    "message": "Message updated"
-  },
-  "message_updated_activity_4997737e": {
-    "message": "Message updated activity"
-  },
-  "microsoft_app_id_a7f3e591": {
-    "message": "Microsoft App Id"
-  },
-  "microsoft_app_password_737ebc90": {
-    "message": "Microsoft App Password"
-  },
-  "minimap_beb3be27": {
-    "message": "Minimap"
-  },
-  "minimum_f31b05ab": {
-    "message": "Minimum"
-  },
-  "minimum_help_text_6ab5b190": {
-    "message": "Minimum help text"
-  },
-  "missing_definition_for_defname_33f2b594": {
-    "message": "Missing definition for { defName }"
-  },
-  "missing_fields_1c88ab71": {
-    "message": "missing fields"
-  },
-  "modification_rejected_6a6e8322": {
-    "message": "Modification Rejected"
-  },
-  "modify_active_dialog_edcf4a45": {
-    "message": "Modify active dialog"
-  },
-  "modify_this_dialog_3c38af24": {
-    "message": "Modify this dialog"
-  },
-  "more_options_e89670cf": {
-    "message": "More options"
-  },
-  "mostspecificselector_2cf1a6ae": {
-    "message": "MostSpecificSelector"
-  },
-  "move_abf00365": {
-    "message": "Move"
-  },
-  "move_down_eaae3426": {
-    "message": "Move Down"
-  },
-  "move_up_b1c4d3a5": {
-    "message": "Move Up"
-  },
-  "msft_ignite_ai_show_e131edef": {
-    "message": "MSFT Ignite AI Show"
-  },
-  "multi_choice_839b54bb": {
-    "message": "Multi-choice"
-  },
-  "multiple_wildcards_26f50b6c": {
-    "message": "multiple wildcards"
-  },
-  "must_be_an_expression_error_477cbda6": {
-    "message": "must be an expression: { error }"
-  },
-  "must_have_a_name_d5c5c464": {
-    "message": "Must have a name"
-  },
-  "my_publish_profile_2ed56828": {
-    "message": "My Publish Profile"
-  },
-  "name_1aed4a1b": {
-    "message": "Name"
-  },
-  "name_and_save_your_skill_manifest_cfd672b7": {
-    "message": "Name and save your skill manifest."
-  },
-  "name_cannot_include_special_characters_or_spaces_59a1950b": {
-    "message": "Name cannot include special characters or spaces"
-  },
-  "name_copy_55d27c1a": {
-    "message": "{ name }_Copy"
-  },
-  "name_is_name_abc564f9": {
-    "message": "Name is { name }"
-  },
-  "name_is_required_29d28f8d": {
-    "message": "{ name } is required"
-  },
-  "name_of_skill_dialog_to_call_201707f3": {
-    "message": "Name of skill dialog to call"
-  },
-  "name_of_the_property_f3cae657": {
-    "message": "Name of the property"
-  },
-  "navigation_control_94f2649e": {
-    "message": "navigation control"
-  },
-  "navigation_pane_e587b73c": {
-    "message": "Navigation pane"
-  },
-  "navigation_panel_530ae4ac": {
-    "message": "Navigation panel"
-  },
-  "navigation_path_8b299e64": {
-    "message": "Navigation Path"
-  },
-  "navigation_to_see_actions_3be545c9": {
-    "message": "navigation to see actions"
-  },
-  "new_13daf639": {
-    "message": "New"
-  },
-  "new_template_49e6f0f2": {
-    "message": "New template"
-  },
-  "new_trigger_331c811b": {
-    "message": "New Trigger .."
-  },
-  "new_update_available_30534ea5": {
-    "message": "New update available"
-  },
-  "new_value_3c1ce474": {
-    "message": "New value"
-  },
-  "newsectionplaceholdersectionname_5fc0d21": {
-    "message": "_NewSectionPlaceHolderSectionName"
-  },
-  "next_40e12421": {
-    "message": "Next"
-  },
-  "no_editor_for_type_8b5593c5": {
-    "message": "No Editor for { type }"
-  },
-  "no_extensions_installed_4b925277": {
-    "message": "No extensions installed"
-  },
-  "no_lu_file_with_name_id_fb21315d": {
-    "message": "NO LU FILE WITH NAME { id }"
-  },
-  "no_lu_or_qna_file_with_name_id_21cfe9dc": {
-    "message": "NO LU OR QNA FILE WITH NAME { id }"
-  },
-  "no_search_results_1ba50423": {
-    "message": "No search results"
-  },
-  "no_name_e082310e": {
-    "message": "[no name]"
-  },
-  "no_updates_available_cecd904d": {
-    "message": "No updates available"
-  },
-  "no_wildcard_ff439e76": {
-    "message": "no wildcard"
-  },
-  "node_menu_e2aa8092": {
-    "message": "Node menu"
-  },
-  "not_a_single_template_e37f894": {
-    "message": "Not a single template"
-  },
-  "not_yet_published_669e37b3": {
-    "message": "Not yet published"
-  },
-  "notification_list_ee2abb6c": {
-    "message": "Notification list"
-  },
-  "notification_message_msg_7d55d08e": {
-    "message": "Notification Message { msg }"
-  },
-  "notification_type_263c145d": {
-    "message": "Notification type"
-  },
-  "notifications_cbfa7704": {
-    "message": "Notifications"
-  },
-  "nov_12_2019_96ec5473": {
-    "message": "Nov 12, 2019"
-  },
-  "number_a6dc44e": {
-    "message": "Number"
-  },
-  "number_constant_1938e96e": {
-    "message": "Number constant."
-  },
-  "number_constant_or_expression_to_evaluate_1098771": {
-    "message": "Number constant or expression to evaluate."
-  },
-  "number_dc1c178": {
-    "message": "number"
-  },
-  "number_or_expression_55c7f9f": {
-    "message": "Number or expression"
-  },
-  "numeric_field_c2564f69": {
-    "message": "numeric field"
-  },
-  "oauth_login_b6aa9534": {
-    "message": "OAuth login"
-  },
-  "object_345070f6": {
-    "message": "Object"
-  },
-  "object_constant_77052b91": {
-    "message": "Object constant."
-  },
-  "object_or_expression_89903fa1": {
-    "message": "Object or expression"
-  },
-  "object_or_expression_to_evaluate_699c8827": {
-    "message": "Object or expression to evaluate."
-  },
-  "off_5385ef3f": {
-    "message": "Off"
-  },
-  "ok_c47544a2": {
-    "message": "OK"
-  },
-  "ok_ff1b646a": {
-    "message": "Ok"
-  },
-  "okay_1772bbeb": {
-    "message": "Okay"
-  },
-  "on_8f7190e5": {
-    "message": "On"
-  },
-  "onboarding_8407871c": {
-    "message": "Onboarding"
-  },
-  "ondialogevents_types_3dc569b5": {
-    "message": "OnDialogEvents Types"
-  },
-  "open_e0beb7b9": {
-    "message": "Open"
-  },
-  "open_inline_editor_a5aabcfa": {
-    "message": "Open inline editor"
-  },
-  "optional_221bcc9d": {
-    "message": "Optional"
-  },
-  "optional_db6daecb": {
-    "message": "optional"
-  },
-  "optional_properties_2c23c7c6": {
-    "message": "Optional properties"
-  },
-  "or_4f7d4edb": {
-    "message": "Or: "
-  },
-  "origin_lg_file_not_found_in_store_d194cdbc": {
-    "message": "origin lg file not found in store"
-  },
-  "origin_lu_file_not_found_in_store_19e5cc8f": {
-    "message": "origin lu file not found in store"
-  },
-  "original_ce7b7e64": {
-    "message": " - Original"
-  },
-  "other_1c6d9c79": {
-    "message": "Other"
-  },
-  "output_5023cf84": {
-    "message": "Output"
-  },
-  "page_number_cdee4179": {
-    "message": "Page number"
-  },
-  "parse_failed_at_name_error_8f562bda": {
-    "message": "Parse failed at { name }: { error }"
-  },
-  "paste_5963d1c1": {
-    "message": "Paste"
-  },
-  "please_add_at_least_minitems_endpoint_5439fd74": {
-    "message": "Please add at least { minItems } endpoint"
-  },
-  "please_enter_a_value_for_key_77cfc097": {
-    "message": "Please enter a value for { key }"
-  },
-  "please_enter_an_event_name_a148275a": {
-    "message": "Please enter an event name"
-  },
-  "please_input_a_manifest_url_d726edbf": {
-    "message": "Please input a manifest Url"
-  },
-  "please_input_regex_pattern_5cd659a2": {
-    "message": "Please input regEx pattern"
-  },
-  "please_log_in_before_continuing_b6eace13": {
-    "message": "Please log in before continuing."
-  },
-  "please_return_to_design_view_to_start_the_onboardi_a561af9d": {
-    "message": "Please return to Design View to start the Onboarding tutorial."
-  },
-  "please_select_a_event_type_200c4c9f": {
-    "message": "Please select a event type"
-  },
-  "please_select_a_specific_qna_file_to_import_qna_d71d871": {
-    "message": "Please select a specific qna file to import QnA"
-  },
-  "please_select_a_trigger_type_67417abb": {
-    "message": "Please select a trigger type"
-  },
-  "please_select_a_valid_endpoint_bf608af1": {
-    "message": "Please select a valid endpoint"
-  },
-  "please_select_a_version_of_the_manifest_schema_4a3efbb1": {
-    "message": "Please select a version of the manifest schema"
-  },
-  "please_select_an_activity_type_92f4a8a1": {
-    "message": "Please select an activity type"
-  },
-  "populate_your_knowledge_base_bb2d3605": {
-    "message": "Populate your Knowledge Base"
-  },
-  "press_enter_to_add_this_item_or_tab_to_move_to_the_6beb8a14": {
-    "message": "press Enter to add this item or Tab to move to the next interactive element"
-  },
-  "press_enter_to_add_this_name_and_advance_to_the_ne_6a2ae080": {
-    "message": "press Enter to add this name and advance to the next row, or press Tab to advance to the value field"
-  },
-  "previous_bd2ac015": {
-    "message": "Previous"
-  },
-  "previous_folder_e7eeb306": {
-    "message": "previous folder"
-  },
-  "privacy_290109ea": {
-    "message": "Privacy"
-  },
-  "privacy_button_b58e437": {
-    "message": "Privacy button"
-  },
-  "progress_of_total_87de8616": {
-    "message": "{ progress }% of { total }"
-  },
-  "prompt_for_a_date_5d2c689e": {
-    "message": "Prompt for a date"
-  },
-  "prompt_for_a_date_or_a_time_d2df7f90": {
-    "message": "Prompt for a date or a time"
-  },
-  "prompt_for_a_file_or_an_attachment_1bf18e7e": {
-    "message": "Prompt for a file or an attachment"
-  },
-  "prompt_for_a_number_84999edb": {
-    "message": "Prompt for a number"
-  },
-  "prompt_for_attachment_727d4fac": {
-    "message": "Prompt for Attachment"
-  },
-  "prompt_for_confirmation_dc85565c": {
-    "message": "Prompt for confirmation"
-  },
-  "prompt_for_text_5c524f80": {
-    "message": "Prompt for text"
-  },
-  "prompt_with_multi_choice_f428542f": {
-    "message": "Prompt with multi-choice"
-  },
-  "property_array_help_text_126845dc": {
-    "message": "Property array help text"
-  },
-  "property_description_8d21ea2e": {
-    "message": "Property description."
-  },
-  "property_editor_preferences_ad7a4b62": {
-    "message": "Property editor preferences"
-  },
-  "property_has_error_s_please_fix_the_error_s_for_th_e994c143": {
-    "message": "Property has error(s), please fix the error(s) for this property."
-  },
-  "property_name_914371f5": {
-    "message": "Property name"
-  },
-  "property_name_help_text_421a5f7f": {
-    "message": "Property name help text"
-  },
-  "property_quick_actions_d3498f14": {
-    "message": "Property quick actions"
-  },
-  "property_required_help_text_57f027ad": {
-    "message": "Property required help text"
-  },
-  "property_title_f2b443b7": {
-    "message": "Property title"
-  },
-  "property_type_95689fa5": {
-    "message": "Property type."
-  },
-  "property_type_e38cf7e4": {
-    "message": "Property Type"
-  },
-  "property_type_help_text_8a2c202d": {
-    "message": "Property type help text"
-  },
-  "provide_a_brief_description_it_will_appear_on_the__f962eb38": {
-    "message": "Provide a brief description. It will appear on the publish history list."
-  },
-  "pseudo_1a319287": {
-    "message": "Pseudo"
-  },
-  "publish_5211dca3": {
-    "message": "Publish"
-  },
-  "publish_configuration_d759a4e3": {
-    "message": "Publish Configuration"
-  },
-  "publish_destination_type_5f8c200a": {
-    "message": "Publish Destination Type"
-  },
-  "publish_models_9a36752a": {
-    "message": "Publish models"
-  },
-  "publish_profiles_cf8d307b": {
-    "message": "Publish Profiles"
-  },
-  "publish_to_selected_profile_c0998a2": {
-    "message": "Publish to selected profile"
-  },
-  "published_4bb5209e": {
-    "message": "Published"
-  },
-  "publishing_d63a8f2d": {
-    "message": "Publishing"
-  },
-  "qna_28ee5e26": {
-    "message": "QnA"
-  },
-  "qna_editor_9eb94b02": {
-    "message": "QnA editor"
-  },
-  "qna_file_37705cb7": {
-    "message": "qna file"
-  },
-  "qna_intent_recognized_49c3d797": {
-    "message": "QnA Intent recognized"
-  },
-  "qna_navigation_pane_b79ebcbf": {
-    "message": "Qna Navigation Pane"
-  },
-  "qna_region_5a864ef8": {
-    "message": "QnA Region"
-  },
-  "qna_subscription_key_ed72a47": {
-    "message": "QNA Subscription key:"
-  },
-  "question_9121487": {
-    "message": "Question"
-  },
-  "randomselector_4a5274f1": {
-    "message": "RandomSelector"
-  },
-  "range_selection_30caeea5": {
-    "message": "Range Selection"
-  },
-  "re_prompt_for_input_c3b5b3ab": {
-    "message": "Re-prompt for input"
-  },
-  "recent_bots_53585911": {
-    "message": "Recent Bots"
-  },
-  "recognizer_type_dc591e16": {
-    "message": "Recognizer Type"
-  },
-  "recognizers_cefce9d1": {
-    "message": "Recognizers"
-  },
-  "redo_363c58b7": {
-    "message": "Redo"
-  },
-  "redo_is_not_supported_b743e4dc": {
-    "message": "Redo is not supported"
-  },
-  "refer_to_the_syntax_documentation_here_df8dc9b4": {
-    "message": "Refer to the syntax documentation here."
-  },
-  "regex_intent_is_already_defined_df095c1f": {
-    "message": "RegEx { intent } is already defined"
-  },
-  "regular_expression_855557bf": {
-    "message": "Regular Expression"
-  },
-  "release_1af20f26": {
-    "message": "Release: "
-  },
-  "reloading_49d2f661": {
-    "message": "Reloading"
-  },
-  "remove_f47dc62a": {
-    "message": "Remove"
-  },
-  "repeat_this_dialog_83ca994e": {
-    "message": "Repeat this dialog"
-  },
-  "replace_this_dialog_e304015e": {
-    "message": "Replace this dialog"
-  },
-  "reprompt_dialog_event_c42d2c33": {
-    "message": "Reprompt dialog event"
-  },
-  "required_5f7ef8c0": {
-    "message": "Required"
-  },
-  "required_a6089a96": {
-    "message": "required"
-  },
-  "required_properties_dfb0350d": {
-    "message": "Required properties"
-  },
-  "requiredtext_ff8f722f": {
-    "message": "{ requiredText }"
-  },
-  "requiredtext_priority_priority_4293288f": {
-    "message": "{ requiredText } | Priority: { priority }"
-  },
-  "response_is_response_3cd62f8f": {
-    "message": "Response is { response }"
-  },
-  "responses_12d6df1d": {
-    "message": "Responses"
-  },
-  "restart_bot_34e36428": {
-    "message": "Restart Bot"
-  },
-  "result_b1f14e91": {
-    "message": " = Result"
-  },
-  "result_property_100ef34f": {
-    "message": " = Result property"
-  },
-  "return_value_b386d1b": {
-    "message": "= Return value"
-  },
-  "review_and_generate_63dec712": {
-    "message": "Review and generate"
-  },
-  "rollback_26326307": {
-    "message": "Rollback"
-  },
-  "runtime_already_exists_f181f5ec": {
-    "message": "Runtime already exists"
-  },
-  "runtime_code_location_4e94ee12": {
-    "message": "Runtime code location"
-  },
-  "runtime_config_a2904ff9": {
-    "message": "Runtime Config"
-  },
-  "sample_phrases_5d78fa35": {
-    "message": "Sample Phrases"
-  },
-  "sample_phrases_are_phrases_a966b47f": {
-    "message": "Sample Phrases are { phrases }"
-  },
-  "save_11a80ec3": {
-    "message": "Save"
-  },
-  "save_as_9e0cf70b": {
-    "message": "Save as"
-  },
-  "save_your_skill_manifest_63bf5f26": {
-    "message": "Save your skill manifest"
-  },
-  "schema_24739a48": {
-    "message": "Schema"
-  },
-  "scripts_successfully_updated_3a75d57f": {
-    "message": "Scripts successfully updated."
-  },
-  "sdk_runtime_packages_22d8ed1a": {
-    "message": "SDK runtime packages"
-  },
-  "search_280d00bd": {
-    "message": "Search"
-  },
-  "search_for_extensions_on_npm_c5ca65d9": {
-    "message": "Search for extensions on npm"
-  },
-  "see_log_4b833bf7": {
-    "message": "See Log"
-  },
-  "select_a_bot_e1c4dc2b": {
-    "message": "Select a Bot"
-  },
-  "select_a_trigger_on_the_left_a4b41558": {
-    "message": "Select a trigger on the left"
-  },
-  "select_all_f73344a8": {
-    "message": "Select all"
-  },
-  "select_an_activity_type_c982fcbe": {
-    "message": "Select an activity type"
-  },
-  "select_an_event_type_3d7108f1": {
-    "message": "Select an event type"
-  },
-  "select_language_to_delete_d1662d3d": {
-    "message": "Select language to delete"
-  },
-  "select_manifest_version_4f5b1230": {
-    "message": "Select manifest version"
-  },
-  "select_options_9ee7b227": {
-    "message": "Select options"
-  },
-  "select_property_type_5f3ab685": {
-    "message": "select property type"
-  },
-  "select_runtime_version_to_add_d63d383b": {
-    "message": "Select runtime version to add"
-  },
-  "select_the_language_that_bot_will_be_able_to_under_1f2bcb96": {
-    "message": "Select the language that bot will be able to understand (User input) and respond to (Bot responses).\n    To make this bot available in other languages, click “Add’ to create a copy of the default language, and translate the content into the new language."
-  },
-  "select_which_dialogs_are_included_in_the_skill_man_281ef8c9": {
-    "message": "Select which dialogs are included in the skill manifest"
-  },
-  "select_which_tasks_this_skill_can_perform_172b0eae": {
-    "message": "Select which tasks this skill can perform"
-  },
-  "selection_field_86d1dc94": {
-    "message": "selection field"
-  },
-  "selectors_2dcb3029": {
-    "message": "Selectors"
-  },
-  "send_a_response_1a917d7e": {
-    "message": "Send a response"
-  },
-  "send_an_http_request_aa32fd2": {
-    "message": "Send an HTTP request"
-  },
-  "send_messages_c48b239": {
-    "message": "Send Messages"
-  },
-  "sentence_wrap_930c8ced": {
-    "message": "Sentence wrap"
-  },
-  "session_expired_12aaf414": {
-    "message": "Session expired"
-  },
-  "set_a_property_4258d8d7": {
-    "message": "Set a property"
-  },
-  "set_destination_folder_f76e0259": {
-    "message": "Set destination folder"
-  },
-  "set_properties_7415af3c": {
-    "message": "Set properties"
-  },
-  "set_up_your_bot_75009578": {
-    "message": "Set up your bot"
-  },
-  "settings_5aa0fd0c": {
-    "message": "Settings"
-  },
-  "settings_contains_detailed_information_about_your__54aa601d": {
-    "message": "Settings contains detailed information about your bot. For security reasons, they are hidden by default. To test your bot or publish to Azure, you may need to provide these settings."
-  },
-  "settings_editor_b5246933": {
-    "message": "Settings editor"
-  },
-  "settings_menu_c99ecc6d": {
-    "message": "Settings menu"
-  },
-  "show_all_notifications_55bf7858": {
-    "message": "Show All Notifications"
-  },
-  "show_code_f3e9d1cc": {
-    "message": "Show code"
-  },
-  "show_keys_3072a5b8": {
-    "message": "Show keys"
-  },
-  "show_skill_manifest_5d0abde1": {
-    "message": "Show skill manifest"
-  },
-  "sign_out_user_6845d640": {
-    "message": "Sign out user"
-  },
-  "skill_dialog_name_1bbf0eff": {
-    "message": "Skill Dialog Name"
-  },
-  "skill_endpoint_b563491e": {
-    "message": "Skill Endpoint"
-  },
-  "skill_endpoints_e4e3d8c1": {
-    "message": "Skill endpoints"
-  },
-  "skill_host_endpoint_b1088d0": {
-    "message": "Skill Host Endpoint"
-  },
-  "skill_manifest_endpoint_is_configured_improperly_e083731d": {
-    "message": "Skill manifest endpoint is configured improperly"
-  },
-  "skillname_manifest_ef3d9fed": {
-    "message": "{ skillName } Manifest"
-  },
-  "skills_49cccd6a": {
-    "message": "Skills"
-  },
-  "skip_this_step_to_add_questions_and_answers_manual_ed1b9f80": {
-    "message": "Skip this step to add questions and answers manually after creation. The number of sources and file size you can add depends on the QnA service SKU you choose. "
-  },
-  "sorry_something_went_wrong_with_connecting_bot_run_7d6785e3": {
-    "message": "Sorry, something went wrong with connecting bot runtime"
-  },
-  "sorry_something_went_wrong_with_publishing_try_aga_306a48f5": {
-    "message": "Sorry, something went wrong with publishing. Try again or exit out of this task."
-  },
-  "sorted_a_to_z_915b2ed3": {
-    "message": "Sorted A to Z"
-  },
-  "sorted_z_to_a_722f1567": {
-    "message": "Sorted Z to A"
-  },
-  "spaces_and_special_characters_are_not_allowed_20d47684": {
-    "message": "Spaces and special characters are not allowed."
-  },
-  "spaces_and_special_characters_are_not_allowed_use__48acec3c": {
-    "message": "Spaces and special characters are not allowed. Use letters, numbers, -, or _."
-  },
-  "specify_a_name_and_description_for_your_new_dialog_86eb3130": {
-    "message": "Specify a name and description for your new dialog."
-  },
-  "specify_a_name_description_and_location_for_your_n_667f1438": {
-    "message": "Specify a name, description, and location for your new bot project."
-  },
-  "start_bot_25ecad14": {
-    "message": "Start Bot"
-  },
-  "start_bot_failed_d75647d5": {
-    "message": "Start bot failed"
-  },
-  "start_command_a085f2ec": {
-    "message": "Start command"
-  },
-  "state_is_state_a2b8943": {
-    "message": "State is { state }"
-  },
-  "status_e7fdbe06": {
-    "message": "Status"
-  },
-  "step_of_setlength_43c73821": {
-    "message": "{ step } of { setLength }"
-  },
-  "string_24369b3": {
-    "message": "String"
-  },
-  "string_field_db491570": {
-    "message": "string field"
-  },
-  "string_or_expression_c441b45c": {
-    "message": "String or expression"
-  },
-  "submit_a3cc6859": {
-    "message": "Submit"
-  },
-  "synonyms_optional_afe5cdb1": {
-    "message": "Synonyms (Optional)"
-  },
-  "tb_149f379c": {
-    "message": "TB"
-  },
-  "templatename_is_missing_or_empty_23e6b06e": {
-    "message": "templateName is missing or empty"
-  },
-  "terms_of_use_6542769b": {
-    "message": "Terms of Use"
-  },
-  "test_in_emulator_b1b3c278": {
-    "message": "Test in Emulator"
-  },
-  "test_your_bot_3cd1f4bb": {
-    "message": "Test your bot"
-  },
-  "text_7f4593da": {
-    "message": "Text"
-  },
-  "the_api_messages_endpoint_for_the_skill_f318dc63": {
-    "message": "The /api/messages endpoint for the skill."
-  },
-  "the_callback_url_for_the_skill_host_e20e1012": {
-    "message": "The callback url for the skill host."
-  },
-  "the_dialog_you_have_tried_to_delete_is_currently_u_a37c7a02": {
-    "message": "The dialog you have tried to delete is currently used in the below dialog(s). Removing this dialog will cause your Bot to malfunction without additional action."
-  },
-  "the_following_lufile_s_are_invalid_c61ea748": {
-    "message": "The Following LuFile(s) are invalid: \n"
-  },
-  "the_main_dialog_is_named_after_your_bot_it_is_the__3d9864f": {
-    "message": "The main dialog is named after your bot. It is the root and entry point of a bot."
-  },
-  "the_manifest_can_be_edited_and_refined_manually_if_9269e3f2": {
-    "message": "The manifest can be edited and refined manually if and where needed."
-  },
-  "the_microsoft_app_id_that_will_be_calling_the_skil_955424de": {
-    "message": "The Microsoft App Id that will be calling the skill."
-  },
-  "the_microsoft_app_password_that_will_be_calling_th_acf9e1ea": {
-    "message": "The Microsoft App Password that will be calling the skill."
-  },
-  "the_page_you_are_looking_for_can_t_be_found_a3b75795": {
-    "message": "The page you are looking for can''t be found."
-  },
-  "the_return_type_does_not_match_2ae72548": {
-    "message": "the return type does not match"
-  },
-  "the_root_bot_is_not_a_bot_project_d1495cf6": {
-    "message": "The root bot is not a bot project"
-  },
-  "the_welcome_message_is_triggered_by_the_i_conversa_a3ff58f8": {
-    "message": "The welcome message is triggered by the <i>ConversationUpdate</i> event. To add a new <i>ConversationUpdate</i> trigger:"
-  },
-  "there_are_no_kind_properties_e299287e": {
-    "message": "There are no { kind } properties."
-  },
-  "there_was_an_error_74ed3c58": {
-    "message": "There was an error"
-  },
-  "there_was_error_creating_your_kb_53b31ff3": {
-    "message": "There was error creating your KB"
-  },
-  "these_examples_bring_together_all_of_the_best_prac_ca1b89c7": {
-    "message": "These examples bring together all of the best practices and supporting components we''ve identified through building of conversational experiences."
-  },
-  "these_tasks_will_be_used_to_generate_the_manifest__2791be0e": {
-    "message": "These tasks will be used to generate the manifest and describe the capabilities of this skill to those who may want to use it."
-  },
-  "this_configures_a_data_driven_dialog_via_a_collect_c7fa4389": {
-    "message": "This configures a data driven dialog via a collection of events and actions."
-  },
-  "this_dialog_has_no_trigger_yet_d1f1d173": {
-    "message": "This dialog has no trigger yet."
-  },
-  "this_is_a_required_field_acb9837e": {
-    "message": "This is a required field."
-  },
-  "this_is_a_severity_notification_9beabb58": {
-    "message": "This is a { severity } notification"
-  },
-  "this_is_the_language_used_for_composer_s_user_inte_ab7fa82e": {
-    "message": "This is the language used for Composer’s user interface."
-  },
-  "this_language_will_be_copied_and_used_as_the_basis_573515e4": {
-    "message": "This language will be copied and used as the basis (and fallback language) for the translation."
-  },
-  "this_trigger_type_is_not_supported_by_the_regex_re_2c3b7c46": {
-    "message": "This trigger type is not supported by the RegEx recognizer and will not be fired."
-  },
-  "this_trigger_type_is_not_supported_by_the_regex_re_dc3eefa2": {
-    "message": "This trigger type is not supported by the RegEx recognizer. To ensure this trigger is fired, change the recognizer type."
-  },
-  "this_url_is_duplicated_a0768f44": {
-    "message": "This url is duplicated"
-  },
-  "this_version_of_the_content_is_out_of_date_and_you_5e878f29": {
-    "message": "This version of the content is out of date, and your last change was rejected. The content will be automatically refreshed."
-  },
-  "this_will_delete_the_dialog_and_its_contents_do_yo_9b48fa3c": {
-    "message": "This will delete the Dialog and its contents. Do you wish to continue?"
-  },
-  "this_will_delete_the_profile_do_you_wish_to_contin_61b54894": {
-    "message": "This will delete the profile. Do you wish to continue?"
-  },
-  "this_will_open_your_emulator_application_if_you_do_ba277151": {
-    "message": "This will open your Emulator application. If you don''t yet have the Bot Framework Emulator installed, you can download it <a>here</a>."
-  },
-  "time_2b5aac58": {
-    "message": "Time"
-  },
-  "tip_8f74cd0": {
-    "message": "tip"
-  },
-  "tips_80d0da2b": {
-    "message": "tips"
-  },
-  "title_ee03d132": {
-    "message": "Title"
-  },
-  "title_msg_ee91458d": {
-    "message": "{ title }. { msg }"
-  },
-  "to_customize_the_welcome_message_select_the_i_send_9b4bf4f": {
-    "message": "To customize the welcome message, select the <i>Send a response</i> action in the Visual Editor. Then in the Form Editor on the right, you can edit the bot''s welcome message in the <b>Language Generation</b> field."
-  },
-  "to_learn_more_about_the_lg_file_format_read_the_do_ef6e083d": {
-    "message": "> To learn more about the LG file format, read the documentation at\n> { lgHelp }"
-  },
-  "to_learn_more_about_the_lu_file_format_read_the_do_cac5ffc9": {
-    "message": "> To learn more about the LU file format, read the documentation at\n> { LU_HELP }"
-  },
-  "to_learn_more_about_the_qna_file_format_read_the_d_1ce18259": {
-    "message": "> To learn more about the QnA file format, read the documentation at\n> { QNA_HELP }"
-  },
-  "to_make_your_bot_available_for_others_as_a_skill_w_f2c19b9c": {
-    "message": "To make your bot available for others as a skill, we need to generate a manifest."
-  },
-  "to_run_this_bot_composer_needs_net_core_sdk_d1551038": {
-    "message": "To run this bot, Composer needs .NET Core SDK."
-  },
-  "to_understand_what_the_user_says_your_dialog_needs_4e791611": {
-    "message": "To understand what the user says, your dialog needs a \"Recognizer\"; that includes example words and sentences that users may use."
-  },
-  "to_understand_what_the_user_says_your_dialog_needs_957034cc": {
-    "message": "To understand what the user says, your dialog needs an ''IRecognizer'' that includes example words and sentences that users may use."
-  },
-  "to_which_language_will_you_be_translating_your_bot_77219d69": {
-    "message": "To which language will you be translating your bot?"
-  },
-  "toggle_extension_e41de2d2": {
-    "message": "Toggle extension"
-  },
-  "token_property_e53a19d9": {
-    "message": " = Token Property"
-  },
-  "toolbar_bafd4228": {
-    "message": "toolbar"
-  },
-  "total_mb_531a3721": {
-    "message": "{ total }MB"
-  },
-  "trigger_phrases_f6754fa": {
-    "message": "Trigger phrases"
-  },
-  "trigger_phrases_intent_intentname_a1b62148": {
-    "message": "Trigger phrases (intent: #{ intentName })"
-  },
-  "triggers_connect_intents_with_bot_responses_think__fdfc97ea": {
-    "message": "Triggers connect intents with bot responses. Think of a trigger as one capability of your bot. So your bot is a collection of triggers. To add a new trigger, click the <b>Add</b> button in the toolbar, and then select the <b>Add a new trigger</b> option from the dropdown menu."
-  },
-  "true_1900d7ae": {
-    "message": "true"
-  },
-  "true_b9327890": {
-    "message": "True"
-  },
-  "trueselector_40702dda": {
-    "message": "TrueSelector"
-  },
-  "try_again_ad656c3c": {
-    "message": "Try again"
-  },
-  "type_and_press_enter_33a2905d": {
-    "message": "Type and press enter"
-  },
-  "type_c8106334": {
-    "message": "Type"
-  },
-  "type_could_not_be_loaded_65ebaf86": {
-    "message": "{ type } could not be loaded"
-  },
-  "type_dialog_name_14a50769": {
-    "message": "Type dialog name"
-  },
-  "typing_activity_6b634ae": {
-    "message": "Typing activity"
-  },
-  "unable_to_determine_recognizer_type_from_data_valu_2960f526": {
-    "message": "Unable to determine recognizer type from data: { value }"
-  },
-  "undo_a7be8fef": {
-    "message": "Undo"
-  },
-  "undo_is_not_supported_ecd6f9fc": {
-    "message": "Undo is not supported"
-  },
-  "uninstall_8730233": {
-    "message": "Uninstall"
-  },
-  "unknown_intent_44b962ba": {
-    "message": "Unknown intent"
-  },
-  "unknown_intent_recognized_1953f9be": {
-    "message": "Unknown intent recognized"
-  },
-  "unknown_state_23f73afb": {
-    "message": "Unknown State"
-  },
-  "unused_8d193e3": {
-    "message": "Unused"
-  },
-  "update_a_an_activity_previously_sent_during_the_co_f0619cca": {
-    "message": "Update a an activity previously sent during the conversation"
-  },
-  "update_activity_2b05e6c6": {
-    "message": "Update activity"
-  },
-  "update_available_b637d767": {
-    "message": "Update available"
-  },
-  "update_complete_c5163fbf": {
-    "message": "Update complete"
-  },
-  "update_failed_2c87428c": {
-    "message": "Update failed"
-  },
-  "update_folder_name_error_24563bf6": {
-    "message": "Update Folder Name Error"
-  },
-  "update_in_progress_f65e6b29": {
-    "message": "Update in progress"
-  },
-  "update_scripts_a3a483e": {
-    "message": "Update scripts"
-  },
-  "update_scripts_c58771a2": {
-    "message": "Update Scripts"
-  },
-  "updating_scripts_e17a5722": {
-    "message": "Updating scripts... "
-  },
-  "url_22a5f3b8": {
-    "message": "URL"
-  },
-  "url_8c4ff7d2": {
-    "message": "Url"
-  },
-  "url_should_start_with_http_s_9ca55d94": {
-    "message": "Url should start with http[s]://"
-  },
-  "use_custom_runtime_d7d323fd": {
-    "message": "Use custom runtime"
-  },
-  "used_3d895705": {
-    "message": "Used"
-  },
-  "used_in_126529e5": {
-    "message": "Used In"
-  },
-  "user_input_673e4a89": {
-    "message": "User input"
-  },
-  "user_input_a6ff658d": {
-    "message": "User Input"
-  },
-  "user_is_typing_790cb502": {
-    "message": "User is typing"
-  },
-  "validating_35b79a96": {
-    "message": "Validating..."
-  },
-  "validation_rules_efd3144d": {
-    "message": "Validation Rules"
-  },
-  "value_d842f16d": {
-    "message": "Value"
-  },
-  "version_5599c321": {
-    "message": "Version"
-  },
-  "version_version_a051e218": {
-    "message": "Version { version }"
-  },
-  "video_tutorials_79eb26ca": {
-    "message": "Video tutorials:"
-  },
-  "view_ba339f93": {
-    "message": "View"
-  },
-  "view_kb_c382e495": {
-    "message": "View KB"
-  },
-  "view_on_npm_2051324d": {
-    "message": "View on npm"
-  },
-  "vishwac_sena_45910bf0": {
-    "message": "Vishwac Sena"
-  },
-  "visual_editor_216472d": {
-    "message": "Visual editor"
-  },
-  "warning_53c98b03": {
-    "message": "Warning!"
-  },
-  "warning_the_action_you_are_about_to_take_cannot_be_1071a3c3": {
-    "message": "Warning: the action you are about to take cannot be undone. Going further will delete this bot and any related files in the bot project folder."
-  },
-  "we_have_created_a_sample_bot_to_help_you_get_start_95a58922": {
-    "message": "We have created a sample bot to help you get started with Composer. Click here to open the bot."
-  },
-  "we_need_to_define_the_endpoints_for_the_skill_to_a_5dc98d90": {
-    "message": "We need to define the endpoints for the skill to allow other bots to interact with it."
-  },
-  "weather_bot_c38920cd": {
-    "message": "Weather Bot"
-  },
-  "welcome_73d18b4d": {
-    "message": "Welcome!"
-  },
-  "welcome_dd4e7151": {
-    "message": "Welcome"
-  },
-  "westeurope_cabf9688": {
-    "message": "westeurope"
-  },
-  "westus_dc50d800": {
-    "message": "westus"
-  },
-  "what_can_the_user_accomplish_through_this_conversa_7ddb03a1": {
-    "message": "What can the user accomplish through this conversation? For example, BookATable, OrderACoffee etc."
-  },
-  "what_is_the_name_of_the_custom_event_b28a7b3": {
-    "message": "What is the name of the custom event?"
-  },
-  "what_is_the_name_of_this_trigger_2642266e": {
-    "message": "What is the name of this trigger"
-  },
-  "what_is_the_name_of_this_trigger_luis_17b60a23": {
-    "message": "What is the name of this trigger (LUIS)"
-  },
-  "what_is_the_name_of_this_trigger_regex_f77376d7": {
-    "message": "What is the name of this trigger (RegEx)"
-  },
-  "what_is_the_name_of_your_bot_a571c565": {
-    "message": "What is the name of your bot?"
-  },
-  "what_is_the_type_of_this_trigger_d2701744": {
-    "message": "What is the type of this trigger?"
-  },
-  "what_your_bot_says_to_the_user_this_is_a_template__a8d2266d": {
-    "message": "What your bot says to the user. This is a template used to create the outgoing message. It can include language generation rules, properties from memory, and other features.\n\nFor example, to define variations that will be chosen at random, write:\n- hello\n- hi"
-  },
-  "what_your_bot_says_to_the_user_visit_a_target_blan_7735479": {
-    "message": "What your Bot says to the user. Visit <a target=\"_blank\" href=\"https://aka.ms/bf-composer-docs-lg\"> the documentation</a> a reference of capabilities."
-  },
-  "when_deleting_a_language_only_the_content_will_be__8f7f8dee": {
-    "message": "When deleting a language, only the content will be removed. The flow and logic of the conversation and dialog will remain functional."
-  },
-  "when_done_switch_to_the_newly_created_language_and_862b7dd9": {
-    "message": "When done, switch to the newly created language and start the (manual) translation process."
-  },
-  "when_multiple_people_are_working_with_models_you_w_32b48099": {
-    "message": "When multiple people are working with models you want to be able to work with models independently from each other tied to the source control."
-  },
-  "which_activity_type_18333457": {
-    "message": "Which activity type?"
-  },
-  "which_bot_do_you_want_to_open_974bb1e5": {
-    "message": "Which bot do you want to open?"
-  },
-  "which_event_6e655d2b": {
-    "message": "Which event?"
-  },
-  "yes_dde87d5": {
-    "message": "Yes"
-  },
-  "you_are_about_to_publish_your_bot_to_the_profile_b_79a6a226": {
-    "message": "You are about to publish your bot to the profile below. Do you want to proceed?"
-  },
-  "you_can_create_a_new_bot_from_scratch_with_compose_1486288c": {
-    "message": "You can create a new bot from scratch with Composer, or start with a template."
-  },
-  "you_can_define_and_manage_b_intents_b_here_each_in_721b8a0c": {
-    "message": "You can define and manage <b>intents</b> here. Each intent describes a particular user intention through utterances (i.e. user says). <b>Intents are often triggers of your bot.</b>"
-  },
-  "you_can_manage_all_bot_responses_here_make_good_us_5e6e1953": {
-    "message": "You can manage all bot responses here. Make good use of the templates to create sophisticated response logic based on your own needs."
-  },
-  "you_do_not_have_permission_to_save_bots_here_56cc10c7": {
-    "message": "You do not have permission to save bots here"
-  },
-  "your_bot_creation_journey_on_composer_131c1a8b": {
-    "message": "Your bot creation journey on Composer"
-  },
-  "your_bot_is_using_luis_and_qna_for_natural_languag_53830684": {
-    "message": "Your bot is using LUIS and QNA for natural language understanding."
-  },
-  "your_knowledge_base_is_ready_6ecc1871": {
-    "message": "Your knowledge base is ready!"
-  }
-}
\ No newline at end of file
+{}
\ No newline at end of file
diff --git a/Composer/packages/server/src/router/api.ts b/Composer/packages/server/src/router/api.ts
index e28ee00cef..224253d6a6 100644
--- a/Composer/packages/server/src/router/api.ts
+++ b/Composer/packages/server/src/router/api.ts
@@ -77,7 +77,7 @@ router.post('/extensions', ExtensionsController.addExtension);
 router.delete('/extensions', ExtensionsController.removeExtension);
 router.patch('/extensions/toggle', ExtensionsController.toggleExtension);
 router.get('/extensions/search', ExtensionsController.searchExtensions);
-router.get('/extensions/:id/view/:view', ExtensionsController.getBundleForView);
+router.get('/extensions/:id/:bundleId', ExtensionsController.getBundleForView);
 // proxy route for extensions (allows extension client code to make fetch calls using the Composer server as a proxy -- avoids browser blocking request due to CORS)
 router.post('/extensions/proxy/:url', ExtensionsController.performExtensionFetch);
 
diff --git a/Composer/packages/tools/language-servers/language-understanding/package.json b/Composer/packages/tools/language-servers/language-understanding/package.json
index 2766d839d7..24c9f3d148 100644
--- a/Composer/packages/tools/language-servers/language-understanding/package.json
+++ b/Composer/packages/tools/language-servers/language-understanding/package.json
@@ -18,6 +18,8 @@
     "start:server": "cd demo && ts-node ./src/server.ts"
   },
   "dependencies": {
+    "@bfc/indexers": "*",
+    "@bfc/shared": "*",
     "@microsoft/bf-cli-command": "^4.10.0-preview.141651",
     "@microsoft/bf-lu": "^4.10.0-dev.20200808.5a7c973",
     "express": "^4.15.2",
diff --git a/Composer/packages/tools/language-servers/package.json b/Composer/packages/tools/language-servers/package.json
deleted file mode 100644
index 0e7d78e6ae..0000000000
--- a/Composer/packages/tools/language-servers/package.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-    "name": "@bfc/language-servers",
-    "license": "MIT",
-    "version": "1.0.0",
-    "description": "",
-    "main": "index.js",
-    "scripts": {
-        "build": "yarn build:lg && yarn build:lu && yarn build:intellisense",
-        "build:lg": "cd language-generation && yarn build",
-        "build:lu": "cd language-understanding && yarn build",
-        "build:intellisense": "cd intellisense && yarn build"
-    },
-    "author": ""
-}
diff --git a/Composer/packages/tools/package.json b/Composer/packages/tools/package.json
deleted file mode 100644
index 2b05172881..0000000000
--- a/Composer/packages/tools/package.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "name": "@bfc/tools",
-  "license": "MIT",
-  "private": true,
-  "version": "1.0.0",
-  "description": "",
-  "main": "index.js",
-  "scripts": {
-    "build:language-servers": "cd language-servers && yarn build",
-    "build:built-in-functions": "cd built-in-functions && yarn build",
-    "build:all": "yarn build:built-in-functions && concurrently --kill-others-on-fail \"yarn:build:language-servers\""
-  },
-  "author": ""
-}
diff --git a/Composer/packages/types/.eslintrc.js b/Composer/packages/types/.eslintrc.js
new file mode 100644
index 0000000000..8cbe448349
--- /dev/null
+++ b/Composer/packages/types/.eslintrc.js
@@ -0,0 +1,10 @@
+module.exports = {
+  extends: ['../../.eslintrc.js'],
+  parserOptions: {
+    project: './tsconfig.json',
+    tsconfigRootDir: __dirname,
+  },
+  rules: {
+    'security/detect-non-literal-fs-filename': 'off',
+  },
+};
diff --git a/Composer/packages/types/.gitignore b/Composer/packages/types/.gitignore
new file mode 100644
index 0000000000..a65b41774a
--- /dev/null
+++ b/Composer/packages/types/.gitignore
@@ -0,0 +1 @@
+lib
diff --git a/Composer/packages/types/package.json b/Composer/packages/types/package.json
new file mode 100644
index 0000000000..15b001fae6
--- /dev/null
+++ b/Composer/packages/types/package.json
@@ -0,0 +1,20 @@
+{
+  "name": "@bfc/types",
+  "version": "0.0.1",
+  "description": "Shared types for Composer.",
+  "main": "lib/index.js",
+  "scripts": {
+    "build": "yarn clean && tsc",
+    "clean": "rimraf lib"
+  },
+  "author": "andy.brown@microsoft.com",
+  "license": "MIT",
+  "dependencies": {
+    "json-schema": "^0.2.5"
+  },
+  "devDependencies": {
+    "@types/express": "^4.16.1",
+    "rimraf": "^3.0.2",
+    "typescript": "^3.8.3"
+  }
+}
diff --git a/Composer/packages/types/src/diagnostic.ts b/Composer/packages/types/src/diagnostic.ts
new file mode 100644
index 0000000000..f34e87e814
--- /dev/null
+++ b/Composer/packages/types/src/diagnostic.ts
@@ -0,0 +1,55 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+
+export type IRange = {
+  start: IPosition;
+  end: IPosition;
+};
+
+export type IPosition = {
+  line: number;
+  character: number;
+};
+
+export enum DiagnosticSeverity {
+  Error = 0,
+  Warning = 1,
+  Information = 2,
+  Hint = 3,
+}
+
+export type IDiagnostic = {
+  /**
+   * Error
+   * Warning
+   * Information
+   * Hint
+   */
+  severity: DiagnosticSeverity;
+
+  /**
+   * human-readable message
+   */
+  message: string;
+
+  /**
+   * source is used to indentify the source of this error
+   * ie, resource id or file name
+   */
+  source: string;
+
+  /**
+   * path and range are to help locate the error,
+   * path is used for json or any structured content
+   * range is used for text-based content
+   */
+  range?: IRange;
+  path?: string;
+
+  /*
+   * code is a machine readable idenfier to classify error
+   * and allow further or alternative intepretation of this error
+   * for example CA2001
+   */
+  code?: string;
+};
diff --git a/Composer/packages/lib/shared/src/types/dialogUtils.ts b/Composer/packages/types/src/dialogUtils.ts
similarity index 62%
rename from Composer/packages/lib/shared/src/types/dialogUtils.ts
rename to Composer/packages/types/src/dialogUtils.ts
index 2ff5cac284..feb38cee51 100644
--- a/Composer/packages/lib/shared/src/types/dialogUtils.ts
+++ b/Composer/packages/types/src/dialogUtils.ts
@@ -1,27 +1,27 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
-export interface ISearchTarget {
+export type ISearchTarget = {
   type: string;
   value: string;
-}
+};
 
-export interface IDefinition {
+export type IDefinition = {
   [key: string]: any;
-}
+};
 
-export interface ISearchResult {
+export type ISearchResult = {
   [key: string]: string[];
-}
+};
 
-export interface IExpressionProperties {
+export type IExpressionProperties = {
   [key: string]: {
     properties: string[];
     requiredTypes: { [key: string]: boolean };
   };
-}
+};
 
-export interface IIntentTrigger {
+export type IIntentTrigger = {
   intent: string;
   dialogs: string[];
-}
+};
diff --git a/Composer/packages/extension/src/types/extension.ts b/Composer/packages/types/src/extension.ts
similarity index 54%
rename from Composer/packages/extension/src/types/extension.ts
rename to Composer/packages/types/src/extension.ts
index 6104fab5b0..d726c7f2b9 100644
--- a/Composer/packages/extension/src/types/extension.ts
+++ b/Composer/packages/types/src/extension.ts
@@ -1,7 +1,17 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
-export type ExtensionContributionPage = {
+import { RequestHandler } from 'express-serve-static-core';
+import { JSONSchema7 } from 'json-schema';
+
+import { PublishPlugin } from './publish';
+import { RuntimeTemplate, BotTemplate } from './runtime';
+
+export type ExtensionPublishContribution = {
+  bundleId: string;
+};
+
+export type ExtensionPageContribution = {
   /** Id of cooresponding UI bundle. */
   bundleId: string;
   /** Label to dispaly in nav. */
@@ -13,10 +23,8 @@ export type ExtensionContributionPage = {
 
 export type ExtensionContribution = {
   views?: {
-    pages?: ExtensionContributionPage[];
-    publish?: {
-      bundleId?: string;
-    };
+    pages?: ExtensionPageContribution[];
+    publish?: ExtensionPublishContribution[];
   };
 };
 
@@ -44,21 +52,21 @@ export type ExtensionMetadata = {
   contributes: ExtensionContribution;
 };
 
-export interface ExtensionMap {
+export type ExtensionMap = {
   [id: string]: ExtensionMetadata | undefined;
-}
+};
 
 /** Info about a plugin returned from an NPM search query */
-export interface ExtensionSearchResult {
+export type ExtensionSearchResult = {
   id: string;
   keywords: string[];
   version: string;
   description: string;
   url: string;
-}
+};
 
 /** Representation of the properties Composer cares about inside of an extension's package.json */
-export interface PackageJSON {
+export type PackageJSON = {
   name: string;
   version: string;
   description: string;
@@ -68,4 +76,35 @@ export interface PackageJSON {
     contributes?: ExtensionContribution;
     bundles?: ExtensionBundle[];
   };
-}
+};
+
+export type ExtensionCollection = {
+  storage: {
+    [key: string]: any;
+  };
+  publish: {
+    [key: string]: {
+      plugin: {
+        name: string;
+        description: string;
+        /** (Optional instructions displayed in the UI) */
+        instructions?: string;
+        /** (Optional) Schema for publishing configuration. */
+        schema?: JSONSchema7;
+        /** Whether or not the plugin has custom UI to host in the publish surface */
+        bundleId?: string;
+      };
+      methods: PublishPlugin;
+    };
+  };
+  authentication: {
+    middleware?: RequestHandler;
+    serializeUser?: (user: any, next: any) => void;
+    deserializeUser?: (user: any, next: any) => void;
+    allowedUrls: string[];
+    [key: string]: any;
+  };
+  runtimeTemplates: RuntimeTemplate[];
+  botTemplates: BotTemplate[];
+  baseTemplates: BotTemplate[];
+};
diff --git a/Composer/packages/lib/shared/src/types/index.ts b/Composer/packages/types/src/index.ts
similarity index 73%
rename from Composer/packages/lib/shared/src/types/index.ts
rename to Composer/packages/types/src/index.ts
index ab3827c46c..7e2863d243 100644
--- a/Composer/packages/lib/shared/src/types/index.ts
+++ b/Composer/packages/types/src/index.ts
@@ -3,10 +3,13 @@
 
 export * from './diagnostic';
 export * from './dialogUtils';
+export * from './extension';
 export * from './indexers';
+export * from './publish';
+export * from './runtime';
 export * from './schema';
 export * from './sdk';
-export * from './settings';
 export * from './server';
+export * from './settings';
 export * from './shell';
-export * from './EditorAPI';
+export * from './user';
diff --git a/Composer/packages/lib/shared/src/types/indexers.ts b/Composer/packages/types/src/indexers.ts
similarity index 72%
rename from Composer/packages/lib/shared/src/types/indexers.ts
rename to Composer/packages/types/src/indexers.ts
index 9416d09c0e..8df6145067 100644
--- a/Composer/packages/lib/shared/src/types/indexers.ts
+++ b/Composer/packages/types/src/indexers.ts
@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
-import { Diagnostic, Range } from './diagnostic';
+import { IDiagnostic, IRange } from './diagnostic';
 import { IIntentTrigger } from './dialogUtils';
 
 import { DialogSetting } from './index';
@@ -17,34 +17,34 @@ export enum FileExtensions {
   FormDialogSchema = '.form-dialog',
 }
 
-export interface FileInfo {
+export type FileInfo = {
   name: string;
   content: string;
   path: string;
   relativePath: string;
   lastModified: string;
-}
+};
 
-export interface ITrigger {
+export type ITrigger = {
   id: string;
   displayName: string;
   type: string;
   isIntent: boolean;
-}
+};
 
-export interface ReferredLuIntents {
+export type ReferredLuIntents = {
   name: string;
   path: string;
-}
+};
 
-export interface DialogSchemaFile {
+export type DialogSchemaFile = {
   id: string;
   content: any;
-}
+};
 
-export interface DialogInfo {
+export type DialogInfo = {
   content: any;
-  diagnostics: Diagnostic[];
+  diagnostics: IDiagnostic[];
   displayName: string;
   id: string;
   isRoot: boolean;
@@ -57,35 +57,35 @@ export interface DialogInfo {
   triggers: ITrigger[];
   intentTriggers: IIntentTrigger[];
   skills: string[];
-}
+};
 
-export interface LgTemplateJsonPath {
+export type LgTemplateJsonPath = {
   name: string;
   path: string;
-}
+};
 
-export interface Intent {
+export type Intent = {
   name: string;
-}
+};
 
-export interface Utterance {
+export type Utterance = {
   intent: string;
   text: string;
-}
+};
 
-export interface LuIntentSection {
+export type LuIntentSection = {
   Name: string;
   Body: string;
   Entities?: LuEntity[];
   Children?: LuIntentSection[];
-  range?: Range;
-}
+  range?: IRange;
+};
 
-export interface LuParsed {
+export type LuParsed = {
   empty: boolean;
   intents: LuIntentSection[];
-  diagnostics: Diagnostic[];
-}
+  diagnostics: IDiagnostic[];
+};
 
 export enum LuSectionTypes {
   SIMPLEINTENTSECTION = 'simpleIntentSection',
@@ -93,55 +93,55 @@ export enum LuSectionTypes {
   MODELINFOSECTION = 'modelInfoSection',
 }
 
-export interface LuEntity {
+export type LuEntity = {
   Name: string;
-}
+};
 
-export interface LuFile {
+export type LuFile = {
   id: string;
   content: string;
-  diagnostics: Diagnostic[];
+  diagnostics: IDiagnostic[];
   intents: LuIntentSection[];
   empty: boolean;
   [key: string]: any;
-}
+};
 
-export interface QnASection {
+export type QnASection = {
   Questions: { content: string; id: string }[];
   Answer: string;
   Body: string;
-}
+};
 
-export interface QnAFile {
+export type QnAFile = {
   id: string;
   content: string;
   qnaSections: QnASection[];
   [key: string]: any;
-}
+};
 
-export interface LgTemplate {
+export type LgTemplate = {
   name: string;
   body: string;
   parameters: string[];
-  range?: Range;
-}
+  range?: IRange;
+};
 
-export interface LgParsed {
-  diagnostics: Diagnostic[];
+export type LgParsed = {
+  diagnostics: IDiagnostic[];
   templates: LgTemplate[];
-}
+};
 
-export interface LgFile {
+export type LgFile = {
   id: string;
   content: string;
-  diagnostics: Diagnostic[];
+  diagnostics: IDiagnostic[];
   templates: LgTemplate[];
   allTemplates: LgTemplate[];
   options?: string[];
   parseResult?: any;
-}
+};
 
-export interface Skill {
+export type Skill = {
   id: string;
   content: any;
   description?: string;
@@ -150,28 +150,28 @@ export interface Skill {
   manifestUrl: string;
   msAppId: string;
   name: string;
-}
+};
 
-export interface TextFile {
+export type TextFile = {
   id: string;
   content: string;
-}
+};
 export type FileResolver = (id: string) => FileInfo | undefined;
 
 export type MemoryResolver = (id: string) => string[] | undefined;
 
-export interface SkillManifestInfo {
+export type SkillManifestInfo = {
   content: { [key: string]: any };
   lastModified: string;
   id: string;
-}
+};
 
-export interface SkillManifest {
+export type SkillManifest = {
   content: any;
   id: string;
   path?: string;
   lastModified?: string;
-}
+};
 
 export type BotAssets = {
   projectId: string;
@@ -184,8 +184,8 @@ export type BotAssets = {
   dialogSchemas: DialogSchemaFile[];
 };
 
-export interface BotInfo {
+export type BotInfo = {
   assets: BotAssets;
-  diagnostics: Diagnostic[];
+  diagnostics: IDiagnostic[];
   name: string;
-}
+};
diff --git a/Composer/packages/types/src/publish.ts b/Composer/packages/types/src/publish.ts
new file mode 100644
index 0000000000..2c99e3042c
--- /dev/null
+++ b/Composer/packages/types/src/publish.ts
@@ -0,0 +1,57 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+
+import type { JSONSchema7 } from 'json-schema';
+
+import type { IBotProject } from './server';
+import type { UserIdentity } from './user';
+import type { ILuisConfig, IQnAConfig } from './settings';
+
+export type PublishResult = {
+  message: string;
+  comment?: string;
+  log?: string;
+  id?: string;
+  time?: Date;
+  endpointURL?: string;
+  status?: number;
+};
+
+export type PublishResponse = {
+  status: number;
+  result: PublishResult;
+};
+
+// TODO: Add types for project, metadata
+export type PublishPlugin<Config = any> = {
+  // methods plugins should support
+  publish: (config: Config, project: IBotProject, metadata: any, user?: UserIdentity) => Promise<PublishResponse>;
+  getStatus?: (config: Config, project: IBotProject, user?: UserIdentity) => Promise<PublishResponse>;
+  getHistory?: (config: Config, project: IBotProject, user?: UserIdentity) => Promise<PublishResult[]>;
+  rollback?: (
+    config: Config,
+    project: IBotProject,
+    rollbackToVersion: string,
+    user?: UserIdentity
+  ) => Promise<PublishResponse>;
+
+  // other properties
+  schema?: JSONSchema7;
+  instructions?: string;
+  customName?: string;
+  customDescription?: string;
+  bundleId?: string;
+  [key: string]: any;
+};
+
+export type IPublishConfig = {
+  luis: ILuisConfig;
+  qna: IQnAConfig;
+};
+
+export type PublishTarget = {
+  name: string;
+  type: string;
+  configuration: string;
+  lastPublished?: Date;
+};
diff --git a/Composer/packages/types/src/runtime.ts b/Composer/packages/types/src/runtime.ts
new file mode 100644
index 0000000000..3ba1d7dee3
--- /dev/null
+++ b/Composer/packages/types/src/runtime.ts
@@ -0,0 +1,84 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+
+import { IBotProject } from './server';
+import { DialogSetting } from './settings';
+
+type Stat = {
+  isDir: boolean;
+  isFile: boolean;
+  isWritable: boolean;
+  lastModified: string;
+  size: string;
+};
+
+type MakeDirectoryOptions = {
+  recursive?: boolean;
+};
+
+type IFileStorage = {
+  stat(path: string): Promise<Stat>;
+  readFile(path: string): Promise<string>;
+  readDir(path: string): Promise<string[]>;
+  exists(path: string): Promise<boolean>;
+  writeFile(path: string, content: any): Promise<void>;
+  removeFile(path: string): Promise<void>;
+  mkDir(path: string, options?: MakeDirectoryOptions): Promise<void>;
+  rmDir(path: string): Promise<void>;
+  rmrfDir(path: string): Promise<void>;
+  glob(pattern: string | string[], path: string): Promise<string[]>;
+  copyFile(src: string, dest: string): Promise<void>;
+  rename(oldPath: string, newPath: string): Promise<void>;
+  zip(source: string, cb: any): unknown;
+};
+
+export type BotTemplate = {
+  id: string;
+  name: string;
+  description: string;
+  /* absolute path */
+  path: string;
+  /* tags for further grouping and search secenario */
+  tags?: string[];
+  /* list of supported runtime versions */
+  support?: string[];
+};
+
+export type RuntimeTemplate = {
+  /** method used to eject the runtime into a project. returns resulting path of runtime! */
+  eject: (project: IBotProject, localDisk?: any, isReplace?: boolean) => Promise<string>;
+
+  /** build method used for local publish */
+  build: (runtimePath: string, project: IBotProject) => Promise<void>;
+
+  run: (project: IBotProject, localDisk?: any) => Promise<void>;
+
+  /** build for deploy method */
+  buildDeploy: (
+    runtimePath: string,
+    project: IBotProject,
+    settings: DialogSetting,
+    profileName: string
+  ) => Promise<string>;
+
+  /** set skill manifest, different folder for different runtime  */
+  setSkillManifest: (
+    dstRuntimePath: string,
+    dstStorage: IFileStorage,
+    srcManifestDir: string,
+    srcStorage: IFileStorage,
+    mode: string
+  ) => Promise<void>;
+
+  /** path to code template */
+  path: string;
+
+  /** internal use key */
+  key: string;
+
+  /** name of runtime template to display in interface */
+  name: string;
+
+  /** command used to start runtime */
+  startCommand: string;
+};
diff --git a/Composer/packages/lib/shared/src/types/schema.ts b/Composer/packages/types/src/schema.ts
similarity index 91%
rename from Composer/packages/lib/shared/src/types/schema.ts
rename to Composer/packages/types/src/schema.ts
index 394d6adebc..1b5cb2b9b6 100644
--- a/Composer/packages/lib/shared/src/types/schema.ts
+++ b/Composer/packages/types/src/schema.ts
@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
-import { JSONSchema6 } from 'json-schema';
+import { JSONSchema7 } from 'json-schema';
 
 // All of the known SDK types. Update this list when we take a schema update.
 // To get this list copy the output of the following commands in a node repl from the project root:
@@ -139,19 +139,27 @@ export interface DefinitionSummary {
   $ref: string;
 }
 
-export interface OBISchema extends JSONSchema6 {
-  $schema?: string;
-  $role?: string;
-  $kind?: SDKKinds;
+export type SchemaDefinitions = {
+  [key: string]: AdaptiveSchema;
+};
+
+interface AdaptiveSchema extends Omit<JSONSchema7, 'definitions' | 'properties' | 'additionalProperties'> {
   $copy?: string;
   $id?: string;
+  $kind?: string;
+  $role?: string;
   $designer?: {
     id: string;
     [key: string]: any;
   };
-  description?: string;
-  oneOf?: DefinitionSummary[];
-  definitions?: any;
-  title?: string;
-  __additional_property?: boolean;
+  definitions?: SchemaDefinitions;
+  oneOf?: AdaptiveSchema[];
+  properties?: SchemaDefinitions;
+  additionalProperties?: boolean | AdaptiveSchema;
+  items?: AdaptiveSchema | AdaptiveSchema[];
 }
+
+// Re-export monkey patched json schema interfaces
+export { AdaptiveSchema as JSONSchema7 };
+
+export type DefinitionCache = Map<string, AdaptiveSchema>;
diff --git a/Composer/packages/lib/shared/src/types/sdk.ts b/Composer/packages/types/src/sdk.ts
similarity index 85%
rename from Composer/packages/lib/shared/src/types/sdk.ts
rename to Composer/packages/types/src/sdk.ts
index 171c0970bb..2b1a3f4322 100644
--- a/Composer/packages/lib/shared/src/types/sdk.ts
+++ b/Composer/packages/types/src/sdk.ts
@@ -1,15 +1,13 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
-/* eslint-disable @typescript-eslint/no-empty-interface */
-
-export interface DesignerData {
+export type DesignerData = {
   name?: string;
   description?: string;
   id: string;
-}
+};
 
-export interface BaseSchema {
+export type BaseSchema = {
   /** Defines the valid properties for the component you are configuring (from a dialog .schema file) */
   $kind: string;
   /** Inline id for reuse of an inline definition */
@@ -20,7 +18,7 @@ export interface BaseSchema {
   $designer?: DesignerData;
   /** If 'disabled' equals to or be evaluated as 'true', runtime will skip this action. */
   disabled?: boolean | string;
-}
+};
 
 /* Union of components which implement the IActivityTemplate interface */
 type MicrosoftIActivityTemplate = string;
@@ -31,25 +29,25 @@ interface OpenObject<T = string> {
   [x: string]: T;
 }
 
-export interface IAssignmentObject {
+export type IAssignmentObject = {
   value?: string;
   property?: string;
-}
+};
 
-export interface IChoiceObject {
+export type IChoiceObject = {
   /** the value to return when selected. */
   value?: string;
   /** Card action for the choice */
   action?: OpenObject;
   /** the list of synonyms to recognize in addition to the value. This is optional. */
   synonyms?: string[];
-}
+};
 
 export type IChoice = IChoiceObject[] | string;
 
 type IListStyle = 'none' | 'auto' | 'inline' | 'list' | 'suggestedAction' | 'heroCard';
 
-export interface IChoiceOption {
+export type IChoiceOption = {
   /** Character used to separate individual choices when there are more than 2 choices */
   inlineSeparator?: string;
   /** Separator inserted between the choices when their are only 2 choices */
@@ -58,32 +56,32 @@ export interface IChoiceOption {
   inlineOrMore?: string;
   /** If true, inline and list style choices will be prefixed with the index of the choice. */
   includeNumbers?: boolean;
-}
+};
 
-export interface IConfirmChoice {
+export type IConfirmChoice = {
   /** the value to return when selected. */
   value?: string;
   /** Card action for the choice */
   action?: OpenObject;
   /** The list of synonyms to recognize in addition to the value. This is optional. */
   synonyms?: string[];
-}
+};
 
-export interface IRecognizerOption {
+export type IRecognizerOption = {
   /** If true, the choices value field will NOT be search over */
   noValue?: boolean;
-}
+};
 
 /** Respond with an activity. */
-export interface SendActivity extends BaseSchema {
+export type SendActivity = BaseSchema & {
   activity?: MicrosoftIActivityTemplate;
-}
+};
 
 /**
  * Inputs
  */
 
-export interface InputDialog extends BaseSchema {
+export type InputDialog = BaseSchema & {
   /** (Optional) id for the dialog */
   id: string;
   /** The message to send to as prompt for this input. */
@@ -108,16 +106,16 @@ export interface InputDialog extends BaseSchema {
   alwaysPrompt: boolean;
   /** Always will always consult parent dialogs first, never will not consult parent dialogs, notRecognized will consult parent only when it's not recognized */
   allowInterruptions: 'always' | 'never' | 'notRecognized';
-}
+};
 
 /** This represents a dialog which gathers an attachment such as image or music */
-export interface AttachmentInput extends Partial<InputDialog> {
+export type AttachmentInput = Partial<InputDialog> & {
   /** The attachment output format. */
   outputFormat?: 'all' | 'first';
-}
+};
 
 /** This represents a dialog which gathers a choice responses */
-export interface ChoiceInput extends Partial<InputDialog> {
+export type ChoiceInput = Partial<InputDialog> & {
   /** The output format. */
   outputFormat?: 'value' | 'index';
   choices?: IChoice;
@@ -129,10 +127,10 @@ export interface ChoiceInput extends Partial<InputDialog> {
   style?: IListStyle;
   choiceOptions?: IChoiceOption;
   recognizerOptions?: IRecognizerOption;
-}
+};
 
 /** This represents a dialog which gathers a yes/no style responses */
-export interface ConfirmInput extends Partial<InputDialog> {
+export type ConfirmInput = Partial<InputDialog> & {
   outputFormat: undefined;
   /** The prompts default locale that should be recognized. */
   defaultLocale?: string;
@@ -140,25 +138,25 @@ export interface ConfirmInput extends Partial<InputDialog> {
   style?: IListStyle;
   choiceOptions?: IChoiceOption;
   confirmChoices?: IConfirmChoice[];
-}
+};
 
-export interface DateTimeInput extends Partial<InputDialog> {
+export type DateTimeInput = Partial<InputDialog> & {
   outputFormat: undefined;
   /** The prompts default locale that should be recognized. */
   defaultLocale?: string;
-}
-export interface NumberInput extends Partial<InputDialog> {
+};
+export type NumberInput = Partial<InputDialog> & {
   /** The output format. */
   outputFormat?: 'float' | 'integer';
   /** The prompts default locale that should be recognized. */
   defaultLocale?: string;
-}
+};
 
 /** This represents a dialog which gathers a text from the user */
-export interface TextInput extends Partial<InputDialog> {
+export type TextInput = Partial<InputDialog> & {
   /** The output format. */
   outputFormat?: 'none' | 'trim' | 'lowercase' | 'uppercase';
-}
+};
 
 export type MicrosoftInputDialog =
   | AttachmentInput
@@ -172,11 +170,11 @@ export type MicrosoftInputDialog =
  * Recognizers
  */
 
-export interface LuisRecognizer extends BaseSchema {
+export type LuisRecognizer = BaseSchema & {
   applicationId: string;
   endpoint: string;
   endpointKey: string;
-}
+};
 
 interface IntentPattern {
   $kind: 'Microsoft.IntentPattern';
@@ -184,15 +182,15 @@ interface IntentPattern {
   pattern: string;
 }
 
-export interface RegexRecognizer extends BaseSchema {
+export type RegexRecognizer = BaseSchema & {
   /** Pattern->Intents mappings */
   intents: IntentPattern[];
-}
+};
 
-export interface CrossTrainedRecognizer extends BaseSchema {
+export type CrossTrainedRecognizer = BaseSchema & {
   /** Pattern->Intents mappings */
   recognizers: string[];
-}
+};
 
 export type MicrosoftIRecognizer = LuisRecognizer | RegexRecognizer | CrossTrainedRecognizer | string;
 
@@ -213,23 +211,23 @@ export enum DialogEvent {
   stepsResumed = 'stepsResumed',
 }
 
-interface RuleBase extends BaseSchema {
+type RuleBase = BaseSchema & {
   /** Optional constraint to which must be met for this rule to fire */
   constraint?: string;
   /** Sequence of steps or dialogs to execute */
   actions: MicrosoftIDialog[];
-}
+};
 
 /** This defines the steps to take when an Intent is recognized (and optionally entities) */
-export interface OnIntent extends RuleBase {
+export type OnIntent = RuleBase & {
   /** Intent name to trigger on */
   intent: string;
   /** The entities required to trigger this rule */
   entities: string[];
-}
+};
 
 /** Defines a sequence of steps to take if there is no other trigger or plan operating */
-export interface OnUnknownIntent extends RuleBase {}
+export type OnUnknownIntent = RuleBase & {};
 
 export type ITriggerCondition = OnIntent | OnUnknownIntent;
 
@@ -237,51 +235,51 @@ export type ITriggerCondition = OnIntent | OnUnknownIntent;
  * Conversational Flow and Dialog Management
  */
 
-export interface CaseCondition {
+export type CaseCondition = {
   /** Value which must match the condition property */
   value: string;
   /** Steps to execute if case is equal to condition */
   actions: MicrosoftIDialog[];
-}
+};
 
 /** Step which conditionally decides which step to execute next. */
-export interface SwitchCondition extends BaseSchema {
+export type SwitchCondition = BaseSchema & {
   /** Expression to evaluate to switch on. */
   condition?: string;
   /** Cases to evaluate against condition */
   cases?: CaseCondition[];
   /** Step to execute if no case is equal to condition */
   default?: MicrosoftIDialog[];
-}
+};
 
 /** Two-way branch the conversation flow based on a condition. */
-export interface IfCondition extends BaseSchema {
+export type IfCondition = BaseSchema & {
   /** Expression to evaluate. */
   condition?: string;
   actions?: MicrosoftIDialog[];
   elseActions?: MicrosoftIDialog[];
-}
+};
 
 /** Execute actions on each item in an a collection. */
-export interface Foreach extends BaseSchema {
+export type Foreach = BaseSchema & {
   itemsProperty?: string;
   actions?: MicrosoftIDialog[];
-}
+};
 
 /** Execute actions on each page (collection of items) in an array. */
-export interface ForeachPage extends BaseSchema {
+export type ForeachPage = BaseSchema & {
   itemsProperty?: string;
   pageSize?: number;
   actions?: MicrosoftIDialog[];
-}
+};
 
-export interface EditActions extends BaseSchema {
+export type EditActions = BaseSchema & {
   changeType: string;
   actions?: MicrosoftIDialog[];
-}
+};
 
 /** Flexible, data driven dialog that can adapt to the conversation. */
-export interface MicrosoftAdaptiveDialog extends BaseSchema {
+export type MicrosoftAdaptiveDialog = BaseSchema & {
   /** Optional dialog ID. */
   id?: string;
   /** If this is true the dialog will automatically end when there are no more steps to run.  If this is false it is the responsbility of the author to call EndDialog at an appropriate time. */
@@ -292,7 +290,7 @@ export interface MicrosoftAdaptiveDialog extends BaseSchema {
   recognizer?: MicrosoftIRecognizer;
   /** This is the array of rules to use to evaluate conversation */
   triggers: ITriggerCondition[];
-}
+};
 
 /* Union of components which implement the IDialog interface */
 export type MicrosoftIDialog =
diff --git a/Composer/packages/lib/shared/src/types/server.ts b/Composer/packages/types/src/server.ts
similarity index 82%
rename from Composer/packages/lib/shared/src/types/server.ts
rename to Composer/packages/types/src/server.ts
index 770a6311de..3dd18f023b 100644
--- a/Composer/packages/lib/shared/src/types/server.ts
+++ b/Composer/packages/types/src/server.ts
@@ -1,10 +1,10 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 import { Skill, FileInfo } from './indexers';
-import { Diagnostic } from './diagnostic';
+import { IDiagnostic } from './diagnostic';
 import { DialogSetting } from './settings';
 
-export interface ProjectTemplate {
+export type ProjectTemplate = {
   id: string;
   name: string;
   description: string;
@@ -14,9 +14,9 @@ export interface ProjectTemplate {
   tags?: string[];
   /* list of supported runtime versions */
   support?: string[];
-}
+};
 
-export interface IBotProject {
+export type IBotProject = {
   fileStorage: any;
   dir: string;
   dataDir: string;
@@ -30,7 +30,7 @@ export interface IBotProject {
     [key: string]: string;
   };
   skills: Skill[];
-  diagnostics: Diagnostic[];
+  diagnostics: IDiagnostic[];
   settingManager: ISettingManager;
   settings: DialogSetting | null;
   getProject: () => {
@@ -39,14 +39,14 @@ export interface IBotProject {
     location: string;
     schemas: any;
     skills: Skill[];
-    diagnostics: Diagnostic[];
+    diagnostics: IDiagnostic[];
     settings: DialogSetting | null;
   };
   [key: string]: any;
-}
+};
 
-export interface ISettingManager {
+export type ISettingManager = {
   get(obfuscate?: boolean): Promise<any | null>;
   set(settings: any): Promise<void>;
   getFileName: () => string;
-}
+};
diff --git a/Composer/packages/lib/shared/src/types/settings.ts b/Composer/packages/types/src/settings.ts
similarity index 70%
rename from Composer/packages/lib/shared/src/types/settings.ts
rename to Composer/packages/types/src/settings.ts
index 0a549c0fb9..c5d987866f 100644
--- a/Composer/packages/lib/shared/src/types/settings.ts
+++ b/Composer/packages/types/src/settings.ts
@@ -1,33 +1,35 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
-export interface CodeEditorSettings {
+import type { PublishTarget } from './publish';
+
+export type CodeEditorSettings = {
   lineNumbers: boolean;
   wordWrap: boolean;
   minimap: boolean;
-}
+};
 
-export interface UserSettings {
+export type UserSettings = {
   appUpdater: AppUpdaterSettings;
   codeEditor: CodeEditorSettings;
   propertyEditorWidth: number;
   dialogNavWidth: number;
   appLocale: string;
-}
+};
 
-export interface AppUpdaterSettings {
+export type AppUpdaterSettings = {
   autoDownload: boolean;
   useNightly: boolean;
-}
+};
 
-export interface SkillSetting {
+export type SkillSetting = {
   name: string;
   manifestUrl: string;
   msAppId: string;
   endpointUrl: string;
-}
+};
 
-export interface DialogSetting {
+export type DialogSetting = {
   MicrosoftAppId?: string;
   MicrosoftAppPassword?: string;
   luis: ILuisConfig;
@@ -46,9 +48,9 @@ export interface DialogSetting {
   botId?: string;
   skillHostEndpoint?: string;
   [key: string]: any;
-}
+};
 
-export interface ILuisConfig {
+export type ILuisConfig = {
   name: string;
   endpoint: string;
   authoringKey: string;
@@ -57,28 +59,16 @@ export interface ILuisConfig {
   authoringRegion: string | 'westus';
   defaultLanguage: string | 'en-us';
   environment: string | 'composer';
-}
+};
 
-export interface IQnAConfig {
+export type IQnAConfig = {
   subscriptionKey: string;
   endpointKey: string;
   qnaRegion: string;
   [key: string]: string;
-}
+};
 
-export interface IConfig extends ILuisConfig {
+export type IConfig = ILuisConfig & {
   subscriptionKey: string;
   qnaRegion: string | 'westus';
-}
-
-export interface IPublishConfig {
-  luis: ILuisConfig;
-  qna: IQnAConfig;
-}
-
-export interface PublishTarget {
-  name: string;
-  type: string;
-  configuration: string;
-  lastPublished?: Date;
-}
+};
diff --git a/Composer/packages/lib/shared/src/types/shell.ts b/Composer/packages/types/src/shell.ts
similarity index 84%
rename from Composer/packages/lib/shared/src/types/shell.ts
rename to Composer/packages/types/src/shell.ts
index 03c5753076..d7e86aa874 100644
--- a/Composer/packages/lib/shared/src/types/shell.ts
+++ b/Composer/packages/types/src/shell.ts
@@ -2,21 +2,21 @@
 // Licensed under the MIT License.
 /* eslint-disable @typescript-eslint/no-explicit-any */
 
-import { DialogInfo, LuFile, LgFile, QnAFile, LuIntentSection, LgTemplate, DialogSchemaFile } from './indexers';
-import { SkillSetting, UserSettings } from './settings';
-import { OBISchema } from './schema';
+import type { DialogInfo, LuFile, LgFile, QnAFile, LuIntentSection, LgTemplate, DialogSchemaFile } from './indexers';
+import type { SkillSetting, UserSettings } from './settings';
+import type { JSONSchema7 } from './schema';
 
 /** Recursively marks all properties as optional. */
 type AllPartial<T> = {
   [P in keyof T]?: T[P] extends (infer U)[] ? AllPartial<U>[] : T[P] extends object ? AllPartial<T[P]> : T[P];
 };
 
-export interface EditorSchema {
+export type EditorSchema = {
   content?: {
     fieldTemplateOverrides: any;
     SDKOverrides?: any;
   };
-}
+};
 
 type UISchema = {
   [key: string]: {
@@ -25,15 +25,15 @@ type UISchema = {
     menu?: any;
   };
 };
-export interface BotSchemas {
-  default?: OBISchema;
+export type BotSchemas = {
+  default?: JSONSchema7;
   sdk?: any;
   ui?: { content: UISchema };
   uiOverrides?: { content: UISchema };
   diagnostics?: any[];
-}
+};
 
-export interface ShellData {
+export type ShellData = {
   locale: string;
   botName: string;
   currentDialog: DialogInfo;
@@ -61,9 +61,9 @@ export interface ShellData {
   skillsSettings: Record<string, SkillSetting>;
   // TODO: remove
   schemas: BotSchemas;
-}
+};
 
-export interface ShellApi {
+export type ShellApi = {
   getDialog: (dialogId: string) => any;
   saveDialog: (dialogId: string, newDialogData: any) => any;
   saveData: <T = any>(newData: T, updatePath?: string) => void;
@@ -75,14 +75,14 @@ export interface ShellApi {
   copyLgTemplate: (id: string, fromTemplateName: string, toTemplateName?: string) => Promise<LgFile[] | undefined>;
   addLgTemplate: (id: string, templateName: string, templateStr: string) => Promise<LgFile[] | undefined>;
   updateLgTemplate: (id: string, templateName: string, templateStr: string) => Promise<LgFile[] | undefined>;
-  deboucedUpdateLgTemplate: (id: string, templateName: string, templateStr: string) => Promise<LgFile[] | undefined>;
+  debouncedUpdateLgTemplate: (id: string, templateName: string, templateStr: string) => Promise<LgFile[] | undefined>;
   removeLgTemplate: (id: string, templateName: string) => Promise<LgFile[] | undefined>;
   removeLgTemplates: (id: string, templateNames: string[]) => Promise<LgFile[] | undefined>;
   getLuIntent: (id: string, intentName: string) => LuIntentSection | undefined;
   getLuIntents: (id: string) => LuIntentSection[];
   addLuIntent: (id: string, intentName: string, intent: LuIntentSection) => Promise<LuFile[] | undefined>;
   updateLuIntent: (id: string, intentName: string, intent: LuIntentSection) => Promise<LuFile[] | undefined>;
-  deboucedUpdateLuIntent: (id: string, intentName: string, intent: LuIntentSection) => Promise<LuFile[] | undefined>;
+  debouncedUpdateLuIntent: (id: string, intentName: string, intent: LuIntentSection) => Promise<LuFile[] | undefined>;
   renameLuIntent: (id: string, intentName: string, newIntentName: string) => Promise<LuFile[] | undefined>;
   removeLuIntent: (id: string, intentName: string) => void;
   updateQnaContent: (id: string, content: string) => void;
@@ -102,14 +102,9 @@ export interface ShellApi {
   updateDialogSchema: (_: DialogSchemaFile) => Promise<void>;
   createTrigger: (id: string, formData, url?: string) => void;
   updateSkillSetting: (skillId: string, skillsData: SkillSetting) => Promise<void>;
-}
-
-export interface Shell {
-  api: ShellApi;
-  data: ShellData;
-}
+};
 
-export interface Shell {
+export type Shell = {
   api: ShellApi;
   data: ShellData;
-}
+};
diff --git a/Composer/packages/types/src/user.ts b/Composer/packages/types/src/user.ts
new file mode 100644
index 0000000000..9c313fae7b
--- /dev/null
+++ b/Composer/packages/types/src/user.ts
@@ -0,0 +1,6 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+
+export type UserIdentity = {
+  [key: string]: any;
+};
diff --git a/Composer/packages/types/tsconfig.json b/Composer/packages/types/tsconfig.json
new file mode 100644
index 0000000000..e3e6f1d50b
--- /dev/null
+++ b/Composer/packages/types/tsconfig.json
@@ -0,0 +1,9 @@
+{
+  "extends": "../../tsconfig.base.json",
+  "compilerOptions": {
+    "outDir": "./lib/",
+    "sourceMap": true,
+    "target": "es6"
+  },
+  "include": ["src/**/*.ts"]
+}
diff --git a/Composer/packages/types/yarn.lock b/Composer/packages/types/yarn.lock
new file mode 100644
index 0000000000..98b4db2c41
--- /dev/null
+++ b/Composer/packages/types/yarn.lock
@@ -0,0 +1,18 @@
+# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
+# yarn lockfile v1
+
+
+express-serve-static-core@^0.1.1:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/express-serve-static-core/-/express-serve-static-core-0.1.1.tgz#222358112a79bc9fbe00838232e8cd2e3132ef37"
+  integrity sha1-IiNYESp5vJ++AIOCMujNLjEy7zc=
+
+json-schema@^0.2.5:
+  version "0.2.5"
+  resolved "https://registry.yarnpkg.com/json-schema/-/json-schema-0.2.5.tgz#97997f50972dd0500214e208c407efa4b5d7063b"
+  integrity sha512-gWJOWYFrhQ8j7pVm0EM8Slr+EPVq1Phf6lvzvD/WCeqkrx/f2xBI0xOsRRS9xCn3I4vKtP519dvs3TP09r24wQ==
+
+typescript@^3.8.3:
+  version "3.9.7"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.9.7.tgz#98d600a5ebdc38f40cb277522f12dc800e9e25fa"
+  integrity sha512-BLbiRkiBzAwsjut4x/dsibSTB6yWpwT5qWmC2OfuCg3GgVQCSgMs4vEctYPhsaGtd0AeuuHMkjZ2h2WG8MSzRw==
diff --git a/Composer/packages/ui-plugins/lg/package.json b/Composer/packages/ui-plugins/lg/package.json
index 142e105925..805b95db1e 100644
--- a/Composer/packages/ui-plugins/lg/package.json
+++ b/Composer/packages/ui-plugins/lg/package.json
@@ -38,6 +38,7 @@
   "dependencies": {
     "@bfc/shared": "*",
     "@bfc/indexers": "*",
+    "@bfc/ui-shared": "*",
     "@emotion/core": "^10.0.27"
   }
 }
diff --git a/Composer/packages/ui-plugins/lg/src/LgField.tsx b/Composer/packages/ui-plugins/lg/src/LgField.tsx
index eb11ff737a..f242f36a5a 100644
--- a/Composer/packages/ui-plugins/lg/src/LgField.tsx
+++ b/Composer/packages/ui-plugins/lg/src/LgField.tsx
@@ -49,7 +49,7 @@ const LgField: React.FC<FieldProps<string>> = (props) => {
 
   const updateLgTemplate = useCallback(
     (body: string) => {
-      shellApi.deboucedUpdateLgTemplate(lgFileId, lgName, body);
+      shellApi.debouncedUpdateLgTemplate(lgFileId, lgName, body);
     },
     [lgName, lgFileId]
   );
diff --git a/Composer/packages/ui-plugins/luis/src/LuisIntentEditor.tsx b/Composer/packages/ui-plugins/luis/src/LuisIntentEditor.tsx
index d1ea6ab169..a4d4388b13 100644
--- a/Composer/packages/ui-plugins/luis/src/LuisIntentEditor.tsx
+++ b/Composer/packages/ui-plugins/luis/src/LuisIntentEditor.tsx
@@ -40,7 +40,7 @@ const LuisIntentEditor: React.FC<FieldProps<string>> = (props) => {
     }
 
     const newIntent = { Name: intentName, Body: newValue };
-    shellApi.deboucedUpdateLuIntent(luFile.id, intentName, newIntent);
+    shellApi.debouncedUpdateLuIntent(luFile.id, intentName, newIntent);
     onChange(intentName);
   };
 
diff --git a/Composer/packages/ui-plugins/prompts/package.json b/Composer/packages/ui-plugins/prompts/package.json
index 8d4d6e0840..e4bc17d4ae 100644
--- a/Composer/packages/ui-plugins/prompts/package.json
+++ b/Composer/packages/ui-plugins/prompts/package.json
@@ -44,6 +44,7 @@
   },
   "dependencies": {
     "@bfc/shared": "*",
+    "@bfc/ui-shared": "*",
     "@emotion/core": "^10.0.27"
   }
 }
diff --git a/Composer/packages/ui-plugins/schema-editor/src/utils/getDefinitions.ts b/Composer/packages/ui-plugins/schema-editor/src/utils/getDefinitions.ts
index 1014b0cfb1..7f3f25355c 100644
--- a/Composer/packages/ui-plugins/schema-editor/src/utils/getDefinitions.ts
+++ b/Composer/packages/ui-plugins/schema-editor/src/utils/getDefinitions.ts
@@ -1,10 +1,10 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
-import { JSONSchema7, JSONSchema7Definition } from '@bfc/extension-client';
+import { JSONSchema7, SchemaDefinitions } from '@bfc/extension-client';
 
-export const getDefinitions = (expressions: JSONSchema7[] = [], definitions: { [key: string]: JSONSchema7 }) =>
-  expressions.reduce((acc: { [key: string]: JSONSchema7Definition }, schema: any) => {
+export const getDefinitions = (expressions: JSONSchema7[] = [], definitions: SchemaDefinitions) =>
+  expressions.reduce((acc: SchemaDefinitions, schema: any) => {
     const defName = (schema?.$ref || '').replace('#/definitions/', '');
     const defSchema = definitions?.[defName] as JSONSchema7;
 
diff --git a/Composer/plugins/sample-ui-plugin/package.json b/Composer/plugins/sample-ui-plugin/package.json
index 698723192b..d05f805e34 100644
--- a/Composer/plugins/sample-ui-plugin/package.json
+++ b/Composer/plugins/sample-ui-plugin/package.json
@@ -22,10 +22,10 @@
     ],
     "contributes": {
       "views": {
-        "publish": {
+        "publish": [{
           "bundleId": "publish"
-        },
-        "page-DISABLED": [
+        }],
+        "pages-DISABLED": [
           {
             "bundleId": "page",
             "label": "Sample UI Plugin"
diff --git a/Composer/plugins/sample-ui-plugin/src/node/index.ts b/Composer/plugins/sample-ui-plugin/src/node/index.ts
index 9ee1d8c42e..a5e7d8de20 100644
--- a/Composer/plugins/sample-ui-plugin/src/node/index.ts
+++ b/Composer/plugins/sample-ui-plugin/src/node/index.ts
@@ -5,7 +5,7 @@
 function initialize(registration) {
   const plugin = {
     customDescription: 'Publish using custom UI',
-    hasView: true /** we have custom UI to host */,
+    bundleId: 'publish' /** we have custom UI to host */,
     publish,
     getStatus,
   };
diff --git a/Composer/plugins/sample-ui-plugin/webpack.config.js b/Composer/plugins/sample-ui-plugin/webpack.config.js
index abe57b96c8..0fdfc56a9a 100644
--- a/Composer/plugins/sample-ui-plugin/webpack.config.js
+++ b/Composer/plugins/sample-ui-plugin/webpack.config.js
@@ -1,13 +1,18 @@
-const { resolve } = require('path');
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+
+// eslint-disable-next-line @typescript-eslint/no-var-requires
+const path = require('path');
 
 module.exports = {
   entry: {
     page: './src/client/page/index.tsx',
     publish: './src/client/publish/index.tsx',
   },
-  mode: 'production',
+  mode: 'development',
+  devtool: 'eval-source-map',
   output: {
-    path: resolve(__dirname, 'dist'),
+    path: path.resolve(__dirname, 'dist'),
   },
   externals: {
     // expect react & react-dom to be available in the extension host iframe globally under "React" and "ReactDOM" variables