From 1b458f7285ee99fc38a7ec6593ccb81f2ba065bd Mon Sep 17 00:00:00 2001
From: Andy Brown <asbrown002@gmail.com>
Date: Wed, 9 Sep 2020 12:44:16 -0700
Subject: [PATCH 01/10] rename plugins to extensions where it makes sense

---
 Composer/package.json                         |  4 +-
 Composer/packages/client/src/App.tsx          |  4 +-
 .../client/src/pages/setting/SettingsPage.tsx |  4 +-
 .../Plugins.tsx => extensions/Extensions.tsx} | 72 +++++++--------
 .../client/src/pages/setting/router.tsx       |  4 +-
 .../client/src/recoilModel/atoms/appState.ts  |  4 +-
 .../src/recoilModel/dispatchers/extensions.ts | 92 +++++++++++++++++++
 .../src/recoilModel/dispatchers/index.ts      |  4 +-
 .../src/recoilModel/dispatchers/plugins.ts    | 92 -------------------
 .../packages/client/src/recoilModel/types.ts  |  5 +-
 Composer/packages/client/src/utils/hooks.ts   |  8 +-
 Composer/packages/electron-server/src/main.ts |  2 +-
 .../.gitignore                                |  0
 .../package.json                              |  4 +-
 .../src/auth/index.ts                         |  0
 .../src/auth/types.ts                         |  0
 .../src/common/constants.ts                   |  0
 .../src/common/index.ts                       |  4 +-
 .../src/index.ts                              |  0
 .../src/logger.ts                             |  2 +-
 .../src/page/index.ts                         |  0
 .../src/publish/index.ts                      |  0
 .../src/publish/types.ts                      |  0
 .../tsconfig.json                             |  0
 Composer/packages/server/package.json         |  2 +-
 .../controllers/{plugins.ts => extensions.ts} | 36 ++++----
 Composer/packages/server/src/router/api.ts    | 20 ++--
 Composer/packages/server/src/server.ts        |  2 +-
 Composer/plugins/azurePublish/package.json    |  2 +-
 .../plugins/mockRemotePublish/package.json    |  2 +-
 .../plugins/sample-ui-plugin/package.json     |  2 +-
 .../src/client/page/index.tsx                 |  2 +-
 .../src/client/publish/index.tsx              |  2 +-
 .../src/client/publish/main.tsx               |  2 +-
 Composer/plugins/sample-ui-plugin/yarn.lock   |  2 +-
 35 files changed, 189 insertions(+), 190 deletions(-)
 rename Composer/packages/client/src/pages/setting/{plugins/Plugins.tsx => extensions/Extensions.tsx} (72%)
 create mode 100644 Composer/packages/client/src/recoilModel/dispatchers/extensions.ts
 delete mode 100644 Composer/packages/client/src/recoilModel/dispatchers/plugins.ts
 rename Composer/packages/extensions/{client-plugin-lib => extension-client}/.gitignore (100%)
 rename Composer/packages/extensions/{client-plugin-lib => extension-client}/package.json (71%)
 rename Composer/packages/extensions/{client-plugin-lib => extension-client}/src/auth/index.ts (100%)
 rename Composer/packages/extensions/{client-plugin-lib => extension-client}/src/auth/types.ts (100%)
 rename Composer/packages/extensions/{client-plugin-lib => extension-client}/src/common/constants.ts (100%)
 rename Composer/packages/extensions/{client-plugin-lib => extension-client}/src/common/index.ts (74%)
 rename Composer/packages/extensions/{client-plugin-lib => extension-client}/src/index.ts (100%)
 rename Composer/packages/extensions/{client-plugin-lib => extension-client}/src/logger.ts (66%)
 rename Composer/packages/extensions/{client-plugin-lib => extension-client}/src/page/index.ts (100%)
 rename Composer/packages/extensions/{client-plugin-lib => extension-client}/src/publish/index.ts (100%)
 rename Composer/packages/extensions/{client-plugin-lib => extension-client}/src/publish/types.ts (100%)
 rename Composer/packages/extensions/{client-plugin-lib => extension-client}/tsconfig.json (100%)
 rename Composer/packages/server/src/controllers/{plugins.ts => extensions.ts} (67%)

diff --git a/Composer/package.json b/Composer/package.json
index d130ea2e8d..0b4a958c50 100644
--- a/Composer/package.json
+++ b/Composer/package.json
@@ -37,7 +37,7 @@
     "build:test": "yarn workspace @bfc/test-utils build",
     "build:lib": "yarn workspace @bfc/libs build:all",
     "build:electron": "yarn workspace @bfc/electron-server build",
-    "build:extensions": "wsrun -lt -p @bfc/plugin-loader @bfc/intellisense @bfc/extension @bfc/adaptive-form @bfc/adaptive-flow @bfc/ui-plugin-* @bfc/client-plugin-lib -c build",
+    "build:extensions": "wsrun -lt -p @bfc/plugin-loader @bfc/intellisense @bfc/extension @bfc/adaptive-form @bfc/adaptive-flow @bfc/ui-plugin-* @bfc/extension-client -c build",
     "build:server": "yarn workspace @bfc/server build",
     "build:client": "yarn workspace @bfc/client build",
     "build:tools": "yarn workspace @bfc/tools build:all",
@@ -121,4 +121,4 @@
     "wsrun": "^5.2.0"
   },
   "dependencies": {}
-}
\ No newline at end of file
+}
diff --git a/Composer/packages/client/src/App.tsx b/Composer/packages/client/src/App.tsx
index 59661e7adf..907901ffb6 100644
--- a/Composer/packages/client/src/App.tsx
+++ b/Composer/packages/client/src/App.tsx
@@ -13,9 +13,9 @@ import { dispatcherState } from './recoilModel/DispatcherWrapper';
 initializeIcons(undefined, { disableWarnings: true });
 
 export const App: React.FC = () => {
-  const { fetchPlugins } = useRecoilValue(dispatcherState);
+  const { fetchExtensions } = useRecoilValue(dispatcherState);
   useEffect(() => {
-    fetchPlugins();
+    fetchExtensions();
   });
 
   return (
diff --git a/Composer/packages/client/src/pages/setting/SettingsPage.tsx b/Composer/packages/client/src/pages/setting/SettingsPage.tsx
index febb998495..1a99fd822c 100644
--- a/Composer/packages/client/src/pages/setting/SettingsPage.tsx
+++ b/Composer/packages/client/src/pages/setting/SettingsPage.tsx
@@ -73,7 +73,7 @@ const SettingPage: React.FC<RouteComponentProps<{ '*': string }>> = () => {
     botSettings: formatMessage('Bot Settings'),
     appSettings: formatMessage('Application Settings'),
     runtime: formatMessage('Runtime Config'),
-    plugins: formatMessage('Plugins'),
+    extensions: formatMessage('Extensions'),
     about: formatMessage('About'),
   };
 
@@ -86,7 +86,7 @@ const SettingPage: React.FC<RouteComponentProps<{ '*': string }>> = () => {
     },
     { id: 'application', name: settingLabels.appSettings, url: getProjectLink('application') },
     { id: 'runtime', name: settingLabels.runtime, url: getProjectLink('runtime', projectId), disabled: !projectId },
-    // { id: 'plugins', name: settingLabels.plugins, url: getProjectLink('plugins') },
+    // { id: 'extensions', name: settingLabels.extensions, url: getProjectLink('extensions') },
     { id: 'about', name: settingLabels.about, url: getProjectLink('about') },
   ];
 
diff --git a/Composer/packages/client/src/pages/setting/plugins/Plugins.tsx b/Composer/packages/client/src/pages/setting/extensions/Extensions.tsx
similarity index 72%
rename from Composer/packages/client/src/pages/setting/plugins/Plugins.tsx
rename to Composer/packages/client/src/pages/setting/extensions/Extensions.tsx
index 71ffc26bf1..3af2af1b22 100644
--- a/Composer/packages/client/src/pages/setting/plugins/Plugins.tsx
+++ b/Composer/packages/client/src/pages/setting/extensions/Extensions.tsx
@@ -19,33 +19,33 @@ import { TextField } from 'office-ui-fabric-react/lib/TextField';
 import axios from 'axios';
 import { useRecoilValue } from 'recoil';
 
-import { PluginConfig } from '../../../recoilModel/types';
+import { ExtensionConfig } from '../../../recoilModel/types';
 import { Toolbar, IToolbarItem } from '../../../components/Toolbar';
 import httpClient from '../../../utils/httpUtil';
-import { dispatcherState, pluginsState } from '../../../recoilModel';
+import { dispatcherState, extensionsState } from '../../../recoilModel';
 
-const Plugins: React.FC<RouteComponentProps> = () => {
-  const { fetchPlugins, togglePlugin, addPlugin, removePlugin } = useRecoilValue(dispatcherState);
-  const plugins = useRecoilValue(pluginsState);
+const Extensions: React.FC<RouteComponentProps> = () => {
+  const { fetchExtensions, toggleExtension, addExtension, removeExtension } = useRecoilValue(dispatcherState);
+  const extensions = useRecoilValue(extensionsState);
   const [showNewModal, setShowNewModal] = useState(false);
-  const [pluginName, setPluginName] = useState<string | null>(null);
-  const [pluginVersion, setPluginVersion] = useState<string | null>(null);
-  const [matchingPlugins, setMatchingPlugins] = useState<PluginConfig[]>([]);
-  const [selectedPlugin, setSelectedPlugin] = useState<any>();
+  const [extensionName, setExtensionName] = useState<string | null>(null);
+  const [extensionVersion, setExtensionVersion] = useState<string | null>(null);
+  const [matchingExtensions, setMatchingExtensions] = useState<ExtensionConfig[]>([]);
+  const [selectedExtension, setSelectedExtension] = useState<any>();
 
   useEffect(() => {
-    fetchPlugins();
+    fetchExtensions();
   }, []);
 
   useEffect(() => {
-    if (pluginName !== null) {
+    if (extensionName !== null) {
       const source = axios.CancelToken.source();
 
       const timer = setTimeout(() => {
         httpClient
-          .get(`/plugins/search?q=${pluginName}`, { cancelToken: source.token })
+          .get(`/extensions/search?q=${extensionName}`, { cancelToken: source.token })
           .then((res) => {
-            setMatchingPlugins(res.data);
+            setMatchingExtensions(res.data);
           })
           .catch((err) => {
             if (!axios.isCancel(err)) {
@@ -59,7 +59,7 @@ const Plugins: React.FC<RouteComponentProps> = () => {
         clearTimeout(timer);
       };
     }
-  }, [pluginName]);
+  }, [extensionName]);
 
   const installedColumns: IColumn[] = [
     {
@@ -67,7 +67,7 @@ const Plugins: React.FC<RouteComponentProps> = () => {
       name: formatMessage('Name'),
       minWidth: 100,
       maxWidth: 150,
-      onRender: (item: PluginConfig) => {
+      onRender: (item: ExtensionConfig) => {
         return <span>{item.id}</span>;
       },
     },
@@ -76,7 +76,7 @@ const Plugins: React.FC<RouteComponentProps> = () => {
       name: formatMessage('Version'),
       minWidth: 30,
       maxWidth: 100,
-      onRender: (item: PluginConfig) => {
+      onRender: (item: ExtensionConfig) => {
         return <span>{item.version}</span>;
       },
     },
@@ -85,10 +85,10 @@ const Plugins: React.FC<RouteComponentProps> = () => {
       name: formatMessage('Enabled'),
       minWidth: 30,
       maxWidth: 150,
-      onRender: (item: PluginConfig) => {
+      onRender: (item: ExtensionConfig) => {
         const text = item.enabled ? formatMessage('Disable') : formatMessage('Enable');
         return (
-          <DefaultButton disabled={item.builtIn} onClick={() => togglePlugin(item.id, !item.enabled)}>
+          <DefaultButton disabled={item.builtIn} onClick={() => toggleExtension(item.id, !item.enabled)}>
             {text}
           </DefaultButton>
         );
@@ -99,9 +99,9 @@ const Plugins: React.FC<RouteComponentProps> = () => {
       name: formatMessage('Remove'),
       minWidth: 30,
       maxWidth: 150,
-      onRender: (item: PluginConfig) => {
+      onRender: (item: ExtensionConfig) => {
         return (
-          <DefaultButton disabled={item.builtIn} onClick={() => removePlugin(item.id)}>
+          <DefaultButton disabled={item.builtIn} onClick={() => removeExtension(item.id)}>
             {formatMessage('Remove')}
           </DefaultButton>
         );
@@ -154,7 +154,7 @@ const Plugins: React.FC<RouteComponentProps> = () => {
   ];
 
   const toolbarItems: IToolbarItem[] = [
-    // TODO (toanzian / abrown): re-enable once remote plugins are supported
+    // TODO (toanzian / abrown): re-enable once remote extensions are supported
     /*{
       type: 'action',
       text: formatMessage('Add'),
@@ -171,14 +171,14 @@ const Plugins: React.FC<RouteComponentProps> = () => {
   ];
 
   const submit = useCallback(() => {
-    if (selectedPlugin && pluginVersion) {
-      addPlugin(selectedPlugin.id, pluginVersion);
+    if (selectedExtension && extensionVersion) {
+      addExtension(selectedExtension.id, extensionVersion);
       setShowNewModal(false);
-      setPluginName(null);
-      setPluginVersion(null);
-      setSelectedPlugin(null);
+      setExtensionName(null);
+      setExtensionVersion(null);
+      setSelectedExtension(null);
     }
-  }, [selectedPlugin, pluginVersion]);
+  }, [selectedExtension, extensionVersion]);
 
   return (
     <div>
@@ -186,15 +186,15 @@ const Plugins: React.FC<RouteComponentProps> = () => {
       <DetailsList
         checkboxVisibility={CheckboxVisibility.hidden}
         columns={installedColumns}
-        items={plugins}
+        items={extensions}
         layoutMode={DetailsListLayoutMode.justified}
         selectionMode={SelectionMode.single}
       />
       <Dialog
         dialogContentProps={{
           type: DialogType.close,
-          title: formatMessage('Add new plugin'),
-          subText: formatMessage('Search for plugins'),
+          title: formatMessage('Add new extension'),
+          subText: formatMessage('Search for extensions'),
         }}
         hidden={!showNewModal}
         minWidth="600px"
@@ -202,17 +202,17 @@ const Plugins: React.FC<RouteComponentProps> = () => {
       >
         <div>
           <TextField
-            label={formatMessage('Plugin name')}
-            value={pluginName ?? ''}
-            onChange={(_e, val) => setPluginName(val ?? null)}
+            label={formatMessage('Extension name')}
+            value={extensionName ?? ''}
+            onChange={(_e, val) => setExtensionName(val ?? null)}
           />
           <DetailsList
             checkboxVisibility={CheckboxVisibility.always}
             columns={matchingColumns}
-            items={matchingPlugins}
+            items={matchingExtensions}
             layoutMode={DetailsListLayoutMode.justified}
             selectionMode={SelectionMode.single}
-            onActiveItemChanged={(item) => setSelectedPlugin(item)}
+            onActiveItemChanged={(item) => setSelectedExtension(item)}
           />
         </div>
         <DialogFooter>
@@ -226,4 +226,4 @@ const Plugins: React.FC<RouteComponentProps> = () => {
   );
 };
 
-export { Plugins };
+export { Extensions };
diff --git a/Composer/packages/client/src/pages/setting/router.tsx b/Composer/packages/client/src/pages/setting/router.tsx
index 98214295c5..81deba54fb 100644
--- a/Composer/packages/client/src/pages/setting/router.tsx
+++ b/Composer/packages/client/src/pages/setting/router.tsx
@@ -12,7 +12,7 @@ import { About } from '../about/About';
 import { DialogSettings } from './dialog-settings/DialogSettings';
 import { AppSettings } from './app-settings/AppSettings';
 import { RuntimeSettings } from './runtime-settings/RuntimeSettings';
-// import { Plugins } from './plugins/Plugins';
+// import { Extensions } from './extensions/Extensions';
 
 export const SettingsRoutes = React.memo(({ projectId }: { projectId: string }) => {
   const applicationError = useRecoilValue(applicationErrorState);
@@ -34,7 +34,7 @@ export const SettingsRoutes = React.memo(({ projectId }: { projectId: string })
         <About path="about" />
         <DialogSettings path="/bot/:projectId/dialog-settings" />
         <RuntimeSettings path="/bot/:projectId/runtime" />
-        {/* <Plugins path="plugins" /> */}
+        {/* <Extensions path="extensions" /> */}
       </Router>
     </ErrorBoundary>
   );
diff --git a/Composer/packages/client/src/recoilModel/atoms/appState.ts b/Composer/packages/client/src/recoilModel/atoms/appState.ts
index 949863ab0f..002d994d82 100644
--- a/Composer/packages/client/src/recoilModel/atoms/appState.ts
+++ b/Composer/packages/client/src/recoilModel/atoms/appState.ts
@@ -152,7 +152,7 @@ export const boilerplateVersionState = atom<BoilerplateVersion>({
   },
 });
 
-export const pluginsState = atom<PluginConfig[]>({
-  key: getFullyQualifiedKey('plugins'),
+export const extensionsState = atom<PluginConfig[]>({
+  key: getFullyQualifiedKey('extensions'),
   default: [],
 });
diff --git a/Composer/packages/client/src/recoilModel/dispatchers/extensions.ts b/Composer/packages/client/src/recoilModel/dispatchers/extensions.ts
new file mode 100644
index 0000000000..c545eb03ea
--- /dev/null
+++ b/Composer/packages/client/src/recoilModel/dispatchers/extensions.ts
@@ -0,0 +1,92 @@
+/* eslint-disable react-hooks/rules-of-hooks */
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+
+import { CallbackInterface, useRecoilCallback } from 'recoil';
+
+import httpClient from '../../utils/httpUtil';
+import { extensionsState } from '../atoms';
+import { ExtensionConfig } from '../types';
+
+export const extensionsDispatcher = () => {
+  const fetchExtensions = useRecoilCallback((callbackHelpers: CallbackInterface) => async () => {
+    const { set } = callbackHelpers;
+    try {
+      const res = await httpClient.get('/extensions');
+
+      set(extensionsState, res.data);
+    } catch (err) {
+      console.error(err);
+    }
+  });
+
+  const addExtension = useRecoilCallback(
+    (callbackHelpers: CallbackInterface) => async (extensionName: string, version: string) => {
+      const { set } = callbackHelpers;
+      try {
+        const res = await httpClient.post('/extensions', { name: extensionName, version });
+        const addedExtension: ExtensionConfig = res.data;
+
+        set(extensionsState, (extensions) => {
+          if (extensions.find((p) => p.id === addedExtension.id)) {
+            extensions = extensions.map((p) => {
+              if (p.id === addedExtension.id) {
+                return addedExtension;
+              }
+              return p;
+            });
+          } else {
+            extensions.push(addedExtension);
+          }
+          return extensions;
+        });
+      } catch (err) {
+        console.error(err);
+      }
+    }
+  );
+
+  const removeExtension = useRecoilCallback((callbackHelpers: CallbackInterface) => async (extensionName: string) => {
+    const { set } = callbackHelpers;
+    try {
+      const res = await httpClient.delete('/extensions', { data: { id: extensionName } });
+
+      set(extensionsState, res.data);
+    } catch (err) {
+      console.error(err);
+    }
+  });
+
+  const toggleExtension = useRecoilCallback(
+    (callbackHelpers: CallbackInterface) => async (extensionId: string, enabled: boolean) => {
+      const { set } = callbackHelpers;
+      try {
+        const res = await httpClient.patch('/extensions/toggle', {
+          id: extensionId,
+          enabled: Boolean(enabled),
+        });
+        const toggledExtension: ExtensionConfig = res.data;
+
+        set(extensionsState, (extensions) => {
+          return (extensions = extensions.map((p) => {
+            if (p.id === toggledExtension.id) {
+              // update the toggled extension
+              return toggledExtension;
+            }
+            return p;
+          }));
+        });
+      } catch (err) {
+        // do nothing
+        console.error(err);
+      }
+    }
+  );
+
+  return {
+    fetchExtensions,
+    addExtension,
+    removeExtension,
+    toggleExtension,
+  };
+};
diff --git a/Composer/packages/client/src/recoilModel/dispatchers/index.ts b/Composer/packages/client/src/recoilModel/dispatchers/index.ts
index aa00541a8c..983b536f4e 100644
--- a/Composer/packages/client/src/recoilModel/dispatchers/index.ts
+++ b/Composer/packages/client/src/recoilModel/dispatchers/index.ts
@@ -18,7 +18,7 @@ import { settingsDispatcher } from './setting';
 import { skillDispatcher } from './skill';
 import { userDispatcher } from './user';
 import { multilangDispatcher } from './multilang';
-import { pluginsDispatcher } from './plugins';
+import { extensionsDispatcher } from './extensions';
 
 const createDispatchers = () => {
   return {
@@ -39,7 +39,7 @@ const createDispatchers = () => {
     ...skillDispatcher(),
     ...userDispatcher(),
     ...multilangDispatcher(),
-    ...pluginsDispatcher(),
+    ...extensionsDispatcher(),
   };
 };
 
diff --git a/Composer/packages/client/src/recoilModel/dispatchers/plugins.ts b/Composer/packages/client/src/recoilModel/dispatchers/plugins.ts
deleted file mode 100644
index e1af5ad67b..0000000000
--- a/Composer/packages/client/src/recoilModel/dispatchers/plugins.ts
+++ /dev/null
@@ -1,92 +0,0 @@
-/* eslint-disable react-hooks/rules-of-hooks */
-// Copyright (c) Microsoft Corporation.
-// Licensed under the MIT License.
-
-import { CallbackInterface, useRecoilCallback } from 'recoil';
-
-import httpClient from '../../utils/httpUtil';
-import { pluginsState } from '../atoms';
-import { PluginConfig } from '../types';
-
-export const pluginsDispatcher = () => {
-  const fetchPlugins = useRecoilCallback((callbackHelpers: CallbackInterface) => async () => {
-    const { set } = callbackHelpers;
-    try {
-      const res = await httpClient.get('/plugins');
-
-      set(pluginsState, res.data);
-    } catch (err) {
-      console.error(err);
-    }
-  });
-
-  const addPlugin = useRecoilCallback(
-    (callbackHelpers: CallbackInterface) => async (pluginName: string, version: string) => {
-      const { set } = callbackHelpers;
-      try {
-        const res = await httpClient.post('/plugins', { name: pluginName, version });
-        const addedPlugin: PluginConfig = res.data;
-
-        set(pluginsState, (plugins) => {
-          if (plugins.find((p) => p.id === addedPlugin.id)) {
-            plugins = plugins.map((p) => {
-              if (p.id === addedPlugin.id) {
-                return addedPlugin;
-              }
-              return p;
-            });
-          } else {
-            plugins.push(addedPlugin);
-          }
-          return plugins;
-        });
-      } catch (err) {
-        console.error(err);
-      }
-    }
-  );
-
-  const removePlugin = useRecoilCallback((callbackHelpers: CallbackInterface) => async (pluginName: string) => {
-    const { set } = callbackHelpers;
-    try {
-      const res = await httpClient.delete('/plugins', { data: { id: pluginName } });
-
-      set(pluginsState, res.data);
-    } catch (err) {
-      console.error(err);
-    }
-  });
-
-  const togglePlugin = useRecoilCallback(
-    (callbackHelpers: CallbackInterface) => async (pluginId: string, enabled: boolean) => {
-      const { set } = callbackHelpers;
-      try {
-        const res = await httpClient.patch('/plugins/toggle', {
-          id: pluginId,
-          enabled: Boolean(enabled),
-        });
-        const toggledPlugin: PluginConfig = res.data;
-
-        set(pluginsState, (plugins) => {
-          return (plugins = plugins.map((p) => {
-            if (p.id === toggledPlugin.id) {
-              // update the toggled plugin
-              return toggledPlugin;
-            }
-            return p;
-          }));
-        });
-      } catch (err) {
-        // do nothing
-        console.error(err);
-      }
-    }
-  );
-
-  return {
-    fetchPlugins,
-    addPlugin,
-    removePlugin,
-    togglePlugin,
-  };
-};
diff --git a/Composer/packages/client/src/recoilModel/types.ts b/Composer/packages/client/src/recoilModel/types.ts
index de39892340..f640ea2367 100644
--- a/Composer/packages/client/src/recoilModel/types.ts
+++ b/Composer/packages/client/src/recoilModel/types.ts
@@ -40,14 +40,13 @@ export interface PublishType {
 }
 
 // TODO: move this definition to a shared spot
-export interface PluginConfig {
+export interface ExtensionConfig {
   id: string;
   name: string;
   enabled: boolean;
   version: string;
-  /** Special property only used in the in-memory representation of plugins to flag as a built-in. Not written to disk. */
+  /** Special property only used in the in-memory representation of extensions to flag as a built-in. Not written to disk. */
   builtIn?: boolean;
-  configuration: object;
   /** Path where module is installed */
   path: string;
   bundles: any; // TODO: needed?
diff --git a/Composer/packages/client/src/utils/hooks.ts b/Composer/packages/client/src/utils/hooks.ts
index 359b756dc8..51533cca93 100644
--- a/Composer/packages/client/src/utils/hooks.ts
+++ b/Composer/packages/client/src/utils/hooks.ts
@@ -7,7 +7,7 @@ import replace from 'lodash/replace';
 import find from 'lodash/find';
 import { useRecoilValue } from 'recoil';
 
-import { projectIdState, designPageLocationState, pluginsState } from './../recoilModel';
+import { projectIdState, designPageLocationState, extensionsState } from './../recoilModel';
 import { bottomLinks, topLinks } from './pageLinks';
 import routerCache from './routerCache';
 import { projectIdCache } from './projectCache';
@@ -24,11 +24,11 @@ export const useLocation = () => {
 export const useLinks = () => {
   const projectId = useRecoilValue(projectIdState);
   const designPageLocation = useRecoilValue(designPageLocationState);
-  const plugins = useRecoilValue(pluginsState);
+  const extensions = useRecoilValue(extensionsState);
   const openedDialogId = designPageLocation.dialogId || 'Main';
 
-  // add page-contributing plugins
-  const pluginPages = plugins.reduce((pages, p) => {
+  // add page-contributing extensions
+  const pluginPages = extensions.reduce((pages, p) => {
     const pageConfig = p.contributes?.views?.page;
     if (pageConfig) {
       pages.push({ ...pageConfig, id: p.id });
diff --git a/Composer/packages/electron-server/src/main.ts b/Composer/packages/electron-server/src/main.ts
index 579f209f75..7528966df8 100644
--- a/Composer/packages/electron-server/src/main.ts
+++ b/Composer/packages/electron-server/src/main.ts
@@ -57,7 +57,7 @@ async function createAppDataDir() {
   const azurePublishPath: string = join(composerAppDataPath, 'publishBots');
   process.env.COMPOSER_APP_DATA = join(composerAppDataPath, 'data.json'); // path to the actual data file
   process.env.COMPOSER_EXTENSION_DATA = join(composerAppDataPath, 'extensions.json');
-  process.env.COMPOSER_REMOTE_PLUGINS_DIR = join(composerAppDataPath, 'remote-plugins');
+  process.env.COMPOSER_REMOTE_PLUGINS_DIR = join(composerAppDataPath, 'extensions');
 
   log('creating composer app data path at: ', composerAppDataPath);
 
diff --git a/Composer/packages/extensions/client-plugin-lib/.gitignore b/Composer/packages/extensions/extension-client/.gitignore
similarity index 100%
rename from Composer/packages/extensions/client-plugin-lib/.gitignore
rename to Composer/packages/extensions/extension-client/.gitignore
diff --git a/Composer/packages/extensions/client-plugin-lib/package.json b/Composer/packages/extensions/extension-client/package.json
similarity index 71%
rename from Composer/packages/extensions/client-plugin-lib/package.json
rename to Composer/packages/extensions/extension-client/package.json
index e848da36c3..1a3fe3c413 100644
--- a/Composer/packages/extensions/client-plugin-lib/package.json
+++ b/Composer/packages/extensions/extension-client/package.json
@@ -1,7 +1,7 @@
 {
-  "name": "@bfc/client-plugin-lib",
+  "name": "@bfc/extension-client",
   "version": "1.0.0",
-  "description": "Composer plugin library to be consumed by the client bundle of a Composer plugin.",
+  "description": "Composer extension library to be consumed by the client bundle of a Composer extension.",
   "main": "lib/index.js",
   "license": "MIT",
   "private": true,
diff --git a/Composer/packages/extensions/client-plugin-lib/src/auth/index.ts b/Composer/packages/extensions/extension-client/src/auth/index.ts
similarity index 100%
rename from Composer/packages/extensions/client-plugin-lib/src/auth/index.ts
rename to Composer/packages/extensions/extension-client/src/auth/index.ts
diff --git a/Composer/packages/extensions/client-plugin-lib/src/auth/types.ts b/Composer/packages/extensions/extension-client/src/auth/types.ts
similarity index 100%
rename from Composer/packages/extensions/client-plugin-lib/src/auth/types.ts
rename to Composer/packages/extensions/extension-client/src/auth/types.ts
diff --git a/Composer/packages/extensions/client-plugin-lib/src/common/constants.ts b/Composer/packages/extensions/extension-client/src/common/constants.ts
similarity index 100%
rename from Composer/packages/extensions/client-plugin-lib/src/common/constants.ts
rename to Composer/packages/extensions/extension-client/src/common/constants.ts
diff --git a/Composer/packages/extensions/client-plugin-lib/src/common/index.ts b/Composer/packages/extensions/extension-client/src/common/index.ts
similarity index 74%
rename from Composer/packages/extensions/client-plugin-lib/src/common/index.ts
rename to Composer/packages/extensions/extension-client/src/common/index.ts
index ab83bfe736..e04b6b1b17 100644
--- a/Composer/packages/extensions/client-plugin-lib/src/common/index.ts
+++ b/Composer/packages/extensions/extension-client/src/common/index.ts
@@ -8,9 +8,9 @@ export function render(component: React.ReactElement) {
   window[ComposerGlobalName].render(component);
 }
 
-/** Allows plugin client bundles to make AJAX calls from the server -- avoiding the issue of CORS */
+/** Allows extension client bundles to make AJAX calls from the server -- avoiding the issue of CORS */
 function fetchProxy(url: string, options: RequestInit) {
-  return fetch(`/api/plugins/proxy/${encodeURIComponent(url)}`, {
+  return fetch(`/api/extensions/proxy/${encodeURIComponent(url)}`, {
     method: 'POST',
     body: JSON.stringify(options),
     headers: {
diff --git a/Composer/packages/extensions/client-plugin-lib/src/index.ts b/Composer/packages/extensions/extension-client/src/index.ts
similarity index 100%
rename from Composer/packages/extensions/client-plugin-lib/src/index.ts
rename to Composer/packages/extensions/extension-client/src/index.ts
diff --git a/Composer/packages/extensions/client-plugin-lib/src/logger.ts b/Composer/packages/extensions/extension-client/src/logger.ts
similarity index 66%
rename from Composer/packages/extensions/client-plugin-lib/src/logger.ts
rename to Composer/packages/extensions/extension-client/src/logger.ts
index 7a8b080dd7..c25f24a9fc 100644
--- a/Composer/packages/extensions/client-plugin-lib/src/logger.ts
+++ b/Composer/packages/extensions/extension-client/src/logger.ts
@@ -3,4 +3,4 @@
 
 import debug from 'debug';
 
-export default debug('composer:client-plugin-lib');
+export default debug('composer:extension-client');
diff --git a/Composer/packages/extensions/client-plugin-lib/src/page/index.ts b/Composer/packages/extensions/extension-client/src/page/index.ts
similarity index 100%
rename from Composer/packages/extensions/client-plugin-lib/src/page/index.ts
rename to Composer/packages/extensions/extension-client/src/page/index.ts
diff --git a/Composer/packages/extensions/client-plugin-lib/src/publish/index.ts b/Composer/packages/extensions/extension-client/src/publish/index.ts
similarity index 100%
rename from Composer/packages/extensions/client-plugin-lib/src/publish/index.ts
rename to Composer/packages/extensions/extension-client/src/publish/index.ts
diff --git a/Composer/packages/extensions/client-plugin-lib/src/publish/types.ts b/Composer/packages/extensions/extension-client/src/publish/types.ts
similarity index 100%
rename from Composer/packages/extensions/client-plugin-lib/src/publish/types.ts
rename to Composer/packages/extensions/extension-client/src/publish/types.ts
diff --git a/Composer/packages/extensions/client-plugin-lib/tsconfig.json b/Composer/packages/extensions/extension-client/tsconfig.json
similarity index 100%
rename from Composer/packages/extensions/client-plugin-lib/tsconfig.json
rename to Composer/packages/extensions/extension-client/tsconfig.json
diff --git a/Composer/packages/server/package.json b/Composer/packages/server/package.json
index 17163b7924..f7398853e8 100644
--- a/Composer/packages/server/package.json
+++ b/Composer/packages/server/package.json
@@ -99,4 +99,4 @@
   "resolutions": {
     "bl": "^2.2.1"
   }
-}
\ No newline at end of file
+}
diff --git a/Composer/packages/server/src/controllers/plugins.ts b/Composer/packages/server/src/controllers/extensions.ts
similarity index 67%
rename from Composer/packages/server/src/controllers/plugins.ts
rename to Composer/packages/server/src/controllers/extensions.ts
index 74c9973e94..0cec6db29d 100644
--- a/Composer/packages/server/src/controllers/plugins.ts
+++ b/Composer/packages/server/src/controllers/extensions.ts
@@ -4,51 +4,51 @@
 import { Request, Response } from 'express';
 import { PluginManager } from '@bfc/plugin-loader';
 
-interface AddPluginRequest extends Request {
+interface AddExtensionRequest extends Request {
   body: {
     name?: string;
     version?: string;
   };
 }
 
-interface TogglePluginRequest extends Request {
+interface ToggleExtensionRequest extends Request {
   body: {
     id?: string;
     enabled?: boolean;
   };
 }
 
-interface RemovePluginRequest extends Request {
+interface RemoveExtensionRequest extends Request {
   body: {
     id?: string;
   };
 }
 
-interface SearchPluginsRequest extends Request {
+interface SearchExtensionsRequest extends Request {
   query: {
     q?: string;
   };
 }
 
-interface PluginViewBundleRequest extends Request {
+interface ExtensionViewBundleRequest extends Request {
   params: {
     id: string;
     view: string;
   };
 }
 
-interface PluginFetchRequest extends Request {
+interface ExtensionFetchRequest extends Request {
   body: RequestInit;
   params: {
     url: string;
   };
 }
 
-export async function listPlugins(req: Request, res: Response) {
-  res.json(PluginManager.getAll()); // might need to have this list all enabled plugins ?
+export async function listExtensions(req: Request, res: Response) {
+  res.json(PluginManager.getAll()); // might need to have this list all enabled extensions ?
 }
 
-export async function addPlugin(req: AddPluginRequest, res: Response) {
+export async function addExtension(req: AddExtensionRequest, res: Response) {
   const { name, version } = req.body;
 
   if (!name) {
@@ -61,7 +61,7 @@ export async function addPlugin(req: AddPluginRequest, res: Response) {
   res.json(PluginManager.find(name));
 }
 
-export async function togglePlugin(req: TogglePluginRequest, res: Response) {
+export async function toggleExtension(req: ToggleExtensionRequest, res: Response) {
   const { id, enabled } = req.body;
 
   if (!id) {
@@ -70,7 +70,7 @@ export async function togglePlugin(req: TogglePluginRequest, res: Response) {
   }
 
   if (!PluginManager.find(id)) {
-    res.status(404).json({ error: `plugin \`${id}\` not found` });
+    res.status(404).json({ error: `extension \`${id}\` not found` });
     return;
   }
 
@@ -83,7 +83,7 @@ export async function togglePlugin(req: TogglePluginRequest, res: Response) {
   res.json(PluginManager.find(id));
 }
 
-export async function removePlugin(req: RemovePluginRequest, res: Response) {
+export async function removeExtension(req: RemoveExtensionRequest, res: Response) {
   const { id } = req.body;
 
   if (!id) {
@@ -92,7 +92,7 @@ export async function removePlugin(req: RemovePluginRequest, res: Response) {
   }
 
   if (!PluginManager.find(id)) {
-    res.status(404).json({ error: `plugin \`${id}\` not found` });
+    res.status(404).json({ error: `extension \`${id}\` not found` });
     return;
   }
 
@@ -100,17 +100,17 @@ export async function removePlugin(req: RemovePluginRequest, res: Response) {
   res.json(PluginManager.getAll());
 }
 
-export async function searchPlugins(req: SearchPluginsRequest, res: Response) {
+export async function searchExtensions(req: SearchExtensionsRequest, res: Response) {
   const { q } = req.query;
 
   const results = await PluginManager.search(q ?? '');
   res.json(results);
 }
 
-export async function getBundleForView(req: PluginViewBundleRequest, res: Response) {
+export async function getBundleForView(req: ExtensionViewBundleRequest, res: Response) {
   const { id, view } = req.params;
-  const plugin = PluginManager.find(id);
-  const bundleId = plugin.contributes.views?.[view].bundleId as string;
+  const extension = PluginManager.find(id);
+  const bundleId = extension.contributes.views?.[view].bundleId as string;
   const bundle = PluginManager.getBundle(id, bundleId);
   if (bundle) {
     res.sendFile(bundle);
@@ -119,7 +119,7 @@ export async function getBundleForView(req: PluginViewBundleRequest, res: Respon
   }
 }
 
-export async function performPluginFetch(req: PluginFetchRequest, res: Response) {
+export async function performExtensionFetch(req: ExtensionFetchRequest, res: Response) {
   const { url } = req.params;
   const options = req.body;
   if (!url || !options) {
diff --git a/Composer/packages/server/src/router/api.ts b/Composer/packages/server/src/router/api.ts
index ae74c4c568..30a64e762e 100644
--- a/Composer/packages/server/src/router/api.ts
+++ b/Composer/packages/server/src/router/api.ts
@@ -8,7 +8,7 @@ import { StorageController } from '../controllers/storage';
 import { PublishController } from '../controllers/publisher';
 import { AssetController } from '../controllers/asset';
 import { EjectController } from '../controllers/eject';
-import * as PluginsController from '../controllers/plugins';
+import * as ExtensionsController from '../controllers/extensions';
 
 import { UtilitiesController } from './../controllers/utilities';
 
@@ -62,15 +62,15 @@ router.get('/assets/projectTemplates', AssetController.getProjTemplates);
 
 //help api
 router.get('/utilities/qna/parse', UtilitiesController.getQnaContent);
-// plugins
-router.get('/plugins', PluginsController.listPlugins);
-router.post('/plugins', PluginsController.addPlugin);
-router.delete('/plugins', PluginsController.removePlugin);
-router.patch('/plugins/toggle', PluginsController.togglePlugin);
-router.get('/plugins/search', PluginsController.searchPlugins);
-router.get('/plugins/:id/view/:view', PluginsController.getBundleForView);
-// proxy route for plugins (allows plugin client code to make fetch calls using the Composer server as a proxy -- avoids browser blocking request due to CORS)
-router.post('/plugins/proxy/:url', PluginsController.performPluginFetch);
+// extensions
+router.get('/extensions', ExtensionsController.listExtensions);
+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);
+// 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);
 
 const ErrorHandler = (handler: RequestHandler) => (req: Request, res: Response, next: NextFunction) => {
   Promise.resolve(handler(req, res, next)).catch(next);
diff --git a/Composer/packages/server/src/server.ts b/Composer/packages/server/src/server.ts
index cae89089ce..bce05a0186 100644
--- a/Composer/packages/server/src/server.ts
+++ b/Composer/packages/server/src/server.ts
@@ -16,8 +16,8 @@ import { IConnection, createConnection } from 'vscode-languageserver';
 import { IntellisenseServer } from '@bfc/intellisense-languageserver';
 import { LGServer } from '@bfc/lg-languageserver';
 import { LUServer } from '@bfc/lu-languageserver';
-import { pluginLoader, PluginManager } from '@bfc/plugin-loader';
 import chalk from 'chalk';
+import { pluginLoader, PluginManager } from '@bfc/plugin-loader';
 
 import { BotProjectService } from './services/project';
 import { getAuthProvider } from './router/auth';
diff --git a/Composer/plugins/azurePublish/package.json b/Composer/plugins/azurePublish/package.json
index ccec5c1b17..c2cbeeb75e 100644
--- a/Composer/plugins/azurePublish/package.json
+++ b/Composer/plugins/azurePublish/package.json
@@ -41,4 +41,4 @@
   "resolutions": {
     "bl": "^4.0.3"
   }
-}
\ No newline at end of file
+}
diff --git a/Composer/plugins/mockRemotePublish/package.json b/Composer/plugins/mockRemotePublish/package.json
index 48fa682eb0..7527d2fa84 100644
--- a/Composer/plugins/mockRemotePublish/package.json
+++ b/Composer/plugins/mockRemotePublish/package.json
@@ -17,4 +17,4 @@
     "@bfc/plugin-loader": "file:../../packages/extensions/plugin-loader",
     "@types/uuid": "^7.0.2"
   }
-}
\ No newline at end of file
+}
diff --git a/Composer/plugins/sample-ui-plugin/package.json b/Composer/plugins/sample-ui-plugin/package.json
index 96d15d3245..f9fd199cf5 100644
--- a/Composer/plugins/sample-ui-plugin/package.json
+++ b/Composer/plugins/sample-ui-plugin/package.json
@@ -34,7 +34,7 @@
   "extendsComposer": false,
   "main": "dist/index.js",
   "dependencies": {
-    "@bfc/client-plugin-lib": "file:../../packages/extensions/client-plugin-lib",
+    "@bfc/extension-client": "file:../../packages/extensions/extension-client",
     "emotion": "^10.0.27",
     "react": "^16.13.0",
     "react-dom": "^16.13.0"
diff --git a/Composer/plugins/sample-ui-plugin/src/client/page/index.tsx b/Composer/plugins/sample-ui-plugin/src/client/page/index.tsx
index cb13db94c1..6f5ac4606f 100644
--- a/Composer/plugins/sample-ui-plugin/src/client/page/index.tsx
+++ b/Composer/plugins/sample-ui-plugin/src/client/page/index.tsx
@@ -3,7 +3,7 @@
 
 import * as React from 'react';
 import { useCallback, useState } from 'react';
-import { render } from '@bfc/client-plugin-lib';
+import { render } from '@bfc/extension-client';
 import { cx } from 'emotion';
 
 import { label, output, pageRoot, shortTextField, textField } from '../styles';
diff --git a/Composer/plugins/sample-ui-plugin/src/client/publish/index.tsx b/Composer/plugins/sample-ui-plugin/src/client/publish/index.tsx
index ff60db3a32..c6d08f8703 100644
--- a/Composer/plugins/sample-ui-plugin/src/client/publish/index.tsx
+++ b/Composer/plugins/sample-ui-plugin/src/client/publish/index.tsx
@@ -2,7 +2,7 @@
 // Licensed under the MIT License.
 
 import * as React from 'react';
-import { render } from '@bfc/client-plugin-lib';
+import { render } from '@bfc/extension-client';
 
 import { Main } from './main';
 
diff --git a/Composer/plugins/sample-ui-plugin/src/client/publish/main.tsx b/Composer/plugins/sample-ui-plugin/src/client/publish/main.tsx
index 41ec9543c5..4865439411 100644
--- a/Composer/plugins/sample-ui-plugin/src/client/publish/main.tsx
+++ b/Composer/plugins/sample-ui-plugin/src/client/publish/main.tsx
@@ -3,7 +3,7 @@
 
 import * as React from 'react';
 import { useEffect, useCallback, useState } from 'react';
-import { setConfigIsValid, setPublishConfig, useConfigBeingEdited } from '@bfc/client-plugin-lib';
+import { setConfigIsValid, setPublishConfig, useConfigBeingEdited } from '@bfc/extension-client';
 
 import { column, label, publishRoot, textField } from '../styles';
 
diff --git a/Composer/plugins/sample-ui-plugin/yarn.lock b/Composer/plugins/sample-ui-plugin/yarn.lock
index e2885e5dfe..fa4e872be9 100644
--- a/Composer/plugins/sample-ui-plugin/yarn.lock
+++ b/Composer/plugins/sample-ui-plugin/yarn.lock
@@ -46,7 +46,7 @@
     lodash "^4.17.19"
     to-fast-properties "^2.0.0"
 
-"@bfc/client-plugin-lib@file:../../packages/extensions/client-plugin-lib":
+"@bfc/extension-client@file:../../packages/extensions/extension-client":
   version "1.0.0"
   dependencies:
     debug "^4.1.1"

From 254eabda9581e1d4fc6cad4a0af9d6da734fe757 Mon Sep 17 00:00:00 2001
From: Andy Brown <asbrown002@gmail.com>
Date: Wed, 9 Sep 2020 13:10:58 -0700
Subject: [PATCH 02/10] move packages out of extensions directory

---
 Composer/package.json                                     | 8 ++++++--
 .../packages/{extensions => }/adaptive-flow/.eslintrc.js  | 2 +-
 .../packages/{extensions => }/adaptive-flow/.gitignore    | 0
 .../adaptive-flow-editor/AdaptiveFlowEditor.test.tsx      | 0
 .../adaptive-flow-editor/components/IconMenu.test.tsx     | 0
 .../adaptive-flow-editor/components/KeyboardZone.test.tsx | 0
 .../constants/ElementAttributes.test.tsx                  | 0
 .../constants/KeyboardCommandTypes.test.ts                | 0
 .../adaptive-flow-editor/constants/MenuTypes.test.ts      | 0
 .../constants/ScreenReaderMessage.test.ts                 | 0
 .../adaptive-flow-editor/constants/editorConfig.test.ts   | 0
 .../contexts/NodeRendererContext.test.tsx                 | 0
 .../contexts/SelectionContext.test.tsx                    | 0
 .../adaptive-flow-editor/hooks/useEditorEventApi.test.ts  | 0
 .../adaptive-flow-editor/renderers/EdgeMenu.test.tsx      | 0
 .../renderers/ElementWrapper.test.tsx                     | 0
 .../adaptive-flow-editor/renderers/NodeMenu.test.tsx      | 0
 .../adaptive-flow-editor/renderers/NodeWrapper.test.tsx   | 0
 .../__tests__/adaptive-flow-editor/stubs/ShellApiStub.ts  | 0
 .../adaptive-flow-editor/utils/NodeIndexGetter.test.ts    | 0
 .../utils/calculateRangeSelection.test.ts                 | 0
 .../utils/cursorTracker/index.test.ts                     | 0
 .../adaptive-flow-editor/utils/cursorTracker/type.test.ts | 0
 .../adaptive-flow-editor/utils/getCustomSchema.test.ts    | 0
 .../utils/mapKeyboardCommandToEditorEvent.test.ts         | 0
 .../adaptive-flow-editor/utils/normalizeSelection.test.ts | 0
 .../adaptive/AdaptiveDialog.test.tsx                      | 0
 .../adaptive/AdaptiveTrigger.test.tsx                     | 0
 .../adaptive-flow-renderer/components/ArrowLine.test.tsx  | 0
 .../adaptive-flow-renderer/components/Diamond.test.tsx    | 0
 .../components/ElementMeasurer.test.tsx                   | 0
 .../adaptive-flow-renderer/components/FlowEdges.test.tsx  | 0
 .../adaptive-flow-renderer/components/IconBrick.test.tsx  | 0
 .../components/LoopIndicator.test.tsx                     | 0
 .../components/OffsetContainer.test.tsx                   | 0
 .../components/SVGContainer.test.tsx                      | 0
 .../adaptive-flow-renderer/configs/builtinSchema.test.ts  | 0
 .../layouters/baseInputLayouter.test.ts                   | 0
 .../layouters/calculateNodeBoundary.test.ts               | 0
 .../layouters/foreachLayouter.test.ts                     | 0
 .../layouters/ifelseLayouter.test.ts                      | 0
 .../layouters/measureJsonBoundary.test.ts                 | 0
 .../layouters/sequentialLayouter.test.ts                  | 0
 .../layouters/switchCaseLayouter.test.ts                  | 0
 .../adaptive-flow-renderer/transformers/ObiTypes.test.ts  | 0
 .../adaptive-flow-renderer/transformers/todoBot.main.json | 0
 .../transformers/transformForeach.test.ts                 | 0
 .../transformers/transformIfCondition.test.ts             | 0
 .../transformers/transformObiRules.test.tsx               | 0
 .../transformers/transformRootDialog.test.ts              | 0
 .../transformers/transformStepGroup.test.ts               | 0
 .../transformers/transformSwitchCondition.test.ts         | 0
 .../adaptive-flow-renderer/utils/DesignerCache.test.ts    | 0
 .../adaptive-flow-renderer/utils/EdgeUtil.test.tsx        | 0
 .../adaptive-flow-renderer/utils/widgetRenderer.test.tsx  | 0
 .../adaptive-flow-renderer/widgets/ActionCard.test.tsx    | 0
 .../adaptive-flow-renderer/widgets/DialogRef.test.tsx     | 0
 .../adaptive-flow-renderer/widgets/ForeachWidget.test.tsx | 0
 .../widgets/IfConditionWidget.test.tsx                    | 0
 .../adaptive-flow-renderer/widgets/PromptWidget.test.tsx  | 0
 .../widgets/SwitchConditionWidget.test.tsx                | 0
 .../adaptive-flow-renderer/widgets/icon.test.tsx          | 0
 .../{extensions => }/adaptive-flow/demo/index.html        | 0
 .../{extensions => }/adaptive-flow/demo/readme.md         | 0
 .../adaptive-flow/demo/src/components/json-block/index.js | 0
 .../{extensions => }/adaptive-flow/demo/src/index.css     | 0
 .../{extensions => }/adaptive-flow/demo/src/index.js      | 0
 .../adaptive-flow/demo/src/samples/index.js               | 0
 .../adaptive-flow/demo/src/samples/todo/AddToDo.json      | 0
 .../adaptive-flow/demo/src/samples/todo/ClearToDos.json   | 0
 .../adaptive-flow/demo/src/samples/todo/DeleteToDo.json   | 0
 .../adaptive-flow/demo/src/samples/todo/ShowToDos.json    | 0
 .../adaptive-flow/demo/src/samples/todo/ToDoBot.main.json | 0
 .../adaptive-flow/demo/src/stories/EventsEditorDemo.js    | 0
 .../adaptive-flow/demo/src/stories/StepEditorDemo.css     | 0
 .../adaptive-flow/demo/src/stories/StepEditorDemo.js      | 0
 .../adaptive-flow/demo/src/stories/VisualEditorDemo.css   | 0
 .../adaptive-flow/demo/src/stories/VisualEditorDemo.js    | 0
 .../adaptive-flow/demo/src/stories/VisualSDKDemo.js       | 0
 .../adaptive-flow/demo/src/stories/story.css              | 0
 .../{extensions => }/adaptive-flow/demo/tsconfig.json     | 0
 .../adaptive-flow/demo/webpack.config.demo.js             | 0
 .../{extensions => }/adaptive-flow/jest.config.js         | 0
 .../packages/{extensions => }/adaptive-flow/package.json  | 0
 .../src/adaptive-flow-editor/AdaptiveFlowEditor.tsx       | 0
 .../src/adaptive-flow-editor/components/IconMenu.tsx      | 0
 .../src/adaptive-flow-editor/components/KeyboardZone.ts   | 0
 .../adaptive-flow-editor/constants/ElementAttributes.ts   | 0
 .../constants/KeyboardCommandTypes.ts                     | 0
 .../src/adaptive-flow-editor/constants/MenuTypes.ts       | 0
 .../adaptive-flow-editor/constants/ScreenReaderMessage.ts | 0
 .../src/adaptive-flow-editor/constants/editorConfig.ts    | 0
 .../adaptive-flow-editor/contexts/NodeRendererContext.ts  | 0
 .../src/adaptive-flow-editor/contexts/SelectionContext.ts | 0
 .../src/adaptive-flow-editor/contexts/SelfHostContext.ts  | 0
 .../src/adaptive-flow-editor/hooks/useEditorEventApi.ts   | 0
 .../src/adaptive-flow-editor/hooks/useFlowUIOptions.ts    | 0
 .../src/adaptive-flow-editor/hooks/useSelectionEffect.ts  | 0
 .../adaptive-flow-editor/renderers/EdgeMenu/EdgeMenu.tsx  | 0
 .../renderers/EdgeMenu/createSchemaMenu.tsx               | 0
 .../renderers/EdgeMenu/defaultMenuOrder.ts                | 0
 .../src/adaptive-flow-editor/renderers/EdgeMenu/index.tsx | 0
 .../src/adaptive-flow-editor/renderers/ElementWrapper.tsx | 0
 .../src/adaptive-flow-editor/renderers/NodeMenu.tsx       | 0
 .../src/adaptive-flow-editor/renderers/NodeWrapper.tsx    | 0
 .../src/adaptive-flow-editor/renderers/index.tsx          | 0
 .../src/adaptive-flow-editor/utils/NodeIndexGetter.ts     | 0
 .../adaptive-flow-editor/utils/calculateRangeSelection.ts | 0
 .../adaptive-flow-editor/utils/cursorTracker/arrowMove.ts | 0
 .../utils/cursorTracker/calculate/calculateBySchema.ts    | 0
 .../utils/cursorTracker/calculate/calculateByVector.ts    | 0
 .../src/adaptive-flow-editor/utils/cursorTracker/index.ts | 0
 .../utils/cursorTracker/locateElement.ts                  | 0
 .../adaptive-flow-editor/utils/cursorTracker/tabMove.ts   | 0
 .../src/adaptive-flow-editor/utils/cursorTracker/type.ts  | 0
 .../src/adaptive-flow-editor/utils/getCustomSchema.ts     | 0
 .../utils/mapKeyboardCommandToEditorEvent.ts              | 0
 .../src/adaptive-flow-editor/utils/normalizeSelection.ts  | 0
 .../src/adaptive-flow-editor/utils/scrollNodeIntoView.ts  | 0
 .../adaptive-flow-renderer/adaptive/AdaptiveDialog.tsx    | 0
 .../adaptive-flow-renderer/adaptive/AdaptiveTrigger.tsx   | 0
 .../src/adaptive-flow-renderer/components/ArrowLine.tsx   | 0
 .../src/adaptive-flow-renderer/components/Diamond.tsx     | 0
 .../adaptive-flow-renderer/components/ElementMeasurer.tsx | 0
 .../src/adaptive-flow-renderer/components/FlowEdges.tsx   | 0
 .../src/adaptive-flow-renderer/components/IconBrick.tsx   | 0
 .../adaptive-flow-renderer/components/LoopIndicator.tsx   | 0
 .../adaptive-flow-renderer/components/OffsetContainer.tsx | 0
 .../adaptive-flow-renderer/components/SVGContainer.tsx    | 0
 .../src/adaptive-flow-renderer/configs/builtinSchema.tsx  | 0
 .../src/adaptive-flow-renderer/configs/builtinWidgets.tsx | 0
 .../constants/AdaptiveFieldNames.ts                       | 0
 .../src/adaptive-flow-renderer/constants/AdaptiveKinds.ts | 0
 .../src/adaptive-flow-renderer/constants/ElementColors.ts | 0
 .../src/adaptive-flow-renderer/constants/ElementSizes.ts  | 0
 .../adaptive-flow-renderer/constants/NodeEventTypes.ts    | 0
 .../adaptive-flow-renderer/contexts/RendererContext.tsx   | 0
 .../src/adaptive-flow-renderer/contexts/SchemaContext.ts  | 0
 .../src/adaptive-flow-renderer/hooks/useSmartLayout.ts    | 0
 .../adaptive-flow-renderer/layouters/baseInputLayouter.ts | 0
 .../layouters/calculateNodeBoundary.ts                    | 0
 .../adaptive-flow-renderer/layouters/foreachLayouter.ts   | 0
 .../adaptive-flow-renderer/layouters/ifelseLayouter.ts    | 0
 .../layouters/measureJsonBoundary.ts                      | 0
 .../layouters/sequentialLayouter.ts                       | 0
 .../layouters/sharedLayouterUtils.ts                      | 0
 .../layouters/switchCaseLayouter.ts                       | 0
 .../src/adaptive-flow-renderer/models/Boundary.ts         | 0
 .../src/adaptive-flow-renderer/models/EdgeData.ts         | 0
 .../src/adaptive-flow-renderer/models/GraphLayout.ts      | 0
 .../src/adaptive-flow-renderer/models/GraphNode.ts        | 0
 .../src/adaptive-flow-renderer/models/IndexedNode.ts      | 0
 .../transformers/inheritParentProperty.ts                 | 0
 .../transformers/transformBaseInput.ts                    | 0
 .../transformers/transformForeach.ts                      | 0
 .../transformers/transformIfCondition.ts                  | 0
 .../transformers/transformObiRules.ts                     | 0
 .../transformers/transformRootDialog.ts                   | 0
 .../transformers/transformStepGroup.ts                    | 0
 .../transformers/transformSwitchCondition.ts              | 0
 .../types/PluggableComponents.types.ts                    | 0
 .../adaptive-flow-renderer/types/flowRenderer.types.ts    | 0
 .../src/adaptive-flow-renderer/types/nodeProps.ts         | 0
 .../utils/adaptive/outlineObiJson.ts                      | 0
 .../adaptive-flow-renderer/utils/adaptive/stepBuilder.ts  | 0
 .../adaptive-flow-renderer/utils/visual/DesignerCache.ts  | 0
 .../src/adaptive-flow-renderer/utils/visual/EdgeUtil.tsx  | 0
 .../utils/visual/WidgetSchemaProvider.ts                  | 0
 .../utils/visual/widgetRenderer.tsx                       | 0
 .../widgets/ActionCard/ActionCard.tsx                     | 0
 .../widgets/ActionCard/CardTemplate.tsx                   | 0
 .../widgets/ActionCard/CardTemplateStyle.ts               | 0
 .../adaptive-flow-renderer/widgets/ActionCard/index.tsx   | 0
 .../src/adaptive-flow-renderer/widgets/ActionGroup.tsx    | 0
 .../widgets/ActionHeader/ActionHeader.tsx                 | 0
 .../widgets/ActionHeader/ActionHeaderStyle.ts             | 0
 .../adaptive-flow-renderer/widgets/ActionHeader/icon.tsx  | 0
 .../widgets/ActionHeader/iconStyles.ts                    | 0
 .../adaptive-flow-renderer/widgets/ActionHeader/index.tsx | 0
 .../src/adaptive-flow-renderer/widgets/AdaptiveAction.tsx | 0
 .../src/adaptive-flow-renderer/widgets/DialogRef.tsx      | 0
 .../src/adaptive-flow-renderer/widgets/ForeachWidget.tsx  | 0
 .../adaptive-flow-renderer/widgets/IfConditionWidget.tsx  | 0
 .../src/adaptive-flow-renderer/widgets/PromptWidget.tsx   | 0
 .../widgets/SwitchConditionWidget.tsx                     | 0
 .../widgets/TriggerSummary/TriggerSummary.tsx             | 0
 .../widgets/TriggerSummary/index.tsx                      | 0
 .../widgets/TriggerSummary/triggerStyles.ts               | 0
 .../src/adaptive-flow-renderer/widgets/index.ts           | 0
 .../widgets/styles/DisabledStyle.ts                       | 0
 .../packages/{extensions => }/adaptive-flow/src/index.tsx | 0
 .../{extensions => }/adaptive-flow/tsconfig.build.json    | 0
 .../packages/{extensions => }/adaptive-flow/tsconfig.json | 2 +-
 .../packages/{extensions => }/adaptive-form/.eslintignore | 0
 .../{extensions/extension => adaptive-form}/.eslintrc.js  | 2 +-
 .../packages/{extensions => }/adaptive-form/.gitignore    | 0
 .../{extensions => }/adaptive-form/jest.config.js         | 0
 .../packages/{extensions => }/adaptive-form/package.json  | 0
 .../adaptive-form/src/components/AdaptiveForm.tsx         | 0
 .../adaptive-form/src/components/CollapseField.tsx        | 0
 .../adaptive-form/src/components/ErrorInfo.tsx            | 0
 .../adaptive-form/src/components/ErrorMessage.tsx         | 0
 .../adaptive-form/src/components/FieldLabel.tsx           | 0
 .../adaptive-form/src/components/FormRow.tsx              | 0
 .../adaptive-form/src/components/FormTitle.tsx            | 0
 .../adaptive-form/src/components/Link.tsx                 | 0
 .../adaptive-form/src/components/LoadingTimeout.tsx       | 0
 .../adaptive-form/src/components/SchemaField.tsx          | 0
 .../src/components/__tests__/ErrorMessage.test.tsx        | 0
 .../src/components/__tests__/FieldLabel.test.tsx          | 0
 .../src/components/__tests__/FormRow.test.tsx             | 0
 .../src/components/__tests__/LoadingTimeout.test.tsx      | 0
 .../src/components/__tests__/SchemaField.test.tsx         | 0
 .../adaptive-form/src/components/fields/ArrayField.tsx    | 0
 .../src/components/fields/ArrayFieldItem.tsx              | 0
 .../adaptive-form/src/components/fields/BooleanField.tsx  | 0
 .../adaptive-form/src/components/fields/EditableField.tsx | 0
 .../fields/ExpressionField/ExpressionEditor.tsx           | 0
 .../components/fields/ExpressionField/ExpressionField.tsx | 0
 .../ExpressionField/__tests__/ExpressionField.test.tsx    | 0
 .../fields/ExpressionField/__tests__/utils.test.ts        | 0
 .../src/components/fields/ExpressionField/utils.ts        | 0
 .../src/components/fields/IntellisenseField.tsx           | 0
 .../adaptive-form/src/components/fields/IntentField.tsx   | 0
 .../adaptive-form/src/components/fields/JsonField.tsx     | 0
 .../adaptive-form/src/components/fields/NumberField.tsx   | 0
 .../src/components/fields/ObjectArrayField.tsx            | 0
 .../adaptive-form/src/components/fields/ObjectField.tsx   | 0
 .../src/components/fields/OneOfField/OneOfField.tsx       | 0
 .../fields/OneOfField/__tests__/OneOfField.test.tsx       | 0
 .../components/fields/OneOfField/__tests__/utils.test.ts  | 0
 .../src/components/fields/OneOfField/index.ts             | 0
 .../src/components/fields/OneOfField/utils.ts             | 0
 .../src/components/fields/OpenObjectField/ObjectItem.tsx  | 0
 .../components/fields/OpenObjectField/OpenObjectField.tsx | 0
 .../fields/OpenObjectField/__tests__/ObjectItem.test.tsx  | 0
 .../OpenObjectField/__tests__/OpenObjectField.test.tsx    | 0
 .../src/components/fields/OpenObjectField/index.ts        | 0
 .../src/components/fields/OpenObjectField/styles.ts       | 0
 .../src/components/fields/QnAActionsField.tsx             | 0
 .../src/components/fields/RecognizerField.tsx             | 0
 .../src/components/fields/RegexIntentField.tsx            | 0
 .../adaptive-form/src/components/fields/SelectField.tsx   | 0
 .../adaptive-form/src/components/fields/StringField.tsx   | 0
 .../src/components/fields/UnsupportedField.tsx            | 0
 .../src/components/fields/__tests__/ArrayField.test.tsx   | 0
 .../src/components/fields/__tests__/ArrayFieldItem.tsx    | 0
 .../src/components/fields/__tests__/BooleanField.test.tsx | 0
 .../src/components/fields/__tests__/IntentField.test.tsx  | 0
 .../src/components/fields/__tests__/JsonField.test.tsx    | 0
 .../src/components/fields/__tests__/NumberField.test.tsx  | 0
 .../components/fields/__tests__/ObjectArrayField.test.tsx | 0
 .../src/components/fields/__tests__/ObjectField.test.tsx  | 0
 .../components/fields/__tests__/RecognizerField.test.tsx  | 0
 .../components/fields/__tests__/RegexIntentField.test.tsx | 0
 .../src/components/fields/__tests__/SelectField.test.tsx  | 0
 .../src/components/fields/__tests__/StringField.test.tsx  | 0
 .../components/fields/__tests__/UnsupportedField.test.tsx | 0
 .../src/components/fields/__tests__/testUtils.ts          | 0
 .../adaptive-form/src/components/fields/index.ts          | 0
 .../adaptive-form/src/components/fields/styles.ts         | 0
 .../adaptive-form/src/components/index.ts                 | 0
 .../adaptive-form/src/components/sharedStyles.ts          | 0
 .../adaptive-form/src/defaultRecognizers.ts               | 0
 .../packages/{extensions => }/adaptive-form/src/index.ts  | 0
 .../adaptive-form/src/utils/__tests__/arrayUtils.test.ts  | 0
 .../src/utils/__tests__/getOrderedProperties.test.ts      | 0
 .../src/utils/__tests__/getUIOptions.test.ts              | 0
 .../src/utils/__tests__/getValueType.test.ts              | 0
 .../adaptive-form/src/utils/__tests__/objectUtils.test.ts | 0
 .../src/utils/__tests__/resolveFieldWidget.test.ts        | 0
 .../src/utils/__tests__/resolvePropSchema.test.ts         | 0
 .../adaptive-form/src/utils/__tests__/resolveRef.test.ts  | 0
 .../src/utils/__tests__/uiOptionsHelpers.test.ts          | 0
 .../adaptive-form/src/utils/arrayUtils.ts                 | 0
 .../adaptive-form/src/utils/getHiddenProperties.ts        | 0
 .../adaptive-form/src/utils/getIntellisenseUrl.ts         | 0
 .../adaptive-form/src/utils/getOrderedProperties.ts       | 0
 .../adaptive-form/src/utils/getUIOptions.ts               | 0
 .../adaptive-form/src/utils/getValueType.ts               | 0
 .../{extensions => }/adaptive-form/src/utils/index.ts     | 0
 .../adaptive-form/src/utils/objectUtils.ts                | 0
 .../adaptive-form/src/utils/resolveFieldWidget.ts         | 0
 .../adaptive-form/src/utils/resolvePropSchema.ts          | 0
 .../adaptive-form/src/utils/resolveRef.ts                 | 0
 .../adaptive-form/src/utils/uiOptionsHelpers.ts           | 0
 .../{extensions => }/adaptive-form/tsconfig.build.json    | 0
 .../intellisense => adaptive-form}/tsconfig.json          | 2 +-
 .../packages/{extensions => }/extension-client/.gitignore | 0
 .../{extensions => }/extension-client/package.json        | 0
 .../{extensions => }/extension-client/src/auth/index.ts   | 0
 .../{extensions => }/extension-client/src/auth/types.ts   | 0
 .../extension-client/src/common/constants.ts              | 0
 .../{extensions => }/extension-client/src/common/index.ts | 0
 .../{extensions => }/extension-client/src/index.ts        | 0
 .../{extensions => }/extension-client/src/logger.ts       | 0
 .../{extensions => }/extension-client/src/page/index.ts   | 0
 .../extension-client/src/publish/index.ts                 | 0
 .../extension-client/src/publish/types.ts                 | 0
 .../{extensions => }/extension-client/tsconfig.json       | 2 +-
 .../{extensions/adaptive-form => extension}/.eslintrc.js  | 2 +-
 Composer/packages/{extensions => }/extension/.gitignore   | 0
 .../packages/{extensions => }/extension/jest.config.js    | 0
 Composer/packages/{extensions => }/extension/package.json | 0
 .../extension/src/components/Extension.tsx                | 0
 .../{extensions => }/extension/src/components/index.ts    | 0
 .../{extensions => }/extension/src/extensionContext.ts    | 0
 .../extension/src/hooks/__tests__/useFlowConfig.test.tsx  | 0
 .../extension/src/hooks/__tests__/useFormConfig.test.tsx  | 0
 .../extension/src/hooks/__tests__/useMenuConfig.test.tsx  | 0
 .../src/hooks/__tests__/useRecognizerConfig.test.tsx      | 0
 .../{extensions => }/extension/src/hooks/index.ts         | 0
 .../{extensions => }/extension/src/hooks/useActionApi.ts  | 0
 .../{extensions => }/extension/src/hooks/useDebounce.ts   | 0
 .../{extensions => }/extension/src/hooks/useDialogApi.ts  | 0
 .../extension/src/hooks/useDialogEditApi.ts               | 0
 .../{extensions => }/extension/src/hooks/useFlowConfig.ts | 0
 .../{extensions => }/extension/src/hooks/useFormConfig.ts | 0
 .../{extensions => }/extension/src/hooks/useLgApi.ts      | 0
 .../{extensions => }/extension/src/hooks/useLuApi.ts      | 0
 .../{extensions => }/extension/src/hooks/useMenuConfig.ts | 0
 .../extension/src/hooks/useRecognizerConfig.ts            | 0
 .../{extensions => }/extension/src/hooks/useShellApi.ts   | 0
 .../{extensions => }/extension/src/hooks/useTriggerApi.ts | 0
 Composer/packages/{extensions => }/extension/src/index.ts | 0
 .../{extensions => }/extension/src/types/extension.ts     | 0
 .../{extensions => }/extension/src/types/flowSchema.ts    | 0
 .../packages/{extensions => }/extension/src/types/form.ts | 0
 .../{extensions => }/extension/src/types/formSchema.ts    | 0
 .../{extensions => }/extension/src/types/index.ts         | 0
 .../{extensions => }/extension/src/types/menuSchema.ts    | 0
 .../src/utils/__tests__/mergePluginConfigs.test.ts        | 0
 .../{extensions => }/extension/src/utils/index.ts         | 0
 .../extension/src/utils/mergePluginConfigs.ts             | 0
 .../{extensions => }/extension/tsconfig.build.json        | 0
 .../packages/{extensions => }/extension/tsconfig.json     | 2 +-
 .../packages/{extensions => }/intellisense/.gitignore     | 0
 .../packages/{extensions => }/intellisense/jest.config.js | 0
 .../packages/{extensions => }/intellisense/package.json   | 0
 .../intellisense/src/components/CompletionElement.tsx     | 0
 .../intellisense/src/components/CompletionList.tsx        | 0
 .../intellisense/src/components/IntellisenseTextField.tsx | 0
 .../components/__tests__/IntellisenseTextField.test.tsx   | 0
 .../{extensions => }/intellisense/src/components/index.ts | 0
 .../intellisense/src/hooks/useLanguageServer.ts           | 0
 .../intellisense/src/utils/lspMessagesUtils.ts            | 0
 .../{extensions => }/intellisense/src/utils/uiUtils.ts    | 0
 .../{extensions => }/intellisense/tsconfig.build.json     | 0
 .../adaptive-form => intellisense}/tsconfig.json          | 2 +-
 .../packages/{extensions => }/plugin-loader/.eslintrc.js  | 2 +-
 .../packages/{extensions => }/plugin-loader/.gitignore    | 0
 .../packages/{extensions => }/plugin-loader/package.json  | 0
 .../packages/{extensions => }/plugin-loader/src/index.ts  | 0
 .../src/loader/composerPluginRegistration.ts              | 0
 .../{extensions => }/plugin-loader/src/loader/index.ts    | 0
 .../plugin-loader/src/loader/pluginLoader.ts              | 0
 .../packages/{extensions => }/plugin-loader/src/logger.ts | 0
 .../{extensions => }/plugin-loader/src/manager/index.ts   | 0
 .../{extensions => }/plugin-loader/src/manager/manager.ts | 0
 .../plugin-loader/src/storage/extensionManifestStore.ts   | 0
 .../{extensions => }/plugin-loader/src/storage/index.ts   | 0
 .../{extensions => }/plugin-loader/src/types/extension.ts | 0
 .../{extensions => }/plugin-loader/src/types/types.ts     | 0
 .../packages/{extensions => }/plugin-loader/tsconfig.json | 2 +-
 Composer/plugins/azurePublish/package.json                | 2 +-
 Composer/plugins/azurePublish/yarn.lock                   | 2 +-
 366 files changed, 18 insertions(+), 14 deletions(-)
 rename Composer/packages/{extensions => }/adaptive-flow/.eslintrc.js (86%)
 rename Composer/packages/{extensions => }/adaptive-flow/.gitignore (100%)
 rename Composer/packages/{extensions => }/adaptive-flow/__tests__/adaptive-flow-editor/AdaptiveFlowEditor.test.tsx (100%)
 rename Composer/packages/{extensions => }/adaptive-flow/__tests__/adaptive-flow-editor/components/IconMenu.test.tsx (100%)
 rename Composer/packages/{extensions => }/adaptive-flow/__tests__/adaptive-flow-editor/components/KeyboardZone.test.tsx (100%)
 rename Composer/packages/{extensions => }/adaptive-flow/__tests__/adaptive-flow-editor/constants/ElementAttributes.test.tsx (100%)
 rename Composer/packages/{extensions => }/adaptive-flow/__tests__/adaptive-flow-editor/constants/KeyboardCommandTypes.test.ts (100%)
 rename Composer/packages/{extensions => }/adaptive-flow/__tests__/adaptive-flow-editor/constants/MenuTypes.test.ts (100%)
 rename Composer/packages/{extensions => }/adaptive-flow/__tests__/adaptive-flow-editor/constants/ScreenReaderMessage.test.ts (100%)
 rename Composer/packages/{extensions => }/adaptive-flow/__tests__/adaptive-flow-editor/constants/editorConfig.test.ts (100%)
 rename Composer/packages/{extensions => }/adaptive-flow/__tests__/adaptive-flow-editor/contexts/NodeRendererContext.test.tsx (100%)
 rename Composer/packages/{extensions => }/adaptive-flow/__tests__/adaptive-flow-editor/contexts/SelectionContext.test.tsx (100%)
 rename Composer/packages/{extensions => }/adaptive-flow/__tests__/adaptive-flow-editor/hooks/useEditorEventApi.test.ts (100%)
 rename Composer/packages/{extensions => }/adaptive-flow/__tests__/adaptive-flow-editor/renderers/EdgeMenu.test.tsx (100%)
 rename Composer/packages/{extensions => }/adaptive-flow/__tests__/adaptive-flow-editor/renderers/ElementWrapper.test.tsx (100%)
 rename Composer/packages/{extensions => }/adaptive-flow/__tests__/adaptive-flow-editor/renderers/NodeMenu.test.tsx (100%)
 rename Composer/packages/{extensions => }/adaptive-flow/__tests__/adaptive-flow-editor/renderers/NodeWrapper.test.tsx (100%)
 rename Composer/packages/{extensions => }/adaptive-flow/__tests__/adaptive-flow-editor/stubs/ShellApiStub.ts (100%)
 rename Composer/packages/{extensions => }/adaptive-flow/__tests__/adaptive-flow-editor/utils/NodeIndexGetter.test.ts (100%)
 rename Composer/packages/{extensions => }/adaptive-flow/__tests__/adaptive-flow-editor/utils/calculateRangeSelection.test.ts (100%)
 rename Composer/packages/{extensions => }/adaptive-flow/__tests__/adaptive-flow-editor/utils/cursorTracker/index.test.ts (100%)
 rename Composer/packages/{extensions => }/adaptive-flow/__tests__/adaptive-flow-editor/utils/cursorTracker/type.test.ts (100%)
 rename Composer/packages/{extensions => }/adaptive-flow/__tests__/adaptive-flow-editor/utils/getCustomSchema.test.ts (100%)
 rename Composer/packages/{extensions => }/adaptive-flow/__tests__/adaptive-flow-editor/utils/mapKeyboardCommandToEditorEvent.test.ts (100%)
 rename Composer/packages/{extensions => }/adaptive-flow/__tests__/adaptive-flow-editor/utils/normalizeSelection.test.ts (100%)
 rename Composer/packages/{extensions => }/adaptive-flow/__tests__/adaptive-flow-renderer/adaptive/AdaptiveDialog.test.tsx (100%)
 rename Composer/packages/{extensions => }/adaptive-flow/__tests__/adaptive-flow-renderer/adaptive/AdaptiveTrigger.test.tsx (100%)
 rename Composer/packages/{extensions => }/adaptive-flow/__tests__/adaptive-flow-renderer/components/ArrowLine.test.tsx (100%)
 rename Composer/packages/{extensions => }/adaptive-flow/__tests__/adaptive-flow-renderer/components/Diamond.test.tsx (100%)
 rename Composer/packages/{extensions => }/adaptive-flow/__tests__/adaptive-flow-renderer/components/ElementMeasurer.test.tsx (100%)
 rename Composer/packages/{extensions => }/adaptive-flow/__tests__/adaptive-flow-renderer/components/FlowEdges.test.tsx (100%)
 rename Composer/packages/{extensions => }/adaptive-flow/__tests__/adaptive-flow-renderer/components/IconBrick.test.tsx (100%)
 rename Composer/packages/{extensions => }/adaptive-flow/__tests__/adaptive-flow-renderer/components/LoopIndicator.test.tsx (100%)
 rename Composer/packages/{extensions => }/adaptive-flow/__tests__/adaptive-flow-renderer/components/OffsetContainer.test.tsx (100%)
 rename Composer/packages/{extensions => }/adaptive-flow/__tests__/adaptive-flow-renderer/components/SVGContainer.test.tsx (100%)
 rename Composer/packages/{extensions => }/adaptive-flow/__tests__/adaptive-flow-renderer/configs/builtinSchema.test.ts (100%)
 rename Composer/packages/{extensions => }/adaptive-flow/__tests__/adaptive-flow-renderer/layouters/baseInputLayouter.test.ts (100%)
 rename Composer/packages/{extensions => }/adaptive-flow/__tests__/adaptive-flow-renderer/layouters/calculateNodeBoundary.test.ts (100%)
 rename Composer/packages/{extensions => }/adaptive-flow/__tests__/adaptive-flow-renderer/layouters/foreachLayouter.test.ts (100%)
 rename Composer/packages/{extensions => }/adaptive-flow/__tests__/adaptive-flow-renderer/layouters/ifelseLayouter.test.ts (100%)
 rename Composer/packages/{extensions => }/adaptive-flow/__tests__/adaptive-flow-renderer/layouters/measureJsonBoundary.test.ts (100%)
 rename Composer/packages/{extensions => }/adaptive-flow/__tests__/adaptive-flow-renderer/layouters/sequentialLayouter.test.ts (100%)
 rename Composer/packages/{extensions => }/adaptive-flow/__tests__/adaptive-flow-renderer/layouters/switchCaseLayouter.test.ts (100%)
 rename Composer/packages/{extensions => }/adaptive-flow/__tests__/adaptive-flow-renderer/transformers/ObiTypes.test.ts (100%)
 rename Composer/packages/{extensions => }/adaptive-flow/__tests__/adaptive-flow-renderer/transformers/todoBot.main.json (100%)
 rename Composer/packages/{extensions => }/adaptive-flow/__tests__/adaptive-flow-renderer/transformers/transformForeach.test.ts (100%)
 rename Composer/packages/{extensions => }/adaptive-flow/__tests__/adaptive-flow-renderer/transformers/transformIfCondition.test.ts (100%)
 rename Composer/packages/{extensions => }/adaptive-flow/__tests__/adaptive-flow-renderer/transformers/transformObiRules.test.tsx (100%)
 rename Composer/packages/{extensions => }/adaptive-flow/__tests__/adaptive-flow-renderer/transformers/transformRootDialog.test.ts (100%)
 rename Composer/packages/{extensions => }/adaptive-flow/__tests__/adaptive-flow-renderer/transformers/transformStepGroup.test.ts (100%)
 rename Composer/packages/{extensions => }/adaptive-flow/__tests__/adaptive-flow-renderer/transformers/transformSwitchCondition.test.ts (100%)
 rename Composer/packages/{extensions => }/adaptive-flow/__tests__/adaptive-flow-renderer/utils/DesignerCache.test.ts (100%)
 rename Composer/packages/{extensions => }/adaptive-flow/__tests__/adaptive-flow-renderer/utils/EdgeUtil.test.tsx (100%)
 rename Composer/packages/{extensions => }/adaptive-flow/__tests__/adaptive-flow-renderer/utils/widgetRenderer.test.tsx (100%)
 rename Composer/packages/{extensions => }/adaptive-flow/__tests__/adaptive-flow-renderer/widgets/ActionCard.test.tsx (100%)
 rename Composer/packages/{extensions => }/adaptive-flow/__tests__/adaptive-flow-renderer/widgets/DialogRef.test.tsx (100%)
 rename Composer/packages/{extensions => }/adaptive-flow/__tests__/adaptive-flow-renderer/widgets/ForeachWidget.test.tsx (100%)
 rename Composer/packages/{extensions => }/adaptive-flow/__tests__/adaptive-flow-renderer/widgets/IfConditionWidget.test.tsx (100%)
 rename Composer/packages/{extensions => }/adaptive-flow/__tests__/adaptive-flow-renderer/widgets/PromptWidget.test.tsx (100%)
 rename Composer/packages/{extensions => }/adaptive-flow/__tests__/adaptive-flow-renderer/widgets/SwitchConditionWidget.test.tsx (100%)
 rename Composer/packages/{extensions => }/adaptive-flow/__tests__/adaptive-flow-renderer/widgets/icon.test.tsx (100%)
 rename Composer/packages/{extensions => }/adaptive-flow/demo/index.html (100%)
 rename Composer/packages/{extensions => }/adaptive-flow/demo/readme.md (100%)
 rename Composer/packages/{extensions => }/adaptive-flow/demo/src/components/json-block/index.js (100%)
 rename Composer/packages/{extensions => }/adaptive-flow/demo/src/index.css (100%)
 rename Composer/packages/{extensions => }/adaptive-flow/demo/src/index.js (100%)
 rename Composer/packages/{extensions => }/adaptive-flow/demo/src/samples/index.js (100%)
 rename Composer/packages/{extensions => }/adaptive-flow/demo/src/samples/todo/AddToDo.json (100%)
 rename Composer/packages/{extensions => }/adaptive-flow/demo/src/samples/todo/ClearToDos.json (100%)
 rename Composer/packages/{extensions => }/adaptive-flow/demo/src/samples/todo/DeleteToDo.json (100%)
 rename Composer/packages/{extensions => }/adaptive-flow/demo/src/samples/todo/ShowToDos.json (100%)
 rename Composer/packages/{extensions => }/adaptive-flow/demo/src/samples/todo/ToDoBot.main.json (100%)
 rename Composer/packages/{extensions => }/adaptive-flow/demo/src/stories/EventsEditorDemo.js (100%)
 rename Composer/packages/{extensions => }/adaptive-flow/demo/src/stories/StepEditorDemo.css (100%)
 rename Composer/packages/{extensions => }/adaptive-flow/demo/src/stories/StepEditorDemo.js (100%)
 rename Composer/packages/{extensions => }/adaptive-flow/demo/src/stories/VisualEditorDemo.css (100%)
 rename Composer/packages/{extensions => }/adaptive-flow/demo/src/stories/VisualEditorDemo.js (100%)
 rename Composer/packages/{extensions => }/adaptive-flow/demo/src/stories/VisualSDKDemo.js (100%)
 rename Composer/packages/{extensions => }/adaptive-flow/demo/src/stories/story.css (100%)
 rename Composer/packages/{extensions => }/adaptive-flow/demo/tsconfig.json (100%)
 rename Composer/packages/{extensions => }/adaptive-flow/demo/webpack.config.demo.js (100%)
 rename Composer/packages/{extensions => }/adaptive-flow/jest.config.js (100%)
 rename Composer/packages/{extensions => }/adaptive-flow/package.json (100%)
 rename Composer/packages/{extensions => }/adaptive-flow/src/adaptive-flow-editor/AdaptiveFlowEditor.tsx (100%)
 rename Composer/packages/{extensions => }/adaptive-flow/src/adaptive-flow-editor/components/IconMenu.tsx (100%)
 rename Composer/packages/{extensions => }/adaptive-flow/src/adaptive-flow-editor/components/KeyboardZone.ts (100%)
 rename Composer/packages/{extensions => }/adaptive-flow/src/adaptive-flow-editor/constants/ElementAttributes.ts (100%)
 rename Composer/packages/{extensions => }/adaptive-flow/src/adaptive-flow-editor/constants/KeyboardCommandTypes.ts (100%)
 rename Composer/packages/{extensions => }/adaptive-flow/src/adaptive-flow-editor/constants/MenuTypes.ts (100%)
 rename Composer/packages/{extensions => }/adaptive-flow/src/adaptive-flow-editor/constants/ScreenReaderMessage.ts (100%)
 rename Composer/packages/{extensions => }/adaptive-flow/src/adaptive-flow-editor/constants/editorConfig.ts (100%)
 rename Composer/packages/{extensions => }/adaptive-flow/src/adaptive-flow-editor/contexts/NodeRendererContext.ts (100%)
 rename Composer/packages/{extensions => }/adaptive-flow/src/adaptive-flow-editor/contexts/SelectionContext.ts (100%)
 rename Composer/packages/{extensions => }/adaptive-flow/src/adaptive-flow-editor/contexts/SelfHostContext.ts (100%)
 rename Composer/packages/{extensions => }/adaptive-flow/src/adaptive-flow-editor/hooks/useEditorEventApi.ts (100%)
 rename Composer/packages/{extensions => }/adaptive-flow/src/adaptive-flow-editor/hooks/useFlowUIOptions.ts (100%)
 rename Composer/packages/{extensions => }/adaptive-flow/src/adaptive-flow-editor/hooks/useSelectionEffect.ts (100%)
 rename Composer/packages/{extensions => }/adaptive-flow/src/adaptive-flow-editor/renderers/EdgeMenu/EdgeMenu.tsx (100%)
 rename Composer/packages/{extensions => }/adaptive-flow/src/adaptive-flow-editor/renderers/EdgeMenu/createSchemaMenu.tsx (100%)
 rename Composer/packages/{extensions => }/adaptive-flow/src/adaptive-flow-editor/renderers/EdgeMenu/defaultMenuOrder.ts (100%)
 rename Composer/packages/{extensions => }/adaptive-flow/src/adaptive-flow-editor/renderers/EdgeMenu/index.tsx (100%)
 rename Composer/packages/{extensions => }/adaptive-flow/src/adaptive-flow-editor/renderers/ElementWrapper.tsx (100%)
 rename Composer/packages/{extensions => }/adaptive-flow/src/adaptive-flow-editor/renderers/NodeMenu.tsx (100%)
 rename Composer/packages/{extensions => }/adaptive-flow/src/adaptive-flow-editor/renderers/NodeWrapper.tsx (100%)
 rename Composer/packages/{extensions => }/adaptive-flow/src/adaptive-flow-editor/renderers/index.tsx (100%)
 rename Composer/packages/{extensions => }/adaptive-flow/src/adaptive-flow-editor/utils/NodeIndexGetter.ts (100%)
 rename Composer/packages/{extensions => }/adaptive-flow/src/adaptive-flow-editor/utils/calculateRangeSelection.ts (100%)
 rename Composer/packages/{extensions => }/adaptive-flow/src/adaptive-flow-editor/utils/cursorTracker/arrowMove.ts (100%)
 rename Composer/packages/{extensions => }/adaptive-flow/src/adaptive-flow-editor/utils/cursorTracker/calculate/calculateBySchema.ts (100%)
 rename Composer/packages/{extensions => }/adaptive-flow/src/adaptive-flow-editor/utils/cursorTracker/calculate/calculateByVector.ts (100%)
 rename Composer/packages/{extensions => }/adaptive-flow/src/adaptive-flow-editor/utils/cursorTracker/index.ts (100%)
 rename Composer/packages/{extensions => }/adaptive-flow/src/adaptive-flow-editor/utils/cursorTracker/locateElement.ts (100%)
 rename Composer/packages/{extensions => }/adaptive-flow/src/adaptive-flow-editor/utils/cursorTracker/tabMove.ts (100%)
 rename Composer/packages/{extensions => }/adaptive-flow/src/adaptive-flow-editor/utils/cursorTracker/type.ts (100%)
 rename Composer/packages/{extensions => }/adaptive-flow/src/adaptive-flow-editor/utils/getCustomSchema.ts (100%)
 rename Composer/packages/{extensions => }/adaptive-flow/src/adaptive-flow-editor/utils/mapKeyboardCommandToEditorEvent.ts (100%)
 rename Composer/packages/{extensions => }/adaptive-flow/src/adaptive-flow-editor/utils/normalizeSelection.ts (100%)
 rename Composer/packages/{extensions => }/adaptive-flow/src/adaptive-flow-editor/utils/scrollNodeIntoView.ts (100%)
 rename Composer/packages/{extensions => }/adaptive-flow/src/adaptive-flow-renderer/adaptive/AdaptiveDialog.tsx (100%)
 rename Composer/packages/{extensions => }/adaptive-flow/src/adaptive-flow-renderer/adaptive/AdaptiveTrigger.tsx (100%)
 rename Composer/packages/{extensions => }/adaptive-flow/src/adaptive-flow-renderer/components/ArrowLine.tsx (100%)
 rename Composer/packages/{extensions => }/adaptive-flow/src/adaptive-flow-renderer/components/Diamond.tsx (100%)
 rename Composer/packages/{extensions => }/adaptive-flow/src/adaptive-flow-renderer/components/ElementMeasurer.tsx (100%)
 rename Composer/packages/{extensions => }/adaptive-flow/src/adaptive-flow-renderer/components/FlowEdges.tsx (100%)
 rename Composer/packages/{extensions => }/adaptive-flow/src/adaptive-flow-renderer/components/IconBrick.tsx (100%)
 rename Composer/packages/{extensions => }/adaptive-flow/src/adaptive-flow-renderer/components/LoopIndicator.tsx (100%)
 rename Composer/packages/{extensions => }/adaptive-flow/src/adaptive-flow-renderer/components/OffsetContainer.tsx (100%)
 rename Composer/packages/{extensions => }/adaptive-flow/src/adaptive-flow-renderer/components/SVGContainer.tsx (100%)
 rename Composer/packages/{extensions => }/adaptive-flow/src/adaptive-flow-renderer/configs/builtinSchema.tsx (100%)
 rename Composer/packages/{extensions => }/adaptive-flow/src/adaptive-flow-renderer/configs/builtinWidgets.tsx (100%)
 rename Composer/packages/{extensions => }/adaptive-flow/src/adaptive-flow-renderer/constants/AdaptiveFieldNames.ts (100%)
 rename Composer/packages/{extensions => }/adaptive-flow/src/adaptive-flow-renderer/constants/AdaptiveKinds.ts (100%)
 rename Composer/packages/{extensions => }/adaptive-flow/src/adaptive-flow-renderer/constants/ElementColors.ts (100%)
 rename Composer/packages/{extensions => }/adaptive-flow/src/adaptive-flow-renderer/constants/ElementSizes.ts (100%)
 rename Composer/packages/{extensions => }/adaptive-flow/src/adaptive-flow-renderer/constants/NodeEventTypes.ts (100%)
 rename Composer/packages/{extensions => }/adaptive-flow/src/adaptive-flow-renderer/contexts/RendererContext.tsx (100%)
 rename Composer/packages/{extensions => }/adaptive-flow/src/adaptive-flow-renderer/contexts/SchemaContext.ts (100%)
 rename Composer/packages/{extensions => }/adaptive-flow/src/adaptive-flow-renderer/hooks/useSmartLayout.ts (100%)
 rename Composer/packages/{extensions => }/adaptive-flow/src/adaptive-flow-renderer/layouters/baseInputLayouter.ts (100%)
 rename Composer/packages/{extensions => }/adaptive-flow/src/adaptive-flow-renderer/layouters/calculateNodeBoundary.ts (100%)
 rename Composer/packages/{extensions => }/adaptive-flow/src/adaptive-flow-renderer/layouters/foreachLayouter.ts (100%)
 rename Composer/packages/{extensions => }/adaptive-flow/src/adaptive-flow-renderer/layouters/ifelseLayouter.ts (100%)
 rename Composer/packages/{extensions => }/adaptive-flow/src/adaptive-flow-renderer/layouters/measureJsonBoundary.ts (100%)
 rename Composer/packages/{extensions => }/adaptive-flow/src/adaptive-flow-renderer/layouters/sequentialLayouter.ts (100%)
 rename Composer/packages/{extensions => }/adaptive-flow/src/adaptive-flow-renderer/layouters/sharedLayouterUtils.ts (100%)
 rename Composer/packages/{extensions => }/adaptive-flow/src/adaptive-flow-renderer/layouters/switchCaseLayouter.ts (100%)
 rename Composer/packages/{extensions => }/adaptive-flow/src/adaptive-flow-renderer/models/Boundary.ts (100%)
 rename Composer/packages/{extensions => }/adaptive-flow/src/adaptive-flow-renderer/models/EdgeData.ts (100%)
 rename Composer/packages/{extensions => }/adaptive-flow/src/adaptive-flow-renderer/models/GraphLayout.ts (100%)
 rename Composer/packages/{extensions => }/adaptive-flow/src/adaptive-flow-renderer/models/GraphNode.ts (100%)
 rename Composer/packages/{extensions => }/adaptive-flow/src/adaptive-flow-renderer/models/IndexedNode.ts (100%)
 rename Composer/packages/{extensions => }/adaptive-flow/src/adaptive-flow-renderer/transformers/inheritParentProperty.ts (100%)
 rename Composer/packages/{extensions => }/adaptive-flow/src/adaptive-flow-renderer/transformers/transformBaseInput.ts (100%)
 rename Composer/packages/{extensions => }/adaptive-flow/src/adaptive-flow-renderer/transformers/transformForeach.ts (100%)
 rename Composer/packages/{extensions => }/adaptive-flow/src/adaptive-flow-renderer/transformers/transformIfCondition.ts (100%)
 rename Composer/packages/{extensions => }/adaptive-flow/src/adaptive-flow-renderer/transformers/transformObiRules.ts (100%)
 rename Composer/packages/{extensions => }/adaptive-flow/src/adaptive-flow-renderer/transformers/transformRootDialog.ts (100%)
 rename Composer/packages/{extensions => }/adaptive-flow/src/adaptive-flow-renderer/transformers/transformStepGroup.ts (100%)
 rename Composer/packages/{extensions => }/adaptive-flow/src/adaptive-flow-renderer/transformers/transformSwitchCondition.ts (100%)
 rename Composer/packages/{extensions => }/adaptive-flow/src/adaptive-flow-renderer/types/PluggableComponents.types.ts (100%)
 rename Composer/packages/{extensions => }/adaptive-flow/src/adaptive-flow-renderer/types/flowRenderer.types.ts (100%)
 rename Composer/packages/{extensions => }/adaptive-flow/src/adaptive-flow-renderer/types/nodeProps.ts (100%)
 rename Composer/packages/{extensions => }/adaptive-flow/src/adaptive-flow-renderer/utils/adaptive/outlineObiJson.ts (100%)
 rename Composer/packages/{extensions => }/adaptive-flow/src/adaptive-flow-renderer/utils/adaptive/stepBuilder.ts (100%)
 rename Composer/packages/{extensions => }/adaptive-flow/src/adaptive-flow-renderer/utils/visual/DesignerCache.ts (100%)
 rename Composer/packages/{extensions => }/adaptive-flow/src/adaptive-flow-renderer/utils/visual/EdgeUtil.tsx (100%)
 rename Composer/packages/{extensions => }/adaptive-flow/src/adaptive-flow-renderer/utils/visual/WidgetSchemaProvider.ts (100%)
 rename Composer/packages/{extensions => }/adaptive-flow/src/adaptive-flow-renderer/utils/visual/widgetRenderer.tsx (100%)
 rename Composer/packages/{extensions => }/adaptive-flow/src/adaptive-flow-renderer/widgets/ActionCard/ActionCard.tsx (100%)
 rename Composer/packages/{extensions => }/adaptive-flow/src/adaptive-flow-renderer/widgets/ActionCard/CardTemplate.tsx (100%)
 rename Composer/packages/{extensions => }/adaptive-flow/src/adaptive-flow-renderer/widgets/ActionCard/CardTemplateStyle.ts (100%)
 rename Composer/packages/{extensions => }/adaptive-flow/src/adaptive-flow-renderer/widgets/ActionCard/index.tsx (100%)
 rename Composer/packages/{extensions => }/adaptive-flow/src/adaptive-flow-renderer/widgets/ActionGroup.tsx (100%)
 rename Composer/packages/{extensions => }/adaptive-flow/src/adaptive-flow-renderer/widgets/ActionHeader/ActionHeader.tsx (100%)
 rename Composer/packages/{extensions => }/adaptive-flow/src/adaptive-flow-renderer/widgets/ActionHeader/ActionHeaderStyle.ts (100%)
 rename Composer/packages/{extensions => }/adaptive-flow/src/adaptive-flow-renderer/widgets/ActionHeader/icon.tsx (100%)
 rename Composer/packages/{extensions => }/adaptive-flow/src/adaptive-flow-renderer/widgets/ActionHeader/iconStyles.ts (100%)
 rename Composer/packages/{extensions => }/adaptive-flow/src/adaptive-flow-renderer/widgets/ActionHeader/index.tsx (100%)
 rename Composer/packages/{extensions => }/adaptive-flow/src/adaptive-flow-renderer/widgets/AdaptiveAction.tsx (100%)
 rename Composer/packages/{extensions => }/adaptive-flow/src/adaptive-flow-renderer/widgets/DialogRef.tsx (100%)
 rename Composer/packages/{extensions => }/adaptive-flow/src/adaptive-flow-renderer/widgets/ForeachWidget.tsx (100%)
 rename Composer/packages/{extensions => }/adaptive-flow/src/adaptive-flow-renderer/widgets/IfConditionWidget.tsx (100%)
 rename Composer/packages/{extensions => }/adaptive-flow/src/adaptive-flow-renderer/widgets/PromptWidget.tsx (100%)
 rename Composer/packages/{extensions => }/adaptive-flow/src/adaptive-flow-renderer/widgets/SwitchConditionWidget.tsx (100%)
 rename Composer/packages/{extensions => }/adaptive-flow/src/adaptive-flow-renderer/widgets/TriggerSummary/TriggerSummary.tsx (100%)
 rename Composer/packages/{extensions => }/adaptive-flow/src/adaptive-flow-renderer/widgets/TriggerSummary/index.tsx (100%)
 rename Composer/packages/{extensions => }/adaptive-flow/src/adaptive-flow-renderer/widgets/TriggerSummary/triggerStyles.ts (100%)
 rename Composer/packages/{extensions => }/adaptive-flow/src/adaptive-flow-renderer/widgets/index.ts (100%)
 rename Composer/packages/{extensions => }/adaptive-flow/src/adaptive-flow-renderer/widgets/styles/DisabledStyle.ts (100%)
 rename Composer/packages/{extensions => }/adaptive-flow/src/index.tsx (100%)
 rename Composer/packages/{extensions => }/adaptive-flow/tsconfig.build.json (100%)
 rename Composer/packages/{extensions => }/adaptive-flow/tsconfig.json (74%)
 rename Composer/packages/{extensions => }/adaptive-form/.eslintignore (100%)
 rename Composer/packages/{extensions/extension => adaptive-form}/.eslintrc.js (71%)
 rename Composer/packages/{extensions => }/adaptive-form/.gitignore (100%)
 rename Composer/packages/{extensions => }/adaptive-form/jest.config.js (100%)
 rename Composer/packages/{extensions => }/adaptive-form/package.json (100%)
 rename Composer/packages/{extensions => }/adaptive-form/src/components/AdaptiveForm.tsx (100%)
 rename Composer/packages/{extensions => }/adaptive-form/src/components/CollapseField.tsx (100%)
 rename Composer/packages/{extensions => }/adaptive-form/src/components/ErrorInfo.tsx (100%)
 rename Composer/packages/{extensions => }/adaptive-form/src/components/ErrorMessage.tsx (100%)
 rename Composer/packages/{extensions => }/adaptive-form/src/components/FieldLabel.tsx (100%)
 rename Composer/packages/{extensions => }/adaptive-form/src/components/FormRow.tsx (100%)
 rename Composer/packages/{extensions => }/adaptive-form/src/components/FormTitle.tsx (100%)
 rename Composer/packages/{extensions => }/adaptive-form/src/components/Link.tsx (100%)
 rename Composer/packages/{extensions => }/adaptive-form/src/components/LoadingTimeout.tsx (100%)
 rename Composer/packages/{extensions => }/adaptive-form/src/components/SchemaField.tsx (100%)
 rename Composer/packages/{extensions => }/adaptive-form/src/components/__tests__/ErrorMessage.test.tsx (100%)
 rename Composer/packages/{extensions => }/adaptive-form/src/components/__tests__/FieldLabel.test.tsx (100%)
 rename Composer/packages/{extensions => }/adaptive-form/src/components/__tests__/FormRow.test.tsx (100%)
 rename Composer/packages/{extensions => }/adaptive-form/src/components/__tests__/LoadingTimeout.test.tsx (100%)
 rename Composer/packages/{extensions => }/adaptive-form/src/components/__tests__/SchemaField.test.tsx (100%)
 rename Composer/packages/{extensions => }/adaptive-form/src/components/fields/ArrayField.tsx (100%)
 rename Composer/packages/{extensions => }/adaptive-form/src/components/fields/ArrayFieldItem.tsx (100%)
 rename Composer/packages/{extensions => }/adaptive-form/src/components/fields/BooleanField.tsx (100%)
 rename Composer/packages/{extensions => }/adaptive-form/src/components/fields/EditableField.tsx (100%)
 rename Composer/packages/{extensions => }/adaptive-form/src/components/fields/ExpressionField/ExpressionEditor.tsx (100%)
 rename Composer/packages/{extensions => }/adaptive-form/src/components/fields/ExpressionField/ExpressionField.tsx (100%)
 rename Composer/packages/{extensions => }/adaptive-form/src/components/fields/ExpressionField/__tests__/ExpressionField.test.tsx (100%)
 rename Composer/packages/{extensions => }/adaptive-form/src/components/fields/ExpressionField/__tests__/utils.test.ts (100%)
 rename Composer/packages/{extensions => }/adaptive-form/src/components/fields/ExpressionField/utils.ts (100%)
 rename Composer/packages/{extensions => }/adaptive-form/src/components/fields/IntellisenseField.tsx (100%)
 rename Composer/packages/{extensions => }/adaptive-form/src/components/fields/IntentField.tsx (100%)
 rename Composer/packages/{extensions => }/adaptive-form/src/components/fields/JsonField.tsx (100%)
 rename Composer/packages/{extensions => }/adaptive-form/src/components/fields/NumberField.tsx (100%)
 rename Composer/packages/{extensions => }/adaptive-form/src/components/fields/ObjectArrayField.tsx (100%)
 rename Composer/packages/{extensions => }/adaptive-form/src/components/fields/ObjectField.tsx (100%)
 rename Composer/packages/{extensions => }/adaptive-form/src/components/fields/OneOfField/OneOfField.tsx (100%)
 rename Composer/packages/{extensions => }/adaptive-form/src/components/fields/OneOfField/__tests__/OneOfField.test.tsx (100%)
 rename Composer/packages/{extensions => }/adaptive-form/src/components/fields/OneOfField/__tests__/utils.test.ts (100%)
 rename Composer/packages/{extensions => }/adaptive-form/src/components/fields/OneOfField/index.ts (100%)
 rename Composer/packages/{extensions => }/adaptive-form/src/components/fields/OneOfField/utils.ts (100%)
 rename Composer/packages/{extensions => }/adaptive-form/src/components/fields/OpenObjectField/ObjectItem.tsx (100%)
 rename Composer/packages/{extensions => }/adaptive-form/src/components/fields/OpenObjectField/OpenObjectField.tsx (100%)
 rename Composer/packages/{extensions => }/adaptive-form/src/components/fields/OpenObjectField/__tests__/ObjectItem.test.tsx (100%)
 rename Composer/packages/{extensions => }/adaptive-form/src/components/fields/OpenObjectField/__tests__/OpenObjectField.test.tsx (100%)
 rename Composer/packages/{extensions => }/adaptive-form/src/components/fields/OpenObjectField/index.ts (100%)
 rename Composer/packages/{extensions => }/adaptive-form/src/components/fields/OpenObjectField/styles.ts (100%)
 rename Composer/packages/{extensions => }/adaptive-form/src/components/fields/QnAActionsField.tsx (100%)
 rename Composer/packages/{extensions => }/adaptive-form/src/components/fields/RecognizerField.tsx (100%)
 rename Composer/packages/{extensions => }/adaptive-form/src/components/fields/RegexIntentField.tsx (100%)
 rename Composer/packages/{extensions => }/adaptive-form/src/components/fields/SelectField.tsx (100%)
 rename Composer/packages/{extensions => }/adaptive-form/src/components/fields/StringField.tsx (100%)
 rename Composer/packages/{extensions => }/adaptive-form/src/components/fields/UnsupportedField.tsx (100%)
 rename Composer/packages/{extensions => }/adaptive-form/src/components/fields/__tests__/ArrayField.test.tsx (100%)
 rename Composer/packages/{extensions => }/adaptive-form/src/components/fields/__tests__/ArrayFieldItem.tsx (100%)
 rename Composer/packages/{extensions => }/adaptive-form/src/components/fields/__tests__/BooleanField.test.tsx (100%)
 rename Composer/packages/{extensions => }/adaptive-form/src/components/fields/__tests__/IntentField.test.tsx (100%)
 rename Composer/packages/{extensions => }/adaptive-form/src/components/fields/__tests__/JsonField.test.tsx (100%)
 rename Composer/packages/{extensions => }/adaptive-form/src/components/fields/__tests__/NumberField.test.tsx (100%)
 rename Composer/packages/{extensions => }/adaptive-form/src/components/fields/__tests__/ObjectArrayField.test.tsx (100%)
 rename Composer/packages/{extensions => }/adaptive-form/src/components/fields/__tests__/ObjectField.test.tsx (100%)
 rename Composer/packages/{extensions => }/adaptive-form/src/components/fields/__tests__/RecognizerField.test.tsx (100%)
 rename Composer/packages/{extensions => }/adaptive-form/src/components/fields/__tests__/RegexIntentField.test.tsx (100%)
 rename Composer/packages/{extensions => }/adaptive-form/src/components/fields/__tests__/SelectField.test.tsx (100%)
 rename Composer/packages/{extensions => }/adaptive-form/src/components/fields/__tests__/StringField.test.tsx (100%)
 rename Composer/packages/{extensions => }/adaptive-form/src/components/fields/__tests__/UnsupportedField.test.tsx (100%)
 rename Composer/packages/{extensions => }/adaptive-form/src/components/fields/__tests__/testUtils.ts (100%)
 rename Composer/packages/{extensions => }/adaptive-form/src/components/fields/index.ts (100%)
 rename Composer/packages/{extensions => }/adaptive-form/src/components/fields/styles.ts (100%)
 rename Composer/packages/{extensions => }/adaptive-form/src/components/index.ts (100%)
 rename Composer/packages/{extensions => }/adaptive-form/src/components/sharedStyles.ts (100%)
 rename Composer/packages/{extensions => }/adaptive-form/src/defaultRecognizers.ts (100%)
 rename Composer/packages/{extensions => }/adaptive-form/src/index.ts (100%)
 rename Composer/packages/{extensions => }/adaptive-form/src/utils/__tests__/arrayUtils.test.ts (100%)
 rename Composer/packages/{extensions => }/adaptive-form/src/utils/__tests__/getOrderedProperties.test.ts (100%)
 rename Composer/packages/{extensions => }/adaptive-form/src/utils/__tests__/getUIOptions.test.ts (100%)
 rename Composer/packages/{extensions => }/adaptive-form/src/utils/__tests__/getValueType.test.ts (100%)
 rename Composer/packages/{extensions => }/adaptive-form/src/utils/__tests__/objectUtils.test.ts (100%)
 rename Composer/packages/{extensions => }/adaptive-form/src/utils/__tests__/resolveFieldWidget.test.ts (100%)
 rename Composer/packages/{extensions => }/adaptive-form/src/utils/__tests__/resolvePropSchema.test.ts (100%)
 rename Composer/packages/{extensions => }/adaptive-form/src/utils/__tests__/resolveRef.test.ts (100%)
 rename Composer/packages/{extensions => }/adaptive-form/src/utils/__tests__/uiOptionsHelpers.test.ts (100%)
 rename Composer/packages/{extensions => }/adaptive-form/src/utils/arrayUtils.ts (100%)
 rename Composer/packages/{extensions => }/adaptive-form/src/utils/getHiddenProperties.ts (100%)
 rename Composer/packages/{extensions => }/adaptive-form/src/utils/getIntellisenseUrl.ts (100%)
 rename Composer/packages/{extensions => }/adaptive-form/src/utils/getOrderedProperties.ts (100%)
 rename Composer/packages/{extensions => }/adaptive-form/src/utils/getUIOptions.ts (100%)
 rename Composer/packages/{extensions => }/adaptive-form/src/utils/getValueType.ts (100%)
 rename Composer/packages/{extensions => }/adaptive-form/src/utils/index.ts (100%)
 rename Composer/packages/{extensions => }/adaptive-form/src/utils/objectUtils.ts (100%)
 rename Composer/packages/{extensions => }/adaptive-form/src/utils/resolveFieldWidget.ts (100%)
 rename Composer/packages/{extensions => }/adaptive-form/src/utils/resolvePropSchema.ts (100%)
 rename Composer/packages/{extensions => }/adaptive-form/src/utils/resolveRef.ts (100%)
 rename Composer/packages/{extensions => }/adaptive-form/src/utils/uiOptionsHelpers.ts (100%)
 rename Composer/packages/{extensions => }/adaptive-form/tsconfig.build.json (100%)
 rename Composer/packages/{extensions/intellisense => adaptive-form}/tsconfig.json (63%)
 rename Composer/packages/{extensions => }/extension-client/.gitignore (100%)
 rename Composer/packages/{extensions => }/extension-client/package.json (100%)
 rename Composer/packages/{extensions => }/extension-client/src/auth/index.ts (100%)
 rename Composer/packages/{extensions => }/extension-client/src/auth/types.ts (100%)
 rename Composer/packages/{extensions => }/extension-client/src/common/constants.ts (100%)
 rename Composer/packages/{extensions => }/extension-client/src/common/index.ts (100%)
 rename Composer/packages/{extensions => }/extension-client/src/index.ts (100%)
 rename Composer/packages/{extensions => }/extension-client/src/logger.ts (100%)
 rename Composer/packages/{extensions => }/extension-client/src/page/index.ts (100%)
 rename Composer/packages/{extensions => }/extension-client/src/publish/index.ts (100%)
 rename Composer/packages/{extensions => }/extension-client/src/publish/types.ts (100%)
 rename Composer/packages/{extensions => }/extension-client/tsconfig.json (74%)
 rename Composer/packages/{extensions/adaptive-form => extension}/.eslintrc.js (71%)
 rename Composer/packages/{extensions => }/extension/.gitignore (100%)
 rename Composer/packages/{extensions => }/extension/jest.config.js (100%)
 rename Composer/packages/{extensions => }/extension/package.json (100%)
 rename Composer/packages/{extensions => }/extension/src/components/Extension.tsx (100%)
 rename Composer/packages/{extensions => }/extension/src/components/index.ts (100%)
 rename Composer/packages/{extensions => }/extension/src/extensionContext.ts (100%)
 rename Composer/packages/{extensions => }/extension/src/hooks/__tests__/useFlowConfig.test.tsx (100%)
 rename Composer/packages/{extensions => }/extension/src/hooks/__tests__/useFormConfig.test.tsx (100%)
 rename Composer/packages/{extensions => }/extension/src/hooks/__tests__/useMenuConfig.test.tsx (100%)
 rename Composer/packages/{extensions => }/extension/src/hooks/__tests__/useRecognizerConfig.test.tsx (100%)
 rename Composer/packages/{extensions => }/extension/src/hooks/index.ts (100%)
 rename Composer/packages/{extensions => }/extension/src/hooks/useActionApi.ts (100%)
 rename Composer/packages/{extensions => }/extension/src/hooks/useDebounce.ts (100%)
 rename Composer/packages/{extensions => }/extension/src/hooks/useDialogApi.ts (100%)
 rename Composer/packages/{extensions => }/extension/src/hooks/useDialogEditApi.ts (100%)
 rename Composer/packages/{extensions => }/extension/src/hooks/useFlowConfig.ts (100%)
 rename Composer/packages/{extensions => }/extension/src/hooks/useFormConfig.ts (100%)
 rename Composer/packages/{extensions => }/extension/src/hooks/useLgApi.ts (100%)
 rename Composer/packages/{extensions => }/extension/src/hooks/useLuApi.ts (100%)
 rename Composer/packages/{extensions => }/extension/src/hooks/useMenuConfig.ts (100%)
 rename Composer/packages/{extensions => }/extension/src/hooks/useRecognizerConfig.ts (100%)
 rename Composer/packages/{extensions => }/extension/src/hooks/useShellApi.ts (100%)
 rename Composer/packages/{extensions => }/extension/src/hooks/useTriggerApi.ts (100%)
 rename Composer/packages/{extensions => }/extension/src/index.ts (100%)
 rename Composer/packages/{extensions => }/extension/src/types/extension.ts (100%)
 rename Composer/packages/{extensions => }/extension/src/types/flowSchema.ts (100%)
 rename Composer/packages/{extensions => }/extension/src/types/form.ts (100%)
 rename Composer/packages/{extensions => }/extension/src/types/formSchema.ts (100%)
 rename Composer/packages/{extensions => }/extension/src/types/index.ts (100%)
 rename Composer/packages/{extensions => }/extension/src/types/menuSchema.ts (100%)
 rename Composer/packages/{extensions => }/extension/src/utils/__tests__/mergePluginConfigs.test.ts (100%)
 rename Composer/packages/{extensions => }/extension/src/utils/index.ts (100%)
 rename Composer/packages/{extensions => }/extension/src/utils/mergePluginConfigs.ts (100%)
 rename Composer/packages/{extensions => }/extension/tsconfig.build.json (100%)
 rename Composer/packages/{extensions => }/extension/tsconfig.json (63%)
 rename Composer/packages/{extensions => }/intellisense/.gitignore (100%)
 rename Composer/packages/{extensions => }/intellisense/jest.config.js (100%)
 rename Composer/packages/{extensions => }/intellisense/package.json (100%)
 rename Composer/packages/{extensions => }/intellisense/src/components/CompletionElement.tsx (100%)
 rename Composer/packages/{extensions => }/intellisense/src/components/CompletionList.tsx (100%)
 rename Composer/packages/{extensions => }/intellisense/src/components/IntellisenseTextField.tsx (100%)
 rename Composer/packages/{extensions => }/intellisense/src/components/__tests__/IntellisenseTextField.test.tsx (100%)
 rename Composer/packages/{extensions => }/intellisense/src/components/index.ts (100%)
 rename Composer/packages/{extensions => }/intellisense/src/hooks/useLanguageServer.ts (100%)
 rename Composer/packages/{extensions => }/intellisense/src/utils/lspMessagesUtils.ts (100%)
 rename Composer/packages/{extensions => }/intellisense/src/utils/uiUtils.ts (100%)
 rename Composer/packages/{extensions => }/intellisense/tsconfig.build.json (100%)
 rename Composer/packages/{extensions/adaptive-form => intellisense}/tsconfig.json (63%)
 rename Composer/packages/{extensions => }/plugin-loader/.eslintrc.js (82%)
 rename Composer/packages/{extensions => }/plugin-loader/.gitignore (100%)
 rename Composer/packages/{extensions => }/plugin-loader/package.json (100%)
 rename Composer/packages/{extensions => }/plugin-loader/src/index.ts (100%)
 rename Composer/packages/{extensions => }/plugin-loader/src/loader/composerPluginRegistration.ts (100%)
 rename Composer/packages/{extensions => }/plugin-loader/src/loader/index.ts (100%)
 rename Composer/packages/{extensions => }/plugin-loader/src/loader/pluginLoader.ts (100%)
 rename Composer/packages/{extensions => }/plugin-loader/src/logger.ts (100%)
 rename Composer/packages/{extensions => }/plugin-loader/src/manager/index.ts (100%)
 rename Composer/packages/{extensions => }/plugin-loader/src/manager/manager.ts (100%)
 rename Composer/packages/{extensions => }/plugin-loader/src/storage/extensionManifestStore.ts (100%)
 rename Composer/packages/{extensions => }/plugin-loader/src/storage/index.ts (100%)
 rename Composer/packages/{extensions => }/plugin-loader/src/types/extension.ts (100%)
 rename Composer/packages/{extensions => }/plugin-loader/src/types/types.ts (100%)
 rename Composer/packages/{extensions => }/plugin-loader/tsconfig.json (74%)

diff --git a/Composer/package.json b/Composer/package.json
index 0b4a958c50..dfec97d173 100644
--- a/Composer/package.json
+++ b/Composer/package.json
@@ -16,12 +16,16 @@
     "node": ">=12"
   },
   "workspaces": [
+    "packages/adaptive-flow",
+    "packages/adaptive-form",
     "packages/client",
     "packages/electron-server",
-    "packages/extensions",
-    "packages/extensions/*",
+    "packages/extension-client",
+    "packages/extension",
+    "packages/intellisense",
     "packages/lib",
     "packages/lib/*",
+    "packages/plugin-loader",
     "packages/server",
     "packages/test-utils",
     "packages/tools",
diff --git a/Composer/packages/extensions/adaptive-flow/.eslintrc.js b/Composer/packages/adaptive-flow/.eslintrc.js
similarity index 86%
rename from Composer/packages/extensions/adaptive-flow/.eslintrc.js
rename to Composer/packages/adaptive-flow/.eslintrc.js
index ea421ff1e3..8061ace797 100644
--- a/Composer/packages/extensions/adaptive-flow/.eslintrc.js
+++ b/Composer/packages/adaptive-flow/.eslintrc.js
@@ -1,5 +1,5 @@
 module.exports = {
-  extends: ['../../../.eslintrc.react.js'],
+  extends: ['../../.eslintrc.react.js'],
   parserOptions: {
     project: './tsconfig.json',
     tsconfigRootDir: __dirname,
diff --git a/Composer/packages/extensions/adaptive-flow/.gitignore b/Composer/packages/adaptive-flow/.gitignore
similarity index 100%
rename from Composer/packages/extensions/adaptive-flow/.gitignore
rename to Composer/packages/adaptive-flow/.gitignore
diff --git a/Composer/packages/extensions/adaptive-flow/__tests__/adaptive-flow-editor/AdaptiveFlowEditor.test.tsx b/Composer/packages/adaptive-flow/__tests__/adaptive-flow-editor/AdaptiveFlowEditor.test.tsx
similarity index 100%
rename from Composer/packages/extensions/adaptive-flow/__tests__/adaptive-flow-editor/AdaptiveFlowEditor.test.tsx
rename to Composer/packages/adaptive-flow/__tests__/adaptive-flow-editor/AdaptiveFlowEditor.test.tsx
diff --git a/Composer/packages/extensions/adaptive-flow/__tests__/adaptive-flow-editor/components/IconMenu.test.tsx b/Composer/packages/adaptive-flow/__tests__/adaptive-flow-editor/components/IconMenu.test.tsx
similarity index 100%
rename from Composer/packages/extensions/adaptive-flow/__tests__/adaptive-flow-editor/components/IconMenu.test.tsx
rename to Composer/packages/adaptive-flow/__tests__/adaptive-flow-editor/components/IconMenu.test.tsx
diff --git a/Composer/packages/extensions/adaptive-flow/__tests__/adaptive-flow-editor/components/KeyboardZone.test.tsx b/Composer/packages/adaptive-flow/__tests__/adaptive-flow-editor/components/KeyboardZone.test.tsx
similarity index 100%
rename from Composer/packages/extensions/adaptive-flow/__tests__/adaptive-flow-editor/components/KeyboardZone.test.tsx
rename to Composer/packages/adaptive-flow/__tests__/adaptive-flow-editor/components/KeyboardZone.test.tsx
diff --git a/Composer/packages/extensions/adaptive-flow/__tests__/adaptive-flow-editor/constants/ElementAttributes.test.tsx b/Composer/packages/adaptive-flow/__tests__/adaptive-flow-editor/constants/ElementAttributes.test.tsx
similarity index 100%
rename from Composer/packages/extensions/adaptive-flow/__tests__/adaptive-flow-editor/constants/ElementAttributes.test.tsx
rename to Composer/packages/adaptive-flow/__tests__/adaptive-flow-editor/constants/ElementAttributes.test.tsx
diff --git a/Composer/packages/extensions/adaptive-flow/__tests__/adaptive-flow-editor/constants/KeyboardCommandTypes.test.ts b/Composer/packages/adaptive-flow/__tests__/adaptive-flow-editor/constants/KeyboardCommandTypes.test.ts
similarity index 100%
rename from Composer/packages/extensions/adaptive-flow/__tests__/adaptive-flow-editor/constants/KeyboardCommandTypes.test.ts
rename to Composer/packages/adaptive-flow/__tests__/adaptive-flow-editor/constants/KeyboardCommandTypes.test.ts
diff --git a/Composer/packages/extensions/adaptive-flow/__tests__/adaptive-flow-editor/constants/MenuTypes.test.ts b/Composer/packages/adaptive-flow/__tests__/adaptive-flow-editor/constants/MenuTypes.test.ts
similarity index 100%
rename from Composer/packages/extensions/adaptive-flow/__tests__/adaptive-flow-editor/constants/MenuTypes.test.ts
rename to Composer/packages/adaptive-flow/__tests__/adaptive-flow-editor/constants/MenuTypes.test.ts
diff --git a/Composer/packages/extensions/adaptive-flow/__tests__/adaptive-flow-editor/constants/ScreenReaderMessage.test.ts b/Composer/packages/adaptive-flow/__tests__/adaptive-flow-editor/constants/ScreenReaderMessage.test.ts
similarity index 100%
rename from Composer/packages/extensions/adaptive-flow/__tests__/adaptive-flow-editor/constants/ScreenReaderMessage.test.ts
rename to Composer/packages/adaptive-flow/__tests__/adaptive-flow-editor/constants/ScreenReaderMessage.test.ts
diff --git a/Composer/packages/extensions/adaptive-flow/__tests__/adaptive-flow-editor/constants/editorConfig.test.ts b/Composer/packages/adaptive-flow/__tests__/adaptive-flow-editor/constants/editorConfig.test.ts
similarity index 100%
rename from Composer/packages/extensions/adaptive-flow/__tests__/adaptive-flow-editor/constants/editorConfig.test.ts
rename to Composer/packages/adaptive-flow/__tests__/adaptive-flow-editor/constants/editorConfig.test.ts
diff --git a/Composer/packages/extensions/adaptive-flow/__tests__/adaptive-flow-editor/contexts/NodeRendererContext.test.tsx b/Composer/packages/adaptive-flow/__tests__/adaptive-flow-editor/contexts/NodeRendererContext.test.tsx
similarity index 100%
rename from Composer/packages/extensions/adaptive-flow/__tests__/adaptive-flow-editor/contexts/NodeRendererContext.test.tsx
rename to Composer/packages/adaptive-flow/__tests__/adaptive-flow-editor/contexts/NodeRendererContext.test.tsx
diff --git a/Composer/packages/extensions/adaptive-flow/__tests__/adaptive-flow-editor/contexts/SelectionContext.test.tsx b/Composer/packages/adaptive-flow/__tests__/adaptive-flow-editor/contexts/SelectionContext.test.tsx
similarity index 100%
rename from Composer/packages/extensions/adaptive-flow/__tests__/adaptive-flow-editor/contexts/SelectionContext.test.tsx
rename to Composer/packages/adaptive-flow/__tests__/adaptive-flow-editor/contexts/SelectionContext.test.tsx
diff --git a/Composer/packages/extensions/adaptive-flow/__tests__/adaptive-flow-editor/hooks/useEditorEventApi.test.ts b/Composer/packages/adaptive-flow/__tests__/adaptive-flow-editor/hooks/useEditorEventApi.test.ts
similarity index 100%
rename from Composer/packages/extensions/adaptive-flow/__tests__/adaptive-flow-editor/hooks/useEditorEventApi.test.ts
rename to Composer/packages/adaptive-flow/__tests__/adaptive-flow-editor/hooks/useEditorEventApi.test.ts
diff --git a/Composer/packages/extensions/adaptive-flow/__tests__/adaptive-flow-editor/renderers/EdgeMenu.test.tsx b/Composer/packages/adaptive-flow/__tests__/adaptive-flow-editor/renderers/EdgeMenu.test.tsx
similarity index 100%
rename from Composer/packages/extensions/adaptive-flow/__tests__/adaptive-flow-editor/renderers/EdgeMenu.test.tsx
rename to Composer/packages/adaptive-flow/__tests__/adaptive-flow-editor/renderers/EdgeMenu.test.tsx
diff --git a/Composer/packages/extensions/adaptive-flow/__tests__/adaptive-flow-editor/renderers/ElementWrapper.test.tsx b/Composer/packages/adaptive-flow/__tests__/adaptive-flow-editor/renderers/ElementWrapper.test.tsx
similarity index 100%
rename from Composer/packages/extensions/adaptive-flow/__tests__/adaptive-flow-editor/renderers/ElementWrapper.test.tsx
rename to Composer/packages/adaptive-flow/__tests__/adaptive-flow-editor/renderers/ElementWrapper.test.tsx
diff --git a/Composer/packages/extensions/adaptive-flow/__tests__/adaptive-flow-editor/renderers/NodeMenu.test.tsx b/Composer/packages/adaptive-flow/__tests__/adaptive-flow-editor/renderers/NodeMenu.test.tsx
similarity index 100%
rename from Composer/packages/extensions/adaptive-flow/__tests__/adaptive-flow-editor/renderers/NodeMenu.test.tsx
rename to Composer/packages/adaptive-flow/__tests__/adaptive-flow-editor/renderers/NodeMenu.test.tsx
diff --git a/Composer/packages/extensions/adaptive-flow/__tests__/adaptive-flow-editor/renderers/NodeWrapper.test.tsx b/Composer/packages/adaptive-flow/__tests__/adaptive-flow-editor/renderers/NodeWrapper.test.tsx
similarity index 100%
rename from Composer/packages/extensions/adaptive-flow/__tests__/adaptive-flow-editor/renderers/NodeWrapper.test.tsx
rename to Composer/packages/adaptive-flow/__tests__/adaptive-flow-editor/renderers/NodeWrapper.test.tsx
diff --git a/Composer/packages/extensions/adaptive-flow/__tests__/adaptive-flow-editor/stubs/ShellApiStub.ts b/Composer/packages/adaptive-flow/__tests__/adaptive-flow-editor/stubs/ShellApiStub.ts
similarity index 100%
rename from Composer/packages/extensions/adaptive-flow/__tests__/adaptive-flow-editor/stubs/ShellApiStub.ts
rename to Composer/packages/adaptive-flow/__tests__/adaptive-flow-editor/stubs/ShellApiStub.ts
diff --git a/Composer/packages/extensions/adaptive-flow/__tests__/adaptive-flow-editor/utils/NodeIndexGetter.test.ts b/Composer/packages/adaptive-flow/__tests__/adaptive-flow-editor/utils/NodeIndexGetter.test.ts
similarity index 100%
rename from Composer/packages/extensions/adaptive-flow/__tests__/adaptive-flow-editor/utils/NodeIndexGetter.test.ts
rename to Composer/packages/adaptive-flow/__tests__/adaptive-flow-editor/utils/NodeIndexGetter.test.ts
diff --git a/Composer/packages/extensions/adaptive-flow/__tests__/adaptive-flow-editor/utils/calculateRangeSelection.test.ts b/Composer/packages/adaptive-flow/__tests__/adaptive-flow-editor/utils/calculateRangeSelection.test.ts
similarity index 100%
rename from Composer/packages/extensions/adaptive-flow/__tests__/adaptive-flow-editor/utils/calculateRangeSelection.test.ts
rename to Composer/packages/adaptive-flow/__tests__/adaptive-flow-editor/utils/calculateRangeSelection.test.ts
diff --git a/Composer/packages/extensions/adaptive-flow/__tests__/adaptive-flow-editor/utils/cursorTracker/index.test.ts b/Composer/packages/adaptive-flow/__tests__/adaptive-flow-editor/utils/cursorTracker/index.test.ts
similarity index 100%
rename from Composer/packages/extensions/adaptive-flow/__tests__/adaptive-flow-editor/utils/cursorTracker/index.test.ts
rename to Composer/packages/adaptive-flow/__tests__/adaptive-flow-editor/utils/cursorTracker/index.test.ts
diff --git a/Composer/packages/extensions/adaptive-flow/__tests__/adaptive-flow-editor/utils/cursorTracker/type.test.ts b/Composer/packages/adaptive-flow/__tests__/adaptive-flow-editor/utils/cursorTracker/type.test.ts
similarity index 100%
rename from Composer/packages/extensions/adaptive-flow/__tests__/adaptive-flow-editor/utils/cursorTracker/type.test.ts
rename to Composer/packages/adaptive-flow/__tests__/adaptive-flow-editor/utils/cursorTracker/type.test.ts
diff --git a/Composer/packages/extensions/adaptive-flow/__tests__/adaptive-flow-editor/utils/getCustomSchema.test.ts b/Composer/packages/adaptive-flow/__tests__/adaptive-flow-editor/utils/getCustomSchema.test.ts
similarity index 100%
rename from Composer/packages/extensions/adaptive-flow/__tests__/adaptive-flow-editor/utils/getCustomSchema.test.ts
rename to Composer/packages/adaptive-flow/__tests__/adaptive-flow-editor/utils/getCustomSchema.test.ts
diff --git a/Composer/packages/extensions/adaptive-flow/__tests__/adaptive-flow-editor/utils/mapKeyboardCommandToEditorEvent.test.ts b/Composer/packages/adaptive-flow/__tests__/adaptive-flow-editor/utils/mapKeyboardCommandToEditorEvent.test.ts
similarity index 100%
rename from Composer/packages/extensions/adaptive-flow/__tests__/adaptive-flow-editor/utils/mapKeyboardCommandToEditorEvent.test.ts
rename to Composer/packages/adaptive-flow/__tests__/adaptive-flow-editor/utils/mapKeyboardCommandToEditorEvent.test.ts
diff --git a/Composer/packages/extensions/adaptive-flow/__tests__/adaptive-flow-editor/utils/normalizeSelection.test.ts b/Composer/packages/adaptive-flow/__tests__/adaptive-flow-editor/utils/normalizeSelection.test.ts
similarity index 100%
rename from Composer/packages/extensions/adaptive-flow/__tests__/adaptive-flow-editor/utils/normalizeSelection.test.ts
rename to Composer/packages/adaptive-flow/__tests__/adaptive-flow-editor/utils/normalizeSelection.test.ts
diff --git a/Composer/packages/extensions/adaptive-flow/__tests__/adaptive-flow-renderer/adaptive/AdaptiveDialog.test.tsx b/Composer/packages/adaptive-flow/__tests__/adaptive-flow-renderer/adaptive/AdaptiveDialog.test.tsx
similarity index 100%
rename from Composer/packages/extensions/adaptive-flow/__tests__/adaptive-flow-renderer/adaptive/AdaptiveDialog.test.tsx
rename to Composer/packages/adaptive-flow/__tests__/adaptive-flow-renderer/adaptive/AdaptiveDialog.test.tsx
diff --git a/Composer/packages/extensions/adaptive-flow/__tests__/adaptive-flow-renderer/adaptive/AdaptiveTrigger.test.tsx b/Composer/packages/adaptive-flow/__tests__/adaptive-flow-renderer/adaptive/AdaptiveTrigger.test.tsx
similarity index 100%
rename from Composer/packages/extensions/adaptive-flow/__tests__/adaptive-flow-renderer/adaptive/AdaptiveTrigger.test.tsx
rename to Composer/packages/adaptive-flow/__tests__/adaptive-flow-renderer/adaptive/AdaptiveTrigger.test.tsx
diff --git a/Composer/packages/extensions/adaptive-flow/__tests__/adaptive-flow-renderer/components/ArrowLine.test.tsx b/Composer/packages/adaptive-flow/__tests__/adaptive-flow-renderer/components/ArrowLine.test.tsx
similarity index 100%
rename from Composer/packages/extensions/adaptive-flow/__tests__/adaptive-flow-renderer/components/ArrowLine.test.tsx
rename to Composer/packages/adaptive-flow/__tests__/adaptive-flow-renderer/components/ArrowLine.test.tsx
diff --git a/Composer/packages/extensions/adaptive-flow/__tests__/adaptive-flow-renderer/components/Diamond.test.tsx b/Composer/packages/adaptive-flow/__tests__/adaptive-flow-renderer/components/Diamond.test.tsx
similarity index 100%
rename from Composer/packages/extensions/adaptive-flow/__tests__/adaptive-flow-renderer/components/Diamond.test.tsx
rename to Composer/packages/adaptive-flow/__tests__/adaptive-flow-renderer/components/Diamond.test.tsx
diff --git a/Composer/packages/extensions/adaptive-flow/__tests__/adaptive-flow-renderer/components/ElementMeasurer.test.tsx b/Composer/packages/adaptive-flow/__tests__/adaptive-flow-renderer/components/ElementMeasurer.test.tsx
similarity index 100%
rename from Composer/packages/extensions/adaptive-flow/__tests__/adaptive-flow-renderer/components/ElementMeasurer.test.tsx
rename to Composer/packages/adaptive-flow/__tests__/adaptive-flow-renderer/components/ElementMeasurer.test.tsx
diff --git a/Composer/packages/extensions/adaptive-flow/__tests__/adaptive-flow-renderer/components/FlowEdges.test.tsx b/Composer/packages/adaptive-flow/__tests__/adaptive-flow-renderer/components/FlowEdges.test.tsx
similarity index 100%
rename from Composer/packages/extensions/adaptive-flow/__tests__/adaptive-flow-renderer/components/FlowEdges.test.tsx
rename to Composer/packages/adaptive-flow/__tests__/adaptive-flow-renderer/components/FlowEdges.test.tsx
diff --git a/Composer/packages/extensions/adaptive-flow/__tests__/adaptive-flow-renderer/components/IconBrick.test.tsx b/Composer/packages/adaptive-flow/__tests__/adaptive-flow-renderer/components/IconBrick.test.tsx
similarity index 100%
rename from Composer/packages/extensions/adaptive-flow/__tests__/adaptive-flow-renderer/components/IconBrick.test.tsx
rename to Composer/packages/adaptive-flow/__tests__/adaptive-flow-renderer/components/IconBrick.test.tsx
diff --git a/Composer/packages/extensions/adaptive-flow/__tests__/adaptive-flow-renderer/components/LoopIndicator.test.tsx b/Composer/packages/adaptive-flow/__tests__/adaptive-flow-renderer/components/LoopIndicator.test.tsx
similarity index 100%
rename from Composer/packages/extensions/adaptive-flow/__tests__/adaptive-flow-renderer/components/LoopIndicator.test.tsx
rename to Composer/packages/adaptive-flow/__tests__/adaptive-flow-renderer/components/LoopIndicator.test.tsx
diff --git a/Composer/packages/extensions/adaptive-flow/__tests__/adaptive-flow-renderer/components/OffsetContainer.test.tsx b/Composer/packages/adaptive-flow/__tests__/adaptive-flow-renderer/components/OffsetContainer.test.tsx
similarity index 100%
rename from Composer/packages/extensions/adaptive-flow/__tests__/adaptive-flow-renderer/components/OffsetContainer.test.tsx
rename to Composer/packages/adaptive-flow/__tests__/adaptive-flow-renderer/components/OffsetContainer.test.tsx
diff --git a/Composer/packages/extensions/adaptive-flow/__tests__/adaptive-flow-renderer/components/SVGContainer.test.tsx b/Composer/packages/adaptive-flow/__tests__/adaptive-flow-renderer/components/SVGContainer.test.tsx
similarity index 100%
rename from Composer/packages/extensions/adaptive-flow/__tests__/adaptive-flow-renderer/components/SVGContainer.test.tsx
rename to Composer/packages/adaptive-flow/__tests__/adaptive-flow-renderer/components/SVGContainer.test.tsx
diff --git a/Composer/packages/extensions/adaptive-flow/__tests__/adaptive-flow-renderer/configs/builtinSchema.test.ts b/Composer/packages/adaptive-flow/__tests__/adaptive-flow-renderer/configs/builtinSchema.test.ts
similarity index 100%
rename from Composer/packages/extensions/adaptive-flow/__tests__/adaptive-flow-renderer/configs/builtinSchema.test.ts
rename to Composer/packages/adaptive-flow/__tests__/adaptive-flow-renderer/configs/builtinSchema.test.ts
diff --git a/Composer/packages/extensions/adaptive-flow/__tests__/adaptive-flow-renderer/layouters/baseInputLayouter.test.ts b/Composer/packages/adaptive-flow/__tests__/adaptive-flow-renderer/layouters/baseInputLayouter.test.ts
similarity index 100%
rename from Composer/packages/extensions/adaptive-flow/__tests__/adaptive-flow-renderer/layouters/baseInputLayouter.test.ts
rename to Composer/packages/adaptive-flow/__tests__/adaptive-flow-renderer/layouters/baseInputLayouter.test.ts
diff --git a/Composer/packages/extensions/adaptive-flow/__tests__/adaptive-flow-renderer/layouters/calculateNodeBoundary.test.ts b/Composer/packages/adaptive-flow/__tests__/adaptive-flow-renderer/layouters/calculateNodeBoundary.test.ts
similarity index 100%
rename from Composer/packages/extensions/adaptive-flow/__tests__/adaptive-flow-renderer/layouters/calculateNodeBoundary.test.ts
rename to Composer/packages/adaptive-flow/__tests__/adaptive-flow-renderer/layouters/calculateNodeBoundary.test.ts
diff --git a/Composer/packages/extensions/adaptive-flow/__tests__/adaptive-flow-renderer/layouters/foreachLayouter.test.ts b/Composer/packages/adaptive-flow/__tests__/adaptive-flow-renderer/layouters/foreachLayouter.test.ts
similarity index 100%
rename from Composer/packages/extensions/adaptive-flow/__tests__/adaptive-flow-renderer/layouters/foreachLayouter.test.ts
rename to Composer/packages/adaptive-flow/__tests__/adaptive-flow-renderer/layouters/foreachLayouter.test.ts
diff --git a/Composer/packages/extensions/adaptive-flow/__tests__/adaptive-flow-renderer/layouters/ifelseLayouter.test.ts b/Composer/packages/adaptive-flow/__tests__/adaptive-flow-renderer/layouters/ifelseLayouter.test.ts
similarity index 100%
rename from Composer/packages/extensions/adaptive-flow/__tests__/adaptive-flow-renderer/layouters/ifelseLayouter.test.ts
rename to Composer/packages/adaptive-flow/__tests__/adaptive-flow-renderer/layouters/ifelseLayouter.test.ts
diff --git a/Composer/packages/extensions/adaptive-flow/__tests__/adaptive-flow-renderer/layouters/measureJsonBoundary.test.ts b/Composer/packages/adaptive-flow/__tests__/adaptive-flow-renderer/layouters/measureJsonBoundary.test.ts
similarity index 100%
rename from Composer/packages/extensions/adaptive-flow/__tests__/adaptive-flow-renderer/layouters/measureJsonBoundary.test.ts
rename to Composer/packages/adaptive-flow/__tests__/adaptive-flow-renderer/layouters/measureJsonBoundary.test.ts
diff --git a/Composer/packages/extensions/adaptive-flow/__tests__/adaptive-flow-renderer/layouters/sequentialLayouter.test.ts b/Composer/packages/adaptive-flow/__tests__/adaptive-flow-renderer/layouters/sequentialLayouter.test.ts
similarity index 100%
rename from Composer/packages/extensions/adaptive-flow/__tests__/adaptive-flow-renderer/layouters/sequentialLayouter.test.ts
rename to Composer/packages/adaptive-flow/__tests__/adaptive-flow-renderer/layouters/sequentialLayouter.test.ts
diff --git a/Composer/packages/extensions/adaptive-flow/__tests__/adaptive-flow-renderer/layouters/switchCaseLayouter.test.ts b/Composer/packages/adaptive-flow/__tests__/adaptive-flow-renderer/layouters/switchCaseLayouter.test.ts
similarity index 100%
rename from Composer/packages/extensions/adaptive-flow/__tests__/adaptive-flow-renderer/layouters/switchCaseLayouter.test.ts
rename to Composer/packages/adaptive-flow/__tests__/adaptive-flow-renderer/layouters/switchCaseLayouter.test.ts
diff --git a/Composer/packages/extensions/adaptive-flow/__tests__/adaptive-flow-renderer/transformers/ObiTypes.test.ts b/Composer/packages/adaptive-flow/__tests__/adaptive-flow-renderer/transformers/ObiTypes.test.ts
similarity index 100%
rename from Composer/packages/extensions/adaptive-flow/__tests__/adaptive-flow-renderer/transformers/ObiTypes.test.ts
rename to Composer/packages/adaptive-flow/__tests__/adaptive-flow-renderer/transformers/ObiTypes.test.ts
diff --git a/Composer/packages/extensions/adaptive-flow/__tests__/adaptive-flow-renderer/transformers/todoBot.main.json b/Composer/packages/adaptive-flow/__tests__/adaptive-flow-renderer/transformers/todoBot.main.json
similarity index 100%
rename from Composer/packages/extensions/adaptive-flow/__tests__/adaptive-flow-renderer/transformers/todoBot.main.json
rename to Composer/packages/adaptive-flow/__tests__/adaptive-flow-renderer/transformers/todoBot.main.json
diff --git a/Composer/packages/extensions/adaptive-flow/__tests__/adaptive-flow-renderer/transformers/transformForeach.test.ts b/Composer/packages/adaptive-flow/__tests__/adaptive-flow-renderer/transformers/transformForeach.test.ts
similarity index 100%
rename from Composer/packages/extensions/adaptive-flow/__tests__/adaptive-flow-renderer/transformers/transformForeach.test.ts
rename to Composer/packages/adaptive-flow/__tests__/adaptive-flow-renderer/transformers/transformForeach.test.ts
diff --git a/Composer/packages/extensions/adaptive-flow/__tests__/adaptive-flow-renderer/transformers/transformIfCondition.test.ts b/Composer/packages/adaptive-flow/__tests__/adaptive-flow-renderer/transformers/transformIfCondition.test.ts
similarity index 100%
rename from Composer/packages/extensions/adaptive-flow/__tests__/adaptive-flow-renderer/transformers/transformIfCondition.test.ts
rename to Composer/packages/adaptive-flow/__tests__/adaptive-flow-renderer/transformers/transformIfCondition.test.ts
diff --git a/Composer/packages/extensions/adaptive-flow/__tests__/adaptive-flow-renderer/transformers/transformObiRules.test.tsx b/Composer/packages/adaptive-flow/__tests__/adaptive-flow-renderer/transformers/transformObiRules.test.tsx
similarity index 100%
rename from Composer/packages/extensions/adaptive-flow/__tests__/adaptive-flow-renderer/transformers/transformObiRules.test.tsx
rename to Composer/packages/adaptive-flow/__tests__/adaptive-flow-renderer/transformers/transformObiRules.test.tsx
diff --git a/Composer/packages/extensions/adaptive-flow/__tests__/adaptive-flow-renderer/transformers/transformRootDialog.test.ts b/Composer/packages/adaptive-flow/__tests__/adaptive-flow-renderer/transformers/transformRootDialog.test.ts
similarity index 100%
rename from Composer/packages/extensions/adaptive-flow/__tests__/adaptive-flow-renderer/transformers/transformRootDialog.test.ts
rename to Composer/packages/adaptive-flow/__tests__/adaptive-flow-renderer/transformers/transformRootDialog.test.ts
diff --git a/Composer/packages/extensions/adaptive-flow/__tests__/adaptive-flow-renderer/transformers/transformStepGroup.test.ts b/Composer/packages/adaptive-flow/__tests__/adaptive-flow-renderer/transformers/transformStepGroup.test.ts
similarity index 100%
rename from Composer/packages/extensions/adaptive-flow/__tests__/adaptive-flow-renderer/transformers/transformStepGroup.test.ts
rename to Composer/packages/adaptive-flow/__tests__/adaptive-flow-renderer/transformers/transformStepGroup.test.ts
diff --git a/Composer/packages/extensions/adaptive-flow/__tests__/adaptive-flow-renderer/transformers/transformSwitchCondition.test.ts b/Composer/packages/adaptive-flow/__tests__/adaptive-flow-renderer/transformers/transformSwitchCondition.test.ts
similarity index 100%
rename from Composer/packages/extensions/adaptive-flow/__tests__/adaptive-flow-renderer/transformers/transformSwitchCondition.test.ts
rename to Composer/packages/adaptive-flow/__tests__/adaptive-flow-renderer/transformers/transformSwitchCondition.test.ts
diff --git a/Composer/packages/extensions/adaptive-flow/__tests__/adaptive-flow-renderer/utils/DesignerCache.test.ts b/Composer/packages/adaptive-flow/__tests__/adaptive-flow-renderer/utils/DesignerCache.test.ts
similarity index 100%
rename from Composer/packages/extensions/adaptive-flow/__tests__/adaptive-flow-renderer/utils/DesignerCache.test.ts
rename to Composer/packages/adaptive-flow/__tests__/adaptive-flow-renderer/utils/DesignerCache.test.ts
diff --git a/Composer/packages/extensions/adaptive-flow/__tests__/adaptive-flow-renderer/utils/EdgeUtil.test.tsx b/Composer/packages/adaptive-flow/__tests__/adaptive-flow-renderer/utils/EdgeUtil.test.tsx
similarity index 100%
rename from Composer/packages/extensions/adaptive-flow/__tests__/adaptive-flow-renderer/utils/EdgeUtil.test.tsx
rename to Composer/packages/adaptive-flow/__tests__/adaptive-flow-renderer/utils/EdgeUtil.test.tsx
diff --git a/Composer/packages/extensions/adaptive-flow/__tests__/adaptive-flow-renderer/utils/widgetRenderer.test.tsx b/Composer/packages/adaptive-flow/__tests__/adaptive-flow-renderer/utils/widgetRenderer.test.tsx
similarity index 100%
rename from Composer/packages/extensions/adaptive-flow/__tests__/adaptive-flow-renderer/utils/widgetRenderer.test.tsx
rename to Composer/packages/adaptive-flow/__tests__/adaptive-flow-renderer/utils/widgetRenderer.test.tsx
diff --git a/Composer/packages/extensions/adaptive-flow/__tests__/adaptive-flow-renderer/widgets/ActionCard.test.tsx b/Composer/packages/adaptive-flow/__tests__/adaptive-flow-renderer/widgets/ActionCard.test.tsx
similarity index 100%
rename from Composer/packages/extensions/adaptive-flow/__tests__/adaptive-flow-renderer/widgets/ActionCard.test.tsx
rename to Composer/packages/adaptive-flow/__tests__/adaptive-flow-renderer/widgets/ActionCard.test.tsx
diff --git a/Composer/packages/extensions/adaptive-flow/__tests__/adaptive-flow-renderer/widgets/DialogRef.test.tsx b/Composer/packages/adaptive-flow/__tests__/adaptive-flow-renderer/widgets/DialogRef.test.tsx
similarity index 100%
rename from Composer/packages/extensions/adaptive-flow/__tests__/adaptive-flow-renderer/widgets/DialogRef.test.tsx
rename to Composer/packages/adaptive-flow/__tests__/adaptive-flow-renderer/widgets/DialogRef.test.tsx
diff --git a/Composer/packages/extensions/adaptive-flow/__tests__/adaptive-flow-renderer/widgets/ForeachWidget.test.tsx b/Composer/packages/adaptive-flow/__tests__/adaptive-flow-renderer/widgets/ForeachWidget.test.tsx
similarity index 100%
rename from Composer/packages/extensions/adaptive-flow/__tests__/adaptive-flow-renderer/widgets/ForeachWidget.test.tsx
rename to Composer/packages/adaptive-flow/__tests__/adaptive-flow-renderer/widgets/ForeachWidget.test.tsx
diff --git a/Composer/packages/extensions/adaptive-flow/__tests__/adaptive-flow-renderer/widgets/IfConditionWidget.test.tsx b/Composer/packages/adaptive-flow/__tests__/adaptive-flow-renderer/widgets/IfConditionWidget.test.tsx
similarity index 100%
rename from Composer/packages/extensions/adaptive-flow/__tests__/adaptive-flow-renderer/widgets/IfConditionWidget.test.tsx
rename to Composer/packages/adaptive-flow/__tests__/adaptive-flow-renderer/widgets/IfConditionWidget.test.tsx
diff --git a/Composer/packages/extensions/adaptive-flow/__tests__/adaptive-flow-renderer/widgets/PromptWidget.test.tsx b/Composer/packages/adaptive-flow/__tests__/adaptive-flow-renderer/widgets/PromptWidget.test.tsx
similarity index 100%
rename from Composer/packages/extensions/adaptive-flow/__tests__/adaptive-flow-renderer/widgets/PromptWidget.test.tsx
rename to Composer/packages/adaptive-flow/__tests__/adaptive-flow-renderer/widgets/PromptWidget.test.tsx
diff --git a/Composer/packages/extensions/adaptive-flow/__tests__/adaptive-flow-renderer/widgets/SwitchConditionWidget.test.tsx b/Composer/packages/adaptive-flow/__tests__/adaptive-flow-renderer/widgets/SwitchConditionWidget.test.tsx
similarity index 100%
rename from Composer/packages/extensions/adaptive-flow/__tests__/adaptive-flow-renderer/widgets/SwitchConditionWidget.test.tsx
rename to Composer/packages/adaptive-flow/__tests__/adaptive-flow-renderer/widgets/SwitchConditionWidget.test.tsx
diff --git a/Composer/packages/extensions/adaptive-flow/__tests__/adaptive-flow-renderer/widgets/icon.test.tsx b/Composer/packages/adaptive-flow/__tests__/adaptive-flow-renderer/widgets/icon.test.tsx
similarity index 100%
rename from Composer/packages/extensions/adaptive-flow/__tests__/adaptive-flow-renderer/widgets/icon.test.tsx
rename to Composer/packages/adaptive-flow/__tests__/adaptive-flow-renderer/widgets/icon.test.tsx
diff --git a/Composer/packages/extensions/adaptive-flow/demo/index.html b/Composer/packages/adaptive-flow/demo/index.html
similarity index 100%
rename from Composer/packages/extensions/adaptive-flow/demo/index.html
rename to Composer/packages/adaptive-flow/demo/index.html
diff --git a/Composer/packages/extensions/adaptive-flow/demo/readme.md b/Composer/packages/adaptive-flow/demo/readme.md
similarity index 100%
rename from Composer/packages/extensions/adaptive-flow/demo/readme.md
rename to Composer/packages/adaptive-flow/demo/readme.md
diff --git a/Composer/packages/extensions/adaptive-flow/demo/src/components/json-block/index.js b/Composer/packages/adaptive-flow/demo/src/components/json-block/index.js
similarity index 100%
rename from Composer/packages/extensions/adaptive-flow/demo/src/components/json-block/index.js
rename to Composer/packages/adaptive-flow/demo/src/components/json-block/index.js
diff --git a/Composer/packages/extensions/adaptive-flow/demo/src/index.css b/Composer/packages/adaptive-flow/demo/src/index.css
similarity index 100%
rename from Composer/packages/extensions/adaptive-flow/demo/src/index.css
rename to Composer/packages/adaptive-flow/demo/src/index.css
diff --git a/Composer/packages/extensions/adaptive-flow/demo/src/index.js b/Composer/packages/adaptive-flow/demo/src/index.js
similarity index 100%
rename from Composer/packages/extensions/adaptive-flow/demo/src/index.js
rename to Composer/packages/adaptive-flow/demo/src/index.js
diff --git a/Composer/packages/extensions/adaptive-flow/demo/src/samples/index.js b/Composer/packages/adaptive-flow/demo/src/samples/index.js
similarity index 100%
rename from Composer/packages/extensions/adaptive-flow/demo/src/samples/index.js
rename to Composer/packages/adaptive-flow/demo/src/samples/index.js
diff --git a/Composer/packages/extensions/adaptive-flow/demo/src/samples/todo/AddToDo.json b/Composer/packages/adaptive-flow/demo/src/samples/todo/AddToDo.json
similarity index 100%
rename from Composer/packages/extensions/adaptive-flow/demo/src/samples/todo/AddToDo.json
rename to Composer/packages/adaptive-flow/demo/src/samples/todo/AddToDo.json
diff --git a/Composer/packages/extensions/adaptive-flow/demo/src/samples/todo/ClearToDos.json b/Composer/packages/adaptive-flow/demo/src/samples/todo/ClearToDos.json
similarity index 100%
rename from Composer/packages/extensions/adaptive-flow/demo/src/samples/todo/ClearToDos.json
rename to Composer/packages/adaptive-flow/demo/src/samples/todo/ClearToDos.json
diff --git a/Composer/packages/extensions/adaptive-flow/demo/src/samples/todo/DeleteToDo.json b/Composer/packages/adaptive-flow/demo/src/samples/todo/DeleteToDo.json
similarity index 100%
rename from Composer/packages/extensions/adaptive-flow/demo/src/samples/todo/DeleteToDo.json
rename to Composer/packages/adaptive-flow/demo/src/samples/todo/DeleteToDo.json
diff --git a/Composer/packages/extensions/adaptive-flow/demo/src/samples/todo/ShowToDos.json b/Composer/packages/adaptive-flow/demo/src/samples/todo/ShowToDos.json
similarity index 100%
rename from Composer/packages/extensions/adaptive-flow/demo/src/samples/todo/ShowToDos.json
rename to Composer/packages/adaptive-flow/demo/src/samples/todo/ShowToDos.json
diff --git a/Composer/packages/extensions/adaptive-flow/demo/src/samples/todo/ToDoBot.main.json b/Composer/packages/adaptive-flow/demo/src/samples/todo/ToDoBot.main.json
similarity index 100%
rename from Composer/packages/extensions/adaptive-flow/demo/src/samples/todo/ToDoBot.main.json
rename to Composer/packages/adaptive-flow/demo/src/samples/todo/ToDoBot.main.json
diff --git a/Composer/packages/extensions/adaptive-flow/demo/src/stories/EventsEditorDemo.js b/Composer/packages/adaptive-flow/demo/src/stories/EventsEditorDemo.js
similarity index 100%
rename from Composer/packages/extensions/adaptive-flow/demo/src/stories/EventsEditorDemo.js
rename to Composer/packages/adaptive-flow/demo/src/stories/EventsEditorDemo.js
diff --git a/Composer/packages/extensions/adaptive-flow/demo/src/stories/StepEditorDemo.css b/Composer/packages/adaptive-flow/demo/src/stories/StepEditorDemo.css
similarity index 100%
rename from Composer/packages/extensions/adaptive-flow/demo/src/stories/StepEditorDemo.css
rename to Composer/packages/adaptive-flow/demo/src/stories/StepEditorDemo.css
diff --git a/Composer/packages/extensions/adaptive-flow/demo/src/stories/StepEditorDemo.js b/Composer/packages/adaptive-flow/demo/src/stories/StepEditorDemo.js
similarity index 100%
rename from Composer/packages/extensions/adaptive-flow/demo/src/stories/StepEditorDemo.js
rename to Composer/packages/adaptive-flow/demo/src/stories/StepEditorDemo.js
diff --git a/Composer/packages/extensions/adaptive-flow/demo/src/stories/VisualEditorDemo.css b/Composer/packages/adaptive-flow/demo/src/stories/VisualEditorDemo.css
similarity index 100%
rename from Composer/packages/extensions/adaptive-flow/demo/src/stories/VisualEditorDemo.css
rename to Composer/packages/adaptive-flow/demo/src/stories/VisualEditorDemo.css
diff --git a/Composer/packages/extensions/adaptive-flow/demo/src/stories/VisualEditorDemo.js b/Composer/packages/adaptive-flow/demo/src/stories/VisualEditorDemo.js
similarity index 100%
rename from Composer/packages/extensions/adaptive-flow/demo/src/stories/VisualEditorDemo.js
rename to Composer/packages/adaptive-flow/demo/src/stories/VisualEditorDemo.js
diff --git a/Composer/packages/extensions/adaptive-flow/demo/src/stories/VisualSDKDemo.js b/Composer/packages/adaptive-flow/demo/src/stories/VisualSDKDemo.js
similarity index 100%
rename from Composer/packages/extensions/adaptive-flow/demo/src/stories/VisualSDKDemo.js
rename to Composer/packages/adaptive-flow/demo/src/stories/VisualSDKDemo.js
diff --git a/Composer/packages/extensions/adaptive-flow/demo/src/stories/story.css b/Composer/packages/adaptive-flow/demo/src/stories/story.css
similarity index 100%
rename from Composer/packages/extensions/adaptive-flow/demo/src/stories/story.css
rename to Composer/packages/adaptive-flow/demo/src/stories/story.css
diff --git a/Composer/packages/extensions/adaptive-flow/demo/tsconfig.json b/Composer/packages/adaptive-flow/demo/tsconfig.json
similarity index 100%
rename from Composer/packages/extensions/adaptive-flow/demo/tsconfig.json
rename to Composer/packages/adaptive-flow/demo/tsconfig.json
diff --git a/Composer/packages/extensions/adaptive-flow/demo/webpack.config.demo.js b/Composer/packages/adaptive-flow/demo/webpack.config.demo.js
similarity index 100%
rename from Composer/packages/extensions/adaptive-flow/demo/webpack.config.demo.js
rename to Composer/packages/adaptive-flow/demo/webpack.config.demo.js
diff --git a/Composer/packages/extensions/adaptive-flow/jest.config.js b/Composer/packages/adaptive-flow/jest.config.js
similarity index 100%
rename from Composer/packages/extensions/adaptive-flow/jest.config.js
rename to Composer/packages/adaptive-flow/jest.config.js
diff --git a/Composer/packages/extensions/adaptive-flow/package.json b/Composer/packages/adaptive-flow/package.json
similarity index 100%
rename from Composer/packages/extensions/adaptive-flow/package.json
rename to Composer/packages/adaptive-flow/package.json
diff --git a/Composer/packages/extensions/adaptive-flow/src/adaptive-flow-editor/AdaptiveFlowEditor.tsx b/Composer/packages/adaptive-flow/src/adaptive-flow-editor/AdaptiveFlowEditor.tsx
similarity index 100%
rename from Composer/packages/extensions/adaptive-flow/src/adaptive-flow-editor/AdaptiveFlowEditor.tsx
rename to Composer/packages/adaptive-flow/src/adaptive-flow-editor/AdaptiveFlowEditor.tsx
diff --git a/Composer/packages/extensions/adaptive-flow/src/adaptive-flow-editor/components/IconMenu.tsx b/Composer/packages/adaptive-flow/src/adaptive-flow-editor/components/IconMenu.tsx
similarity index 100%
rename from Composer/packages/extensions/adaptive-flow/src/adaptive-flow-editor/components/IconMenu.tsx
rename to Composer/packages/adaptive-flow/src/adaptive-flow-editor/components/IconMenu.tsx
diff --git a/Composer/packages/extensions/adaptive-flow/src/adaptive-flow-editor/components/KeyboardZone.ts b/Composer/packages/adaptive-flow/src/adaptive-flow-editor/components/KeyboardZone.ts
similarity index 100%
rename from Composer/packages/extensions/adaptive-flow/src/adaptive-flow-editor/components/KeyboardZone.ts
rename to Composer/packages/adaptive-flow/src/adaptive-flow-editor/components/KeyboardZone.ts
diff --git a/Composer/packages/extensions/adaptive-flow/src/adaptive-flow-editor/constants/ElementAttributes.ts b/Composer/packages/adaptive-flow/src/adaptive-flow-editor/constants/ElementAttributes.ts
similarity index 100%
rename from Composer/packages/extensions/adaptive-flow/src/adaptive-flow-editor/constants/ElementAttributes.ts
rename to Composer/packages/adaptive-flow/src/adaptive-flow-editor/constants/ElementAttributes.ts
diff --git a/Composer/packages/extensions/adaptive-flow/src/adaptive-flow-editor/constants/KeyboardCommandTypes.ts b/Composer/packages/adaptive-flow/src/adaptive-flow-editor/constants/KeyboardCommandTypes.ts
similarity index 100%
rename from Composer/packages/extensions/adaptive-flow/src/adaptive-flow-editor/constants/KeyboardCommandTypes.ts
rename to Composer/packages/adaptive-flow/src/adaptive-flow-editor/constants/KeyboardCommandTypes.ts
diff --git a/Composer/packages/extensions/adaptive-flow/src/adaptive-flow-editor/constants/MenuTypes.ts b/Composer/packages/adaptive-flow/src/adaptive-flow-editor/constants/MenuTypes.ts
similarity index 100%
rename from Composer/packages/extensions/adaptive-flow/src/adaptive-flow-editor/constants/MenuTypes.ts
rename to Composer/packages/adaptive-flow/src/adaptive-flow-editor/constants/MenuTypes.ts
diff --git a/Composer/packages/extensions/adaptive-flow/src/adaptive-flow-editor/constants/ScreenReaderMessage.ts b/Composer/packages/adaptive-flow/src/adaptive-flow-editor/constants/ScreenReaderMessage.ts
similarity index 100%
rename from Composer/packages/extensions/adaptive-flow/src/adaptive-flow-editor/constants/ScreenReaderMessage.ts
rename to Composer/packages/adaptive-flow/src/adaptive-flow-editor/constants/ScreenReaderMessage.ts
diff --git a/Composer/packages/extensions/adaptive-flow/src/adaptive-flow-editor/constants/editorConfig.ts b/Composer/packages/adaptive-flow/src/adaptive-flow-editor/constants/editorConfig.ts
similarity index 100%
rename from Composer/packages/extensions/adaptive-flow/src/adaptive-flow-editor/constants/editorConfig.ts
rename to Composer/packages/adaptive-flow/src/adaptive-flow-editor/constants/editorConfig.ts
diff --git a/Composer/packages/extensions/adaptive-flow/src/adaptive-flow-editor/contexts/NodeRendererContext.ts b/Composer/packages/adaptive-flow/src/adaptive-flow-editor/contexts/NodeRendererContext.ts
similarity index 100%
rename from Composer/packages/extensions/adaptive-flow/src/adaptive-flow-editor/contexts/NodeRendererContext.ts
rename to Composer/packages/adaptive-flow/src/adaptive-flow-editor/contexts/NodeRendererContext.ts
diff --git a/Composer/packages/extensions/adaptive-flow/src/adaptive-flow-editor/contexts/SelectionContext.ts b/Composer/packages/adaptive-flow/src/adaptive-flow-editor/contexts/SelectionContext.ts
similarity index 100%
rename from Composer/packages/extensions/adaptive-flow/src/adaptive-flow-editor/contexts/SelectionContext.ts
rename to Composer/packages/adaptive-flow/src/adaptive-flow-editor/contexts/SelectionContext.ts
diff --git a/Composer/packages/extensions/adaptive-flow/src/adaptive-flow-editor/contexts/SelfHostContext.ts b/Composer/packages/adaptive-flow/src/adaptive-flow-editor/contexts/SelfHostContext.ts
similarity index 100%
rename from Composer/packages/extensions/adaptive-flow/src/adaptive-flow-editor/contexts/SelfHostContext.ts
rename to Composer/packages/adaptive-flow/src/adaptive-flow-editor/contexts/SelfHostContext.ts
diff --git a/Composer/packages/extensions/adaptive-flow/src/adaptive-flow-editor/hooks/useEditorEventApi.ts b/Composer/packages/adaptive-flow/src/adaptive-flow-editor/hooks/useEditorEventApi.ts
similarity index 100%
rename from Composer/packages/extensions/adaptive-flow/src/adaptive-flow-editor/hooks/useEditorEventApi.ts
rename to Composer/packages/adaptive-flow/src/adaptive-flow-editor/hooks/useEditorEventApi.ts
diff --git a/Composer/packages/extensions/adaptive-flow/src/adaptive-flow-editor/hooks/useFlowUIOptions.ts b/Composer/packages/adaptive-flow/src/adaptive-flow-editor/hooks/useFlowUIOptions.ts
similarity index 100%
rename from Composer/packages/extensions/adaptive-flow/src/adaptive-flow-editor/hooks/useFlowUIOptions.ts
rename to Composer/packages/adaptive-flow/src/adaptive-flow-editor/hooks/useFlowUIOptions.ts
diff --git a/Composer/packages/extensions/adaptive-flow/src/adaptive-flow-editor/hooks/useSelectionEffect.ts b/Composer/packages/adaptive-flow/src/adaptive-flow-editor/hooks/useSelectionEffect.ts
similarity index 100%
rename from Composer/packages/extensions/adaptive-flow/src/adaptive-flow-editor/hooks/useSelectionEffect.ts
rename to Composer/packages/adaptive-flow/src/adaptive-flow-editor/hooks/useSelectionEffect.ts
diff --git a/Composer/packages/extensions/adaptive-flow/src/adaptive-flow-editor/renderers/EdgeMenu/EdgeMenu.tsx b/Composer/packages/adaptive-flow/src/adaptive-flow-editor/renderers/EdgeMenu/EdgeMenu.tsx
similarity index 100%
rename from Composer/packages/extensions/adaptive-flow/src/adaptive-flow-editor/renderers/EdgeMenu/EdgeMenu.tsx
rename to Composer/packages/adaptive-flow/src/adaptive-flow-editor/renderers/EdgeMenu/EdgeMenu.tsx
diff --git a/Composer/packages/extensions/adaptive-flow/src/adaptive-flow-editor/renderers/EdgeMenu/createSchemaMenu.tsx b/Composer/packages/adaptive-flow/src/adaptive-flow-editor/renderers/EdgeMenu/createSchemaMenu.tsx
similarity index 100%
rename from Composer/packages/extensions/adaptive-flow/src/adaptive-flow-editor/renderers/EdgeMenu/createSchemaMenu.tsx
rename to Composer/packages/adaptive-flow/src/adaptive-flow-editor/renderers/EdgeMenu/createSchemaMenu.tsx
diff --git a/Composer/packages/extensions/adaptive-flow/src/adaptive-flow-editor/renderers/EdgeMenu/defaultMenuOrder.ts b/Composer/packages/adaptive-flow/src/adaptive-flow-editor/renderers/EdgeMenu/defaultMenuOrder.ts
similarity index 100%
rename from Composer/packages/extensions/adaptive-flow/src/adaptive-flow-editor/renderers/EdgeMenu/defaultMenuOrder.ts
rename to Composer/packages/adaptive-flow/src/adaptive-flow-editor/renderers/EdgeMenu/defaultMenuOrder.ts
diff --git a/Composer/packages/extensions/adaptive-flow/src/adaptive-flow-editor/renderers/EdgeMenu/index.tsx b/Composer/packages/adaptive-flow/src/adaptive-flow-editor/renderers/EdgeMenu/index.tsx
similarity index 100%
rename from Composer/packages/extensions/adaptive-flow/src/adaptive-flow-editor/renderers/EdgeMenu/index.tsx
rename to Composer/packages/adaptive-flow/src/adaptive-flow-editor/renderers/EdgeMenu/index.tsx
diff --git a/Composer/packages/extensions/adaptive-flow/src/adaptive-flow-editor/renderers/ElementWrapper.tsx b/Composer/packages/adaptive-flow/src/adaptive-flow-editor/renderers/ElementWrapper.tsx
similarity index 100%
rename from Composer/packages/extensions/adaptive-flow/src/adaptive-flow-editor/renderers/ElementWrapper.tsx
rename to Composer/packages/adaptive-flow/src/adaptive-flow-editor/renderers/ElementWrapper.tsx
diff --git a/Composer/packages/extensions/adaptive-flow/src/adaptive-flow-editor/renderers/NodeMenu.tsx b/Composer/packages/adaptive-flow/src/adaptive-flow-editor/renderers/NodeMenu.tsx
similarity index 100%
rename from Composer/packages/extensions/adaptive-flow/src/adaptive-flow-editor/renderers/NodeMenu.tsx
rename to Composer/packages/adaptive-flow/src/adaptive-flow-editor/renderers/NodeMenu.tsx
diff --git a/Composer/packages/extensions/adaptive-flow/src/adaptive-flow-editor/renderers/NodeWrapper.tsx b/Composer/packages/adaptive-flow/src/adaptive-flow-editor/renderers/NodeWrapper.tsx
similarity index 100%
rename from Composer/packages/extensions/adaptive-flow/src/adaptive-flow-editor/renderers/NodeWrapper.tsx
rename to Composer/packages/adaptive-flow/src/adaptive-flow-editor/renderers/NodeWrapper.tsx
diff --git a/Composer/packages/extensions/adaptive-flow/src/adaptive-flow-editor/renderers/index.tsx b/Composer/packages/adaptive-flow/src/adaptive-flow-editor/renderers/index.tsx
similarity index 100%
rename from Composer/packages/extensions/adaptive-flow/src/adaptive-flow-editor/renderers/index.tsx
rename to Composer/packages/adaptive-flow/src/adaptive-flow-editor/renderers/index.tsx
diff --git a/Composer/packages/extensions/adaptive-flow/src/adaptive-flow-editor/utils/NodeIndexGetter.ts b/Composer/packages/adaptive-flow/src/adaptive-flow-editor/utils/NodeIndexGetter.ts
similarity index 100%
rename from Composer/packages/extensions/adaptive-flow/src/adaptive-flow-editor/utils/NodeIndexGetter.ts
rename to Composer/packages/adaptive-flow/src/adaptive-flow-editor/utils/NodeIndexGetter.ts
diff --git a/Composer/packages/extensions/adaptive-flow/src/adaptive-flow-editor/utils/calculateRangeSelection.ts b/Composer/packages/adaptive-flow/src/adaptive-flow-editor/utils/calculateRangeSelection.ts
similarity index 100%
rename from Composer/packages/extensions/adaptive-flow/src/adaptive-flow-editor/utils/calculateRangeSelection.ts
rename to Composer/packages/adaptive-flow/src/adaptive-flow-editor/utils/calculateRangeSelection.ts
diff --git a/Composer/packages/extensions/adaptive-flow/src/adaptive-flow-editor/utils/cursorTracker/arrowMove.ts b/Composer/packages/adaptive-flow/src/adaptive-flow-editor/utils/cursorTracker/arrowMove.ts
similarity index 100%
rename from Composer/packages/extensions/adaptive-flow/src/adaptive-flow-editor/utils/cursorTracker/arrowMove.ts
rename to Composer/packages/adaptive-flow/src/adaptive-flow-editor/utils/cursorTracker/arrowMove.ts
diff --git a/Composer/packages/extensions/adaptive-flow/src/adaptive-flow-editor/utils/cursorTracker/calculate/calculateBySchema.ts b/Composer/packages/adaptive-flow/src/adaptive-flow-editor/utils/cursorTracker/calculate/calculateBySchema.ts
similarity index 100%
rename from Composer/packages/extensions/adaptive-flow/src/adaptive-flow-editor/utils/cursorTracker/calculate/calculateBySchema.ts
rename to Composer/packages/adaptive-flow/src/adaptive-flow-editor/utils/cursorTracker/calculate/calculateBySchema.ts
diff --git a/Composer/packages/extensions/adaptive-flow/src/adaptive-flow-editor/utils/cursorTracker/calculate/calculateByVector.ts b/Composer/packages/adaptive-flow/src/adaptive-flow-editor/utils/cursorTracker/calculate/calculateByVector.ts
similarity index 100%
rename from Composer/packages/extensions/adaptive-flow/src/adaptive-flow-editor/utils/cursorTracker/calculate/calculateByVector.ts
rename to Composer/packages/adaptive-flow/src/adaptive-flow-editor/utils/cursorTracker/calculate/calculateByVector.ts
diff --git a/Composer/packages/extensions/adaptive-flow/src/adaptive-flow-editor/utils/cursorTracker/index.ts b/Composer/packages/adaptive-flow/src/adaptive-flow-editor/utils/cursorTracker/index.ts
similarity index 100%
rename from Composer/packages/extensions/adaptive-flow/src/adaptive-flow-editor/utils/cursorTracker/index.ts
rename to Composer/packages/adaptive-flow/src/adaptive-flow-editor/utils/cursorTracker/index.ts
diff --git a/Composer/packages/extensions/adaptive-flow/src/adaptive-flow-editor/utils/cursorTracker/locateElement.ts b/Composer/packages/adaptive-flow/src/adaptive-flow-editor/utils/cursorTracker/locateElement.ts
similarity index 100%
rename from Composer/packages/extensions/adaptive-flow/src/adaptive-flow-editor/utils/cursorTracker/locateElement.ts
rename to Composer/packages/adaptive-flow/src/adaptive-flow-editor/utils/cursorTracker/locateElement.ts
diff --git a/Composer/packages/extensions/adaptive-flow/src/adaptive-flow-editor/utils/cursorTracker/tabMove.ts b/Composer/packages/adaptive-flow/src/adaptive-flow-editor/utils/cursorTracker/tabMove.ts
similarity index 100%
rename from Composer/packages/extensions/adaptive-flow/src/adaptive-flow-editor/utils/cursorTracker/tabMove.ts
rename to Composer/packages/adaptive-flow/src/adaptive-flow-editor/utils/cursorTracker/tabMove.ts
diff --git a/Composer/packages/extensions/adaptive-flow/src/adaptive-flow-editor/utils/cursorTracker/type.ts b/Composer/packages/adaptive-flow/src/adaptive-flow-editor/utils/cursorTracker/type.ts
similarity index 100%
rename from Composer/packages/extensions/adaptive-flow/src/adaptive-flow-editor/utils/cursorTracker/type.ts
rename to Composer/packages/adaptive-flow/src/adaptive-flow-editor/utils/cursorTracker/type.ts
diff --git a/Composer/packages/extensions/adaptive-flow/src/adaptive-flow-editor/utils/getCustomSchema.ts b/Composer/packages/adaptive-flow/src/adaptive-flow-editor/utils/getCustomSchema.ts
similarity index 100%
rename from Composer/packages/extensions/adaptive-flow/src/adaptive-flow-editor/utils/getCustomSchema.ts
rename to Composer/packages/adaptive-flow/src/adaptive-flow-editor/utils/getCustomSchema.ts
diff --git a/Composer/packages/extensions/adaptive-flow/src/adaptive-flow-editor/utils/mapKeyboardCommandToEditorEvent.ts b/Composer/packages/adaptive-flow/src/adaptive-flow-editor/utils/mapKeyboardCommandToEditorEvent.ts
similarity index 100%
rename from Composer/packages/extensions/adaptive-flow/src/adaptive-flow-editor/utils/mapKeyboardCommandToEditorEvent.ts
rename to Composer/packages/adaptive-flow/src/adaptive-flow-editor/utils/mapKeyboardCommandToEditorEvent.ts
diff --git a/Composer/packages/extensions/adaptive-flow/src/adaptive-flow-editor/utils/normalizeSelection.ts b/Composer/packages/adaptive-flow/src/adaptive-flow-editor/utils/normalizeSelection.ts
similarity index 100%
rename from Composer/packages/extensions/adaptive-flow/src/adaptive-flow-editor/utils/normalizeSelection.ts
rename to Composer/packages/adaptive-flow/src/adaptive-flow-editor/utils/normalizeSelection.ts
diff --git a/Composer/packages/extensions/adaptive-flow/src/adaptive-flow-editor/utils/scrollNodeIntoView.ts b/Composer/packages/adaptive-flow/src/adaptive-flow-editor/utils/scrollNodeIntoView.ts
similarity index 100%
rename from Composer/packages/extensions/adaptive-flow/src/adaptive-flow-editor/utils/scrollNodeIntoView.ts
rename to Composer/packages/adaptive-flow/src/adaptive-flow-editor/utils/scrollNodeIntoView.ts
diff --git a/Composer/packages/extensions/adaptive-flow/src/adaptive-flow-renderer/adaptive/AdaptiveDialog.tsx b/Composer/packages/adaptive-flow/src/adaptive-flow-renderer/adaptive/AdaptiveDialog.tsx
similarity index 100%
rename from Composer/packages/extensions/adaptive-flow/src/adaptive-flow-renderer/adaptive/AdaptiveDialog.tsx
rename to Composer/packages/adaptive-flow/src/adaptive-flow-renderer/adaptive/AdaptiveDialog.tsx
diff --git a/Composer/packages/extensions/adaptive-flow/src/adaptive-flow-renderer/adaptive/AdaptiveTrigger.tsx b/Composer/packages/adaptive-flow/src/adaptive-flow-renderer/adaptive/AdaptiveTrigger.tsx
similarity index 100%
rename from Composer/packages/extensions/adaptive-flow/src/adaptive-flow-renderer/adaptive/AdaptiveTrigger.tsx
rename to Composer/packages/adaptive-flow/src/adaptive-flow-renderer/adaptive/AdaptiveTrigger.tsx
diff --git a/Composer/packages/extensions/adaptive-flow/src/adaptive-flow-renderer/components/ArrowLine.tsx b/Composer/packages/adaptive-flow/src/adaptive-flow-renderer/components/ArrowLine.tsx
similarity index 100%
rename from Composer/packages/extensions/adaptive-flow/src/adaptive-flow-renderer/components/ArrowLine.tsx
rename to Composer/packages/adaptive-flow/src/adaptive-flow-renderer/components/ArrowLine.tsx
diff --git a/Composer/packages/extensions/adaptive-flow/src/adaptive-flow-renderer/components/Diamond.tsx b/Composer/packages/adaptive-flow/src/adaptive-flow-renderer/components/Diamond.tsx
similarity index 100%
rename from Composer/packages/extensions/adaptive-flow/src/adaptive-flow-renderer/components/Diamond.tsx
rename to Composer/packages/adaptive-flow/src/adaptive-flow-renderer/components/Diamond.tsx
diff --git a/Composer/packages/extensions/adaptive-flow/src/adaptive-flow-renderer/components/ElementMeasurer.tsx b/Composer/packages/adaptive-flow/src/adaptive-flow-renderer/components/ElementMeasurer.tsx
similarity index 100%
rename from Composer/packages/extensions/adaptive-flow/src/adaptive-flow-renderer/components/ElementMeasurer.tsx
rename to Composer/packages/adaptive-flow/src/adaptive-flow-renderer/components/ElementMeasurer.tsx
diff --git a/Composer/packages/extensions/adaptive-flow/src/adaptive-flow-renderer/components/FlowEdges.tsx b/Composer/packages/adaptive-flow/src/adaptive-flow-renderer/components/FlowEdges.tsx
similarity index 100%
rename from Composer/packages/extensions/adaptive-flow/src/adaptive-flow-renderer/components/FlowEdges.tsx
rename to Composer/packages/adaptive-flow/src/adaptive-flow-renderer/components/FlowEdges.tsx
diff --git a/Composer/packages/extensions/adaptive-flow/src/adaptive-flow-renderer/components/IconBrick.tsx b/Composer/packages/adaptive-flow/src/adaptive-flow-renderer/components/IconBrick.tsx
similarity index 100%
rename from Composer/packages/extensions/adaptive-flow/src/adaptive-flow-renderer/components/IconBrick.tsx
rename to Composer/packages/adaptive-flow/src/adaptive-flow-renderer/components/IconBrick.tsx
diff --git a/Composer/packages/extensions/adaptive-flow/src/adaptive-flow-renderer/components/LoopIndicator.tsx b/Composer/packages/adaptive-flow/src/adaptive-flow-renderer/components/LoopIndicator.tsx
similarity index 100%
rename from Composer/packages/extensions/adaptive-flow/src/adaptive-flow-renderer/components/LoopIndicator.tsx
rename to Composer/packages/adaptive-flow/src/adaptive-flow-renderer/components/LoopIndicator.tsx
diff --git a/Composer/packages/extensions/adaptive-flow/src/adaptive-flow-renderer/components/OffsetContainer.tsx b/Composer/packages/adaptive-flow/src/adaptive-flow-renderer/components/OffsetContainer.tsx
similarity index 100%
rename from Composer/packages/extensions/adaptive-flow/src/adaptive-flow-renderer/components/OffsetContainer.tsx
rename to Composer/packages/adaptive-flow/src/adaptive-flow-renderer/components/OffsetContainer.tsx
diff --git a/Composer/packages/extensions/adaptive-flow/src/adaptive-flow-renderer/components/SVGContainer.tsx b/Composer/packages/adaptive-flow/src/adaptive-flow-renderer/components/SVGContainer.tsx
similarity index 100%
rename from Composer/packages/extensions/adaptive-flow/src/adaptive-flow-renderer/components/SVGContainer.tsx
rename to Composer/packages/adaptive-flow/src/adaptive-flow-renderer/components/SVGContainer.tsx
diff --git a/Composer/packages/extensions/adaptive-flow/src/adaptive-flow-renderer/configs/builtinSchema.tsx b/Composer/packages/adaptive-flow/src/adaptive-flow-renderer/configs/builtinSchema.tsx
similarity index 100%
rename from Composer/packages/extensions/adaptive-flow/src/adaptive-flow-renderer/configs/builtinSchema.tsx
rename to Composer/packages/adaptive-flow/src/adaptive-flow-renderer/configs/builtinSchema.tsx
diff --git a/Composer/packages/extensions/adaptive-flow/src/adaptive-flow-renderer/configs/builtinWidgets.tsx b/Composer/packages/adaptive-flow/src/adaptive-flow-renderer/configs/builtinWidgets.tsx
similarity index 100%
rename from Composer/packages/extensions/adaptive-flow/src/adaptive-flow-renderer/configs/builtinWidgets.tsx
rename to Composer/packages/adaptive-flow/src/adaptive-flow-renderer/configs/builtinWidgets.tsx
diff --git a/Composer/packages/extensions/adaptive-flow/src/adaptive-flow-renderer/constants/AdaptiveFieldNames.ts b/Composer/packages/adaptive-flow/src/adaptive-flow-renderer/constants/AdaptiveFieldNames.ts
similarity index 100%
rename from Composer/packages/extensions/adaptive-flow/src/adaptive-flow-renderer/constants/AdaptiveFieldNames.ts
rename to Composer/packages/adaptive-flow/src/adaptive-flow-renderer/constants/AdaptiveFieldNames.ts
diff --git a/Composer/packages/extensions/adaptive-flow/src/adaptive-flow-renderer/constants/AdaptiveKinds.ts b/Composer/packages/adaptive-flow/src/adaptive-flow-renderer/constants/AdaptiveKinds.ts
similarity index 100%
rename from Composer/packages/extensions/adaptive-flow/src/adaptive-flow-renderer/constants/AdaptiveKinds.ts
rename to Composer/packages/adaptive-flow/src/adaptive-flow-renderer/constants/AdaptiveKinds.ts
diff --git a/Composer/packages/extensions/adaptive-flow/src/adaptive-flow-renderer/constants/ElementColors.ts b/Composer/packages/adaptive-flow/src/adaptive-flow-renderer/constants/ElementColors.ts
similarity index 100%
rename from Composer/packages/extensions/adaptive-flow/src/adaptive-flow-renderer/constants/ElementColors.ts
rename to Composer/packages/adaptive-flow/src/adaptive-flow-renderer/constants/ElementColors.ts
diff --git a/Composer/packages/extensions/adaptive-flow/src/adaptive-flow-renderer/constants/ElementSizes.ts b/Composer/packages/adaptive-flow/src/adaptive-flow-renderer/constants/ElementSizes.ts
similarity index 100%
rename from Composer/packages/extensions/adaptive-flow/src/adaptive-flow-renderer/constants/ElementSizes.ts
rename to Composer/packages/adaptive-flow/src/adaptive-flow-renderer/constants/ElementSizes.ts
diff --git a/Composer/packages/extensions/adaptive-flow/src/adaptive-flow-renderer/constants/NodeEventTypes.ts b/Composer/packages/adaptive-flow/src/adaptive-flow-renderer/constants/NodeEventTypes.ts
similarity index 100%
rename from Composer/packages/extensions/adaptive-flow/src/adaptive-flow-renderer/constants/NodeEventTypes.ts
rename to Composer/packages/adaptive-flow/src/adaptive-flow-renderer/constants/NodeEventTypes.ts
diff --git a/Composer/packages/extensions/adaptive-flow/src/adaptive-flow-renderer/contexts/RendererContext.tsx b/Composer/packages/adaptive-flow/src/adaptive-flow-renderer/contexts/RendererContext.tsx
similarity index 100%
rename from Composer/packages/extensions/adaptive-flow/src/adaptive-flow-renderer/contexts/RendererContext.tsx
rename to Composer/packages/adaptive-flow/src/adaptive-flow-renderer/contexts/RendererContext.tsx
diff --git a/Composer/packages/extensions/adaptive-flow/src/adaptive-flow-renderer/contexts/SchemaContext.ts b/Composer/packages/adaptive-flow/src/adaptive-flow-renderer/contexts/SchemaContext.ts
similarity index 100%
rename from Composer/packages/extensions/adaptive-flow/src/adaptive-flow-renderer/contexts/SchemaContext.ts
rename to Composer/packages/adaptive-flow/src/adaptive-flow-renderer/contexts/SchemaContext.ts
diff --git a/Composer/packages/extensions/adaptive-flow/src/adaptive-flow-renderer/hooks/useSmartLayout.ts b/Composer/packages/adaptive-flow/src/adaptive-flow-renderer/hooks/useSmartLayout.ts
similarity index 100%
rename from Composer/packages/extensions/adaptive-flow/src/adaptive-flow-renderer/hooks/useSmartLayout.ts
rename to Composer/packages/adaptive-flow/src/adaptive-flow-renderer/hooks/useSmartLayout.ts
diff --git a/Composer/packages/extensions/adaptive-flow/src/adaptive-flow-renderer/layouters/baseInputLayouter.ts b/Composer/packages/adaptive-flow/src/adaptive-flow-renderer/layouters/baseInputLayouter.ts
similarity index 100%
rename from Composer/packages/extensions/adaptive-flow/src/adaptive-flow-renderer/layouters/baseInputLayouter.ts
rename to Composer/packages/adaptive-flow/src/adaptive-flow-renderer/layouters/baseInputLayouter.ts
diff --git a/Composer/packages/extensions/adaptive-flow/src/adaptive-flow-renderer/layouters/calculateNodeBoundary.ts b/Composer/packages/adaptive-flow/src/adaptive-flow-renderer/layouters/calculateNodeBoundary.ts
similarity index 100%
rename from Composer/packages/extensions/adaptive-flow/src/adaptive-flow-renderer/layouters/calculateNodeBoundary.ts
rename to Composer/packages/adaptive-flow/src/adaptive-flow-renderer/layouters/calculateNodeBoundary.ts
diff --git a/Composer/packages/extensions/adaptive-flow/src/adaptive-flow-renderer/layouters/foreachLayouter.ts b/Composer/packages/adaptive-flow/src/adaptive-flow-renderer/layouters/foreachLayouter.ts
similarity index 100%
rename from Composer/packages/extensions/adaptive-flow/src/adaptive-flow-renderer/layouters/foreachLayouter.ts
rename to Composer/packages/adaptive-flow/src/adaptive-flow-renderer/layouters/foreachLayouter.ts
diff --git a/Composer/packages/extensions/adaptive-flow/src/adaptive-flow-renderer/layouters/ifelseLayouter.ts b/Composer/packages/adaptive-flow/src/adaptive-flow-renderer/layouters/ifelseLayouter.ts
similarity index 100%
rename from Composer/packages/extensions/adaptive-flow/src/adaptive-flow-renderer/layouters/ifelseLayouter.ts
rename to Composer/packages/adaptive-flow/src/adaptive-flow-renderer/layouters/ifelseLayouter.ts
diff --git a/Composer/packages/extensions/adaptive-flow/src/adaptive-flow-renderer/layouters/measureJsonBoundary.ts b/Composer/packages/adaptive-flow/src/adaptive-flow-renderer/layouters/measureJsonBoundary.ts
similarity index 100%
rename from Composer/packages/extensions/adaptive-flow/src/adaptive-flow-renderer/layouters/measureJsonBoundary.ts
rename to Composer/packages/adaptive-flow/src/adaptive-flow-renderer/layouters/measureJsonBoundary.ts
diff --git a/Composer/packages/extensions/adaptive-flow/src/adaptive-flow-renderer/layouters/sequentialLayouter.ts b/Composer/packages/adaptive-flow/src/adaptive-flow-renderer/layouters/sequentialLayouter.ts
similarity index 100%
rename from Composer/packages/extensions/adaptive-flow/src/adaptive-flow-renderer/layouters/sequentialLayouter.ts
rename to Composer/packages/adaptive-flow/src/adaptive-flow-renderer/layouters/sequentialLayouter.ts
diff --git a/Composer/packages/extensions/adaptive-flow/src/adaptive-flow-renderer/layouters/sharedLayouterUtils.ts b/Composer/packages/adaptive-flow/src/adaptive-flow-renderer/layouters/sharedLayouterUtils.ts
similarity index 100%
rename from Composer/packages/extensions/adaptive-flow/src/adaptive-flow-renderer/layouters/sharedLayouterUtils.ts
rename to Composer/packages/adaptive-flow/src/adaptive-flow-renderer/layouters/sharedLayouterUtils.ts
diff --git a/Composer/packages/extensions/adaptive-flow/src/adaptive-flow-renderer/layouters/switchCaseLayouter.ts b/Composer/packages/adaptive-flow/src/adaptive-flow-renderer/layouters/switchCaseLayouter.ts
similarity index 100%
rename from Composer/packages/extensions/adaptive-flow/src/adaptive-flow-renderer/layouters/switchCaseLayouter.ts
rename to Composer/packages/adaptive-flow/src/adaptive-flow-renderer/layouters/switchCaseLayouter.ts
diff --git a/Composer/packages/extensions/adaptive-flow/src/adaptive-flow-renderer/models/Boundary.ts b/Composer/packages/adaptive-flow/src/adaptive-flow-renderer/models/Boundary.ts
similarity index 100%
rename from Composer/packages/extensions/adaptive-flow/src/adaptive-flow-renderer/models/Boundary.ts
rename to Composer/packages/adaptive-flow/src/adaptive-flow-renderer/models/Boundary.ts
diff --git a/Composer/packages/extensions/adaptive-flow/src/adaptive-flow-renderer/models/EdgeData.ts b/Composer/packages/adaptive-flow/src/adaptive-flow-renderer/models/EdgeData.ts
similarity index 100%
rename from Composer/packages/extensions/adaptive-flow/src/adaptive-flow-renderer/models/EdgeData.ts
rename to Composer/packages/adaptive-flow/src/adaptive-flow-renderer/models/EdgeData.ts
diff --git a/Composer/packages/extensions/adaptive-flow/src/adaptive-flow-renderer/models/GraphLayout.ts b/Composer/packages/adaptive-flow/src/adaptive-flow-renderer/models/GraphLayout.ts
similarity index 100%
rename from Composer/packages/extensions/adaptive-flow/src/adaptive-flow-renderer/models/GraphLayout.ts
rename to Composer/packages/adaptive-flow/src/adaptive-flow-renderer/models/GraphLayout.ts
diff --git a/Composer/packages/extensions/adaptive-flow/src/adaptive-flow-renderer/models/GraphNode.ts b/Composer/packages/adaptive-flow/src/adaptive-flow-renderer/models/GraphNode.ts
similarity index 100%
rename from Composer/packages/extensions/adaptive-flow/src/adaptive-flow-renderer/models/GraphNode.ts
rename to Composer/packages/adaptive-flow/src/adaptive-flow-renderer/models/GraphNode.ts
diff --git a/Composer/packages/extensions/adaptive-flow/src/adaptive-flow-renderer/models/IndexedNode.ts b/Composer/packages/adaptive-flow/src/adaptive-flow-renderer/models/IndexedNode.ts
similarity index 100%
rename from Composer/packages/extensions/adaptive-flow/src/adaptive-flow-renderer/models/IndexedNode.ts
rename to Composer/packages/adaptive-flow/src/adaptive-flow-renderer/models/IndexedNode.ts
diff --git a/Composer/packages/extensions/adaptive-flow/src/adaptive-flow-renderer/transformers/inheritParentProperty.ts b/Composer/packages/adaptive-flow/src/adaptive-flow-renderer/transformers/inheritParentProperty.ts
similarity index 100%
rename from Composer/packages/extensions/adaptive-flow/src/adaptive-flow-renderer/transformers/inheritParentProperty.ts
rename to Composer/packages/adaptive-flow/src/adaptive-flow-renderer/transformers/inheritParentProperty.ts
diff --git a/Composer/packages/extensions/adaptive-flow/src/adaptive-flow-renderer/transformers/transformBaseInput.ts b/Composer/packages/adaptive-flow/src/adaptive-flow-renderer/transformers/transformBaseInput.ts
similarity index 100%
rename from Composer/packages/extensions/adaptive-flow/src/adaptive-flow-renderer/transformers/transformBaseInput.ts
rename to Composer/packages/adaptive-flow/src/adaptive-flow-renderer/transformers/transformBaseInput.ts
diff --git a/Composer/packages/extensions/adaptive-flow/src/adaptive-flow-renderer/transformers/transformForeach.ts b/Composer/packages/adaptive-flow/src/adaptive-flow-renderer/transformers/transformForeach.ts
similarity index 100%
rename from Composer/packages/extensions/adaptive-flow/src/adaptive-flow-renderer/transformers/transformForeach.ts
rename to Composer/packages/adaptive-flow/src/adaptive-flow-renderer/transformers/transformForeach.ts
diff --git a/Composer/packages/extensions/adaptive-flow/src/adaptive-flow-renderer/transformers/transformIfCondition.ts b/Composer/packages/adaptive-flow/src/adaptive-flow-renderer/transformers/transformIfCondition.ts
similarity index 100%
rename from Composer/packages/extensions/adaptive-flow/src/adaptive-flow-renderer/transformers/transformIfCondition.ts
rename to Composer/packages/adaptive-flow/src/adaptive-flow-renderer/transformers/transformIfCondition.ts
diff --git a/Composer/packages/extensions/adaptive-flow/src/adaptive-flow-renderer/transformers/transformObiRules.ts b/Composer/packages/adaptive-flow/src/adaptive-flow-renderer/transformers/transformObiRules.ts
similarity index 100%
rename from Composer/packages/extensions/adaptive-flow/src/adaptive-flow-renderer/transformers/transformObiRules.ts
rename to Composer/packages/adaptive-flow/src/adaptive-flow-renderer/transformers/transformObiRules.ts
diff --git a/Composer/packages/extensions/adaptive-flow/src/adaptive-flow-renderer/transformers/transformRootDialog.ts b/Composer/packages/adaptive-flow/src/adaptive-flow-renderer/transformers/transformRootDialog.ts
similarity index 100%
rename from Composer/packages/extensions/adaptive-flow/src/adaptive-flow-renderer/transformers/transformRootDialog.ts
rename to Composer/packages/adaptive-flow/src/adaptive-flow-renderer/transformers/transformRootDialog.ts
diff --git a/Composer/packages/extensions/adaptive-flow/src/adaptive-flow-renderer/transformers/transformStepGroup.ts b/Composer/packages/adaptive-flow/src/adaptive-flow-renderer/transformers/transformStepGroup.ts
similarity index 100%
rename from Composer/packages/extensions/adaptive-flow/src/adaptive-flow-renderer/transformers/transformStepGroup.ts
rename to Composer/packages/adaptive-flow/src/adaptive-flow-renderer/transformers/transformStepGroup.ts
diff --git a/Composer/packages/extensions/adaptive-flow/src/adaptive-flow-renderer/transformers/transformSwitchCondition.ts b/Composer/packages/adaptive-flow/src/adaptive-flow-renderer/transformers/transformSwitchCondition.ts
similarity index 100%
rename from Composer/packages/extensions/adaptive-flow/src/adaptive-flow-renderer/transformers/transformSwitchCondition.ts
rename to Composer/packages/adaptive-flow/src/adaptive-flow-renderer/transformers/transformSwitchCondition.ts
diff --git a/Composer/packages/extensions/adaptive-flow/src/adaptive-flow-renderer/types/PluggableComponents.types.ts b/Composer/packages/adaptive-flow/src/adaptive-flow-renderer/types/PluggableComponents.types.ts
similarity index 100%
rename from Composer/packages/extensions/adaptive-flow/src/adaptive-flow-renderer/types/PluggableComponents.types.ts
rename to Composer/packages/adaptive-flow/src/adaptive-flow-renderer/types/PluggableComponents.types.ts
diff --git a/Composer/packages/extensions/adaptive-flow/src/adaptive-flow-renderer/types/flowRenderer.types.ts b/Composer/packages/adaptive-flow/src/adaptive-flow-renderer/types/flowRenderer.types.ts
similarity index 100%
rename from Composer/packages/extensions/adaptive-flow/src/adaptive-flow-renderer/types/flowRenderer.types.ts
rename to Composer/packages/adaptive-flow/src/adaptive-flow-renderer/types/flowRenderer.types.ts
diff --git a/Composer/packages/extensions/adaptive-flow/src/adaptive-flow-renderer/types/nodeProps.ts b/Composer/packages/adaptive-flow/src/adaptive-flow-renderer/types/nodeProps.ts
similarity index 100%
rename from Composer/packages/extensions/adaptive-flow/src/adaptive-flow-renderer/types/nodeProps.ts
rename to Composer/packages/adaptive-flow/src/adaptive-flow-renderer/types/nodeProps.ts
diff --git a/Composer/packages/extensions/adaptive-flow/src/adaptive-flow-renderer/utils/adaptive/outlineObiJson.ts b/Composer/packages/adaptive-flow/src/adaptive-flow-renderer/utils/adaptive/outlineObiJson.ts
similarity index 100%
rename from Composer/packages/extensions/adaptive-flow/src/adaptive-flow-renderer/utils/adaptive/outlineObiJson.ts
rename to Composer/packages/adaptive-flow/src/adaptive-flow-renderer/utils/adaptive/outlineObiJson.ts
diff --git a/Composer/packages/extensions/adaptive-flow/src/adaptive-flow-renderer/utils/adaptive/stepBuilder.ts b/Composer/packages/adaptive-flow/src/adaptive-flow-renderer/utils/adaptive/stepBuilder.ts
similarity index 100%
rename from Composer/packages/extensions/adaptive-flow/src/adaptive-flow-renderer/utils/adaptive/stepBuilder.ts
rename to Composer/packages/adaptive-flow/src/adaptive-flow-renderer/utils/adaptive/stepBuilder.ts
diff --git a/Composer/packages/extensions/adaptive-flow/src/adaptive-flow-renderer/utils/visual/DesignerCache.ts b/Composer/packages/adaptive-flow/src/adaptive-flow-renderer/utils/visual/DesignerCache.ts
similarity index 100%
rename from Composer/packages/extensions/adaptive-flow/src/adaptive-flow-renderer/utils/visual/DesignerCache.ts
rename to Composer/packages/adaptive-flow/src/adaptive-flow-renderer/utils/visual/DesignerCache.ts
diff --git a/Composer/packages/extensions/adaptive-flow/src/adaptive-flow-renderer/utils/visual/EdgeUtil.tsx b/Composer/packages/adaptive-flow/src/adaptive-flow-renderer/utils/visual/EdgeUtil.tsx
similarity index 100%
rename from Composer/packages/extensions/adaptive-flow/src/adaptive-flow-renderer/utils/visual/EdgeUtil.tsx
rename to Composer/packages/adaptive-flow/src/adaptive-flow-renderer/utils/visual/EdgeUtil.tsx
diff --git a/Composer/packages/extensions/adaptive-flow/src/adaptive-flow-renderer/utils/visual/WidgetSchemaProvider.ts b/Composer/packages/adaptive-flow/src/adaptive-flow-renderer/utils/visual/WidgetSchemaProvider.ts
similarity index 100%
rename from Composer/packages/extensions/adaptive-flow/src/adaptive-flow-renderer/utils/visual/WidgetSchemaProvider.ts
rename to Composer/packages/adaptive-flow/src/adaptive-flow-renderer/utils/visual/WidgetSchemaProvider.ts
diff --git a/Composer/packages/extensions/adaptive-flow/src/adaptive-flow-renderer/utils/visual/widgetRenderer.tsx b/Composer/packages/adaptive-flow/src/adaptive-flow-renderer/utils/visual/widgetRenderer.tsx
similarity index 100%
rename from Composer/packages/extensions/adaptive-flow/src/adaptive-flow-renderer/utils/visual/widgetRenderer.tsx
rename to Composer/packages/adaptive-flow/src/adaptive-flow-renderer/utils/visual/widgetRenderer.tsx
diff --git a/Composer/packages/extensions/adaptive-flow/src/adaptive-flow-renderer/widgets/ActionCard/ActionCard.tsx b/Composer/packages/adaptive-flow/src/adaptive-flow-renderer/widgets/ActionCard/ActionCard.tsx
similarity index 100%
rename from Composer/packages/extensions/adaptive-flow/src/adaptive-flow-renderer/widgets/ActionCard/ActionCard.tsx
rename to Composer/packages/adaptive-flow/src/adaptive-flow-renderer/widgets/ActionCard/ActionCard.tsx
diff --git a/Composer/packages/extensions/adaptive-flow/src/adaptive-flow-renderer/widgets/ActionCard/CardTemplate.tsx b/Composer/packages/adaptive-flow/src/adaptive-flow-renderer/widgets/ActionCard/CardTemplate.tsx
similarity index 100%
rename from Composer/packages/extensions/adaptive-flow/src/adaptive-flow-renderer/widgets/ActionCard/CardTemplate.tsx
rename to Composer/packages/adaptive-flow/src/adaptive-flow-renderer/widgets/ActionCard/CardTemplate.tsx
diff --git a/Composer/packages/extensions/adaptive-flow/src/adaptive-flow-renderer/widgets/ActionCard/CardTemplateStyle.ts b/Composer/packages/adaptive-flow/src/adaptive-flow-renderer/widgets/ActionCard/CardTemplateStyle.ts
similarity index 100%
rename from Composer/packages/extensions/adaptive-flow/src/adaptive-flow-renderer/widgets/ActionCard/CardTemplateStyle.ts
rename to Composer/packages/adaptive-flow/src/adaptive-flow-renderer/widgets/ActionCard/CardTemplateStyle.ts
diff --git a/Composer/packages/extensions/adaptive-flow/src/adaptive-flow-renderer/widgets/ActionCard/index.tsx b/Composer/packages/adaptive-flow/src/adaptive-flow-renderer/widgets/ActionCard/index.tsx
similarity index 100%
rename from Composer/packages/extensions/adaptive-flow/src/adaptive-flow-renderer/widgets/ActionCard/index.tsx
rename to Composer/packages/adaptive-flow/src/adaptive-flow-renderer/widgets/ActionCard/index.tsx
diff --git a/Composer/packages/extensions/adaptive-flow/src/adaptive-flow-renderer/widgets/ActionGroup.tsx b/Composer/packages/adaptive-flow/src/adaptive-flow-renderer/widgets/ActionGroup.tsx
similarity index 100%
rename from Composer/packages/extensions/adaptive-flow/src/adaptive-flow-renderer/widgets/ActionGroup.tsx
rename to Composer/packages/adaptive-flow/src/adaptive-flow-renderer/widgets/ActionGroup.tsx
diff --git a/Composer/packages/extensions/adaptive-flow/src/adaptive-flow-renderer/widgets/ActionHeader/ActionHeader.tsx b/Composer/packages/adaptive-flow/src/adaptive-flow-renderer/widgets/ActionHeader/ActionHeader.tsx
similarity index 100%
rename from Composer/packages/extensions/adaptive-flow/src/adaptive-flow-renderer/widgets/ActionHeader/ActionHeader.tsx
rename to Composer/packages/adaptive-flow/src/adaptive-flow-renderer/widgets/ActionHeader/ActionHeader.tsx
diff --git a/Composer/packages/extensions/adaptive-flow/src/adaptive-flow-renderer/widgets/ActionHeader/ActionHeaderStyle.ts b/Composer/packages/adaptive-flow/src/adaptive-flow-renderer/widgets/ActionHeader/ActionHeaderStyle.ts
similarity index 100%
rename from Composer/packages/extensions/adaptive-flow/src/adaptive-flow-renderer/widgets/ActionHeader/ActionHeaderStyle.ts
rename to Composer/packages/adaptive-flow/src/adaptive-flow-renderer/widgets/ActionHeader/ActionHeaderStyle.ts
diff --git a/Composer/packages/extensions/adaptive-flow/src/adaptive-flow-renderer/widgets/ActionHeader/icon.tsx b/Composer/packages/adaptive-flow/src/adaptive-flow-renderer/widgets/ActionHeader/icon.tsx
similarity index 100%
rename from Composer/packages/extensions/adaptive-flow/src/adaptive-flow-renderer/widgets/ActionHeader/icon.tsx
rename to Composer/packages/adaptive-flow/src/adaptive-flow-renderer/widgets/ActionHeader/icon.tsx
diff --git a/Composer/packages/extensions/adaptive-flow/src/adaptive-flow-renderer/widgets/ActionHeader/iconStyles.ts b/Composer/packages/adaptive-flow/src/adaptive-flow-renderer/widgets/ActionHeader/iconStyles.ts
similarity index 100%
rename from Composer/packages/extensions/adaptive-flow/src/adaptive-flow-renderer/widgets/ActionHeader/iconStyles.ts
rename to Composer/packages/adaptive-flow/src/adaptive-flow-renderer/widgets/ActionHeader/iconStyles.ts
diff --git a/Composer/packages/extensions/adaptive-flow/src/adaptive-flow-renderer/widgets/ActionHeader/index.tsx b/Composer/packages/adaptive-flow/src/adaptive-flow-renderer/widgets/ActionHeader/index.tsx
similarity index 100%
rename from Composer/packages/extensions/adaptive-flow/src/adaptive-flow-renderer/widgets/ActionHeader/index.tsx
rename to Composer/packages/adaptive-flow/src/adaptive-flow-renderer/widgets/ActionHeader/index.tsx
diff --git a/Composer/packages/extensions/adaptive-flow/src/adaptive-flow-renderer/widgets/AdaptiveAction.tsx b/Composer/packages/adaptive-flow/src/adaptive-flow-renderer/widgets/AdaptiveAction.tsx
similarity index 100%
rename from Composer/packages/extensions/adaptive-flow/src/adaptive-flow-renderer/widgets/AdaptiveAction.tsx
rename to Composer/packages/adaptive-flow/src/adaptive-flow-renderer/widgets/AdaptiveAction.tsx
diff --git a/Composer/packages/extensions/adaptive-flow/src/adaptive-flow-renderer/widgets/DialogRef.tsx b/Composer/packages/adaptive-flow/src/adaptive-flow-renderer/widgets/DialogRef.tsx
similarity index 100%
rename from Composer/packages/extensions/adaptive-flow/src/adaptive-flow-renderer/widgets/DialogRef.tsx
rename to Composer/packages/adaptive-flow/src/adaptive-flow-renderer/widgets/DialogRef.tsx
diff --git a/Composer/packages/extensions/adaptive-flow/src/adaptive-flow-renderer/widgets/ForeachWidget.tsx b/Composer/packages/adaptive-flow/src/adaptive-flow-renderer/widgets/ForeachWidget.tsx
similarity index 100%
rename from Composer/packages/extensions/adaptive-flow/src/adaptive-flow-renderer/widgets/ForeachWidget.tsx
rename to Composer/packages/adaptive-flow/src/adaptive-flow-renderer/widgets/ForeachWidget.tsx
diff --git a/Composer/packages/extensions/adaptive-flow/src/adaptive-flow-renderer/widgets/IfConditionWidget.tsx b/Composer/packages/adaptive-flow/src/adaptive-flow-renderer/widgets/IfConditionWidget.tsx
similarity index 100%
rename from Composer/packages/extensions/adaptive-flow/src/adaptive-flow-renderer/widgets/IfConditionWidget.tsx
rename to Composer/packages/adaptive-flow/src/adaptive-flow-renderer/widgets/IfConditionWidget.tsx
diff --git a/Composer/packages/extensions/adaptive-flow/src/adaptive-flow-renderer/widgets/PromptWidget.tsx b/Composer/packages/adaptive-flow/src/adaptive-flow-renderer/widgets/PromptWidget.tsx
similarity index 100%
rename from Composer/packages/extensions/adaptive-flow/src/adaptive-flow-renderer/widgets/PromptWidget.tsx
rename to Composer/packages/adaptive-flow/src/adaptive-flow-renderer/widgets/PromptWidget.tsx
diff --git a/Composer/packages/extensions/adaptive-flow/src/adaptive-flow-renderer/widgets/SwitchConditionWidget.tsx b/Composer/packages/adaptive-flow/src/adaptive-flow-renderer/widgets/SwitchConditionWidget.tsx
similarity index 100%
rename from Composer/packages/extensions/adaptive-flow/src/adaptive-flow-renderer/widgets/SwitchConditionWidget.tsx
rename to Composer/packages/adaptive-flow/src/adaptive-flow-renderer/widgets/SwitchConditionWidget.tsx
diff --git a/Composer/packages/extensions/adaptive-flow/src/adaptive-flow-renderer/widgets/TriggerSummary/TriggerSummary.tsx b/Composer/packages/adaptive-flow/src/adaptive-flow-renderer/widgets/TriggerSummary/TriggerSummary.tsx
similarity index 100%
rename from Composer/packages/extensions/adaptive-flow/src/adaptive-flow-renderer/widgets/TriggerSummary/TriggerSummary.tsx
rename to Composer/packages/adaptive-flow/src/adaptive-flow-renderer/widgets/TriggerSummary/TriggerSummary.tsx
diff --git a/Composer/packages/extensions/adaptive-flow/src/adaptive-flow-renderer/widgets/TriggerSummary/index.tsx b/Composer/packages/adaptive-flow/src/adaptive-flow-renderer/widgets/TriggerSummary/index.tsx
similarity index 100%
rename from Composer/packages/extensions/adaptive-flow/src/adaptive-flow-renderer/widgets/TriggerSummary/index.tsx
rename to Composer/packages/adaptive-flow/src/adaptive-flow-renderer/widgets/TriggerSummary/index.tsx
diff --git a/Composer/packages/extensions/adaptive-flow/src/adaptive-flow-renderer/widgets/TriggerSummary/triggerStyles.ts b/Composer/packages/adaptive-flow/src/adaptive-flow-renderer/widgets/TriggerSummary/triggerStyles.ts
similarity index 100%
rename from Composer/packages/extensions/adaptive-flow/src/adaptive-flow-renderer/widgets/TriggerSummary/triggerStyles.ts
rename to Composer/packages/adaptive-flow/src/adaptive-flow-renderer/widgets/TriggerSummary/triggerStyles.ts
diff --git a/Composer/packages/extensions/adaptive-flow/src/adaptive-flow-renderer/widgets/index.ts b/Composer/packages/adaptive-flow/src/adaptive-flow-renderer/widgets/index.ts
similarity index 100%
rename from Composer/packages/extensions/adaptive-flow/src/adaptive-flow-renderer/widgets/index.ts
rename to Composer/packages/adaptive-flow/src/adaptive-flow-renderer/widgets/index.ts
diff --git a/Composer/packages/extensions/adaptive-flow/src/adaptive-flow-renderer/widgets/styles/DisabledStyle.ts b/Composer/packages/adaptive-flow/src/adaptive-flow-renderer/widgets/styles/DisabledStyle.ts
similarity index 100%
rename from Composer/packages/extensions/adaptive-flow/src/adaptive-flow-renderer/widgets/styles/DisabledStyle.ts
rename to Composer/packages/adaptive-flow/src/adaptive-flow-renderer/widgets/styles/DisabledStyle.ts
diff --git a/Composer/packages/extensions/adaptive-flow/src/index.tsx b/Composer/packages/adaptive-flow/src/index.tsx
similarity index 100%
rename from Composer/packages/extensions/adaptive-flow/src/index.tsx
rename to Composer/packages/adaptive-flow/src/index.tsx
diff --git a/Composer/packages/extensions/adaptive-flow/tsconfig.build.json b/Composer/packages/adaptive-flow/tsconfig.build.json
similarity index 100%
rename from Composer/packages/extensions/adaptive-flow/tsconfig.build.json
rename to Composer/packages/adaptive-flow/tsconfig.build.json
diff --git a/Composer/packages/extensions/adaptive-flow/tsconfig.json b/Composer/packages/adaptive-flow/tsconfig.json
similarity index 74%
rename from Composer/packages/extensions/adaptive-flow/tsconfig.json
rename to Composer/packages/adaptive-flow/tsconfig.json
index 8eab2df086..99600667df 100644
--- a/Composer/packages/extensions/adaptive-flow/tsconfig.json
+++ b/Composer/packages/adaptive-flow/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../../tsconfig.base.json",
+  "extends": "../../tsconfig.base.json",
   "compilerOptions": {
     "outDir": "./lib/",
     "module": "esnext",
diff --git a/Composer/packages/extensions/adaptive-form/.eslintignore b/Composer/packages/adaptive-form/.eslintignore
similarity index 100%
rename from Composer/packages/extensions/adaptive-form/.eslintignore
rename to Composer/packages/adaptive-form/.eslintignore
diff --git a/Composer/packages/extensions/extension/.eslintrc.js b/Composer/packages/adaptive-form/.eslintrc.js
similarity index 71%
rename from Composer/packages/extensions/extension/.eslintrc.js
rename to Composer/packages/adaptive-form/.eslintrc.js
index ccecb8e9c0..db24b086e0 100644
--- a/Composer/packages/extensions/extension/.eslintrc.js
+++ b/Composer/packages/adaptive-form/.eslintrc.js
@@ -1,5 +1,5 @@
 module.exports = {
-  extends: ['../../../.eslintrc.react.js'],
+  extends: ['../../.eslintrc.react.js'],
   parserOptions: {
     project: './tsconfig.json',
     tsconfigRootDir: __dirname,
diff --git a/Composer/packages/extensions/adaptive-form/.gitignore b/Composer/packages/adaptive-form/.gitignore
similarity index 100%
rename from Composer/packages/extensions/adaptive-form/.gitignore
rename to Composer/packages/adaptive-form/.gitignore
diff --git a/Composer/packages/extensions/adaptive-form/jest.config.js b/Composer/packages/adaptive-form/jest.config.js
similarity index 100%
rename from Composer/packages/extensions/adaptive-form/jest.config.js
rename to Composer/packages/adaptive-form/jest.config.js
diff --git a/Composer/packages/extensions/adaptive-form/package.json b/Composer/packages/adaptive-form/package.json
similarity index 100%
rename from Composer/packages/extensions/adaptive-form/package.json
rename to Composer/packages/adaptive-form/package.json
diff --git a/Composer/packages/extensions/adaptive-form/src/components/AdaptiveForm.tsx b/Composer/packages/adaptive-form/src/components/AdaptiveForm.tsx
similarity index 100%
rename from Composer/packages/extensions/adaptive-form/src/components/AdaptiveForm.tsx
rename to Composer/packages/adaptive-form/src/components/AdaptiveForm.tsx
diff --git a/Composer/packages/extensions/adaptive-form/src/components/CollapseField.tsx b/Composer/packages/adaptive-form/src/components/CollapseField.tsx
similarity index 100%
rename from Composer/packages/extensions/adaptive-form/src/components/CollapseField.tsx
rename to Composer/packages/adaptive-form/src/components/CollapseField.tsx
diff --git a/Composer/packages/extensions/adaptive-form/src/components/ErrorInfo.tsx b/Composer/packages/adaptive-form/src/components/ErrorInfo.tsx
similarity index 100%
rename from Composer/packages/extensions/adaptive-form/src/components/ErrorInfo.tsx
rename to Composer/packages/adaptive-form/src/components/ErrorInfo.tsx
diff --git a/Composer/packages/extensions/adaptive-form/src/components/ErrorMessage.tsx b/Composer/packages/adaptive-form/src/components/ErrorMessage.tsx
similarity index 100%
rename from Composer/packages/extensions/adaptive-form/src/components/ErrorMessage.tsx
rename to Composer/packages/adaptive-form/src/components/ErrorMessage.tsx
diff --git a/Composer/packages/extensions/adaptive-form/src/components/FieldLabel.tsx b/Composer/packages/adaptive-form/src/components/FieldLabel.tsx
similarity index 100%
rename from Composer/packages/extensions/adaptive-form/src/components/FieldLabel.tsx
rename to Composer/packages/adaptive-form/src/components/FieldLabel.tsx
diff --git a/Composer/packages/extensions/adaptive-form/src/components/FormRow.tsx b/Composer/packages/adaptive-form/src/components/FormRow.tsx
similarity index 100%
rename from Composer/packages/extensions/adaptive-form/src/components/FormRow.tsx
rename to Composer/packages/adaptive-form/src/components/FormRow.tsx
diff --git a/Composer/packages/extensions/adaptive-form/src/components/FormTitle.tsx b/Composer/packages/adaptive-form/src/components/FormTitle.tsx
similarity index 100%
rename from Composer/packages/extensions/adaptive-form/src/components/FormTitle.tsx
rename to Composer/packages/adaptive-form/src/components/FormTitle.tsx
diff --git a/Composer/packages/extensions/adaptive-form/src/components/Link.tsx b/Composer/packages/adaptive-form/src/components/Link.tsx
similarity index 100%
rename from Composer/packages/extensions/adaptive-form/src/components/Link.tsx
rename to Composer/packages/adaptive-form/src/components/Link.tsx
diff --git a/Composer/packages/extensions/adaptive-form/src/components/LoadingTimeout.tsx b/Composer/packages/adaptive-form/src/components/LoadingTimeout.tsx
similarity index 100%
rename from Composer/packages/extensions/adaptive-form/src/components/LoadingTimeout.tsx
rename to Composer/packages/adaptive-form/src/components/LoadingTimeout.tsx
diff --git a/Composer/packages/extensions/adaptive-form/src/components/SchemaField.tsx b/Composer/packages/adaptive-form/src/components/SchemaField.tsx
similarity index 100%
rename from Composer/packages/extensions/adaptive-form/src/components/SchemaField.tsx
rename to Composer/packages/adaptive-form/src/components/SchemaField.tsx
diff --git a/Composer/packages/extensions/adaptive-form/src/components/__tests__/ErrorMessage.test.tsx b/Composer/packages/adaptive-form/src/components/__tests__/ErrorMessage.test.tsx
similarity index 100%
rename from Composer/packages/extensions/adaptive-form/src/components/__tests__/ErrorMessage.test.tsx
rename to Composer/packages/adaptive-form/src/components/__tests__/ErrorMessage.test.tsx
diff --git a/Composer/packages/extensions/adaptive-form/src/components/__tests__/FieldLabel.test.tsx b/Composer/packages/adaptive-form/src/components/__tests__/FieldLabel.test.tsx
similarity index 100%
rename from Composer/packages/extensions/adaptive-form/src/components/__tests__/FieldLabel.test.tsx
rename to Composer/packages/adaptive-form/src/components/__tests__/FieldLabel.test.tsx
diff --git a/Composer/packages/extensions/adaptive-form/src/components/__tests__/FormRow.test.tsx b/Composer/packages/adaptive-form/src/components/__tests__/FormRow.test.tsx
similarity index 100%
rename from Composer/packages/extensions/adaptive-form/src/components/__tests__/FormRow.test.tsx
rename to Composer/packages/adaptive-form/src/components/__tests__/FormRow.test.tsx
diff --git a/Composer/packages/extensions/adaptive-form/src/components/__tests__/LoadingTimeout.test.tsx b/Composer/packages/adaptive-form/src/components/__tests__/LoadingTimeout.test.tsx
similarity index 100%
rename from Composer/packages/extensions/adaptive-form/src/components/__tests__/LoadingTimeout.test.tsx
rename to Composer/packages/adaptive-form/src/components/__tests__/LoadingTimeout.test.tsx
diff --git a/Composer/packages/extensions/adaptive-form/src/components/__tests__/SchemaField.test.tsx b/Composer/packages/adaptive-form/src/components/__tests__/SchemaField.test.tsx
similarity index 100%
rename from Composer/packages/extensions/adaptive-form/src/components/__tests__/SchemaField.test.tsx
rename to Composer/packages/adaptive-form/src/components/__tests__/SchemaField.test.tsx
diff --git a/Composer/packages/extensions/adaptive-form/src/components/fields/ArrayField.tsx b/Composer/packages/adaptive-form/src/components/fields/ArrayField.tsx
similarity index 100%
rename from Composer/packages/extensions/adaptive-form/src/components/fields/ArrayField.tsx
rename to Composer/packages/adaptive-form/src/components/fields/ArrayField.tsx
diff --git a/Composer/packages/extensions/adaptive-form/src/components/fields/ArrayFieldItem.tsx b/Composer/packages/adaptive-form/src/components/fields/ArrayFieldItem.tsx
similarity index 100%
rename from Composer/packages/extensions/adaptive-form/src/components/fields/ArrayFieldItem.tsx
rename to Composer/packages/adaptive-form/src/components/fields/ArrayFieldItem.tsx
diff --git a/Composer/packages/extensions/adaptive-form/src/components/fields/BooleanField.tsx b/Composer/packages/adaptive-form/src/components/fields/BooleanField.tsx
similarity index 100%
rename from Composer/packages/extensions/adaptive-form/src/components/fields/BooleanField.tsx
rename to Composer/packages/adaptive-form/src/components/fields/BooleanField.tsx
diff --git a/Composer/packages/extensions/adaptive-form/src/components/fields/EditableField.tsx b/Composer/packages/adaptive-form/src/components/fields/EditableField.tsx
similarity index 100%
rename from Composer/packages/extensions/adaptive-form/src/components/fields/EditableField.tsx
rename to Composer/packages/adaptive-form/src/components/fields/EditableField.tsx
diff --git a/Composer/packages/extensions/adaptive-form/src/components/fields/ExpressionField/ExpressionEditor.tsx b/Composer/packages/adaptive-form/src/components/fields/ExpressionField/ExpressionEditor.tsx
similarity index 100%
rename from Composer/packages/extensions/adaptive-form/src/components/fields/ExpressionField/ExpressionEditor.tsx
rename to Composer/packages/adaptive-form/src/components/fields/ExpressionField/ExpressionEditor.tsx
diff --git a/Composer/packages/extensions/adaptive-form/src/components/fields/ExpressionField/ExpressionField.tsx b/Composer/packages/adaptive-form/src/components/fields/ExpressionField/ExpressionField.tsx
similarity index 100%
rename from Composer/packages/extensions/adaptive-form/src/components/fields/ExpressionField/ExpressionField.tsx
rename to Composer/packages/adaptive-form/src/components/fields/ExpressionField/ExpressionField.tsx
diff --git a/Composer/packages/extensions/adaptive-form/src/components/fields/ExpressionField/__tests__/ExpressionField.test.tsx b/Composer/packages/adaptive-form/src/components/fields/ExpressionField/__tests__/ExpressionField.test.tsx
similarity index 100%
rename from Composer/packages/extensions/adaptive-form/src/components/fields/ExpressionField/__tests__/ExpressionField.test.tsx
rename to Composer/packages/adaptive-form/src/components/fields/ExpressionField/__tests__/ExpressionField.test.tsx
diff --git a/Composer/packages/extensions/adaptive-form/src/components/fields/ExpressionField/__tests__/utils.test.ts b/Composer/packages/adaptive-form/src/components/fields/ExpressionField/__tests__/utils.test.ts
similarity index 100%
rename from Composer/packages/extensions/adaptive-form/src/components/fields/ExpressionField/__tests__/utils.test.ts
rename to Composer/packages/adaptive-form/src/components/fields/ExpressionField/__tests__/utils.test.ts
diff --git a/Composer/packages/extensions/adaptive-form/src/components/fields/ExpressionField/utils.ts b/Composer/packages/adaptive-form/src/components/fields/ExpressionField/utils.ts
similarity index 100%
rename from Composer/packages/extensions/adaptive-form/src/components/fields/ExpressionField/utils.ts
rename to Composer/packages/adaptive-form/src/components/fields/ExpressionField/utils.ts
diff --git a/Composer/packages/extensions/adaptive-form/src/components/fields/IntellisenseField.tsx b/Composer/packages/adaptive-form/src/components/fields/IntellisenseField.tsx
similarity index 100%
rename from Composer/packages/extensions/adaptive-form/src/components/fields/IntellisenseField.tsx
rename to Composer/packages/adaptive-form/src/components/fields/IntellisenseField.tsx
diff --git a/Composer/packages/extensions/adaptive-form/src/components/fields/IntentField.tsx b/Composer/packages/adaptive-form/src/components/fields/IntentField.tsx
similarity index 100%
rename from Composer/packages/extensions/adaptive-form/src/components/fields/IntentField.tsx
rename to Composer/packages/adaptive-form/src/components/fields/IntentField.tsx
diff --git a/Composer/packages/extensions/adaptive-form/src/components/fields/JsonField.tsx b/Composer/packages/adaptive-form/src/components/fields/JsonField.tsx
similarity index 100%
rename from Composer/packages/extensions/adaptive-form/src/components/fields/JsonField.tsx
rename to Composer/packages/adaptive-form/src/components/fields/JsonField.tsx
diff --git a/Composer/packages/extensions/adaptive-form/src/components/fields/NumberField.tsx b/Composer/packages/adaptive-form/src/components/fields/NumberField.tsx
similarity index 100%
rename from Composer/packages/extensions/adaptive-form/src/components/fields/NumberField.tsx
rename to Composer/packages/adaptive-form/src/components/fields/NumberField.tsx
diff --git a/Composer/packages/extensions/adaptive-form/src/components/fields/ObjectArrayField.tsx b/Composer/packages/adaptive-form/src/components/fields/ObjectArrayField.tsx
similarity index 100%
rename from Composer/packages/extensions/adaptive-form/src/components/fields/ObjectArrayField.tsx
rename to Composer/packages/adaptive-form/src/components/fields/ObjectArrayField.tsx
diff --git a/Composer/packages/extensions/adaptive-form/src/components/fields/ObjectField.tsx b/Composer/packages/adaptive-form/src/components/fields/ObjectField.tsx
similarity index 100%
rename from Composer/packages/extensions/adaptive-form/src/components/fields/ObjectField.tsx
rename to Composer/packages/adaptive-form/src/components/fields/ObjectField.tsx
diff --git a/Composer/packages/extensions/adaptive-form/src/components/fields/OneOfField/OneOfField.tsx b/Composer/packages/adaptive-form/src/components/fields/OneOfField/OneOfField.tsx
similarity index 100%
rename from Composer/packages/extensions/adaptive-form/src/components/fields/OneOfField/OneOfField.tsx
rename to Composer/packages/adaptive-form/src/components/fields/OneOfField/OneOfField.tsx
diff --git a/Composer/packages/extensions/adaptive-form/src/components/fields/OneOfField/__tests__/OneOfField.test.tsx b/Composer/packages/adaptive-form/src/components/fields/OneOfField/__tests__/OneOfField.test.tsx
similarity index 100%
rename from Composer/packages/extensions/adaptive-form/src/components/fields/OneOfField/__tests__/OneOfField.test.tsx
rename to Composer/packages/adaptive-form/src/components/fields/OneOfField/__tests__/OneOfField.test.tsx
diff --git a/Composer/packages/extensions/adaptive-form/src/components/fields/OneOfField/__tests__/utils.test.ts b/Composer/packages/adaptive-form/src/components/fields/OneOfField/__tests__/utils.test.ts
similarity index 100%
rename from Composer/packages/extensions/adaptive-form/src/components/fields/OneOfField/__tests__/utils.test.ts
rename to Composer/packages/adaptive-form/src/components/fields/OneOfField/__tests__/utils.test.ts
diff --git a/Composer/packages/extensions/adaptive-form/src/components/fields/OneOfField/index.ts b/Composer/packages/adaptive-form/src/components/fields/OneOfField/index.ts
similarity index 100%
rename from Composer/packages/extensions/adaptive-form/src/components/fields/OneOfField/index.ts
rename to Composer/packages/adaptive-form/src/components/fields/OneOfField/index.ts
diff --git a/Composer/packages/extensions/adaptive-form/src/components/fields/OneOfField/utils.ts b/Composer/packages/adaptive-form/src/components/fields/OneOfField/utils.ts
similarity index 100%
rename from Composer/packages/extensions/adaptive-form/src/components/fields/OneOfField/utils.ts
rename to Composer/packages/adaptive-form/src/components/fields/OneOfField/utils.ts
diff --git a/Composer/packages/extensions/adaptive-form/src/components/fields/OpenObjectField/ObjectItem.tsx b/Composer/packages/adaptive-form/src/components/fields/OpenObjectField/ObjectItem.tsx
similarity index 100%
rename from Composer/packages/extensions/adaptive-form/src/components/fields/OpenObjectField/ObjectItem.tsx
rename to Composer/packages/adaptive-form/src/components/fields/OpenObjectField/ObjectItem.tsx
diff --git a/Composer/packages/extensions/adaptive-form/src/components/fields/OpenObjectField/OpenObjectField.tsx b/Composer/packages/adaptive-form/src/components/fields/OpenObjectField/OpenObjectField.tsx
similarity index 100%
rename from Composer/packages/extensions/adaptive-form/src/components/fields/OpenObjectField/OpenObjectField.tsx
rename to Composer/packages/adaptive-form/src/components/fields/OpenObjectField/OpenObjectField.tsx
diff --git a/Composer/packages/extensions/adaptive-form/src/components/fields/OpenObjectField/__tests__/ObjectItem.test.tsx b/Composer/packages/adaptive-form/src/components/fields/OpenObjectField/__tests__/ObjectItem.test.tsx
similarity index 100%
rename from Composer/packages/extensions/adaptive-form/src/components/fields/OpenObjectField/__tests__/ObjectItem.test.tsx
rename to Composer/packages/adaptive-form/src/components/fields/OpenObjectField/__tests__/ObjectItem.test.tsx
diff --git a/Composer/packages/extensions/adaptive-form/src/components/fields/OpenObjectField/__tests__/OpenObjectField.test.tsx b/Composer/packages/adaptive-form/src/components/fields/OpenObjectField/__tests__/OpenObjectField.test.tsx
similarity index 100%
rename from Composer/packages/extensions/adaptive-form/src/components/fields/OpenObjectField/__tests__/OpenObjectField.test.tsx
rename to Composer/packages/adaptive-form/src/components/fields/OpenObjectField/__tests__/OpenObjectField.test.tsx
diff --git a/Composer/packages/extensions/adaptive-form/src/components/fields/OpenObjectField/index.ts b/Composer/packages/adaptive-form/src/components/fields/OpenObjectField/index.ts
similarity index 100%
rename from Composer/packages/extensions/adaptive-form/src/components/fields/OpenObjectField/index.ts
rename to Composer/packages/adaptive-form/src/components/fields/OpenObjectField/index.ts
diff --git a/Composer/packages/extensions/adaptive-form/src/components/fields/OpenObjectField/styles.ts b/Composer/packages/adaptive-form/src/components/fields/OpenObjectField/styles.ts
similarity index 100%
rename from Composer/packages/extensions/adaptive-form/src/components/fields/OpenObjectField/styles.ts
rename to Composer/packages/adaptive-form/src/components/fields/OpenObjectField/styles.ts
diff --git a/Composer/packages/extensions/adaptive-form/src/components/fields/QnAActionsField.tsx b/Composer/packages/adaptive-form/src/components/fields/QnAActionsField.tsx
similarity index 100%
rename from Composer/packages/extensions/adaptive-form/src/components/fields/QnAActionsField.tsx
rename to Composer/packages/adaptive-form/src/components/fields/QnAActionsField.tsx
diff --git a/Composer/packages/extensions/adaptive-form/src/components/fields/RecognizerField.tsx b/Composer/packages/adaptive-form/src/components/fields/RecognizerField.tsx
similarity index 100%
rename from Composer/packages/extensions/adaptive-form/src/components/fields/RecognizerField.tsx
rename to Composer/packages/adaptive-form/src/components/fields/RecognizerField.tsx
diff --git a/Composer/packages/extensions/adaptive-form/src/components/fields/RegexIntentField.tsx b/Composer/packages/adaptive-form/src/components/fields/RegexIntentField.tsx
similarity index 100%
rename from Composer/packages/extensions/adaptive-form/src/components/fields/RegexIntentField.tsx
rename to Composer/packages/adaptive-form/src/components/fields/RegexIntentField.tsx
diff --git a/Composer/packages/extensions/adaptive-form/src/components/fields/SelectField.tsx b/Composer/packages/adaptive-form/src/components/fields/SelectField.tsx
similarity index 100%
rename from Composer/packages/extensions/adaptive-form/src/components/fields/SelectField.tsx
rename to Composer/packages/adaptive-form/src/components/fields/SelectField.tsx
diff --git a/Composer/packages/extensions/adaptive-form/src/components/fields/StringField.tsx b/Composer/packages/adaptive-form/src/components/fields/StringField.tsx
similarity index 100%
rename from Composer/packages/extensions/adaptive-form/src/components/fields/StringField.tsx
rename to Composer/packages/adaptive-form/src/components/fields/StringField.tsx
diff --git a/Composer/packages/extensions/adaptive-form/src/components/fields/UnsupportedField.tsx b/Composer/packages/adaptive-form/src/components/fields/UnsupportedField.tsx
similarity index 100%
rename from Composer/packages/extensions/adaptive-form/src/components/fields/UnsupportedField.tsx
rename to Composer/packages/adaptive-form/src/components/fields/UnsupportedField.tsx
diff --git a/Composer/packages/extensions/adaptive-form/src/components/fields/__tests__/ArrayField.test.tsx b/Composer/packages/adaptive-form/src/components/fields/__tests__/ArrayField.test.tsx
similarity index 100%
rename from Composer/packages/extensions/adaptive-form/src/components/fields/__tests__/ArrayField.test.tsx
rename to Composer/packages/adaptive-form/src/components/fields/__tests__/ArrayField.test.tsx
diff --git a/Composer/packages/extensions/adaptive-form/src/components/fields/__tests__/ArrayFieldItem.tsx b/Composer/packages/adaptive-form/src/components/fields/__tests__/ArrayFieldItem.tsx
similarity index 100%
rename from Composer/packages/extensions/adaptive-form/src/components/fields/__tests__/ArrayFieldItem.tsx
rename to Composer/packages/adaptive-form/src/components/fields/__tests__/ArrayFieldItem.tsx
diff --git a/Composer/packages/extensions/adaptive-form/src/components/fields/__tests__/BooleanField.test.tsx b/Composer/packages/adaptive-form/src/components/fields/__tests__/BooleanField.test.tsx
similarity index 100%
rename from Composer/packages/extensions/adaptive-form/src/components/fields/__tests__/BooleanField.test.tsx
rename to Composer/packages/adaptive-form/src/components/fields/__tests__/BooleanField.test.tsx
diff --git a/Composer/packages/extensions/adaptive-form/src/components/fields/__tests__/IntentField.test.tsx b/Composer/packages/adaptive-form/src/components/fields/__tests__/IntentField.test.tsx
similarity index 100%
rename from Composer/packages/extensions/adaptive-form/src/components/fields/__tests__/IntentField.test.tsx
rename to Composer/packages/adaptive-form/src/components/fields/__tests__/IntentField.test.tsx
diff --git a/Composer/packages/extensions/adaptive-form/src/components/fields/__tests__/JsonField.test.tsx b/Composer/packages/adaptive-form/src/components/fields/__tests__/JsonField.test.tsx
similarity index 100%
rename from Composer/packages/extensions/adaptive-form/src/components/fields/__tests__/JsonField.test.tsx
rename to Composer/packages/adaptive-form/src/components/fields/__tests__/JsonField.test.tsx
diff --git a/Composer/packages/extensions/adaptive-form/src/components/fields/__tests__/NumberField.test.tsx b/Composer/packages/adaptive-form/src/components/fields/__tests__/NumberField.test.tsx
similarity index 100%
rename from Composer/packages/extensions/adaptive-form/src/components/fields/__tests__/NumberField.test.tsx
rename to Composer/packages/adaptive-form/src/components/fields/__tests__/NumberField.test.tsx
diff --git a/Composer/packages/extensions/adaptive-form/src/components/fields/__tests__/ObjectArrayField.test.tsx b/Composer/packages/adaptive-form/src/components/fields/__tests__/ObjectArrayField.test.tsx
similarity index 100%
rename from Composer/packages/extensions/adaptive-form/src/components/fields/__tests__/ObjectArrayField.test.tsx
rename to Composer/packages/adaptive-form/src/components/fields/__tests__/ObjectArrayField.test.tsx
diff --git a/Composer/packages/extensions/adaptive-form/src/components/fields/__tests__/ObjectField.test.tsx b/Composer/packages/adaptive-form/src/components/fields/__tests__/ObjectField.test.tsx
similarity index 100%
rename from Composer/packages/extensions/adaptive-form/src/components/fields/__tests__/ObjectField.test.tsx
rename to Composer/packages/adaptive-form/src/components/fields/__tests__/ObjectField.test.tsx
diff --git a/Composer/packages/extensions/adaptive-form/src/components/fields/__tests__/RecognizerField.test.tsx b/Composer/packages/adaptive-form/src/components/fields/__tests__/RecognizerField.test.tsx
similarity index 100%
rename from Composer/packages/extensions/adaptive-form/src/components/fields/__tests__/RecognizerField.test.tsx
rename to Composer/packages/adaptive-form/src/components/fields/__tests__/RecognizerField.test.tsx
diff --git a/Composer/packages/extensions/adaptive-form/src/components/fields/__tests__/RegexIntentField.test.tsx b/Composer/packages/adaptive-form/src/components/fields/__tests__/RegexIntentField.test.tsx
similarity index 100%
rename from Composer/packages/extensions/adaptive-form/src/components/fields/__tests__/RegexIntentField.test.tsx
rename to Composer/packages/adaptive-form/src/components/fields/__tests__/RegexIntentField.test.tsx
diff --git a/Composer/packages/extensions/adaptive-form/src/components/fields/__tests__/SelectField.test.tsx b/Composer/packages/adaptive-form/src/components/fields/__tests__/SelectField.test.tsx
similarity index 100%
rename from Composer/packages/extensions/adaptive-form/src/components/fields/__tests__/SelectField.test.tsx
rename to Composer/packages/adaptive-form/src/components/fields/__tests__/SelectField.test.tsx
diff --git a/Composer/packages/extensions/adaptive-form/src/components/fields/__tests__/StringField.test.tsx b/Composer/packages/adaptive-form/src/components/fields/__tests__/StringField.test.tsx
similarity index 100%
rename from Composer/packages/extensions/adaptive-form/src/components/fields/__tests__/StringField.test.tsx
rename to Composer/packages/adaptive-form/src/components/fields/__tests__/StringField.test.tsx
diff --git a/Composer/packages/extensions/adaptive-form/src/components/fields/__tests__/UnsupportedField.test.tsx b/Composer/packages/adaptive-form/src/components/fields/__tests__/UnsupportedField.test.tsx
similarity index 100%
rename from Composer/packages/extensions/adaptive-form/src/components/fields/__tests__/UnsupportedField.test.tsx
rename to Composer/packages/adaptive-form/src/components/fields/__tests__/UnsupportedField.test.tsx
diff --git a/Composer/packages/extensions/adaptive-form/src/components/fields/__tests__/testUtils.ts b/Composer/packages/adaptive-form/src/components/fields/__tests__/testUtils.ts
similarity index 100%
rename from Composer/packages/extensions/adaptive-form/src/components/fields/__tests__/testUtils.ts
rename to Composer/packages/adaptive-form/src/components/fields/__tests__/testUtils.ts
diff --git a/Composer/packages/extensions/adaptive-form/src/components/fields/index.ts b/Composer/packages/adaptive-form/src/components/fields/index.ts
similarity index 100%
rename from Composer/packages/extensions/adaptive-form/src/components/fields/index.ts
rename to Composer/packages/adaptive-form/src/components/fields/index.ts
diff --git a/Composer/packages/extensions/adaptive-form/src/components/fields/styles.ts b/Composer/packages/adaptive-form/src/components/fields/styles.ts
similarity index 100%
rename from Composer/packages/extensions/adaptive-form/src/components/fields/styles.ts
rename to Composer/packages/adaptive-form/src/components/fields/styles.ts
diff --git a/Composer/packages/extensions/adaptive-form/src/components/index.ts b/Composer/packages/adaptive-form/src/components/index.ts
similarity index 100%
rename from Composer/packages/extensions/adaptive-form/src/components/index.ts
rename to Composer/packages/adaptive-form/src/components/index.ts
diff --git a/Composer/packages/extensions/adaptive-form/src/components/sharedStyles.ts b/Composer/packages/adaptive-form/src/components/sharedStyles.ts
similarity index 100%
rename from Composer/packages/extensions/adaptive-form/src/components/sharedStyles.ts
rename to Composer/packages/adaptive-form/src/components/sharedStyles.ts
diff --git a/Composer/packages/extensions/adaptive-form/src/defaultRecognizers.ts b/Composer/packages/adaptive-form/src/defaultRecognizers.ts
similarity index 100%
rename from Composer/packages/extensions/adaptive-form/src/defaultRecognizers.ts
rename to Composer/packages/adaptive-form/src/defaultRecognizers.ts
diff --git a/Composer/packages/extensions/adaptive-form/src/index.ts b/Composer/packages/adaptive-form/src/index.ts
similarity index 100%
rename from Composer/packages/extensions/adaptive-form/src/index.ts
rename to Composer/packages/adaptive-form/src/index.ts
diff --git a/Composer/packages/extensions/adaptive-form/src/utils/__tests__/arrayUtils.test.ts b/Composer/packages/adaptive-form/src/utils/__tests__/arrayUtils.test.ts
similarity index 100%
rename from Composer/packages/extensions/adaptive-form/src/utils/__tests__/arrayUtils.test.ts
rename to Composer/packages/adaptive-form/src/utils/__tests__/arrayUtils.test.ts
diff --git a/Composer/packages/extensions/adaptive-form/src/utils/__tests__/getOrderedProperties.test.ts b/Composer/packages/adaptive-form/src/utils/__tests__/getOrderedProperties.test.ts
similarity index 100%
rename from Composer/packages/extensions/adaptive-form/src/utils/__tests__/getOrderedProperties.test.ts
rename to Composer/packages/adaptive-form/src/utils/__tests__/getOrderedProperties.test.ts
diff --git a/Composer/packages/extensions/adaptive-form/src/utils/__tests__/getUIOptions.test.ts b/Composer/packages/adaptive-form/src/utils/__tests__/getUIOptions.test.ts
similarity index 100%
rename from Composer/packages/extensions/adaptive-form/src/utils/__tests__/getUIOptions.test.ts
rename to Composer/packages/adaptive-form/src/utils/__tests__/getUIOptions.test.ts
diff --git a/Composer/packages/extensions/adaptive-form/src/utils/__tests__/getValueType.test.ts b/Composer/packages/adaptive-form/src/utils/__tests__/getValueType.test.ts
similarity index 100%
rename from Composer/packages/extensions/adaptive-form/src/utils/__tests__/getValueType.test.ts
rename to Composer/packages/adaptive-form/src/utils/__tests__/getValueType.test.ts
diff --git a/Composer/packages/extensions/adaptive-form/src/utils/__tests__/objectUtils.test.ts b/Composer/packages/adaptive-form/src/utils/__tests__/objectUtils.test.ts
similarity index 100%
rename from Composer/packages/extensions/adaptive-form/src/utils/__tests__/objectUtils.test.ts
rename to Composer/packages/adaptive-form/src/utils/__tests__/objectUtils.test.ts
diff --git a/Composer/packages/extensions/adaptive-form/src/utils/__tests__/resolveFieldWidget.test.ts b/Composer/packages/adaptive-form/src/utils/__tests__/resolveFieldWidget.test.ts
similarity index 100%
rename from Composer/packages/extensions/adaptive-form/src/utils/__tests__/resolveFieldWidget.test.ts
rename to Composer/packages/adaptive-form/src/utils/__tests__/resolveFieldWidget.test.ts
diff --git a/Composer/packages/extensions/adaptive-form/src/utils/__tests__/resolvePropSchema.test.ts b/Composer/packages/adaptive-form/src/utils/__tests__/resolvePropSchema.test.ts
similarity index 100%
rename from Composer/packages/extensions/adaptive-form/src/utils/__tests__/resolvePropSchema.test.ts
rename to Composer/packages/adaptive-form/src/utils/__tests__/resolvePropSchema.test.ts
diff --git a/Composer/packages/extensions/adaptive-form/src/utils/__tests__/resolveRef.test.ts b/Composer/packages/adaptive-form/src/utils/__tests__/resolveRef.test.ts
similarity index 100%
rename from Composer/packages/extensions/adaptive-form/src/utils/__tests__/resolveRef.test.ts
rename to Composer/packages/adaptive-form/src/utils/__tests__/resolveRef.test.ts
diff --git a/Composer/packages/extensions/adaptive-form/src/utils/__tests__/uiOptionsHelpers.test.ts b/Composer/packages/adaptive-form/src/utils/__tests__/uiOptionsHelpers.test.ts
similarity index 100%
rename from Composer/packages/extensions/adaptive-form/src/utils/__tests__/uiOptionsHelpers.test.ts
rename to Composer/packages/adaptive-form/src/utils/__tests__/uiOptionsHelpers.test.ts
diff --git a/Composer/packages/extensions/adaptive-form/src/utils/arrayUtils.ts b/Composer/packages/adaptive-form/src/utils/arrayUtils.ts
similarity index 100%
rename from Composer/packages/extensions/adaptive-form/src/utils/arrayUtils.ts
rename to Composer/packages/adaptive-form/src/utils/arrayUtils.ts
diff --git a/Composer/packages/extensions/adaptive-form/src/utils/getHiddenProperties.ts b/Composer/packages/adaptive-form/src/utils/getHiddenProperties.ts
similarity index 100%
rename from Composer/packages/extensions/adaptive-form/src/utils/getHiddenProperties.ts
rename to Composer/packages/adaptive-form/src/utils/getHiddenProperties.ts
diff --git a/Composer/packages/extensions/adaptive-form/src/utils/getIntellisenseUrl.ts b/Composer/packages/adaptive-form/src/utils/getIntellisenseUrl.ts
similarity index 100%
rename from Composer/packages/extensions/adaptive-form/src/utils/getIntellisenseUrl.ts
rename to Composer/packages/adaptive-form/src/utils/getIntellisenseUrl.ts
diff --git a/Composer/packages/extensions/adaptive-form/src/utils/getOrderedProperties.ts b/Composer/packages/adaptive-form/src/utils/getOrderedProperties.ts
similarity index 100%
rename from Composer/packages/extensions/adaptive-form/src/utils/getOrderedProperties.ts
rename to Composer/packages/adaptive-form/src/utils/getOrderedProperties.ts
diff --git a/Composer/packages/extensions/adaptive-form/src/utils/getUIOptions.ts b/Composer/packages/adaptive-form/src/utils/getUIOptions.ts
similarity index 100%
rename from Composer/packages/extensions/adaptive-form/src/utils/getUIOptions.ts
rename to Composer/packages/adaptive-form/src/utils/getUIOptions.ts
diff --git a/Composer/packages/extensions/adaptive-form/src/utils/getValueType.ts b/Composer/packages/adaptive-form/src/utils/getValueType.ts
similarity index 100%
rename from Composer/packages/extensions/adaptive-form/src/utils/getValueType.ts
rename to Composer/packages/adaptive-form/src/utils/getValueType.ts
diff --git a/Composer/packages/extensions/adaptive-form/src/utils/index.ts b/Composer/packages/adaptive-form/src/utils/index.ts
similarity index 100%
rename from Composer/packages/extensions/adaptive-form/src/utils/index.ts
rename to Composer/packages/adaptive-form/src/utils/index.ts
diff --git a/Composer/packages/extensions/adaptive-form/src/utils/objectUtils.ts b/Composer/packages/adaptive-form/src/utils/objectUtils.ts
similarity index 100%
rename from Composer/packages/extensions/adaptive-form/src/utils/objectUtils.ts
rename to Composer/packages/adaptive-form/src/utils/objectUtils.ts
diff --git a/Composer/packages/extensions/adaptive-form/src/utils/resolveFieldWidget.ts b/Composer/packages/adaptive-form/src/utils/resolveFieldWidget.ts
similarity index 100%
rename from Composer/packages/extensions/adaptive-form/src/utils/resolveFieldWidget.ts
rename to Composer/packages/adaptive-form/src/utils/resolveFieldWidget.ts
diff --git a/Composer/packages/extensions/adaptive-form/src/utils/resolvePropSchema.ts b/Composer/packages/adaptive-form/src/utils/resolvePropSchema.ts
similarity index 100%
rename from Composer/packages/extensions/adaptive-form/src/utils/resolvePropSchema.ts
rename to Composer/packages/adaptive-form/src/utils/resolvePropSchema.ts
diff --git a/Composer/packages/extensions/adaptive-form/src/utils/resolveRef.ts b/Composer/packages/adaptive-form/src/utils/resolveRef.ts
similarity index 100%
rename from Composer/packages/extensions/adaptive-form/src/utils/resolveRef.ts
rename to Composer/packages/adaptive-form/src/utils/resolveRef.ts
diff --git a/Composer/packages/extensions/adaptive-form/src/utils/uiOptionsHelpers.ts b/Composer/packages/adaptive-form/src/utils/uiOptionsHelpers.ts
similarity index 100%
rename from Composer/packages/extensions/adaptive-form/src/utils/uiOptionsHelpers.ts
rename to Composer/packages/adaptive-form/src/utils/uiOptionsHelpers.ts
diff --git a/Composer/packages/extensions/adaptive-form/tsconfig.build.json b/Composer/packages/adaptive-form/tsconfig.build.json
similarity index 100%
rename from Composer/packages/extensions/adaptive-form/tsconfig.build.json
rename to Composer/packages/adaptive-form/tsconfig.build.json
diff --git a/Composer/packages/extensions/intellisense/tsconfig.json b/Composer/packages/adaptive-form/tsconfig.json
similarity index 63%
rename from Composer/packages/extensions/intellisense/tsconfig.json
rename to Composer/packages/adaptive-form/tsconfig.json
index 3188b0d622..9a58047b72 100644
--- a/Composer/packages/extensions/intellisense/tsconfig.json
+++ b/Composer/packages/adaptive-form/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../../tsconfig.base.json",
+  "extends": "../../tsconfig.base.json",
   "compilerOptions": {
     "outDir": "./lib/",
   },
diff --git a/Composer/packages/extensions/extension-client/.gitignore b/Composer/packages/extension-client/.gitignore
similarity index 100%
rename from Composer/packages/extensions/extension-client/.gitignore
rename to Composer/packages/extension-client/.gitignore
diff --git a/Composer/packages/extensions/extension-client/package.json b/Composer/packages/extension-client/package.json
similarity index 100%
rename from Composer/packages/extensions/extension-client/package.json
rename to Composer/packages/extension-client/package.json
diff --git a/Composer/packages/extensions/extension-client/src/auth/index.ts b/Composer/packages/extension-client/src/auth/index.ts
similarity index 100%
rename from Composer/packages/extensions/extension-client/src/auth/index.ts
rename to Composer/packages/extension-client/src/auth/index.ts
diff --git a/Composer/packages/extensions/extension-client/src/auth/types.ts b/Composer/packages/extension-client/src/auth/types.ts
similarity index 100%
rename from Composer/packages/extensions/extension-client/src/auth/types.ts
rename to Composer/packages/extension-client/src/auth/types.ts
diff --git a/Composer/packages/extensions/extension-client/src/common/constants.ts b/Composer/packages/extension-client/src/common/constants.ts
similarity index 100%
rename from Composer/packages/extensions/extension-client/src/common/constants.ts
rename to Composer/packages/extension-client/src/common/constants.ts
diff --git a/Composer/packages/extensions/extension-client/src/common/index.ts b/Composer/packages/extension-client/src/common/index.ts
similarity index 100%
rename from Composer/packages/extensions/extension-client/src/common/index.ts
rename to Composer/packages/extension-client/src/common/index.ts
diff --git a/Composer/packages/extensions/extension-client/src/index.ts b/Composer/packages/extension-client/src/index.ts
similarity index 100%
rename from Composer/packages/extensions/extension-client/src/index.ts
rename to Composer/packages/extension-client/src/index.ts
diff --git a/Composer/packages/extensions/extension-client/src/logger.ts b/Composer/packages/extension-client/src/logger.ts
similarity index 100%
rename from Composer/packages/extensions/extension-client/src/logger.ts
rename to Composer/packages/extension-client/src/logger.ts
diff --git a/Composer/packages/extensions/extension-client/src/page/index.ts b/Composer/packages/extension-client/src/page/index.ts
similarity index 100%
rename from Composer/packages/extensions/extension-client/src/page/index.ts
rename to Composer/packages/extension-client/src/page/index.ts
diff --git a/Composer/packages/extensions/extension-client/src/publish/index.ts b/Composer/packages/extension-client/src/publish/index.ts
similarity index 100%
rename from Composer/packages/extensions/extension-client/src/publish/index.ts
rename to Composer/packages/extension-client/src/publish/index.ts
diff --git a/Composer/packages/extensions/extension-client/src/publish/types.ts b/Composer/packages/extension-client/src/publish/types.ts
similarity index 100%
rename from Composer/packages/extensions/extension-client/src/publish/types.ts
rename to Composer/packages/extension-client/src/publish/types.ts
diff --git a/Composer/packages/extensions/extension-client/tsconfig.json b/Composer/packages/extension-client/tsconfig.json
similarity index 74%
rename from Composer/packages/extensions/extension-client/tsconfig.json
rename to Composer/packages/extension-client/tsconfig.json
index 7b759015d1..e3e6f1d50b 100644
--- a/Composer/packages/extensions/extension-client/tsconfig.json
+++ b/Composer/packages/extension-client/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../../tsconfig.base.json",
+  "extends": "../../tsconfig.base.json",
   "compilerOptions": {
     "outDir": "./lib/",
     "sourceMap": true,
diff --git a/Composer/packages/extensions/adaptive-form/.eslintrc.js b/Composer/packages/extension/.eslintrc.js
similarity index 71%
rename from Composer/packages/extensions/adaptive-form/.eslintrc.js
rename to Composer/packages/extension/.eslintrc.js
index ccecb8e9c0..db24b086e0 100644
--- a/Composer/packages/extensions/adaptive-form/.eslintrc.js
+++ b/Composer/packages/extension/.eslintrc.js
@@ -1,5 +1,5 @@
 module.exports = {
-  extends: ['../../../.eslintrc.react.js'],
+  extends: ['../../.eslintrc.react.js'],
   parserOptions: {
     project: './tsconfig.json',
     tsconfigRootDir: __dirname,
diff --git a/Composer/packages/extensions/extension/.gitignore b/Composer/packages/extension/.gitignore
similarity index 100%
rename from Composer/packages/extensions/extension/.gitignore
rename to Composer/packages/extension/.gitignore
diff --git a/Composer/packages/extensions/extension/jest.config.js b/Composer/packages/extension/jest.config.js
similarity index 100%
rename from Composer/packages/extensions/extension/jest.config.js
rename to Composer/packages/extension/jest.config.js
diff --git a/Composer/packages/extensions/extension/package.json b/Composer/packages/extension/package.json
similarity index 100%
rename from Composer/packages/extensions/extension/package.json
rename to Composer/packages/extension/package.json
diff --git a/Composer/packages/extensions/extension/src/components/Extension.tsx b/Composer/packages/extension/src/components/Extension.tsx
similarity index 100%
rename from Composer/packages/extensions/extension/src/components/Extension.tsx
rename to Composer/packages/extension/src/components/Extension.tsx
diff --git a/Composer/packages/extensions/extension/src/components/index.ts b/Composer/packages/extension/src/components/index.ts
similarity index 100%
rename from Composer/packages/extensions/extension/src/components/index.ts
rename to Composer/packages/extension/src/components/index.ts
diff --git a/Composer/packages/extensions/extension/src/extensionContext.ts b/Composer/packages/extension/src/extensionContext.ts
similarity index 100%
rename from Composer/packages/extensions/extension/src/extensionContext.ts
rename to Composer/packages/extension/src/extensionContext.ts
diff --git a/Composer/packages/extensions/extension/src/hooks/__tests__/useFlowConfig.test.tsx b/Composer/packages/extension/src/hooks/__tests__/useFlowConfig.test.tsx
similarity index 100%
rename from Composer/packages/extensions/extension/src/hooks/__tests__/useFlowConfig.test.tsx
rename to Composer/packages/extension/src/hooks/__tests__/useFlowConfig.test.tsx
diff --git a/Composer/packages/extensions/extension/src/hooks/__tests__/useFormConfig.test.tsx b/Composer/packages/extension/src/hooks/__tests__/useFormConfig.test.tsx
similarity index 100%
rename from Composer/packages/extensions/extension/src/hooks/__tests__/useFormConfig.test.tsx
rename to Composer/packages/extension/src/hooks/__tests__/useFormConfig.test.tsx
diff --git a/Composer/packages/extensions/extension/src/hooks/__tests__/useMenuConfig.test.tsx b/Composer/packages/extension/src/hooks/__tests__/useMenuConfig.test.tsx
similarity index 100%
rename from Composer/packages/extensions/extension/src/hooks/__tests__/useMenuConfig.test.tsx
rename to Composer/packages/extension/src/hooks/__tests__/useMenuConfig.test.tsx
diff --git a/Composer/packages/extensions/extension/src/hooks/__tests__/useRecognizerConfig.test.tsx b/Composer/packages/extension/src/hooks/__tests__/useRecognizerConfig.test.tsx
similarity index 100%
rename from Composer/packages/extensions/extension/src/hooks/__tests__/useRecognizerConfig.test.tsx
rename to Composer/packages/extension/src/hooks/__tests__/useRecognizerConfig.test.tsx
diff --git a/Composer/packages/extensions/extension/src/hooks/index.ts b/Composer/packages/extension/src/hooks/index.ts
similarity index 100%
rename from Composer/packages/extensions/extension/src/hooks/index.ts
rename to Composer/packages/extension/src/hooks/index.ts
diff --git a/Composer/packages/extensions/extension/src/hooks/useActionApi.ts b/Composer/packages/extension/src/hooks/useActionApi.ts
similarity index 100%
rename from Composer/packages/extensions/extension/src/hooks/useActionApi.ts
rename to Composer/packages/extension/src/hooks/useActionApi.ts
diff --git a/Composer/packages/extensions/extension/src/hooks/useDebounce.ts b/Composer/packages/extension/src/hooks/useDebounce.ts
similarity index 100%
rename from Composer/packages/extensions/extension/src/hooks/useDebounce.ts
rename to Composer/packages/extension/src/hooks/useDebounce.ts
diff --git a/Composer/packages/extensions/extension/src/hooks/useDialogApi.ts b/Composer/packages/extension/src/hooks/useDialogApi.ts
similarity index 100%
rename from Composer/packages/extensions/extension/src/hooks/useDialogApi.ts
rename to Composer/packages/extension/src/hooks/useDialogApi.ts
diff --git a/Composer/packages/extensions/extension/src/hooks/useDialogEditApi.ts b/Composer/packages/extension/src/hooks/useDialogEditApi.ts
similarity index 100%
rename from Composer/packages/extensions/extension/src/hooks/useDialogEditApi.ts
rename to Composer/packages/extension/src/hooks/useDialogEditApi.ts
diff --git a/Composer/packages/extensions/extension/src/hooks/useFlowConfig.ts b/Composer/packages/extension/src/hooks/useFlowConfig.ts
similarity index 100%
rename from Composer/packages/extensions/extension/src/hooks/useFlowConfig.ts
rename to Composer/packages/extension/src/hooks/useFlowConfig.ts
diff --git a/Composer/packages/extensions/extension/src/hooks/useFormConfig.ts b/Composer/packages/extension/src/hooks/useFormConfig.ts
similarity index 100%
rename from Composer/packages/extensions/extension/src/hooks/useFormConfig.ts
rename to Composer/packages/extension/src/hooks/useFormConfig.ts
diff --git a/Composer/packages/extensions/extension/src/hooks/useLgApi.ts b/Composer/packages/extension/src/hooks/useLgApi.ts
similarity index 100%
rename from Composer/packages/extensions/extension/src/hooks/useLgApi.ts
rename to Composer/packages/extension/src/hooks/useLgApi.ts
diff --git a/Composer/packages/extensions/extension/src/hooks/useLuApi.ts b/Composer/packages/extension/src/hooks/useLuApi.ts
similarity index 100%
rename from Composer/packages/extensions/extension/src/hooks/useLuApi.ts
rename to Composer/packages/extension/src/hooks/useLuApi.ts
diff --git a/Composer/packages/extensions/extension/src/hooks/useMenuConfig.ts b/Composer/packages/extension/src/hooks/useMenuConfig.ts
similarity index 100%
rename from Composer/packages/extensions/extension/src/hooks/useMenuConfig.ts
rename to Composer/packages/extension/src/hooks/useMenuConfig.ts
diff --git a/Composer/packages/extensions/extension/src/hooks/useRecognizerConfig.ts b/Composer/packages/extension/src/hooks/useRecognizerConfig.ts
similarity index 100%
rename from Composer/packages/extensions/extension/src/hooks/useRecognizerConfig.ts
rename to Composer/packages/extension/src/hooks/useRecognizerConfig.ts
diff --git a/Composer/packages/extensions/extension/src/hooks/useShellApi.ts b/Composer/packages/extension/src/hooks/useShellApi.ts
similarity index 100%
rename from Composer/packages/extensions/extension/src/hooks/useShellApi.ts
rename to Composer/packages/extension/src/hooks/useShellApi.ts
diff --git a/Composer/packages/extensions/extension/src/hooks/useTriggerApi.ts b/Composer/packages/extension/src/hooks/useTriggerApi.ts
similarity index 100%
rename from Composer/packages/extensions/extension/src/hooks/useTriggerApi.ts
rename to Composer/packages/extension/src/hooks/useTriggerApi.ts
diff --git a/Composer/packages/extensions/extension/src/index.ts b/Composer/packages/extension/src/index.ts
similarity index 100%
rename from Composer/packages/extensions/extension/src/index.ts
rename to Composer/packages/extension/src/index.ts
diff --git a/Composer/packages/extensions/extension/src/types/extension.ts b/Composer/packages/extension/src/types/extension.ts
similarity index 100%
rename from Composer/packages/extensions/extension/src/types/extension.ts
rename to Composer/packages/extension/src/types/extension.ts
diff --git a/Composer/packages/extensions/extension/src/types/flowSchema.ts b/Composer/packages/extension/src/types/flowSchema.ts
similarity index 100%
rename from Composer/packages/extensions/extension/src/types/flowSchema.ts
rename to Composer/packages/extension/src/types/flowSchema.ts
diff --git a/Composer/packages/extensions/extension/src/types/form.ts b/Composer/packages/extension/src/types/form.ts
similarity index 100%
rename from Composer/packages/extensions/extension/src/types/form.ts
rename to Composer/packages/extension/src/types/form.ts
diff --git a/Composer/packages/extensions/extension/src/types/formSchema.ts b/Composer/packages/extension/src/types/formSchema.ts
similarity index 100%
rename from Composer/packages/extensions/extension/src/types/formSchema.ts
rename to Composer/packages/extension/src/types/formSchema.ts
diff --git a/Composer/packages/extensions/extension/src/types/index.ts b/Composer/packages/extension/src/types/index.ts
similarity index 100%
rename from Composer/packages/extensions/extension/src/types/index.ts
rename to Composer/packages/extension/src/types/index.ts
diff --git a/Composer/packages/extensions/extension/src/types/menuSchema.ts b/Composer/packages/extension/src/types/menuSchema.ts
similarity index 100%
rename from Composer/packages/extensions/extension/src/types/menuSchema.ts
rename to Composer/packages/extension/src/types/menuSchema.ts
diff --git a/Composer/packages/extensions/extension/src/utils/__tests__/mergePluginConfigs.test.ts b/Composer/packages/extension/src/utils/__tests__/mergePluginConfigs.test.ts
similarity index 100%
rename from Composer/packages/extensions/extension/src/utils/__tests__/mergePluginConfigs.test.ts
rename to Composer/packages/extension/src/utils/__tests__/mergePluginConfigs.test.ts
diff --git a/Composer/packages/extensions/extension/src/utils/index.ts b/Composer/packages/extension/src/utils/index.ts
similarity index 100%
rename from Composer/packages/extensions/extension/src/utils/index.ts
rename to Composer/packages/extension/src/utils/index.ts
diff --git a/Composer/packages/extensions/extension/src/utils/mergePluginConfigs.ts b/Composer/packages/extension/src/utils/mergePluginConfigs.ts
similarity index 100%
rename from Composer/packages/extensions/extension/src/utils/mergePluginConfigs.ts
rename to Composer/packages/extension/src/utils/mergePluginConfigs.ts
diff --git a/Composer/packages/extensions/extension/tsconfig.build.json b/Composer/packages/extension/tsconfig.build.json
similarity index 100%
rename from Composer/packages/extensions/extension/tsconfig.build.json
rename to Composer/packages/extension/tsconfig.build.json
diff --git a/Composer/packages/extensions/extension/tsconfig.json b/Composer/packages/extension/tsconfig.json
similarity index 63%
rename from Composer/packages/extensions/extension/tsconfig.json
rename to Composer/packages/extension/tsconfig.json
index 3188b0d622..9a58047b72 100644
--- a/Composer/packages/extensions/extension/tsconfig.json
+++ b/Composer/packages/extension/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../../tsconfig.base.json",
+  "extends": "../../tsconfig.base.json",
   "compilerOptions": {
     "outDir": "./lib/",
   },
diff --git a/Composer/packages/extensions/intellisense/.gitignore b/Composer/packages/intellisense/.gitignore
similarity index 100%
rename from Composer/packages/extensions/intellisense/.gitignore
rename to Composer/packages/intellisense/.gitignore
diff --git a/Composer/packages/extensions/intellisense/jest.config.js b/Composer/packages/intellisense/jest.config.js
similarity index 100%
rename from Composer/packages/extensions/intellisense/jest.config.js
rename to Composer/packages/intellisense/jest.config.js
diff --git a/Composer/packages/extensions/intellisense/package.json b/Composer/packages/intellisense/package.json
similarity index 100%
rename from Composer/packages/extensions/intellisense/package.json
rename to Composer/packages/intellisense/package.json
diff --git a/Composer/packages/extensions/intellisense/src/components/CompletionElement.tsx b/Composer/packages/intellisense/src/components/CompletionElement.tsx
similarity index 100%
rename from Composer/packages/extensions/intellisense/src/components/CompletionElement.tsx
rename to Composer/packages/intellisense/src/components/CompletionElement.tsx
diff --git a/Composer/packages/extensions/intellisense/src/components/CompletionList.tsx b/Composer/packages/intellisense/src/components/CompletionList.tsx
similarity index 100%
rename from Composer/packages/extensions/intellisense/src/components/CompletionList.tsx
rename to Composer/packages/intellisense/src/components/CompletionList.tsx
diff --git a/Composer/packages/extensions/intellisense/src/components/IntellisenseTextField.tsx b/Composer/packages/intellisense/src/components/IntellisenseTextField.tsx
similarity index 100%
rename from Composer/packages/extensions/intellisense/src/components/IntellisenseTextField.tsx
rename to Composer/packages/intellisense/src/components/IntellisenseTextField.tsx
diff --git a/Composer/packages/extensions/intellisense/src/components/__tests__/IntellisenseTextField.test.tsx b/Composer/packages/intellisense/src/components/__tests__/IntellisenseTextField.test.tsx
similarity index 100%
rename from Composer/packages/extensions/intellisense/src/components/__tests__/IntellisenseTextField.test.tsx
rename to Composer/packages/intellisense/src/components/__tests__/IntellisenseTextField.test.tsx
diff --git a/Composer/packages/extensions/intellisense/src/components/index.ts b/Composer/packages/intellisense/src/components/index.ts
similarity index 100%
rename from Composer/packages/extensions/intellisense/src/components/index.ts
rename to Composer/packages/intellisense/src/components/index.ts
diff --git a/Composer/packages/extensions/intellisense/src/hooks/useLanguageServer.ts b/Composer/packages/intellisense/src/hooks/useLanguageServer.ts
similarity index 100%
rename from Composer/packages/extensions/intellisense/src/hooks/useLanguageServer.ts
rename to Composer/packages/intellisense/src/hooks/useLanguageServer.ts
diff --git a/Composer/packages/extensions/intellisense/src/utils/lspMessagesUtils.ts b/Composer/packages/intellisense/src/utils/lspMessagesUtils.ts
similarity index 100%
rename from Composer/packages/extensions/intellisense/src/utils/lspMessagesUtils.ts
rename to Composer/packages/intellisense/src/utils/lspMessagesUtils.ts
diff --git a/Composer/packages/extensions/intellisense/src/utils/uiUtils.ts b/Composer/packages/intellisense/src/utils/uiUtils.ts
similarity index 100%
rename from Composer/packages/extensions/intellisense/src/utils/uiUtils.ts
rename to Composer/packages/intellisense/src/utils/uiUtils.ts
diff --git a/Composer/packages/extensions/intellisense/tsconfig.build.json b/Composer/packages/intellisense/tsconfig.build.json
similarity index 100%
rename from Composer/packages/extensions/intellisense/tsconfig.build.json
rename to Composer/packages/intellisense/tsconfig.build.json
diff --git a/Composer/packages/extensions/adaptive-form/tsconfig.json b/Composer/packages/intellisense/tsconfig.json
similarity index 63%
rename from Composer/packages/extensions/adaptive-form/tsconfig.json
rename to Composer/packages/intellisense/tsconfig.json
index 3188b0d622..9a58047b72 100644
--- a/Composer/packages/extensions/adaptive-form/tsconfig.json
+++ b/Composer/packages/intellisense/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../../tsconfig.base.json",
+  "extends": "../../tsconfig.base.json",
   "compilerOptions": {
     "outDir": "./lib/",
   },
diff --git a/Composer/packages/extensions/plugin-loader/.eslintrc.js b/Composer/packages/plugin-loader/.eslintrc.js
similarity index 82%
rename from Composer/packages/extensions/plugin-loader/.eslintrc.js
rename to Composer/packages/plugin-loader/.eslintrc.js
index bf813e84fd..8cbe448349 100644
--- a/Composer/packages/extensions/plugin-loader/.eslintrc.js
+++ b/Composer/packages/plugin-loader/.eslintrc.js
@@ -1,5 +1,5 @@
 module.exports = {
-  extends: ['../../../.eslintrc.js'],
+  extends: ['../../.eslintrc.js'],
   parserOptions: {
     project: './tsconfig.json',
     tsconfigRootDir: __dirname,
diff --git a/Composer/packages/extensions/plugin-loader/.gitignore b/Composer/packages/plugin-loader/.gitignore
similarity index 100%
rename from Composer/packages/extensions/plugin-loader/.gitignore
rename to Composer/packages/plugin-loader/.gitignore
diff --git a/Composer/packages/extensions/plugin-loader/package.json b/Composer/packages/plugin-loader/package.json
similarity index 100%
rename from Composer/packages/extensions/plugin-loader/package.json
rename to Composer/packages/plugin-loader/package.json
diff --git a/Composer/packages/extensions/plugin-loader/src/index.ts b/Composer/packages/plugin-loader/src/index.ts
similarity index 100%
rename from Composer/packages/extensions/plugin-loader/src/index.ts
rename to Composer/packages/plugin-loader/src/index.ts
diff --git a/Composer/packages/extensions/plugin-loader/src/loader/composerPluginRegistration.ts b/Composer/packages/plugin-loader/src/loader/composerPluginRegistration.ts
similarity index 100%
rename from Composer/packages/extensions/plugin-loader/src/loader/composerPluginRegistration.ts
rename to Composer/packages/plugin-loader/src/loader/composerPluginRegistration.ts
diff --git a/Composer/packages/extensions/plugin-loader/src/loader/index.ts b/Composer/packages/plugin-loader/src/loader/index.ts
similarity index 100%
rename from Composer/packages/extensions/plugin-loader/src/loader/index.ts
rename to Composer/packages/plugin-loader/src/loader/index.ts
diff --git a/Composer/packages/extensions/plugin-loader/src/loader/pluginLoader.ts b/Composer/packages/plugin-loader/src/loader/pluginLoader.ts
similarity index 100%
rename from Composer/packages/extensions/plugin-loader/src/loader/pluginLoader.ts
rename to Composer/packages/plugin-loader/src/loader/pluginLoader.ts
diff --git a/Composer/packages/extensions/plugin-loader/src/logger.ts b/Composer/packages/plugin-loader/src/logger.ts
similarity index 100%
rename from Composer/packages/extensions/plugin-loader/src/logger.ts
rename to Composer/packages/plugin-loader/src/logger.ts
diff --git a/Composer/packages/extensions/plugin-loader/src/manager/index.ts b/Composer/packages/plugin-loader/src/manager/index.ts
similarity index 100%
rename from Composer/packages/extensions/plugin-loader/src/manager/index.ts
rename to Composer/packages/plugin-loader/src/manager/index.ts
diff --git a/Composer/packages/extensions/plugin-loader/src/manager/manager.ts b/Composer/packages/plugin-loader/src/manager/manager.ts
similarity index 100%
rename from Composer/packages/extensions/plugin-loader/src/manager/manager.ts
rename to Composer/packages/plugin-loader/src/manager/manager.ts
diff --git a/Composer/packages/extensions/plugin-loader/src/storage/extensionManifestStore.ts b/Composer/packages/plugin-loader/src/storage/extensionManifestStore.ts
similarity index 100%
rename from Composer/packages/extensions/plugin-loader/src/storage/extensionManifestStore.ts
rename to Composer/packages/plugin-loader/src/storage/extensionManifestStore.ts
diff --git a/Composer/packages/extensions/plugin-loader/src/storage/index.ts b/Composer/packages/plugin-loader/src/storage/index.ts
similarity index 100%
rename from Composer/packages/extensions/plugin-loader/src/storage/index.ts
rename to Composer/packages/plugin-loader/src/storage/index.ts
diff --git a/Composer/packages/extensions/plugin-loader/src/types/extension.ts b/Composer/packages/plugin-loader/src/types/extension.ts
similarity index 100%
rename from Composer/packages/extensions/plugin-loader/src/types/extension.ts
rename to Composer/packages/plugin-loader/src/types/extension.ts
diff --git a/Composer/packages/extensions/plugin-loader/src/types/types.ts b/Composer/packages/plugin-loader/src/types/types.ts
similarity index 100%
rename from Composer/packages/extensions/plugin-loader/src/types/types.ts
rename to Composer/packages/plugin-loader/src/types/types.ts
diff --git a/Composer/packages/extensions/plugin-loader/tsconfig.json b/Composer/packages/plugin-loader/tsconfig.json
similarity index 74%
rename from Composer/packages/extensions/plugin-loader/tsconfig.json
rename to Composer/packages/plugin-loader/tsconfig.json
index 7b759015d1..e3e6f1d50b 100644
--- a/Composer/packages/extensions/plugin-loader/tsconfig.json
+++ b/Composer/packages/plugin-loader/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../../tsconfig.base.json",
+  "extends": "../../tsconfig.base.json",
   "compilerOptions": {
     "outDir": "./lib/",
     "sourceMap": true,
diff --git a/Composer/plugins/azurePublish/package.json b/Composer/plugins/azurePublish/package.json
index c2cbeeb75e..66f433ade2 100644
--- a/Composer/plugins/azurePublish/package.json
+++ b/Composer/plugins/azurePublish/package.json
@@ -20,7 +20,7 @@
     "@azure/ms-rest-browserauth": "0.1.4",
     "@azure/ms-rest-nodeauth": "3.0.3",
     "@bfc/indexers": "../../packages/lib/indexers",
-    "@bfc/plugin-loader": "../../packages/extensions/plugin-loader",
+    "@bfc/plugin-loader": "../../packages/plugin-loader",
     "@bfc/shared": "../../packages/lib/shared",
     "@microsoft/bf-lu": "^4.10.0-dev.20200728.930f45e",
     "@microsoft/bf-luis-cli": "^4.10.0-dev.20200721.8bb21ac",
diff --git a/Composer/plugins/azurePublish/yarn.lock b/Composer/plugins/azurePublish/yarn.lock
index 92b2422b88..f29cbceb2a 100644
--- a/Composer/plugins/azurePublish/yarn.lock
+++ b/Composer/plugins/azurePublish/yarn.lock
@@ -164,7 +164,7 @@
     botbuilder-lg "^4.10.0-preview-150886"
     lodash "^4.17.19"
 
-"@bfc/plugin-loader@../../packages/extensions/plugin-loader":
+"@bfc/plugin-loader@../../packages/plugin-loader":
   version "1.0.0"
   dependencies:
     debug "^4.1.1"

From 0ce6ec7a210ad76b99ff681fedfa200f6fc6d067 Mon Sep 17 00:00:00 2001
From: Andy Brown <asbrown002@gmail.com>
Date: Wed, 9 Sep 2020 14:00:49 -0700
Subject: [PATCH 03/10] rename extension to editor-extension

---
 Composer/package.json                                       | 2 +-
 .../adaptive-flow-editor/AdaptiveFlowEditor.test.tsx        | 2 +-
 .../adaptive-flow-renderer/utils/widgetRenderer.test.tsx    | 2 +-
 Composer/packages/adaptive-flow/package.json                | 2 +-
 .../src/adaptive-flow-editor/AdaptiveFlowEditor.tsx         | 2 +-
 .../src/adaptive-flow-editor/hooks/useEditorEventApi.ts     | 2 +-
 .../src/adaptive-flow-editor/hooks/useFlowUIOptions.ts      | 2 +-
 .../adaptive-flow-editor/renderers/EdgeMenu/EdgeMenu.tsx    | 2 +-
 .../renderers/EdgeMenu/createSchemaMenu.tsx                 | 2 +-
 .../src/adaptive-flow-editor/renderers/NodeWrapper.tsx      | 2 +-
 .../src/adaptive-flow-renderer/adaptive/AdaptiveDialog.tsx  | 2 +-
 .../src/adaptive-flow-renderer/configs/builtinWidgets.tsx   | 2 +-
 .../src/adaptive-flow-renderer/contexts/SchemaContext.ts    | 2 +-
 .../adaptive-flow-renderer/utils/visual/widgetRenderer.tsx  | 2 +-
 Composer/packages/adaptive-form/package.json                | 4 ++--
 .../packages/adaptive-form/src/components/AdaptiveForm.tsx  | 2 +-
 Composer/packages/adaptive-form/src/components/FormRow.tsx  | 2 +-
 .../packages/adaptive-form/src/components/FormTitle.tsx     | 2 +-
 .../packages/adaptive-form/src/components/SchemaField.tsx   | 2 +-
 .../src/components/__tests__/SchemaField.test.tsx           | 4 ++--
 .../adaptive-form/src/components/fields/ArrayField.tsx      | 2 +-
 .../adaptive-form/src/components/fields/ArrayFieldItem.tsx  | 2 +-
 .../adaptive-form/src/components/fields/BooleanField.tsx    | 2 +-
 .../adaptive-form/src/components/fields/EditableField.tsx   | 2 +-
 .../components/fields/ExpressionField/ExpressionEditor.tsx  | 2 +-
 .../components/fields/ExpressionField/ExpressionField.tsx   | 2 +-
 .../src/components/fields/ExpressionField/utils.ts          | 2 +-
 .../src/components/fields/IntellisenseField.tsx             | 2 +-
 .../adaptive-form/src/components/fields/IntentField.tsx     | 2 +-
 .../adaptive-form/src/components/fields/JsonField.tsx       | 2 +-
 .../adaptive-form/src/components/fields/NumberField.tsx     | 2 +-
 .../src/components/fields/ObjectArrayField.tsx              | 2 +-
 .../adaptive-form/src/components/fields/ObjectField.tsx     | 2 +-
 .../src/components/fields/OneOfField/OneOfField.tsx         | 2 +-
 .../adaptive-form/src/components/fields/OneOfField/utils.ts | 2 +-
 .../src/components/fields/OpenObjectField/ObjectItem.tsx    | 2 +-
 .../components/fields/OpenObjectField/OpenObjectField.tsx   | 2 +-
 .../adaptive-form/src/components/fields/QnAActionsField.tsx | 2 +-
 .../adaptive-form/src/components/fields/RecognizerField.tsx | 2 +-
 .../src/components/fields/RegexIntentField.tsx              | 2 +-
 .../adaptive-form/src/components/fields/SelectField.tsx     | 2 +-
 .../adaptive-form/src/components/fields/StringField.tsx     | 2 +-
 .../src/components/fields/UnsupportedField.tsx              | 2 +-
 .../src/components/fields/__tests__/IntentField.test.tsx    | 4 ++--
 .../src/components/fields/__tests__/JsonField.test.tsx      | 2 +-
 .../components/fields/__tests__/ObjectArrayField.test.tsx   | 4 ++--
 .../components/fields/__tests__/RecognizerField.test.tsx    | 4 ++--
 .../components/fields/__tests__/RegexIntentField.test.tsx   | 4 ++--
 .../src/components/fields/__tests__/testUtils.ts            | 2 +-
 Composer/packages/adaptive-form/src/defaultRecognizers.ts   | 2 +-
 .../adaptive-form/src/utils/__tests__/getUIOptions.test.ts  | 2 +-
 .../src/utils/__tests__/uiOptionsHelpers.test.ts            | 2 +-
 Composer/packages/adaptive-form/src/utils/arrayUtils.ts     | 2 +-
 .../packages/adaptive-form/src/utils/getHiddenProperties.ts | 2 +-
 .../adaptive-form/src/utils/getOrderedProperties.ts         | 2 +-
 Composer/packages/adaptive-form/src/utils/getUIOptions.ts   | 2 +-
 Composer/packages/adaptive-form/src/utils/objectUtils.ts    | 2 +-
 .../packages/adaptive-form/src/utils/resolveFieldWidget.ts  | 2 +-
 .../packages/adaptive-form/src/utils/resolvePropSchema.ts   | 2 +-
 Composer/packages/adaptive-form/src/utils/resolveRef.ts     | 2 +-
 .../packages/adaptive-form/src/utils/uiOptionsHelpers.ts    | 2 +-
 Composer/packages/client/package.json                       | 2 +-
 Composer/packages/client/src/pages/design/DesignPage.tsx    | 2 +-
 .../packages/client/src/pages/design/PropertyEditor.tsx     | 2 +-
 .../client/src/pages/design/exportSkillModal/constants.tsx  | 2 +-
 .../pages/design/exportSkillModal/content/Description.tsx   | 2 +-
 .../src/pages/design/exportSkillModal/content/Endpoints.tsx | 2 +-
 .../pages/design/exportSkillModal/generateSkillManifest.ts  | 2 +-
 .../client/src/pages/design/exportSkillModal/index.tsx      | 2 +-
 Composer/packages/client/src/plugins.ts                     | 2 +-
 Composer/packages/client/src/recoilModel/types.ts           | 2 +-
 .../packages/{extension => editor-extension}/.eslintrc.js   | 0
 .../packages/{extension => editor-extension}/.gitignore     | 0
 .../packages/{extension => editor-extension}/jest.config.js | 0
 .../packages/{extension => editor-extension}/package.json   | 2 +-
 .../src/components/Extension.tsx                            | 0
 .../{extension => editor-extension}/src/components/index.ts | 0
 .../{extension => editor-extension}/src/extensionContext.ts | 0
 .../src/hooks/__tests__/useFlowConfig.test.tsx              | 0
 .../src/hooks/__tests__/useFormConfig.test.tsx              | 0
 .../src/hooks/__tests__/useMenuConfig.test.tsx              | 0
 .../src/hooks/__tests__/useRecognizerConfig.test.tsx        | 0
 .../{extension => editor-extension}/src/hooks/index.ts      | 0
 .../src/hooks/useActionApi.ts                               | 0
 .../src/hooks/useDebounce.ts                                | 0
 .../src/hooks/useDialogApi.ts                               | 0
 .../src/hooks/useDialogEditApi.ts                           | 0
 .../src/hooks/useFlowConfig.ts                              | 0
 .../src/hooks/useFormConfig.ts                              | 0
 .../{extension => editor-extension}/src/hooks/useLgApi.ts   | 0
 .../{extension => editor-extension}/src/hooks/useLuApi.ts   | 0
 .../src/hooks/useMenuConfig.ts                              | 0
 .../src/hooks/useRecognizerConfig.ts                        | 0
 .../src/hooks/useShellApi.ts                                | 0
 .../src/hooks/useTriggerApi.ts                              | 0
 .../packages/{extension => editor-extension}/src/index.ts   | 0
 .../{extension => editor-extension}/src/types/extension.ts  | 0
 .../{extension => editor-extension}/src/types/flowSchema.ts | 0
 .../{extension => editor-extension}/src/types/form.ts       | 0
 .../{extension => editor-extension}/src/types/formSchema.ts | 0
 .../{extension => editor-extension}/src/types/index.ts      | 0
 .../{extension => editor-extension}/src/types/menuSchema.ts | 0
 .../src/utils/__tests__/mergePluginConfigs.test.ts          | 0
 .../{extension => editor-extension}/src/utils/index.ts      | 0
 .../src/utils/mergePluginConfigs.ts                         | 0
 .../{extension => editor-extension}/tsconfig.build.json     | 0
 .../packages/{extension => editor-extension}/tsconfig.json  | 0
 Composer/packages/lib/ui-shared/package.json                | 4 ++--
 Composer/packages/ui-plugins/composer/package.json          | 4 ++--
 .../packages/ui-plugins/composer/src/defaultMenuSchema.ts   | 2 +-
 Composer/packages/ui-plugins/composer/src/index.ts          | 2 +-
 Composer/packages/ui-plugins/cross-trained/package.json     | 4 ++--
 Composer/packages/ui-plugins/cross-trained/src/index.ts     | 2 +-
 Composer/packages/ui-plugins/example/package.json           | 4 ++--
 Composer/packages/ui-plugins/example/src/index.ts           | 2 +-
 Composer/packages/ui-plugins/lg/package.json                | 4 ++--
 Composer/packages/ui-plugins/lg/src/LgField.tsx             | 2 +-
 Composer/packages/ui-plugins/lg/src/LgWidget/LgWidget.tsx   | 2 +-
 .../packages/ui-plugins/lg/src/LgWidget/useLgTemplate.ts    | 2 +-
 Composer/packages/ui-plugins/lg/src/index.ts                | 2 +-
 Composer/packages/ui-plugins/luis/package.json              | 4 ++--
 Composer/packages/ui-plugins/luis/src/LuisIntentEditor.tsx  | 2 +-
 Composer/packages/ui-plugins/luis/src/index.ts              | 2 +-
 Composer/packages/ui-plugins/prompts/package.json           | 6 +++---
 .../ui-plugins/prompts/src/PromptField/UserInput.tsx        | 2 +-
 .../packages/ui-plugins/prompts/src/PromptField/index.tsx   | 2 +-
 .../packages/ui-plugins/prompts/src/PromptField/types.ts    | 2 +-
 Composer/packages/ui-plugins/prompts/src/index.tsx          | 2 +-
 Composer/packages/ui-plugins/schema-editor/package.json     | 4 ++--
 .../schema-editor/src/Fields/AdaptiveDialogField.tsx        | 2 +-
 .../ui-plugins/schema-editor/src/Fields/CollapsedField.tsx  | 2 +-
 .../schema-editor/src/Fields/SchemaEditorField.tsx          | 2 +-
 .../ui-plugins/schema-editor/src/Fields/ValueRefField.tsx   | 2 +-
 .../schema-editor/src/__tests__/SchemaEditorField.test.tsx  | 2 +-
 .../packages/ui-plugins/schema-editor/src/formSchema.ts     | 2 +-
 Composer/packages/ui-plugins/schema-editor/src/index.ts     | 2 +-
 Composer/packages/ui-plugins/schema-editor/src/schema.ts    | 2 +-
 Composer/packages/ui-plugins/schema-editor/src/uiOptions.ts | 2 +-
 .../ui-plugins/schema-editor/src/utils/getDefinitions.ts    | 2 +-
 Composer/packages/ui-plugins/select-dialog/package.json     | 6 +++---
 .../packages/ui-plugins/select-dialog/src/ComboBoxField.tsx | 2 +-
 .../packages/ui-plugins/select-dialog/src/SelectDialog.tsx  | 2 +-
 .../select-dialog/src/__tests__/selectDialog.test.tsx       | 2 +-
 Composer/packages/ui-plugins/select-dialog/src/index.ts     | 2 +-
 .../packages/ui-plugins/select-skill-dialog/package.json    | 6 +++---
 .../select-skill-dialog/src/BeginSkillDialogField.tsx       | 2 +-
 .../ui-plugins/select-skill-dialog/src/ComboBoxField.tsx    | 2 +-
 .../select-skill-dialog/src/SelectSkillDialogField.tsx      | 2 +-
 .../select-skill-dialog/src/SkillEndpointField.tsx          | 2 +-
 .../src/__tests__/BeginSkillDialogField.test.tsx            | 2 +-
 .../src/__tests__/SelectSkillDialog.test.tsx                | 2 +-
 .../packages/ui-plugins/select-skill-dialog/src/index.ts    | 2 +-
 152 files changed, 136 insertions(+), 136 deletions(-)
 rename Composer/packages/{extension => editor-extension}/.eslintrc.js (100%)
 rename Composer/packages/{extension => editor-extension}/.gitignore (100%)
 rename Composer/packages/{extension => editor-extension}/jest.config.js (100%)
 rename Composer/packages/{extension => editor-extension}/package.json (94%)
 rename Composer/packages/{extension => editor-extension}/src/components/Extension.tsx (100%)
 rename Composer/packages/{extension => editor-extension}/src/components/index.ts (100%)
 rename Composer/packages/{extension => editor-extension}/src/extensionContext.ts (100%)
 rename Composer/packages/{extension => editor-extension}/src/hooks/__tests__/useFlowConfig.test.tsx (100%)
 rename Composer/packages/{extension => editor-extension}/src/hooks/__tests__/useFormConfig.test.tsx (100%)
 rename Composer/packages/{extension => editor-extension}/src/hooks/__tests__/useMenuConfig.test.tsx (100%)
 rename Composer/packages/{extension => editor-extension}/src/hooks/__tests__/useRecognizerConfig.test.tsx (100%)
 rename Composer/packages/{extension => editor-extension}/src/hooks/index.ts (100%)
 rename Composer/packages/{extension => editor-extension}/src/hooks/useActionApi.ts (100%)
 rename Composer/packages/{extension => editor-extension}/src/hooks/useDebounce.ts (100%)
 rename Composer/packages/{extension => editor-extension}/src/hooks/useDialogApi.ts (100%)
 rename Composer/packages/{extension => editor-extension}/src/hooks/useDialogEditApi.ts (100%)
 rename Composer/packages/{extension => editor-extension}/src/hooks/useFlowConfig.ts (100%)
 rename Composer/packages/{extension => editor-extension}/src/hooks/useFormConfig.ts (100%)
 rename Composer/packages/{extension => editor-extension}/src/hooks/useLgApi.ts (100%)
 rename Composer/packages/{extension => editor-extension}/src/hooks/useLuApi.ts (100%)
 rename Composer/packages/{extension => editor-extension}/src/hooks/useMenuConfig.ts (100%)
 rename Composer/packages/{extension => editor-extension}/src/hooks/useRecognizerConfig.ts (100%)
 rename Composer/packages/{extension => editor-extension}/src/hooks/useShellApi.ts (100%)
 rename Composer/packages/{extension => editor-extension}/src/hooks/useTriggerApi.ts (100%)
 rename Composer/packages/{extension => editor-extension}/src/index.ts (100%)
 rename Composer/packages/{extension => editor-extension}/src/types/extension.ts (100%)
 rename Composer/packages/{extension => editor-extension}/src/types/flowSchema.ts (100%)
 rename Composer/packages/{extension => editor-extension}/src/types/form.ts (100%)
 rename Composer/packages/{extension => editor-extension}/src/types/formSchema.ts (100%)
 rename Composer/packages/{extension => editor-extension}/src/types/index.ts (100%)
 rename Composer/packages/{extension => editor-extension}/src/types/menuSchema.ts (100%)
 rename Composer/packages/{extension => editor-extension}/src/utils/__tests__/mergePluginConfigs.test.ts (100%)
 rename Composer/packages/{extension => editor-extension}/src/utils/index.ts (100%)
 rename Composer/packages/{extension => editor-extension}/src/utils/mergePluginConfigs.ts (100%)
 rename Composer/packages/{extension => editor-extension}/tsconfig.build.json (100%)
 rename Composer/packages/{extension => editor-extension}/tsconfig.json (100%)

diff --git a/Composer/package.json b/Composer/package.json
index dfec97d173..0d89abc56b 100644
--- a/Composer/package.json
+++ b/Composer/package.json
@@ -21,7 +21,7 @@
     "packages/client",
     "packages/electron-server",
     "packages/extension-client",
-    "packages/extension",
+    "packages/editor-extension",
     "packages/intellisense",
     "packages/lib",
     "packages/lib/*",
diff --git a/Composer/packages/adaptive-flow/__tests__/adaptive-flow-editor/AdaptiveFlowEditor.test.tsx b/Composer/packages/adaptive-flow/__tests__/adaptive-flow-editor/AdaptiveFlowEditor.test.tsx
index ad83d07308..cba8f0854c 100644
--- a/Composer/packages/adaptive-flow/__tests__/adaptive-flow-editor/AdaptiveFlowEditor.test.tsx
+++ b/Composer/packages/adaptive-flow/__tests__/adaptive-flow-editor/AdaptiveFlowEditor.test.tsx
@@ -3,7 +3,7 @@
 
 import React from 'react';
 import { render } from '@bfc/test-utils';
-import { ExtensionContext } from '@bfc/extension';
+import { ExtensionContext } from '@bfc/editor-extension';
 
 import AdaptiveFlowEditor from '../../src/adaptive-flow-editor/AdaptiveFlowEditor';
 
diff --git a/Composer/packages/adaptive-flow/__tests__/adaptive-flow-renderer/utils/widgetRenderer.test.tsx b/Composer/packages/adaptive-flow/__tests__/adaptive-flow-renderer/utils/widgetRenderer.test.tsx
index ba8190437f..a71f9f33b0 100644
--- a/Composer/packages/adaptive-flow/__tests__/adaptive-flow-renderer/utils/widgetRenderer.test.tsx
+++ b/Composer/packages/adaptive-flow/__tests__/adaptive-flow-renderer/utils/widgetRenderer.test.tsx
@@ -3,7 +3,7 @@
 
 import React from 'react';
 import { render } from '@bfc/test-utils';
-import { WidgetComponent, FlowEditorWidgetMap } from '@bfc/extension';
+import { WidgetComponent, FlowEditorWidgetMap } from '@bfc/editor-extension';
 
 import { renderUIWidget, UIWidgetContext } from '../../../src/adaptive-flow-renderer/utils/visual/widgetRenderer';
 import { FlowWidget } from '../../../src/adaptive-flow-renderer/types/flowRenderer.types';
diff --git a/Composer/packages/adaptive-flow/package.json b/Composer/packages/adaptive-flow/package.json
index 5aa830518e..78d46f6d84 100644
--- a/Composer/packages/adaptive-flow/package.json
+++ b/Composer/packages/adaptive-flow/package.json
@@ -23,7 +23,7 @@
     "lint:fix": "yarn lint --fix"
   },
   "dependencies": {
-    "@bfc/extension": "*",
+    "@bfc/editor-extension": "*",
     "@bfc/shared": "*",
     "@bfc/ui-shared": "*",
     "@emotion/core": "^10.0.27",
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 201cdfc642..784e557979 100644
--- a/Composer/packages/adaptive-flow/src/adaptive-flow-editor/AdaptiveFlowEditor.tsx
+++ b/Composer/packages/adaptive-flow/src/adaptive-flow-editor/AdaptiveFlowEditor.tsx
@@ -8,7 +8,7 @@ import React, { useRef, useMemo, useEffect } from 'react';
 import isEqual from 'lodash/isEqual';
 import formatMessage from 'format-message';
 import { DialogFactory } from '@bfc/shared';
-import { useShellApi, JSONSchema7 } from '@bfc/extension';
+import { useShellApi, JSONSchema7 } from '@bfc/editor-extension';
 import { MarqueeSelection } from 'office-ui-fabric-react/lib/MarqueeSelection';
 
 import { FlowSchema, FlowWidget } from '../adaptive-flow-renderer/types/flowRenderer.types';
diff --git a/Composer/packages/adaptive-flow/src/adaptive-flow-editor/hooks/useEditorEventApi.ts b/Composer/packages/adaptive-flow/src/adaptive-flow-editor/hooks/useEditorEventApi.ts
index bff6636263..3070ab7b14 100644
--- a/Composer/packages/adaptive-flow/src/adaptive-flow-editor/hooks/useEditorEventApi.ts
+++ b/Composer/packages/adaptive-flow/src/adaptive-flow-editor/hooks/useEditorEventApi.ts
@@ -3,7 +3,7 @@
 
 import { DialogUtils, SDKKinds, ShellApi, registerEditorAPI } from '@bfc/shared';
 import get from 'lodash/get';
-import { useDialogEditApi, useDialogApi, useActionApi } from '@bfc/extension';
+import { useDialogEditApi, useDialogApi, useActionApi } from '@bfc/editor-extension';
 
 // TODO: leak of visual-sdk domain (designerCache)
 import { designerCache } from '../../adaptive-flow-renderer/utils/visual/DesignerCache';
diff --git a/Composer/packages/adaptive-flow/src/adaptive-flow-editor/hooks/useFlowUIOptions.ts b/Composer/packages/adaptive-flow/src/adaptive-flow-editor/hooks/useFlowUIOptions.ts
index bb9cd8da54..cd6b25911b 100644
--- a/Composer/packages/adaptive-flow/src/adaptive-flow-editor/hooks/useFlowUIOptions.ts
+++ b/Composer/packages/adaptive-flow/src/adaptive-flow-editor/hooks/useFlowUIOptions.ts
@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
-import { useShellApi, useFlowConfig } from '@bfc/extension';
+import { useShellApi, useFlowConfig } from '@bfc/editor-extension';
 
 export function useFlowUIOptions() {
   const { plugins } = useShellApi();
diff --git a/Composer/packages/adaptive-flow/src/adaptive-flow-editor/renderers/EdgeMenu/EdgeMenu.tsx b/Composer/packages/adaptive-flow/src/adaptive-flow-editor/renderers/EdgeMenu/EdgeMenu.tsx
index 655160a786..7ff9a773b0 100644
--- a/Composer/packages/adaptive-flow/src/adaptive-flow-editor/renderers/EdgeMenu/EdgeMenu.tsx
+++ b/Composer/packages/adaptive-flow/src/adaptive-flow-editor/renderers/EdgeMenu/EdgeMenu.tsx
@@ -7,7 +7,7 @@ import { useContext, useState } from 'react';
 import formatMessage from 'format-message';
 import { DefinitionSummary } from '@bfc/shared';
 import { TooltipHost, DirectionalHint } from 'office-ui-fabric-react/lib/Tooltip';
-import { useMenuConfig, MenuUISchema } from '@bfc/extension';
+import { useMenuConfig, MenuUISchema } from '@bfc/editor-extension';
 
 // TODO: leak of visual-sdk domain (EdgeAddButtonSize)
 import { EdgeAddButtonSize } from '../../../adaptive-flow-renderer/constants/ElementSizes';
diff --git a/Composer/packages/adaptive-flow/src/adaptive-flow-editor/renderers/EdgeMenu/createSchemaMenu.tsx b/Composer/packages/adaptive-flow/src/adaptive-flow-editor/renderers/EdgeMenu/createSchemaMenu.tsx
index 967a596e8f..bda292d094 100644
--- a/Composer/packages/adaptive-flow/src/adaptive-flow-editor/renderers/EdgeMenu/createSchemaMenu.tsx
+++ b/Composer/packages/adaptive-flow/src/adaptive-flow-editor/renderers/EdgeMenu/createSchemaMenu.tsx
@@ -10,7 +10,7 @@ import {
 import { SDKKinds, DefinitionSummary } from '@bfc/shared';
 import { FontIcon } from 'office-ui-fabric-react/lib/Icon';
 import formatMessage from 'format-message';
-import { MenuUISchema, MenuOptions } from '@bfc/extension';
+import { MenuUISchema, MenuOptions } from '@bfc/editor-extension';
 import set from 'lodash/set';
 
 import { MenuEventTypes } from '../../constants/MenuTypes';
diff --git a/Composer/packages/adaptive-flow/src/adaptive-flow-editor/renderers/NodeWrapper.tsx b/Composer/packages/adaptive-flow/src/adaptive-flow-editor/renderers/NodeWrapper.tsx
index c8799f64df..6a7550e118 100644
--- a/Composer/packages/adaptive-flow/src/adaptive-flow-editor/renderers/NodeWrapper.tsx
+++ b/Composer/packages/adaptive-flow/src/adaptive-flow-editor/renderers/NodeWrapper.tsx
@@ -5,7 +5,7 @@
 import { jsx, css } from '@emotion/core';
 import { FC, useContext, useCallback } from 'react';
 import { generateSDKTitle, PromptTab } from '@bfc/shared';
-import { useShellApi } from '@bfc/extension';
+import { useShellApi } from '@bfc/editor-extension';
 
 import { AttrNames } from '../constants/ElementAttributes';
 import { NodeRendererContext } from '../contexts/NodeRendererContext';
diff --git a/Composer/packages/adaptive-flow/src/adaptive-flow-renderer/adaptive/AdaptiveDialog.tsx b/Composer/packages/adaptive-flow/src/adaptive-flow-renderer/adaptive/AdaptiveDialog.tsx
index b27cf538f6..5638d408d4 100644
--- a/Composer/packages/adaptive-flow/src/adaptive-flow-renderer/adaptive/AdaptiveDialog.tsx
+++ b/Composer/packages/adaptive-flow/src/adaptive-flow-renderer/adaptive/AdaptiveDialog.tsx
@@ -5,7 +5,7 @@
 import { jsx } from '@emotion/core';
 import { FC, Fragment } from 'react';
 import get from 'lodash/get';
-import { FlowEditorWidgetMap as NodeWidgetMap } from '@bfc/extension';
+import { FlowEditorWidgetMap as NodeWidgetMap } from '@bfc/editor-extension';
 
 import { FlowSchema } from '../types/flowRenderer.types';
 import { EditorEventHandler } from '../constants/NodeEventTypes';
diff --git a/Composer/packages/adaptive-flow/src/adaptive-flow-renderer/configs/builtinWidgets.tsx b/Composer/packages/adaptive-flow/src/adaptive-flow-renderer/configs/builtinWidgets.tsx
index 6f1de4f451..e2e26bc327 100644
--- a/Composer/packages/adaptive-flow/src/adaptive-flow-renderer/configs/builtinWidgets.tsx
+++ b/Composer/packages/adaptive-flow/src/adaptive-flow-renderer/configs/builtinWidgets.tsx
@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
-import { FlowEditorWidgetMap } from '@bfc/extension';
+import { FlowEditorWidgetMap } from '@bfc/editor-extension';
 
 import {
   ActionCard,
diff --git a/Composer/packages/adaptive-flow/src/adaptive-flow-renderer/contexts/SchemaContext.ts b/Composer/packages/adaptive-flow/src/adaptive-flow-renderer/contexts/SchemaContext.ts
index b00a5fee92..2ce8fd8ce8 100644
--- a/Composer/packages/adaptive-flow/src/adaptive-flow-renderer/contexts/SchemaContext.ts
+++ b/Composer/packages/adaptive-flow/src/adaptive-flow-renderer/contexts/SchemaContext.ts
@@ -2,7 +2,7 @@
 // Licensed under the MIT License.
 
 import React from 'react';
-import { FlowEditorWidgetMap } from '@bfc/extension';
+import { FlowEditorWidgetMap } from '@bfc/editor-extension';
 
 import { WidgetSchemaProvider } from '../utils/visual/WidgetSchemaProvider';
 
diff --git a/Composer/packages/adaptive-flow/src/adaptive-flow-renderer/utils/visual/widgetRenderer.tsx b/Composer/packages/adaptive-flow/src/adaptive-flow-renderer/utils/visual/widgetRenderer.tsx
index 88f1158cec..bc347add57 100644
--- a/Composer/packages/adaptive-flow/src/adaptive-flow-renderer/utils/visual/widgetRenderer.tsx
+++ b/Composer/packages/adaptive-flow/src/adaptive-flow-renderer/utils/visual/widgetRenderer.tsx
@@ -3,7 +3,7 @@
 
 import React from 'react';
 import { BaseSchema } from '@bfc/shared';
-import { FlowEditorWidgetMap } from '@bfc/extension';
+import { FlowEditorWidgetMap } from '@bfc/editor-extension';
 
 import { FlowWidget, FlowWidgetProp, WidgetEventHandler } from '../../types/flowRenderer.types';
 import { Boundary } from '../../models/Boundary';
diff --git a/Composer/packages/adaptive-form/package.json b/Composer/packages/adaptive-form/package.json
index 35064209f7..83541dcf0d 100644
--- a/Composer/packages/adaptive-form/package.json
+++ b/Composer/packages/adaptive-form/package.json
@@ -19,7 +19,7 @@
   "license": "MIT",
   "peerDependencies": {
     "@bfc/code-editor": "*",
-    "@bfc/extension": "*",
+    "@bfc/editor-extension": "*",
     "@bfc/intellisense": "*",
     "@uifabric/fluent-theme": "^7.1.4",
     "@uifabric/icons": "^7.3.0",
@@ -31,7 +31,7 @@
   },
   "devDependencies": {
     "@bfc/code-editor": "*",
-    "@bfc/extension": "*",
+    "@bfc/editor-extension": "*",
     "@bfc/intellisense": "*",
     "@bfc/test-utils": "*",
     "@types/lodash": "^4.14.149",
diff --git a/Composer/packages/adaptive-form/src/components/AdaptiveForm.tsx b/Composer/packages/adaptive-form/src/components/AdaptiveForm.tsx
index f24740a1b3..04118bcad5 100644
--- a/Composer/packages/adaptive-form/src/components/AdaptiveForm.tsx
+++ b/Composer/packages/adaptive-form/src/components/AdaptiveForm.tsx
@@ -4,7 +4,7 @@
 /** @jsx jsx */
 import { jsx, css } from '@emotion/core';
 import React from 'react';
-import { FormErrors, JSONSchema7, UIOptions } from '@bfc/extension';
+import { FormErrors, JSONSchema7, UIOptions } from '@bfc/editor-extension';
 import ErrorBoundary from 'react-error-boundary';
 import formatMessage from 'format-message';
 
diff --git a/Composer/packages/adaptive-form/src/components/FormRow.tsx b/Composer/packages/adaptive-form/src/components/FormRow.tsx
index 864639f723..8fbdf9f503 100644
--- a/Composer/packages/adaptive-form/src/components/FormRow.tsx
+++ b/Composer/packages/adaptive-form/src/components/FormRow.tsx
@@ -2,7 +2,7 @@
 // Licensed under the MIT License.
 
 /** @jsx jsx */
-import { FieldProps, UIOptions } from '@bfc/extension';
+import { FieldProps, UIOptions } from '@bfc/editor-extension';
 import { css, jsx } from '@emotion/core';
 import React from 'react';
 
diff --git a/Composer/packages/adaptive-form/src/components/FormTitle.tsx b/Composer/packages/adaptive-form/src/components/FormTitle.tsx
index d0b2c906c6..f56c9ce0ea 100644
--- a/Composer/packages/adaptive-form/src/components/FormTitle.tsx
+++ b/Composer/packages/adaptive-form/src/components/FormTitle.tsx
@@ -7,7 +7,7 @@ import React, { useMemo, useRef } from 'react';
 import { FontWeights } from '@uifabric/styling';
 import { FontSizes } from '@uifabric/fluent-theme';
 import formatMessage from 'format-message';
-import { UIOptions, JSONSchema7, useShellApi, useRecognizerConfig } from '@bfc/extension';
+import { UIOptions, JSONSchema7, useShellApi, useRecognizerConfig } from '@bfc/editor-extension';
 import { css } from '@emotion/core';
 import { SDKKinds } from '@bfc/shared';
 import debounce from 'lodash/debounce';
diff --git a/Composer/packages/adaptive-form/src/components/SchemaField.tsx b/Composer/packages/adaptive-form/src/components/SchemaField.tsx
index 48274ad898..8dfcf86c3e 100644
--- a/Composer/packages/adaptive-form/src/components/SchemaField.tsx
+++ b/Composer/packages/adaptive-form/src/components/SchemaField.tsx
@@ -3,7 +3,7 @@
 /** @jsx jsx */
 import { jsx, css } from '@emotion/core';
 import React, { useEffect } from 'react';
-import { FieldProps, UIOptions, useFormConfig } from '@bfc/extension';
+import { FieldProps, UIOptions, useFormConfig } from '@bfc/editor-extension';
 
 import { getUIOptions, resolveFieldWidget, resolveRef, getUiLabel, getUiPlaceholder, getUiDescription } from '../utils';
 
diff --git a/Composer/packages/adaptive-form/src/components/__tests__/SchemaField.test.tsx b/Composer/packages/adaptive-form/src/components/__tests__/SchemaField.test.tsx
index 0c61786ef9..a0678abb8b 100644
--- a/Composer/packages/adaptive-form/src/components/__tests__/SchemaField.test.tsx
+++ b/Composer/packages/adaptive-form/src/components/__tests__/SchemaField.test.tsx
@@ -3,7 +3,7 @@
 
 import React from 'react';
 import { render, waitFor, fireEvent } from '@bfc/test-utils';
-import { FieldProps, useFormConfig } from '@bfc/extension';
+import { FieldProps, useFormConfig } from '@bfc/editor-extension';
 import assign from 'lodash/assign';
 
 import { SchemaField } from '../SchemaField';
@@ -18,7 +18,7 @@ jest.mock('../../utils/resolveFieldWidget', () => ({
   resolveFieldWidget: jest.fn(),
 }));
 
-jest.mock('@bfc/extension', () => ({
+jest.mock('@bfc/editor-extension', () => ({
   useFormConfig: jest.fn(),
 }));
 
diff --git a/Composer/packages/adaptive-form/src/components/fields/ArrayField.tsx b/Composer/packages/adaptive-form/src/components/fields/ArrayField.tsx
index 3244cc9647..9fef11c0a4 100644
--- a/Composer/packages/adaptive-form/src/components/fields/ArrayField.tsx
+++ b/Composer/packages/adaptive-form/src/components/fields/ArrayField.tsx
@@ -7,7 +7,7 @@ import { TextField } from 'office-ui-fabric-react/lib/TextField';
 import { IconButton } from 'office-ui-fabric-react/lib/Button';
 import { TooltipHost } from 'office-ui-fabric-react/lib/Tooltip';
 import { SharedColors, NeutralColors, FontSizes } from '@uifabric/fluent-theme';
-import { FieldProps } from '@bfc/extension';
+import { FieldProps } from '@bfc/editor-extension';
 import formatMessage from 'format-message';
 
 import { getArrayItemProps, useArrayItems } from '../../utils';
diff --git a/Composer/packages/adaptive-form/src/components/fields/ArrayFieldItem.tsx b/Composer/packages/adaptive-form/src/components/fields/ArrayFieldItem.tsx
index 9850290dbe..64bb087e5f 100644
--- a/Composer/packages/adaptive-form/src/components/fields/ArrayFieldItem.tsx
+++ b/Composer/packages/adaptive-form/src/components/fields/ArrayFieldItem.tsx
@@ -3,7 +3,7 @@
 /** @jsx jsx */
 import { jsx } from '@emotion/core';
 import React from 'react';
-import { FieldProps } from '@bfc/extension';
+import { FieldProps } from '@bfc/editor-extension';
 import { NeutralColors } from '@uifabric/fluent-theme';
 import { IconButton } from 'office-ui-fabric-react/lib/Button';
 import { FontSizes } from '@uifabric/styling';
diff --git a/Composer/packages/adaptive-form/src/components/fields/BooleanField.tsx b/Composer/packages/adaptive-form/src/components/fields/BooleanField.tsx
index 35236b7969..f151df0584 100644
--- a/Composer/packages/adaptive-form/src/components/fields/BooleanField.tsx
+++ b/Composer/packages/adaptive-form/src/components/fields/BooleanField.tsx
@@ -3,7 +3,7 @@
 /** @jsx jsx */
 import { jsx } from '@emotion/core';
 import React from 'react';
-import { FieldProps } from '@bfc/extension';
+import { FieldProps } from '@bfc/editor-extension';
 import { Dropdown, IDropdownOption, ResponsiveMode } from 'office-ui-fabric-react/lib/Dropdown';
 import formatMessage from 'format-message';
 
diff --git a/Composer/packages/adaptive-form/src/components/fields/EditableField.tsx b/Composer/packages/adaptive-form/src/components/fields/EditableField.tsx
index 8ad35d0834..b0d3c55d36 100644
--- a/Composer/packages/adaptive-form/src/components/fields/EditableField.tsx
+++ b/Composer/packages/adaptive-form/src/components/fields/EditableField.tsx
@@ -5,7 +5,7 @@ import React, { useState, useEffect } from 'react';
 import { TextField, ITextFieldStyles } from 'office-ui-fabric-react/lib/TextField';
 import { NeutralColors } from '@uifabric/fluent-theme';
 import { mergeStyleSets } from '@uifabric/styling';
-import { FieldProps } from '@bfc/extension';
+import { FieldProps } from '@bfc/editor-extension';
 
 interface EditableFieldProps extends Omit<FieldProps, 'definitions'> {
   fontSize?: string;
diff --git a/Composer/packages/adaptive-form/src/components/fields/ExpressionField/ExpressionEditor.tsx b/Composer/packages/adaptive-form/src/components/fields/ExpressionField/ExpressionEditor.tsx
index 8b7468dd91..e935b32682 100644
--- a/Composer/packages/adaptive-form/src/components/fields/ExpressionField/ExpressionEditor.tsx
+++ b/Composer/packages/adaptive-form/src/components/fields/ExpressionField/ExpressionEditor.tsx
@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
-import { FieldProps, useShellApi } from '@bfc/extension';
+import { FieldProps, useShellApi } from '@bfc/editor-extension';
 import { IntellisenseTextField } from '@bfc/intellisense';
 import { Icon } from 'office-ui-fabric-react/lib/Icon';
 import React from 'react';
diff --git a/Composer/packages/adaptive-form/src/components/fields/ExpressionField/ExpressionField.tsx b/Composer/packages/adaptive-form/src/components/fields/ExpressionField/ExpressionField.tsx
index 943d2acb2a..7bb0318fe0 100644
--- a/Composer/packages/adaptive-form/src/components/fields/ExpressionField/ExpressionField.tsx
+++ b/Composer/packages/adaptive-form/src/components/fields/ExpressionField/ExpressionField.tsx
@@ -3,7 +3,7 @@
 
 /** @jsx jsx */
 import { JsonEditor } from '@bfc/code-editor';
-import { FieldProps, useFormConfig, useShellApi } from '@bfc/extension';
+import { FieldProps, useFormConfig, useShellApi } from '@bfc/editor-extension';
 import { css, jsx } from '@emotion/core';
 import formatMessage from 'format-message';
 import { Dropdown, IDropdownOption, ResponsiveMode } from 'office-ui-fabric-react/lib/Dropdown';
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 6a2f89402f..868319f815 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';
+import { JSONSchema7, JSONSchema7Definition, SchemaDefinitions } from '@bfc/editor-extension';
 import { IDropdownOption } from 'office-ui-fabric-react/lib/Dropdown';
 
 import { resolveRef, getValueType } from '../../../utils';
diff --git a/Composer/packages/adaptive-form/src/components/fields/IntellisenseField.tsx b/Composer/packages/adaptive-form/src/components/fields/IntellisenseField.tsx
index 36b567edea..5cd6ef9283 100644
--- a/Composer/packages/adaptive-form/src/components/fields/IntellisenseField.tsx
+++ b/Composer/packages/adaptive-form/src/components/fields/IntellisenseField.tsx
@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
-import { FieldProps } from '@bfc/extension';
+import { FieldProps } from '@bfc/editor-extension';
 import { IntellisenseTextField } from '@bfc/intellisense';
 import React from 'react';
 import { TextField } from 'office-ui-fabric-react/lib/TextField';
diff --git a/Composer/packages/adaptive-form/src/components/fields/IntentField.tsx b/Composer/packages/adaptive-form/src/components/fields/IntentField.tsx
index fa700b0d72..86541d6826 100644
--- a/Composer/packages/adaptive-form/src/components/fields/IntentField.tsx
+++ b/Composer/packages/adaptive-form/src/components/fields/IntentField.tsx
@@ -2,7 +2,7 @@
 // Licensed under the MIT License.
 
 import React from 'react';
-import { FieldProps, useShellApi, useRecognizerConfig, FieldWidget } from '@bfc/extension';
+import { FieldProps, useShellApi, useRecognizerConfig, FieldWidget } from '@bfc/editor-extension';
 import formatMessage from 'format-message';
 import { SDKKinds } from '@bfc/shared';
 
diff --git a/Composer/packages/adaptive-form/src/components/fields/JsonField.tsx b/Composer/packages/adaptive-form/src/components/fields/JsonField.tsx
index dc459f413f..16d517c7f1 100644
--- a/Composer/packages/adaptive-form/src/components/fields/JsonField.tsx
+++ b/Composer/packages/adaptive-form/src/components/fields/JsonField.tsx
@@ -4,7 +4,7 @@
 /** @jsx jsx */
 import { jsx, css } from '@emotion/core';
 import React from 'react';
-import { FieldProps, useShellApi } from '@bfc/extension';
+import { FieldProps, useShellApi } from '@bfc/editor-extension';
 import { JsonEditor } from '@bfc/code-editor';
 
 import { FieldLabel } from '../FieldLabel';
diff --git a/Composer/packages/adaptive-form/src/components/fields/NumberField.tsx b/Composer/packages/adaptive-form/src/components/fields/NumberField.tsx
index 718d8d67fa..f7521dc6a3 100644
--- a/Composer/packages/adaptive-form/src/components/fields/NumberField.tsx
+++ b/Composer/packages/adaptive-form/src/components/fields/NumberField.tsx
@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
-import { FieldProps } from '@bfc/extension';
+import { FieldProps } from '@bfc/editor-extension';
 import formatMessage from 'format-message';
 import { SpinButton } from 'office-ui-fabric-react/lib/SpinButton';
 import React from 'react';
diff --git a/Composer/packages/adaptive-form/src/components/fields/ObjectArrayField.tsx b/Composer/packages/adaptive-form/src/components/fields/ObjectArrayField.tsx
index 63b6f37a4a..f52c88c1af 100644
--- a/Composer/packages/adaptive-form/src/components/fields/ObjectArrayField.tsx
+++ b/Composer/packages/adaptive-form/src/components/fields/ObjectArrayField.tsx
@@ -4,7 +4,7 @@
 /** @jsx jsx */
 import { jsx } from '@emotion/core';
 import React, { useState, useMemo, useRef } from 'react';
-import { FieldProps, useShellApi } from '@bfc/extension';
+import { FieldProps, useShellApi } from '@bfc/editor-extension';
 import { DefaultButton } from 'office-ui-fabric-react/lib/Button';
 import { JSONSchema7 } from 'json-schema';
 import { IconButton } from 'office-ui-fabric-react/lib/Button';
diff --git a/Composer/packages/adaptive-form/src/components/fields/ObjectField.tsx b/Composer/packages/adaptive-form/src/components/fields/ObjectField.tsx
index 94ad4240d1..c609f37589 100644
--- a/Composer/packages/adaptive-form/src/components/fields/ObjectField.tsx
+++ b/Composer/packages/adaptive-form/src/components/fields/ObjectField.tsx
@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 import React from 'react';
-import { FieldProps } from '@bfc/extension';
+import { FieldProps } from '@bfc/editor-extension';
 
 import { getOrderedProperties } from '../../utils';
 import { FormRow } from '../FormRow';
diff --git a/Composer/packages/adaptive-form/src/components/fields/OneOfField/OneOfField.tsx b/Composer/packages/adaptive-form/src/components/fields/OneOfField/OneOfField.tsx
index cd0dbe7cf5..f1a91c2cbf 100644
--- a/Composer/packages/adaptive-form/src/components/fields/OneOfField/OneOfField.tsx
+++ b/Composer/packages/adaptive-form/src/components/fields/OneOfField/OneOfField.tsx
@@ -4,7 +4,7 @@
 /** @jsx jsx */
 import { jsx } from '@emotion/core';
 import React, { useState, useMemo } from 'react';
-import { FieldProps, useFormConfig } from '@bfc/extension';
+import { FieldProps, useFormConfig } from '@bfc/editor-extension';
 import { Dropdown, IDropdownOption, ResponsiveMode } from 'office-ui-fabric-react/lib/Dropdown';
 import formatMessage from 'format-message';
 
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 d0b6f481db..6994f832e9 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';
+import { FieldProps, JSONSchema7, JSONSchema7Definition } from '@bfc/editor-extension';
 import merge from 'lodash/merge';
 import omit from 'lodash/omit';
 import { IDropdownOption } from 'office-ui-fabric-react/lib/Dropdown';
diff --git a/Composer/packages/adaptive-form/src/components/fields/OpenObjectField/ObjectItem.tsx b/Composer/packages/adaptive-form/src/components/fields/OpenObjectField/ObjectItem.tsx
index 049f7937b7..07fd0a742d 100644
--- a/Composer/packages/adaptive-form/src/components/fields/OpenObjectField/ObjectItem.tsx
+++ b/Composer/packages/adaptive-form/src/components/fields/OpenObjectField/ObjectItem.tsx
@@ -6,7 +6,7 @@ import { jsx } from '@emotion/core';
 import React, { useState, useCallback, useMemo } from 'react';
 import { FontSizes, NeutralColors } from '@uifabric/fluent-theme';
 import { IconButton } from 'office-ui-fabric-react/lib/Button';
-import { FieldProps } from '@bfc/extension';
+import { FieldProps } from '@bfc/editor-extension';
 import { IContextualMenuItem } from 'office-ui-fabric-react/lib/ContextualMenu';
 import { TooltipHost } from 'office-ui-fabric-react/lib/Tooltip';
 import formatMessage from 'format-message';
diff --git a/Composer/packages/adaptive-form/src/components/fields/OpenObjectField/OpenObjectField.tsx b/Composer/packages/adaptive-form/src/components/fields/OpenObjectField/OpenObjectField.tsx
index b24f34b132..cc01528827 100644
--- a/Composer/packages/adaptive-form/src/components/fields/OpenObjectField/OpenObjectField.tsx
+++ b/Composer/packages/adaptive-form/src/components/fields/OpenObjectField/OpenObjectField.tsx
@@ -8,7 +8,7 @@ import { FontSizes, NeutralColors, SharedColors } from '@uifabric/fluent-theme';
 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';
-import { FieldProps } from '@bfc/extension';
+import { FieldProps } from '@bfc/editor-extension';
 import formatMessage from 'format-message';
 
 import { FieldLabel } from '../../FieldLabel';
diff --git a/Composer/packages/adaptive-form/src/components/fields/QnAActionsField.tsx b/Composer/packages/adaptive-form/src/components/fields/QnAActionsField.tsx
index d519a7dfe3..0b4d342de1 100644
--- a/Composer/packages/adaptive-form/src/components/fields/QnAActionsField.tsx
+++ b/Composer/packages/adaptive-form/src/components/fields/QnAActionsField.tsx
@@ -2,7 +2,7 @@
 // Licensed under the MIT License.
 
 import React from 'react';
-import { FieldProps, useShellApi } from '@bfc/extension';
+import { FieldProps, useShellApi } from '@bfc/editor-extension';
 import formatMessage from 'format-message';
 
 import { Link } from '../Link';
diff --git a/Composer/packages/adaptive-form/src/components/fields/RecognizerField.tsx b/Composer/packages/adaptive-form/src/components/fields/RecognizerField.tsx
index 472b7667a9..53119c985b 100644
--- a/Composer/packages/adaptive-form/src/components/fields/RecognizerField.tsx
+++ b/Composer/packages/adaptive-form/src/components/fields/RecognizerField.tsx
@@ -3,7 +3,7 @@
 /** @jsx jsx */
 import { jsx } from '@emotion/core';
 import React, { useMemo, useState, useEffect } from 'react';
-import { FieldProps, useShellApi, useRecognizerConfig } from '@bfc/extension';
+import { FieldProps, useShellApi, useRecognizerConfig } from '@bfc/editor-extension';
 import { MicrosoftIRecognizer, SDKKinds } from '@bfc/shared';
 import { Dropdown, ResponsiveMode, IDropdownOption } from 'office-ui-fabric-react/lib/Dropdown';
 import formatMessage from 'format-message';
diff --git a/Composer/packages/adaptive-form/src/components/fields/RegexIntentField.tsx b/Composer/packages/adaptive-form/src/components/fields/RegexIntentField.tsx
index 5489c1d583..514ccef0b0 100644
--- a/Composer/packages/adaptive-form/src/components/fields/RegexIntentField.tsx
+++ b/Composer/packages/adaptive-form/src/components/fields/RegexIntentField.tsx
@@ -4,7 +4,7 @@
 /** @jsx jsx */
 import { jsx } from '@emotion/core';
 import React, { useState, useEffect } from 'react';
-import { FieldProps, useShellApi } from '@bfc/extension';
+import { FieldProps, useShellApi } from '@bfc/editor-extension';
 import { DialogInfo, RegexRecognizer } from '@bfc/shared';
 
 import { StringField } from './StringField';
diff --git a/Composer/packages/adaptive-form/src/components/fields/SelectField.tsx b/Composer/packages/adaptive-form/src/components/fields/SelectField.tsx
index d416daa718..a7350b4d42 100644
--- a/Composer/packages/adaptive-form/src/components/fields/SelectField.tsx
+++ b/Composer/packages/adaptive-form/src/components/fields/SelectField.tsx
@@ -2,7 +2,7 @@
 // Licensed under the MIT License.
 import React, { useMemo } from 'react';
 import { Dropdown, IDropdownOption, ResponsiveMode } from 'office-ui-fabric-react/lib/Dropdown';
-import { FieldProps } from '@bfc/extension';
+import { FieldProps } from '@bfc/editor-extension';
 import formatMessage from 'format-message';
 
 import { FieldLabel } from '../FieldLabel';
diff --git a/Composer/packages/adaptive-form/src/components/fields/StringField.tsx b/Composer/packages/adaptive-form/src/components/fields/StringField.tsx
index 2de0211fd1..28a4baaf2c 100644
--- a/Composer/packages/adaptive-form/src/components/fields/StringField.tsx
+++ b/Composer/packages/adaptive-form/src/components/fields/StringField.tsx
@@ -2,7 +2,7 @@
 // Licensed under the MIT License.
 
 import React from 'react';
-import { FieldProps } from '@bfc/extension';
+import { FieldProps } from '@bfc/editor-extension';
 import { NeutralColors } from '@uifabric/fluent-theme';
 import { TextField } from 'office-ui-fabric-react/lib/TextField';
 import formatMessage from 'format-message';
diff --git a/Composer/packages/adaptive-form/src/components/fields/UnsupportedField.tsx b/Composer/packages/adaptive-form/src/components/fields/UnsupportedField.tsx
index fab03c5976..399d19c5d0 100644
--- a/Composer/packages/adaptive-form/src/components/fields/UnsupportedField.tsx
+++ b/Composer/packages/adaptive-form/src/components/fields/UnsupportedField.tsx
@@ -4,7 +4,7 @@
 import { jsx } from '@emotion/core';
 import React, { useState } from 'react';
 import { Link } from 'office-ui-fabric-react/lib/Link';
-import { FieldProps } from '@bfc/extension';
+import { FieldProps } from '@bfc/editor-extension';
 import omit from 'lodash/omit';
 
 import { unsupportedField } from './styles';
diff --git a/Composer/packages/adaptive-form/src/components/fields/__tests__/IntentField.test.tsx b/Composer/packages/adaptive-form/src/components/fields/__tests__/IntentField.test.tsx
index fd7152c440..af3667456a 100644
--- a/Composer/packages/adaptive-form/src/components/fields/__tests__/IntentField.test.tsx
+++ b/Composer/packages/adaptive-form/src/components/fields/__tests__/IntentField.test.tsx
@@ -4,13 +4,13 @@
 import React from 'react';
 import { render, fireEvent } from '@bfc/test-utils';
 import assign from 'lodash/assign';
-import { useShellApi, useRecognizerConfig } from '@bfc/extension';
+import { useShellApi, useRecognizerConfig } from '@bfc/editor-extension';
 
 import { IntentField } from '../IntentField';
 
 import { fieldProps } from './testUtils';
 
-jest.mock('@bfc/extension', () => ({
+jest.mock('@bfc/editor-extension', () => ({
   useShellApi: jest.fn(),
   useRecognizerConfig: jest.fn(),
 }));
diff --git a/Composer/packages/adaptive-form/src/components/fields/__tests__/JsonField.test.tsx b/Composer/packages/adaptive-form/src/components/fields/__tests__/JsonField.test.tsx
index 2fab4c37b4..6f0c645ce3 100644
--- a/Composer/packages/adaptive-form/src/components/fields/__tests__/JsonField.test.tsx
+++ b/Composer/packages/adaptive-form/src/components/fields/__tests__/JsonField.test.tsx
@@ -9,7 +9,7 @@ import { JsonField } from '../JsonField';
 
 import { fieldProps } from './testUtils';
 
-jest.mock('@bfc/extension', () => ({
+jest.mock('@bfc/editor-extension', () => ({
   useShellApi: () => ({
     userSettings: {},
   }),
diff --git a/Composer/packages/adaptive-form/src/components/fields/__tests__/ObjectArrayField.test.tsx b/Composer/packages/adaptive-form/src/components/fields/__tests__/ObjectArrayField.test.tsx
index 86202135ea..cf0b409687 100644
--- a/Composer/packages/adaptive-form/src/components/fields/__tests__/ObjectArrayField.test.tsx
+++ b/Composer/packages/adaptive-form/src/components/fields/__tests__/ObjectArrayField.test.tsx
@@ -4,7 +4,7 @@
 import React from 'react';
 import { render, fireEvent } from '@bfc/test-utils';
 import assign from 'lodash/assign';
-import { useShellApi } from '@bfc/extension';
+import { useShellApi } from '@bfc/editor-extension';
 
 import { ObjectArrayField } from '../ObjectArrayField';
 
@@ -25,7 +25,7 @@ const testSchema = (moreItems: object = {}) => ({
 jest.mock('../ArrayFieldItem', () => ({
   ArrayFieldItem: ({ stackArrayItems }) => <div>{stackArrayItems ? 'stacked' : 'not stacked'}</div>,
 }));
-jest.mock('@bfc/extension', () => ({
+jest.mock('@bfc/editor-extension', () => ({
   useShellApi: jest.fn(),
 }));
 
diff --git a/Composer/packages/adaptive-form/src/components/fields/__tests__/RecognizerField.test.tsx b/Composer/packages/adaptive-form/src/components/fields/__tests__/RecognizerField.test.tsx
index 5ed6a61ed3..c591a4f42d 100644
--- a/Composer/packages/adaptive-form/src/components/fields/__tests__/RecognizerField.test.tsx
+++ b/Composer/packages/adaptive-form/src/components/fields/__tests__/RecognizerField.test.tsx
@@ -3,14 +3,14 @@
 
 import React from 'react';
 import { render, fireEvent, screen } from '@bfc/test-utils';
-import { useRecognizerConfig, useShellApi } from '@bfc/extension';
+import { useRecognizerConfig, useShellApi } from '@bfc/editor-extension';
 import assign from 'lodash/assign';
 
 import { RecognizerField } from '../RecognizerField';
 
 import { fieldProps } from './testUtils';
 
-jest.mock('@bfc/extension', () => ({
+jest.mock('@bfc/editor-extension', () => ({
   useShellApi: jest.fn(),
   useRecognizerConfig: jest.fn(),
 }));
diff --git a/Composer/packages/adaptive-form/src/components/fields/__tests__/RegexIntentField.test.tsx b/Composer/packages/adaptive-form/src/components/fields/__tests__/RegexIntentField.test.tsx
index bb4d40b79c..20f052c42a 100644
--- a/Composer/packages/adaptive-form/src/components/fields/__tests__/RegexIntentField.test.tsx
+++ b/Composer/packages/adaptive-form/src/components/fields/__tests__/RegexIntentField.test.tsx
@@ -4,13 +4,13 @@
 import React from 'react';
 import { render, fireEvent } from '@bfc/test-utils';
 import assign from 'lodash/assign';
-import { useShellApi } from '@bfc/extension';
+import { useShellApi } from '@bfc/editor-extension';
 
 import { RegexIntentField } from '../RegexIntentField';
 
 import { fieldProps } from './testUtils';
 
-jest.mock('@bfc/extension', () => ({
+jest.mock('@bfc/editor-extension', () => ({
   useShellApi: jest.fn(),
 }));
 
diff --git a/Composer/packages/adaptive-form/src/components/fields/__tests__/testUtils.ts b/Composer/packages/adaptive-form/src/components/fields/__tests__/testUtils.ts
index 2dbb138f90..b10bda1f86 100644
--- a/Composer/packages/adaptive-form/src/components/fields/__tests__/testUtils.ts
+++ b/Composer/packages/adaptive-form/src/components/fields/__tests__/testUtils.ts
@@ -2,7 +2,7 @@
 // Licensed under the MIT License.
 
 import assign from 'lodash/assign';
-import { FieldProps } from '@bfc/extension';
+import { FieldProps } from '@bfc/editor-extension';
 
 const defaults: FieldProps = {
   depth: 0,
diff --git a/Composer/packages/adaptive-form/src/defaultRecognizers.ts b/Composer/packages/adaptive-form/src/defaultRecognizers.ts
index d9c5fc1607..4521d897fb 100644
--- a/Composer/packages/adaptive-form/src/defaultRecognizers.ts
+++ b/Composer/packages/adaptive-form/src/defaultRecognizers.ts
@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
-import { RecognizerSchema } from '@bfc/extension';
+import { RecognizerSchema } from '@bfc/editor-extension';
 import { SDKKinds } from '@bfc/shared';
 import formatMessage from 'format-message';
 
diff --git a/Composer/packages/adaptive-form/src/utils/__tests__/getUIOptions.test.ts b/Composer/packages/adaptive-form/src/utils/__tests__/getUIOptions.test.ts
index 5b805518f3..0ebdec63d8 100644
--- a/Composer/packages/adaptive-form/src/utils/__tests__/getUIOptions.test.ts
+++ b/Composer/packages/adaptive-form/src/utils/__tests__/getUIOptions.test.ts
@@ -1,6 +1,6 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
-import { UISchema, JSONSchema7, RoleSchema } from '@bfc/extension';
+import { UISchema, JSONSchema7, RoleSchema } from '@bfc/editor-extension';
 import { SDKKinds } from '@bfc/shared';
 
 import { getUIOptions } from '../getUIOptions';
diff --git a/Composer/packages/adaptive-form/src/utils/__tests__/uiOptionsHelpers.test.ts b/Composer/packages/adaptive-form/src/utils/__tests__/uiOptionsHelpers.test.ts
index 28fcc9ac48..50c88b8fb5 100644
--- a/Composer/packages/adaptive-form/src/utils/__tests__/uiOptionsHelpers.test.ts
+++ b/Composer/packages/adaptive-form/src/utils/__tests__/uiOptionsHelpers.test.ts
@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
-import { FieldProps, UIOptions } from '@bfc/extension';
+import { FieldProps, UIOptions } from '@bfc/editor-extension';
 
 import { getUiLabel, getUiDescription, getUiPlaceholder } from '../uiOptionsHelpers';
 
diff --git a/Composer/packages/adaptive-form/src/utils/arrayUtils.ts b/Composer/packages/adaptive-form/src/utils/arrayUtils.ts
index e85aaf3531..fe136fe1ef 100644
--- a/Composer/packages/adaptive-form/src/utils/arrayUtils.ts
+++ b/Composer/packages/adaptive-form/src/utils/arrayUtils.ts
@@ -2,7 +2,7 @@
 // Licensed under the MIT License.
 
 import { generateUniqueId } from '@bfc/shared';
-import { ChangeHandler } from '@bfc/extension';
+import { ChangeHandler } from '@bfc/editor-extension';
 import { useState } from 'react';
 
 type ArrayChangeHandler<ItemType> = (items: ArrayItem<ItemType>[]) => void;
diff --git a/Composer/packages/adaptive-form/src/utils/getHiddenProperties.ts b/Composer/packages/adaptive-form/src/utils/getHiddenProperties.ts
index 8136942037..e6008af687 100644
--- a/Composer/packages/adaptive-form/src/utils/getHiddenProperties.ts
+++ b/Composer/packages/adaptive-form/src/utils/getHiddenProperties.ts
@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
-import { UIOptions } from '@bfc/extension';
+import { UIOptions } from '@bfc/editor-extension';
 
 export const globalHiddenProperties = ['$kind', '$id', '$copy', '$designer', 'id', 'disabled'];
 
diff --git a/Composer/packages/adaptive-form/src/utils/getOrderedProperties.ts b/Composer/packages/adaptive-form/src/utils/getOrderedProperties.ts
index c4e52de4c5..b618b0a77f 100644
--- a/Composer/packages/adaptive-form/src/utils/getOrderedProperties.ts
+++ b/Composer/packages/adaptive-form/src/utils/getOrderedProperties.ts
@@ -1,6 +1,6 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
-import { UIOptions, JSONSchema7 } from '@bfc/extension';
+import { UIOptions, JSONSchema7 } from '@bfc/editor-extension';
 import cloneDeep from 'lodash/cloneDeep';
 import formatMessage from 'format-message';
 
diff --git a/Composer/packages/adaptive-form/src/utils/getUIOptions.ts b/Composer/packages/adaptive-form/src/utils/getUIOptions.ts
index c382dbb72d..8ae6440f6d 100644
--- a/Composer/packages/adaptive-form/src/utils/getUIOptions.ts
+++ b/Composer/packages/adaptive-form/src/utils/getUIOptions.ts
@@ -1,6 +1,6 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
-import { FormUISchema, UIOptions, JSONSchema7 } from '@bfc/extension';
+import { FormUISchema, UIOptions, JSONSchema7 } from '@bfc/editor-extension';
 /**
  * Merges overrides and plugins into default ui schema and returns the UIOptions
  */
diff --git a/Composer/packages/adaptive-form/src/utils/objectUtils.ts b/Composer/packages/adaptive-form/src/utils/objectUtils.ts
index e9abebe039..3fa8ac61d6 100644
--- a/Composer/packages/adaptive-form/src/utils/objectUtils.ts
+++ b/Composer/packages/adaptive-form/src/utils/objectUtils.ts
@@ -2,7 +2,7 @@
 // Licensed under the MIT License.
 
 import { generateUniqueId } from '@bfc/shared';
-import { ChangeHandler } from '@bfc/extension';
+import { ChangeHandler } from '@bfc/editor-extension';
 import { useState } from 'react';
 
 type ItemType<ValueType = unknown> = { [key: string]: ValueType };
diff --git a/Composer/packages/adaptive-form/src/utils/resolveFieldWidget.ts b/Composer/packages/adaptive-form/src/utils/resolveFieldWidget.ts
index 302fcc21ba..38175e2ed3 100644
--- a/Composer/packages/adaptive-form/src/utils/resolveFieldWidget.ts
+++ b/Composer/packages/adaptive-form/src/utils/resolveFieldWidget.ts
@@ -1,6 +1,6 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
-import { FieldWidget, FormUISchema, JSONSchema7, UIOptions } from '@bfc/extension';
+import { FieldWidget, FormUISchema, JSONSchema7, UIOptions } from '@bfc/editor-extension';
 
 import * as DefaultFields from '../components/fields';
 
diff --git a/Composer/packages/adaptive-form/src/utils/resolvePropSchema.ts b/Composer/packages/adaptive-form/src/utils/resolvePropSchema.ts
index e2801be7c9..7ddb23ee49 100644
--- a/Composer/packages/adaptive-form/src/utils/resolvePropSchema.ts
+++ b/Composer/packages/adaptive-form/src/utils/resolvePropSchema.ts
@@ -1,6 +1,6 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
-import { JSONSchema7, JSONSchema7Definition } from '@bfc/extension';
+import { JSONSchema7, JSONSchema7Definition } from '@bfc/editor-extension';
 
 import { resolveRef } from './resolveRef';
 
diff --git a/Composer/packages/adaptive-form/src/utils/resolveRef.ts b/Composer/packages/adaptive-form/src/utils/resolveRef.ts
index e41973eaa7..c59f5dd991 100644
--- a/Composer/packages/adaptive-form/src/utils/resolveRef.ts
+++ b/Composer/packages/adaptive-form/src/utils/resolveRef.ts
@@ -1,6 +1,6 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
-import { JSONSchema7, JSONSchema7Definition } from '@bfc/extension';
+import { JSONSchema7, JSONSchema7Definition } from '@bfc/editor-extension';
 import formatMessage from 'format-message';
 
 export function resolveRef(
diff --git a/Composer/packages/adaptive-form/src/utils/uiOptionsHelpers.ts b/Composer/packages/adaptive-form/src/utils/uiOptionsHelpers.ts
index 3e46d8a92d..103c929e08 100644
--- a/Composer/packages/adaptive-form/src/utils/uiOptionsHelpers.ts
+++ b/Composer/packages/adaptive-form/src/utils/uiOptionsHelpers.ts
@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
-import { FieldProps } from '@bfc/extension';
+import { FieldProps } from '@bfc/editor-extension';
 import startCase from 'lodash/startCase';
 
 export function getUiLabel(props: FieldProps): string | false | undefined {
diff --git a/Composer/packages/client/package.json b/Composer/packages/client/package.json
index e83d49570a..a50e9f41c0 100644
--- a/Composer/packages/client/package.json
+++ b/Composer/packages/client/package.json
@@ -23,7 +23,7 @@
     "@bfc/adaptive-flow": "*",
     "@bfc/adaptive-form": "*",
     "@bfc/code-editor": "*",
-    "@bfc/extension": "*",
+    "@bfc/editor-extension": "*",
     "@bfc/indexers": "*",
     "@bfc/shared": "*",
     "@bfc/ui-plugin-composer": "*",
diff --git a/Composer/packages/client/src/pages/design/DesignPage.tsx b/Composer/packages/client/src/pages/design/DesignPage.tsx
index 7d784a6141..02d60eb30f 100644
--- a/Composer/packages/client/src/pages/design/DesignPage.tsx
+++ b/Composer/packages/client/src/pages/design/DesignPage.tsx
@@ -11,7 +11,7 @@ import get from 'lodash/get';
 import { DialogFactory, SDKKinds, DialogInfo, PromptTab, getEditorAPI, registerEditorAPI } from '@bfc/shared';
 import { ActionButton } from 'office-ui-fabric-react/lib/Button';
 import { JsonEditor } from '@bfc/code-editor';
-import Extension, { useTriggerApi, PluginConfig } from '@bfc/extension';
+import Extension, { useTriggerApi, PluginConfig } from '@bfc/editor-extension';
 import { useRecoilValue } from 'recoil';
 
 import { LoadingSpinner } from '../../components/LoadingSpinner';
diff --git a/Composer/packages/client/src/pages/design/PropertyEditor.tsx b/Composer/packages/client/src/pages/design/PropertyEditor.tsx
index 3eda8a6ecf..ef478ed063 100644
--- a/Composer/packages/client/src/pages/design/PropertyEditor.tsx
+++ b/Composer/packages/client/src/pages/design/PropertyEditor.tsx
@@ -5,7 +5,7 @@
 import { jsx } from '@emotion/core';
 import React, { useEffect, useMemo, useRef, useState } from 'react';
 import AdaptiveForm, { resolveRef, getUIOptions } from '@bfc/adaptive-form';
-import { FormErrors, JSONSchema7, useFormConfig } from '@bfc/extension';
+import { FormErrors, JSONSchema7, useFormConfig } from '@bfc/editor-extension';
 import formatMessage from 'format-message';
 import isEqual from 'lodash/isEqual';
 import debounce from 'lodash/debounce';
diff --git a/Composer/packages/client/src/pages/design/exportSkillModal/constants.tsx b/Composer/packages/client/src/pages/design/exportSkillModal/constants.tsx
index 9e94baa24a..004e1eb96f 100644
--- a/Composer/packages/client/src/pages/design/exportSkillModal/constants.tsx
+++ b/Composer/packages/client/src/pages/design/exportSkillModal/constants.tsx
@@ -2,7 +2,7 @@
 // Licensed under the MIT License.
 
 import formatMessage from 'format-message';
-import { JSONSchema7 } from '@bfc/extension';
+import { JSONSchema7 } from '@bfc/editor-extension';
 import { resolveRef } from '@bfc/adaptive-form';
 import { SkillManifest } from '@bfc/shared';
 import startCase from 'lodash/startCase';
diff --git a/Composer/packages/client/src/pages/design/exportSkillModal/content/Description.tsx b/Composer/packages/client/src/pages/design/exportSkillModal/content/Description.tsx
index 698b2b93fd..bb54dcf39e 100644
--- a/Composer/packages/client/src/pages/design/exportSkillModal/content/Description.tsx
+++ b/Composer/packages/client/src/pages/design/exportSkillModal/content/Description.tsx
@@ -5,7 +5,7 @@
 import { css, jsx } from '@emotion/core';
 import React, { useMemo, useEffect } from 'react';
 import AdaptiveForm, { FieldLabel } from '@bfc/adaptive-form';
-import { FieldProps, JSONSchema7, UIOptions } from '@bfc/extension';
+import { FieldProps, JSONSchema7, UIOptions } from '@bfc/editor-extension';
 import { TextField } from 'office-ui-fabric-react/lib/TextField';
 import { useRecoilValue } from 'recoil';
 import { v4 as uuid } from 'uuid';
diff --git a/Composer/packages/client/src/pages/design/exportSkillModal/content/Endpoints.tsx b/Composer/packages/client/src/pages/design/exportSkillModal/content/Endpoints.tsx
index 6e4868d145..4dd7caa25e 100644
--- a/Composer/packages/client/src/pages/design/exportSkillModal/content/Endpoints.tsx
+++ b/Composer/packages/client/src/pages/design/exportSkillModal/content/Endpoints.tsx
@@ -5,7 +5,7 @@
 import { css, jsx } from '@emotion/core';
 import React, { useMemo } from 'react';
 import AdaptiveForm from '@bfc/adaptive-form';
-import { JSONSchema7, UIOptions } from '@bfc/extension';
+import { JSONSchema7, UIOptions } from '@bfc/editor-extension';
 
 import { ContentProps } from '../constants';
 
diff --git a/Composer/packages/client/src/pages/design/exportSkillModal/generateSkillManifest.ts b/Composer/packages/client/src/pages/design/exportSkillModal/generateSkillManifest.ts
index adb09b34e5..60c1413cf5 100644
--- a/Composer/packages/client/src/pages/design/exportSkillModal/generateSkillManifest.ts
+++ b/Composer/packages/client/src/pages/design/exportSkillModal/generateSkillManifest.ts
@@ -3,7 +3,7 @@
 
 import get from 'lodash/get';
 import { DialogInfo, DialogSchemaFile, ITrigger, SDKKinds, SkillManifest, LuFile } from '@bfc/shared';
-import { JSONSchema7 } from '@bfc/extension';
+import { JSONSchema7 } from '@bfc/editor-extension';
 
 import { Activities, Activity, activityHandlerMap, ActivityTypes, DispatchModels } from './constants';
 
diff --git a/Composer/packages/client/src/pages/design/exportSkillModal/index.tsx b/Composer/packages/client/src/pages/design/exportSkillModal/index.tsx
index 85aab047d9..ab6dae860b 100644
--- a/Composer/packages/client/src/pages/design/exportSkillModal/index.tsx
+++ b/Composer/packages/client/src/pages/design/exportSkillModal/index.tsx
@@ -7,7 +7,7 @@ import React, { useState } from 'react';
 import formatMessage from 'format-message';
 import { Dialog, DialogFooter, DialogType } from 'office-ui-fabric-react/lib/Dialog';
 import { DefaultButton, PrimaryButton } from 'office-ui-fabric-react/lib/Button';
-import { JSONSchema7 } from '@bfc/extension';
+import { JSONSchema7 } from '@bfc/editor-extension';
 import { Link } from 'office-ui-fabric-react/lib/components/Link';
 import { useRecoilValue } from 'recoil';
 import { SkillManifest } from '@bfc/shared';
diff --git a/Composer/packages/client/src/plugins.ts b/Composer/packages/client/src/plugins.ts
index ef476549f0..5d9891d279 100644
--- a/Composer/packages/client/src/plugins.ts
+++ b/Composer/packages/client/src/plugins.ts
@@ -5,7 +5,7 @@ import isArray from 'lodash/isArray';
 // this is just a type import
 // eslint-disable-next-line lodash/import-scope
 import type { MergeWithCustomizer } from 'lodash';
-import type { PluginConfig } from '@bfc/extension';
+import type { PluginConfig } from '@bfc/editor-extension';
 import composer from '@bfc/ui-plugin-composer';
 import prompts from '@bfc/ui-plugin-prompts';
 import schemaEditor from '@bfc/ui-plugin-dialog-schema-editor';
diff --git a/Composer/packages/client/src/recoilModel/types.ts b/Composer/packages/client/src/recoilModel/types.ts
index f640ea2367..c16bfddedf 100644
--- a/Composer/packages/client/src/recoilModel/types.ts
+++ b/Composer/packages/client/src/recoilModel/types.ts
@@ -1,6 +1,6 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
-import { JSONSchema7 } from '@bfc/extension';
+import { JSONSchema7 } from '@bfc/editor-extension';
 import { AppUpdaterSettings, CodeEditorSettings, PromptTab } from '@bfc/shared';
 
 import { AppUpdaterStatus } from '../constants';
diff --git a/Composer/packages/extension/.eslintrc.js b/Composer/packages/editor-extension/.eslintrc.js
similarity index 100%
rename from Composer/packages/extension/.eslintrc.js
rename to Composer/packages/editor-extension/.eslintrc.js
diff --git a/Composer/packages/extension/.gitignore b/Composer/packages/editor-extension/.gitignore
similarity index 100%
rename from Composer/packages/extension/.gitignore
rename to Composer/packages/editor-extension/.gitignore
diff --git a/Composer/packages/extension/jest.config.js b/Composer/packages/editor-extension/jest.config.js
similarity index 100%
rename from Composer/packages/extension/jest.config.js
rename to Composer/packages/editor-extension/jest.config.js
diff --git a/Composer/packages/extension/package.json b/Composer/packages/editor-extension/package.json
similarity index 94%
rename from Composer/packages/extension/package.json
rename to Composer/packages/editor-extension/package.json
index a7586fa687..e31fe5baac 100644
--- a/Composer/packages/extension/package.json
+++ b/Composer/packages/editor-extension/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "@bfc/extension",
+  "name": "@bfc/editor-extension",
   "version": "0.0.0",
   "private": true,
   "description": "Botframework Composer extension api.",
diff --git a/Composer/packages/extension/src/components/Extension.tsx b/Composer/packages/editor-extension/src/components/Extension.tsx
similarity index 100%
rename from Composer/packages/extension/src/components/Extension.tsx
rename to Composer/packages/editor-extension/src/components/Extension.tsx
diff --git a/Composer/packages/extension/src/components/index.ts b/Composer/packages/editor-extension/src/components/index.ts
similarity index 100%
rename from Composer/packages/extension/src/components/index.ts
rename to Composer/packages/editor-extension/src/components/index.ts
diff --git a/Composer/packages/extension/src/extensionContext.ts b/Composer/packages/editor-extension/src/extensionContext.ts
similarity index 100%
rename from Composer/packages/extension/src/extensionContext.ts
rename to Composer/packages/editor-extension/src/extensionContext.ts
diff --git a/Composer/packages/extension/src/hooks/__tests__/useFlowConfig.test.tsx b/Composer/packages/editor-extension/src/hooks/__tests__/useFlowConfig.test.tsx
similarity index 100%
rename from Composer/packages/extension/src/hooks/__tests__/useFlowConfig.test.tsx
rename to Composer/packages/editor-extension/src/hooks/__tests__/useFlowConfig.test.tsx
diff --git a/Composer/packages/extension/src/hooks/__tests__/useFormConfig.test.tsx b/Composer/packages/editor-extension/src/hooks/__tests__/useFormConfig.test.tsx
similarity index 100%
rename from Composer/packages/extension/src/hooks/__tests__/useFormConfig.test.tsx
rename to Composer/packages/editor-extension/src/hooks/__tests__/useFormConfig.test.tsx
diff --git a/Composer/packages/extension/src/hooks/__tests__/useMenuConfig.test.tsx b/Composer/packages/editor-extension/src/hooks/__tests__/useMenuConfig.test.tsx
similarity index 100%
rename from Composer/packages/extension/src/hooks/__tests__/useMenuConfig.test.tsx
rename to Composer/packages/editor-extension/src/hooks/__tests__/useMenuConfig.test.tsx
diff --git a/Composer/packages/extension/src/hooks/__tests__/useRecognizerConfig.test.tsx b/Composer/packages/editor-extension/src/hooks/__tests__/useRecognizerConfig.test.tsx
similarity index 100%
rename from Composer/packages/extension/src/hooks/__tests__/useRecognizerConfig.test.tsx
rename to Composer/packages/editor-extension/src/hooks/__tests__/useRecognizerConfig.test.tsx
diff --git a/Composer/packages/extension/src/hooks/index.ts b/Composer/packages/editor-extension/src/hooks/index.ts
similarity index 100%
rename from Composer/packages/extension/src/hooks/index.ts
rename to Composer/packages/editor-extension/src/hooks/index.ts
diff --git a/Composer/packages/extension/src/hooks/useActionApi.ts b/Composer/packages/editor-extension/src/hooks/useActionApi.ts
similarity index 100%
rename from Composer/packages/extension/src/hooks/useActionApi.ts
rename to Composer/packages/editor-extension/src/hooks/useActionApi.ts
diff --git a/Composer/packages/extension/src/hooks/useDebounce.ts b/Composer/packages/editor-extension/src/hooks/useDebounce.ts
similarity index 100%
rename from Composer/packages/extension/src/hooks/useDebounce.ts
rename to Composer/packages/editor-extension/src/hooks/useDebounce.ts
diff --git a/Composer/packages/extension/src/hooks/useDialogApi.ts b/Composer/packages/editor-extension/src/hooks/useDialogApi.ts
similarity index 100%
rename from Composer/packages/extension/src/hooks/useDialogApi.ts
rename to Composer/packages/editor-extension/src/hooks/useDialogApi.ts
diff --git a/Composer/packages/extension/src/hooks/useDialogEditApi.ts b/Composer/packages/editor-extension/src/hooks/useDialogEditApi.ts
similarity index 100%
rename from Composer/packages/extension/src/hooks/useDialogEditApi.ts
rename to Composer/packages/editor-extension/src/hooks/useDialogEditApi.ts
diff --git a/Composer/packages/extension/src/hooks/useFlowConfig.ts b/Composer/packages/editor-extension/src/hooks/useFlowConfig.ts
similarity index 100%
rename from Composer/packages/extension/src/hooks/useFlowConfig.ts
rename to Composer/packages/editor-extension/src/hooks/useFlowConfig.ts
diff --git a/Composer/packages/extension/src/hooks/useFormConfig.ts b/Composer/packages/editor-extension/src/hooks/useFormConfig.ts
similarity index 100%
rename from Composer/packages/extension/src/hooks/useFormConfig.ts
rename to Composer/packages/editor-extension/src/hooks/useFormConfig.ts
diff --git a/Composer/packages/extension/src/hooks/useLgApi.ts b/Composer/packages/editor-extension/src/hooks/useLgApi.ts
similarity index 100%
rename from Composer/packages/extension/src/hooks/useLgApi.ts
rename to Composer/packages/editor-extension/src/hooks/useLgApi.ts
diff --git a/Composer/packages/extension/src/hooks/useLuApi.ts b/Composer/packages/editor-extension/src/hooks/useLuApi.ts
similarity index 100%
rename from Composer/packages/extension/src/hooks/useLuApi.ts
rename to Composer/packages/editor-extension/src/hooks/useLuApi.ts
diff --git a/Composer/packages/extension/src/hooks/useMenuConfig.ts b/Composer/packages/editor-extension/src/hooks/useMenuConfig.ts
similarity index 100%
rename from Composer/packages/extension/src/hooks/useMenuConfig.ts
rename to Composer/packages/editor-extension/src/hooks/useMenuConfig.ts
diff --git a/Composer/packages/extension/src/hooks/useRecognizerConfig.ts b/Composer/packages/editor-extension/src/hooks/useRecognizerConfig.ts
similarity index 100%
rename from Composer/packages/extension/src/hooks/useRecognizerConfig.ts
rename to Composer/packages/editor-extension/src/hooks/useRecognizerConfig.ts
diff --git a/Composer/packages/extension/src/hooks/useShellApi.ts b/Composer/packages/editor-extension/src/hooks/useShellApi.ts
similarity index 100%
rename from Composer/packages/extension/src/hooks/useShellApi.ts
rename to Composer/packages/editor-extension/src/hooks/useShellApi.ts
diff --git a/Composer/packages/extension/src/hooks/useTriggerApi.ts b/Composer/packages/editor-extension/src/hooks/useTriggerApi.ts
similarity index 100%
rename from Composer/packages/extension/src/hooks/useTriggerApi.ts
rename to Composer/packages/editor-extension/src/hooks/useTriggerApi.ts
diff --git a/Composer/packages/extension/src/index.ts b/Composer/packages/editor-extension/src/index.ts
similarity index 100%
rename from Composer/packages/extension/src/index.ts
rename to Composer/packages/editor-extension/src/index.ts
diff --git a/Composer/packages/extension/src/types/extension.ts b/Composer/packages/editor-extension/src/types/extension.ts
similarity index 100%
rename from Composer/packages/extension/src/types/extension.ts
rename to Composer/packages/editor-extension/src/types/extension.ts
diff --git a/Composer/packages/extension/src/types/flowSchema.ts b/Composer/packages/editor-extension/src/types/flowSchema.ts
similarity index 100%
rename from Composer/packages/extension/src/types/flowSchema.ts
rename to Composer/packages/editor-extension/src/types/flowSchema.ts
diff --git a/Composer/packages/extension/src/types/form.ts b/Composer/packages/editor-extension/src/types/form.ts
similarity index 100%
rename from Composer/packages/extension/src/types/form.ts
rename to Composer/packages/editor-extension/src/types/form.ts
diff --git a/Composer/packages/extension/src/types/formSchema.ts b/Composer/packages/editor-extension/src/types/formSchema.ts
similarity index 100%
rename from Composer/packages/extension/src/types/formSchema.ts
rename to Composer/packages/editor-extension/src/types/formSchema.ts
diff --git a/Composer/packages/extension/src/types/index.ts b/Composer/packages/editor-extension/src/types/index.ts
similarity index 100%
rename from Composer/packages/extension/src/types/index.ts
rename to Composer/packages/editor-extension/src/types/index.ts
diff --git a/Composer/packages/extension/src/types/menuSchema.ts b/Composer/packages/editor-extension/src/types/menuSchema.ts
similarity index 100%
rename from Composer/packages/extension/src/types/menuSchema.ts
rename to Composer/packages/editor-extension/src/types/menuSchema.ts
diff --git a/Composer/packages/extension/src/utils/__tests__/mergePluginConfigs.test.ts b/Composer/packages/editor-extension/src/utils/__tests__/mergePluginConfigs.test.ts
similarity index 100%
rename from Composer/packages/extension/src/utils/__tests__/mergePluginConfigs.test.ts
rename to Composer/packages/editor-extension/src/utils/__tests__/mergePluginConfigs.test.ts
diff --git a/Composer/packages/extension/src/utils/index.ts b/Composer/packages/editor-extension/src/utils/index.ts
similarity index 100%
rename from Composer/packages/extension/src/utils/index.ts
rename to Composer/packages/editor-extension/src/utils/index.ts
diff --git a/Composer/packages/extension/src/utils/mergePluginConfigs.ts b/Composer/packages/editor-extension/src/utils/mergePluginConfigs.ts
similarity index 100%
rename from Composer/packages/extension/src/utils/mergePluginConfigs.ts
rename to Composer/packages/editor-extension/src/utils/mergePluginConfigs.ts
diff --git a/Composer/packages/extension/tsconfig.build.json b/Composer/packages/editor-extension/tsconfig.build.json
similarity index 100%
rename from Composer/packages/extension/tsconfig.build.json
rename to Composer/packages/editor-extension/tsconfig.build.json
diff --git a/Composer/packages/extension/tsconfig.json b/Composer/packages/editor-extension/tsconfig.json
similarity index 100%
rename from Composer/packages/extension/tsconfig.json
rename to Composer/packages/editor-extension/tsconfig.json
diff --git a/Composer/packages/lib/ui-shared/package.json b/Composer/packages/lib/ui-shared/package.json
index c724c8f262..1d30800f45 100644
--- a/Composer/packages/lib/ui-shared/package.json
+++ b/Composer/packages/lib/ui-shared/package.json
@@ -23,13 +23,13 @@
     "@bfc/adaptive-form": "*",
     "@emotion/core": "^10.0.27",
     "@emotion/styled": "^10.0.27",
-    "@bfc/extension": "*",
+    "@bfc/editor-extension": "*",
     "react": "16.13.0",
     "react-dom": "16.13.0"
   },
   "devDependencies": {
     "@bfc/adaptive-form": "*",
-    "@bfc/extension": "*",
+    "@bfc/editor-extension": "*",
     "@bfc/test-utils": "*",
     "@types/react": "16.9.23",
     "@types/react-dom": "16.9.5",
diff --git a/Composer/packages/ui-plugins/composer/package.json b/Composer/packages/ui-plugins/composer/package.json
index b30882118d..89437f4717 100644
--- a/Composer/packages/ui-plugins/composer/package.json
+++ b/Composer/packages/ui-plugins/composer/package.json
@@ -18,7 +18,7 @@
   "license": "MIT",
   "peerDependencies": {
     "@bfc/adaptive-form": "*",
-    "@bfc/extension": "*",
+    "@bfc/editor-extension": "*",
     "@bfc/intellisense": "*",
     "@emotion/core": "^10.0.27",
     "@uifabric/fluent-theme": "^7.1.4",
@@ -30,7 +30,7 @@
   },
   "devDependencies": {
     "@bfc/adaptive-form": "*",
-    "@bfc/extension": "*",
+    "@bfc/editor-extension": "*",
     "@bfc/intellisense": "*",
     "@bfc/test-utils": "*",
     "@emotion/core": "^10.0.27",
diff --git a/Composer/packages/ui-plugins/composer/src/defaultMenuSchema.ts b/Composer/packages/ui-plugins/composer/src/defaultMenuSchema.ts
index e61126a960..e9b72ee8a0 100644
--- a/Composer/packages/ui-plugins/composer/src/defaultMenuSchema.ts
+++ b/Composer/packages/ui-plugins/composer/src/defaultMenuSchema.ts
@@ -2,7 +2,7 @@
 // Licensed under the MIT License.
 
 import formatMessage from 'format-message';
-import { MenuUISchema } from '@bfc/extension';
+import { MenuUISchema } from '@bfc/editor-extension';
 import { SDKKinds } from '@bfc/shared';
 
 const SubmenuNames = {
diff --git a/Composer/packages/ui-plugins/composer/src/index.ts b/Composer/packages/ui-plugins/composer/src/index.ts
index c26f8a4421..e55f6c9545 100644
--- a/Composer/packages/ui-plugins/composer/src/index.ts
+++ b/Composer/packages/ui-plugins/composer/src/index.ts
@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
-import { PluginConfig, FormUISchema, RecognizerSchema, UISchema, MenuUISchema } from '@bfc/extension';
+import { PluginConfig, FormUISchema, RecognizerSchema, UISchema, MenuUISchema } from '@bfc/editor-extension';
 import { SDKKinds } from '@bfc/shared';
 import formatMessage from 'format-message';
 import mapValues from 'lodash/mapValues';
diff --git a/Composer/packages/ui-plugins/cross-trained/package.json b/Composer/packages/ui-plugins/cross-trained/package.json
index cf1c7eb5dd..4a0c8fcc6f 100644
--- a/Composer/packages/ui-plugins/cross-trained/package.json
+++ b/Composer/packages/ui-plugins/cross-trained/package.json
@@ -21,13 +21,13 @@
   "license": "MIT",
   "peerDependencies": {
     "@bfc/adaptive-form": "*",
-    "@bfc/extension": "*",
+    "@bfc/editor-extension": "*",
     "react": "16.13.0",
     "react-dom": "16.13.0"
   },
   "devDependencies": {
     "@bfc/adaptive-form": "*",
-    "@bfc/extension": "*",
+    "@bfc/editor-extension": "*",
     "@types/react": "16.9.23",
     "@types/react-dom": "16.9.5",
     "react": "16.13.0",
diff --git a/Composer/packages/ui-plugins/cross-trained/src/index.ts b/Composer/packages/ui-plugins/cross-trained/src/index.ts
index 0173b28a73..24d7b3f115 100644
--- a/Composer/packages/ui-plugins/cross-trained/src/index.ts
+++ b/Composer/packages/ui-plugins/cross-trained/src/index.ts
@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
-import { PluginConfig } from '@bfc/extension';
+import { PluginConfig } from '@bfc/editor-extension';
 import { SDKKinds } from '@bfc/shared';
 
 const config: PluginConfig = {
diff --git a/Composer/packages/ui-plugins/example/package.json b/Composer/packages/ui-plugins/example/package.json
index 2b972a3970..4325113e02 100644
--- a/Composer/packages/ui-plugins/example/package.json
+++ b/Composer/packages/ui-plugins/example/package.json
@@ -17,7 +17,7 @@
   "license": "MIT",
   "peerDependencies": {
     "@bfc/adaptive-form": "*",
-    "@bfc/extension": "*",
+    "@bfc/editor-extension": "*",
     "@emotion/core": "^10.0.27",
     "@uifabric/fluent-theme": "^7.1.4",
     "@uifabric/icons": "^7.3.0",
@@ -28,7 +28,7 @@
   },
   "devDependencies": {
     "@bfc/adaptive-form": "*",
-    "@bfc/extension": "*",
+    "@bfc/editor-extension": "*",
     "@bfc/test-utils": "*",
     "@emotion/core": "^10.0.27",
     "@types/react": "16.9.23",
diff --git a/Composer/packages/ui-plugins/example/src/index.ts b/Composer/packages/ui-plugins/example/src/index.ts
index fdc0861afe..15e84d4ae9 100644
--- a/Composer/packages/ui-plugins/example/src/index.ts
+++ b/Composer/packages/ui-plugins/example/src/index.ts
@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
-import { PluginConfig } from '@bfc/extension';
+import { PluginConfig } from '@bfc/editor-extension';
 
 const config: PluginConfig = {};
 
diff --git a/Composer/packages/ui-plugins/lg/package.json b/Composer/packages/ui-plugins/lg/package.json
index c859d9400f..7ff437b1fe 100644
--- a/Composer/packages/ui-plugins/lg/package.json
+++ b/Composer/packages/ui-plugins/lg/package.json
@@ -22,13 +22,13 @@
   "license": "MIT",
   "peerDependencies": {
     "@bfc/adaptive-form": "*",
-    "@bfc/extension": "*",
+    "@bfc/editor-extension": "*",
     "react": "16.13.0",
     "react-dom": "16.13.0"
   },
   "devDependencies": {
     "@bfc/adaptive-form": "*",
-    "@bfc/extension": "*",
+    "@bfc/editor-extension": "*",
     "@bfc/test-utils": "*",
     "@types/react": "16.9.23",
     "@types/react-dom": "16.9.5",
diff --git a/Composer/packages/ui-plugins/lg/src/LgField.tsx b/Composer/packages/ui-plugins/lg/src/LgField.tsx
index e1fa7a1f1f..565805882f 100644
--- a/Composer/packages/ui-plugins/lg/src/LgField.tsx
+++ b/Composer/packages/ui-plugins/lg/src/LgField.tsx
@@ -5,7 +5,7 @@
 import { jsx } from '@emotion/core';
 import React, { useCallback } from 'react';
 import { LgEditor } from '@bfc/code-editor';
-import { FieldProps, useShellApi } from '@bfc/extension';
+import { FieldProps, useShellApi } from '@bfc/editor-extension';
 import { FieldLabel } from '@bfc/adaptive-form';
 import { LgMetaData, LgTemplateRef, LgType, CodeEditorSettings } from '@bfc/shared';
 import { filterTemplateDiagnostics } from '@bfc/indexers';
diff --git a/Composer/packages/ui-plugins/lg/src/LgWidget/LgWidget.tsx b/Composer/packages/ui-plugins/lg/src/LgWidget/LgWidget.tsx
index 6b9a740af9..6641e1fd8a 100644
--- a/Composer/packages/ui-plugins/lg/src/LgWidget/LgWidget.tsx
+++ b/Composer/packages/ui-plugins/lg/src/LgWidget/LgWidget.tsx
@@ -3,7 +3,7 @@
 
 import React from 'react';
 import get from 'lodash/get';
-import { WidgetContainerProps } from '@bfc/extension';
+import { WidgetContainerProps } from '@bfc/editor-extension';
 import { MultilineTextWithEllipsis } from '@bfc/ui-shared';
 
 import { useLgTemplate } from './useLgTemplate';
diff --git a/Composer/packages/ui-plugins/lg/src/LgWidget/useLgTemplate.ts b/Composer/packages/ui-plugins/lg/src/LgWidget/useLgTemplate.ts
index c5a9cdf684..efbca40f65 100644
--- a/Composer/packages/ui-plugins/lg/src/LgWidget/useLgTemplate.ts
+++ b/Composer/packages/ui-plugins/lg/src/LgWidget/useLgTemplate.ts
@@ -2,7 +2,7 @@
 // Licensed under the MIT License.
 
 import { LgTemplateRef, LgFile, LgTemplate } from '@bfc/shared';
-import { useShellApi } from '@bfc/extension';
+import { useShellApi } from '@bfc/editor-extension';
 
 export const queryLgTemplate = (templateId: string, lgFileId: string, lgFiles: LgFile[]): LgTemplate | undefined => {
   return lgFiles.find(({ id }) => id === lgFileId)?.templates?.find(({ name }) => name === templateId);
diff --git a/Composer/packages/ui-plugins/lg/src/index.ts b/Composer/packages/ui-plugins/lg/src/index.ts
index 158b789a98..527415caa2 100644
--- a/Composer/packages/ui-plugins/lg/src/index.ts
+++ b/Composer/packages/ui-plugins/lg/src/index.ts
@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
-import { PluginConfig } from '@bfc/extension';
+import { PluginConfig } from '@bfc/editor-extension';
 import { SDKKinds } from '@bfc/shared';
 import { VisualEditorColors as Colors } from '@bfc/ui-shared';
 
diff --git a/Composer/packages/ui-plugins/luis/package.json b/Composer/packages/ui-plugins/luis/package.json
index b7eff7caf7..b44e0fdde9 100644
--- a/Composer/packages/ui-plugins/luis/package.json
+++ b/Composer/packages/ui-plugins/luis/package.json
@@ -22,14 +22,14 @@
   "license": "MIT",
   "peerDependencies": {
     "@bfc/adaptive-form": "*",
-    "@bfc/extension": "*",
+    "@bfc/editor-extension": "*",
     "@bfc/shared": "*",
     "react": "16.13.0",
     "react-dom": "16.13.0"
   },
   "devDependencies": {
     "@bfc/adaptive-form": "*",
-    "@bfc/extension": "*",
+    "@bfc/editor-extension": "*",
     "@bfc/test-utils": "*",
     "@types/react": "16.9.23",
     "@types/react-dom": "16.9.5",
diff --git a/Composer/packages/ui-plugins/luis/src/LuisIntentEditor.tsx b/Composer/packages/ui-plugins/luis/src/LuisIntentEditor.tsx
index f709caf044..e475d73f82 100644
--- a/Composer/packages/ui-plugins/luis/src/LuisIntentEditor.tsx
+++ b/Composer/packages/ui-plugins/luis/src/LuisIntentEditor.tsx
@@ -5,7 +5,7 @@
 import { jsx } from '@emotion/core';
 import React, { useMemo } from 'react';
 import { LuEditor, inlineModePlaceholder } from '@bfc/code-editor';
-import { FieldProps, useShellApi } from '@bfc/extension';
+import { FieldProps, useShellApi } from '@bfc/editor-extension';
 import { filterSectionDiagnostics } from '@bfc/indexers';
 import { LuIntentSection, CodeEditorSettings, LuMetaData, LuType } from '@bfc/shared';
 
diff --git a/Composer/packages/ui-plugins/luis/src/index.ts b/Composer/packages/ui-plugins/luis/src/index.ts
index 8443e4a658..1501ddea13 100644
--- a/Composer/packages/ui-plugins/luis/src/index.ts
+++ b/Composer/packages/ui-plugins/luis/src/index.ts
@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
-import { PluginConfig } from '@bfc/extension';
+import { PluginConfig } from '@bfc/editor-extension';
 import { SDKKinds } from '@bfc/shared';
 
 import { LuisIntentEditor } from './LuisIntentEditor';
diff --git a/Composer/packages/ui-plugins/prompts/package.json b/Composer/packages/ui-plugins/prompts/package.json
index dcacaee0d0..6b923524ce 100644
--- a/Composer/packages/ui-plugins/prompts/package.json
+++ b/Composer/packages/ui-plugins/prompts/package.json
@@ -21,7 +21,7 @@
   "author": "andy.brown@microsoft.com",
   "license": "MIT",
   "peerDependencies": {
-    "@bfc/extension": "*",
+    "@bfc/editor-extension": "*",
     "@bfc/adaptive-form": "*",
     "@uifabric/fluent-theme": "^7.1.4",
     "@uifabric/icons": "^7.3.0",
@@ -32,7 +32,7 @@
     "react-dom": "16.13.0"
   },
   "devDependencies": {
-    "@bfc/extension": "*",
+    "@bfc/editor-extension": "*",
     "@bfc/adaptive-form": "*",
     "@bfc/test-utils": "*",
     "@types/react": "16.9.23",
@@ -46,4 +46,4 @@
     "@bfc/shared": "*",
     "@emotion/core": "^10.0.27"
   }
-}
\ No newline at end of file
+}
diff --git a/Composer/packages/ui-plugins/prompts/src/PromptField/UserInput.tsx b/Composer/packages/ui-plugins/prompts/src/PromptField/UserInput.tsx
index a8f619231c..d260cab2cd 100644
--- a/Composer/packages/ui-plugins/prompts/src/PromptField/UserInput.tsx
+++ b/Composer/packages/ui-plugins/prompts/src/PromptField/UserInput.tsx
@@ -6,7 +6,7 @@ import { jsx } from '@emotion/core';
 import React, { Fragment } from 'react';
 import { SDKKinds, MicrosoftInputDialog, ChoiceInput, ConfirmInput, LuMetaData, LuType } from '@bfc/shared';
 import { FieldLabel, SchemaField } from '@bfc/adaptive-form';
-import { JSONSchema7, useShellApi, useRecognizerConfig } from '@bfc/extension';
+import { JSONSchema7, useShellApi, useRecognizerConfig } from '@bfc/editor-extension';
 import formatMessage from 'format-message';
 
 import { PromptFieldProps } from './types';
diff --git a/Composer/packages/ui-plugins/prompts/src/PromptField/index.tsx b/Composer/packages/ui-plugins/prompts/src/PromptField/index.tsx
index 64ce6b0afa..ea72c92a52 100644
--- a/Composer/packages/ui-plugins/prompts/src/PromptField/index.tsx
+++ b/Composer/packages/ui-plugins/prompts/src/PromptField/index.tsx
@@ -4,7 +4,7 @@
 import React from 'react';
 import { Pivot, PivotLinkSize, PivotItem } from 'office-ui-fabric-react/lib/Pivot';
 import get from 'lodash/get';
-import { FieldProps, useShellApi } from '@bfc/extension';
+import { FieldProps, useShellApi } from '@bfc/editor-extension';
 import { SchemaField } from '@bfc/adaptive-form';
 import { PromptTab, PropmtTabTitles } from '@bfc/shared';
 
diff --git a/Composer/packages/ui-plugins/prompts/src/PromptField/types.ts b/Composer/packages/ui-plugins/prompts/src/PromptField/types.ts
index 7165e20ddf..8051fdbaf1 100644
--- a/Composer/packages/ui-plugins/prompts/src/PromptField/types.ts
+++ b/Composer/packages/ui-plugins/prompts/src/PromptField/types.ts
@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
-import { FieldProps, JSONSchema7 } from '@bfc/extension';
+import { FieldProps, JSONSchema7 } from '@bfc/editor-extension';
 import { MicrosoftInputDialog, ChoiceInput, ConfirmInput } from '@bfc/shared';
 
 export type InputDialogKeys = keyof MicrosoftInputDialog | keyof ChoiceInput | keyof ConfirmInput;
diff --git a/Composer/packages/ui-plugins/prompts/src/index.tsx b/Composer/packages/ui-plugins/prompts/src/index.tsx
index d0eb3af727..4c52c76e08 100644
--- a/Composer/packages/ui-plugins/prompts/src/index.tsx
+++ b/Composer/packages/ui-plugins/prompts/src/index.tsx
@@ -2,7 +2,7 @@
 // Licensed under the MIT License.
 
 import React from 'react';
-import { FlowWidget, PluginConfig, UIOptions } from '@bfc/extension';
+import { FlowWidget, PluginConfig, UIOptions } from '@bfc/editor-extension';
 import { SDKKinds, getInputType, PromptTab, PropmtTabTitles } from '@bfc/shared';
 import { VisualEditorColors as Colors, ListOverview, BorderedDiv, FixedInfo } from '@bfc/ui-shared';
 import formatMessage from 'format-message';
diff --git a/Composer/packages/ui-plugins/schema-editor/package.json b/Composer/packages/ui-plugins/schema-editor/package.json
index efeb875098..7ff77e559d 100644
--- a/Composer/packages/ui-plugins/schema-editor/package.json
+++ b/Composer/packages/ui-plugins/schema-editor/package.json
@@ -20,7 +20,7 @@
   "author": "tj.durnford@microsoft.com",
   "license": "MIT",
   "peerDependencies": {
-    "@bfc/extension": "*",
+    "@bfc/editor-extension": "*",
     "@bfc/adaptive-form": "*",
     "@bfc/code-editor": "*",
     "format-message": "^6.2.3",
@@ -28,7 +28,7 @@
     "react-dom": "16.13.0"
   },
   "devDependencies": {
-    "@bfc/extension": "*",
+    "@bfc/editor-extension": "*",
     "@bfc/adaptive-form": "*",
     "@bfc/test-utils": "*",
     "@types/react": "16.9.23",
diff --git a/Composer/packages/ui-plugins/schema-editor/src/Fields/AdaptiveDialogField.tsx b/Composer/packages/ui-plugins/schema-editor/src/Fields/AdaptiveDialogField.tsx
index e56c060954..452a503fa7 100644
--- a/Composer/packages/ui-plugins/schema-editor/src/Fields/AdaptiveDialogField.tsx
+++ b/Composer/packages/ui-plugins/schema-editor/src/Fields/AdaptiveDialogField.tsx
@@ -3,7 +3,7 @@
 
 import React from 'react';
 import { SchemaField } from '@bfc/adaptive-form';
-import { FieldProps } from '@bfc/extension';
+import { FieldProps } from '@bfc/editor-extension';
 
 import { SchemaEditorField } from './SchemaEditorField';
 
diff --git a/Composer/packages/ui-plugins/schema-editor/src/Fields/CollapsedField.tsx b/Composer/packages/ui-plugins/schema-editor/src/Fields/CollapsedField.tsx
index e1ea75e45b..3174dc73de 100644
--- a/Composer/packages/ui-plugins/schema-editor/src/Fields/CollapsedField.tsx
+++ b/Composer/packages/ui-plugins/schema-editor/src/Fields/CollapsedField.tsx
@@ -5,7 +5,7 @@
 import { css, jsx } from '@emotion/core';
 import React from 'react';
 import { CollapseField as Collapse, SchemaField } from '@bfc/adaptive-form';
-import { FieldProps } from '@bfc/extension';
+import { FieldProps } from '@bfc/editor-extension';
 import formatMessage from 'format-message';
 
 const style = {
diff --git a/Composer/packages/ui-plugins/schema-editor/src/Fields/SchemaEditorField.tsx b/Composer/packages/ui-plugins/schema-editor/src/Fields/SchemaEditorField.tsx
index ba7158b22d..3754153e9f 100644
--- a/Composer/packages/ui-plugins/schema-editor/src/Fields/SchemaEditorField.tsx
+++ b/Composer/packages/ui-plugins/schema-editor/src/Fields/SchemaEditorField.tsx
@@ -3,7 +3,7 @@
 
 import React, { useMemo } from 'react';
 import AdaptiveForm from '@bfc/adaptive-form';
-import { useShellApi, JSONSchema7 } from '@bfc/extension';
+import { useShellApi, JSONSchema7 } from '@bfc/editor-extension';
 
 import { getDefaultDialogSchema } from '../utils/getDefaultDialogSchema';
 import { getDefinitions } from '../utils/getDefinitions';
diff --git a/Composer/packages/ui-plugins/schema-editor/src/Fields/ValueRefField.tsx b/Composer/packages/ui-plugins/schema-editor/src/Fields/ValueRefField.tsx
index c272a5677d..0a1654e526 100644
--- a/Composer/packages/ui-plugins/schema-editor/src/Fields/ValueRefField.tsx
+++ b/Composer/packages/ui-plugins/schema-editor/src/Fields/ValueRefField.tsx
@@ -4,7 +4,7 @@
 import React, { useMemo } from 'react';
 import { Dropdown, IDropdownOption, ResponsiveMode } from 'office-ui-fabric-react/lib/Dropdown';
 import { FieldLabel } from '@bfc/adaptive-form';
-import { FieldProps } from '@bfc/extension';
+import { FieldProps } from '@bfc/editor-extension';
 import startCase from 'lodash/startCase';
 
 import { valueTypeDefinitions } from '../schema';
diff --git a/Composer/packages/ui-plugins/schema-editor/src/__tests__/SchemaEditorField.test.tsx b/Composer/packages/ui-plugins/schema-editor/src/__tests__/SchemaEditorField.test.tsx
index b52901b36f..85daeefefe 100644
--- a/Composer/packages/ui-plugins/schema-editor/src/__tests__/SchemaEditorField.test.tsx
+++ b/Composer/packages/ui-plugins/schema-editor/src/__tests__/SchemaEditorField.test.tsx
@@ -3,7 +3,7 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
 
 import React from 'react';
-import Extension from '@bfc/extension';
+import Extension from '@bfc/editor-extension';
 import { render, fireEvent, findAllByRole } from '@bfc/test-utils';
 
 import { SchemaEditorField } from '../Fields/SchemaEditorField';
diff --git a/Composer/packages/ui-plugins/schema-editor/src/formSchema.ts b/Composer/packages/ui-plugins/schema-editor/src/formSchema.ts
index 7262e3460a..d3f6cc4977 100644
--- a/Composer/packages/ui-plugins/schema-editor/src/formSchema.ts
+++ b/Composer/packages/ui-plugins/schema-editor/src/formSchema.ts
@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
-import { UISchema } from '@bfc/extension';
+import { UISchema } from '@bfc/editor-extension';
 import { SDKKinds } from '@bfc/shared';
 
 import { AdaptiveDialogField } from './Fields/AdaptiveDialogField';
diff --git a/Composer/packages/ui-plugins/schema-editor/src/index.ts b/Composer/packages/ui-plugins/schema-editor/src/index.ts
index d0e53693e6..12cca1a8b5 100644
--- a/Composer/packages/ui-plugins/schema-editor/src/index.ts
+++ b/Composer/packages/ui-plugins/schema-editor/src/index.ts
@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
-import { PluginConfig } from '@bfc/extension';
+import { PluginConfig } from '@bfc/editor-extension';
 
 import uiSchema from './formSchema';
 
diff --git a/Composer/packages/ui-plugins/schema-editor/src/schema.ts b/Composer/packages/ui-plugins/schema-editor/src/schema.ts
index 165e5dfb9c..1903ceeddc 100644
--- a/Composer/packages/ui-plugins/schema-editor/src/schema.ts
+++ b/Composer/packages/ui-plugins/schema-editor/src/schema.ts
@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
-import { JSONSchema7 } from '@bfc/extension';
+import { JSONSchema7 } from '@bfc/editor-extension';
 import formatMessage from 'format-message';
 
 export const schema = (): JSONSchema7 => ({
diff --git a/Composer/packages/ui-plugins/schema-editor/src/uiOptions.ts b/Composer/packages/ui-plugins/schema-editor/src/uiOptions.ts
index 61e93794b7..74fbcedc69 100644
--- a/Composer/packages/ui-plugins/schema-editor/src/uiOptions.ts
+++ b/Composer/packages/ui-plugins/schema-editor/src/uiOptions.ts
@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
-import { UIOptions } from '@bfc/extension';
+import { UIOptions } from '@bfc/editor-extension';
 import startCase from 'lodash/startCase';
 
 import { CollapsedField } from './Fields/CollapsedField';
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 8f5ef6bdd2..1622c4137c 100644
--- a/Composer/packages/ui-plugins/schema-editor/src/utils/getDefinitions.ts
+++ b/Composer/packages/ui-plugins/schema-editor/src/utils/getDefinitions.ts
@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
-import { JSONSchema7, JSONSchema7Definition } from '@bfc/extension';
+import { JSONSchema7, JSONSchema7Definition } from '@bfc/editor-extension';
 
 export const getDefinitions = (expressions: JSONSchema7[] = [], definitions: { [key: string]: JSONSchema7 }) =>
   expressions.reduce((acc: { [key: string]: JSONSchema7Definition }, schema: any) => {
diff --git a/Composer/packages/ui-plugins/select-dialog/package.json b/Composer/packages/ui-plugins/select-dialog/package.json
index 6eef929481..58c9e67e29 100644
--- a/Composer/packages/ui-plugins/select-dialog/package.json
+++ b/Composer/packages/ui-plugins/select-dialog/package.json
@@ -21,7 +21,7 @@
   "author": "v-thdurn@microsoft.com",
   "license": "MIT",
   "peerDependencies": {
-    "@bfc/extension": "*",
+    "@bfc/editor-extension": "*",
     "@bfc/adaptive-form": "*",
     "@uifabric/fluent-theme": "^7.1.4",
     "@uifabric/icons": "^7.3.0",
@@ -32,7 +32,7 @@
     "react-dom": "16.13.0"
   },
   "devDependencies": {
-    "@bfc/extension": "*",
+    "@bfc/editor-extension": "*",
     "@bfc/adaptive-form": "*",
     "@bfc/test-utils": "*",
     "@types/react": "16.9.23",
@@ -45,4 +45,4 @@
   "dependencies": {
     "@emotion/core": "^10.0.27"
   }
-}
\ No newline at end of file
+}
diff --git a/Composer/packages/ui-plugins/select-dialog/src/ComboBoxField.tsx b/Composer/packages/ui-plugins/select-dialog/src/ComboBoxField.tsx
index 46ee8d5f00..d41b72b719 100644
--- a/Composer/packages/ui-plugins/select-dialog/src/ComboBoxField.tsx
+++ b/Composer/packages/ui-plugins/select-dialog/src/ComboBoxField.tsx
@@ -4,7 +4,7 @@
 import React from 'react';
 import { ComboBox, IComboBoxOption } from 'office-ui-fabric-react/lib/ComboBox';
 import { FieldLabel } from '@bfc/adaptive-form';
-import { FieldProps } from '@bfc/extension';
+import { FieldProps } from '@bfc/editor-extension';
 import { Icon } from 'office-ui-fabric-react/lib/Icon';
 import { ISelectableOption } from 'office-ui-fabric-react/lib/utilities/selectableOption';
 import { IRenderFunction } from 'office-ui-fabric-react/lib/Utilities';
diff --git a/Composer/packages/ui-plugins/select-dialog/src/SelectDialog.tsx b/Composer/packages/ui-plugins/select-dialog/src/SelectDialog.tsx
index d5c6809e90..126db0186b 100644
--- a/Composer/packages/ui-plugins/select-dialog/src/SelectDialog.tsx
+++ b/Composer/packages/ui-plugins/select-dialog/src/SelectDialog.tsx
@@ -3,7 +3,7 @@
 
 import React, { useState } from 'react';
 import { IComboBoxOption, SelectableOptionMenuItemType } from 'office-ui-fabric-react/lib/ComboBox';
-import { FieldProps, useShellApi } from '@bfc/extension';
+import { FieldProps, useShellApi } from '@bfc/editor-extension';
 import formatMessage from 'format-message';
 
 import ComboBoxField, { ADD_DIALOG } from './ComboBoxField';
diff --git a/Composer/packages/ui-plugins/select-dialog/src/__tests__/selectDialog.test.tsx b/Composer/packages/ui-plugins/select-dialog/src/__tests__/selectDialog.test.tsx
index fd307ce9d3..fd76a2d3e9 100644
--- a/Composer/packages/ui-plugins/select-dialog/src/__tests__/selectDialog.test.tsx
+++ b/Composer/packages/ui-plugins/select-dialog/src/__tests__/selectDialog.test.tsx
@@ -5,7 +5,7 @@
 
 import React from 'react';
 import { fireEvent, getAllByRole, render } from '@bfc/test-utils';
-import { Extension } from '@bfc/extension';
+import { Extension } from '@bfc/editor-extension';
 
 import { SelectDialog } from '../SelectDialog';
 
diff --git a/Composer/packages/ui-plugins/select-dialog/src/index.ts b/Composer/packages/ui-plugins/select-dialog/src/index.ts
index 8b55361e1e..da75a5665d 100644
--- a/Composer/packages/ui-plugins/select-dialog/src/index.ts
+++ b/Composer/packages/ui-plugins/select-dialog/src/index.ts
@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
-import { PluginConfig } from '@bfc/extension';
+import { PluginConfig } from '@bfc/editor-extension';
 import { SDKKinds } from '@bfc/shared';
 
 import { SelectDialog } from './SelectDialog';
diff --git a/Composer/packages/ui-plugins/select-skill-dialog/package.json b/Composer/packages/ui-plugins/select-skill-dialog/package.json
index d92d6c1f97..71169d8cb7 100644
--- a/Composer/packages/ui-plugins/select-skill-dialog/package.json
+++ b/Composer/packages/ui-plugins/select-skill-dialog/package.json
@@ -21,7 +21,7 @@
   "author": "v-thdurn@microsoft.com",
   "license": "MIT",
   "peerDependencies": {
-    "@bfc/extension": "*",
+    "@bfc/editor-extension": "*",
     "@bfc/adaptive-form": "*",
     "@uifabric/fluent-theme": "^7.1.4",
     "@uifabric/icons": "^7.3.0",
@@ -33,7 +33,7 @@
   },
   "devDependencies": {
     "@bfc/adaptive-form": "*",
-    "@bfc/extension": "*",
+    "@bfc/editor-extension": "*",
     "@bfc/test-utils": "*",
     "@types/react": "16.9.23",
     "@types/react-dom": "16.9.5",
@@ -45,4 +45,4 @@
   "dependencies": {
     "@emotion/core": "^10.0.27"
   }
-}
\ No newline at end of file
+}
diff --git a/Composer/packages/ui-plugins/select-skill-dialog/src/BeginSkillDialogField.tsx b/Composer/packages/ui-plugins/select-skill-dialog/src/BeginSkillDialogField.tsx
index 37f71f84e6..9cf4249d29 100644
--- a/Composer/packages/ui-plugins/select-skill-dialog/src/BeginSkillDialogField.tsx
+++ b/Composer/packages/ui-plugins/select-skill-dialog/src/BeginSkillDialogField.tsx
@@ -2,7 +2,7 @@
 // Licensed under the MIT License.
 
 import React, { useMemo } from 'react';
-import { FieldProps, JSONSchema7, useShellApi } from '@bfc/extension';
+import { FieldProps, JSONSchema7, useShellApi } from '@bfc/editor-extension';
 import { Link } from 'office-ui-fabric-react/lib/Link';
 import { ObjectField, SchemaField } from '@bfc/adaptive-form';
 import formatMessage from 'format-message';
diff --git a/Composer/packages/ui-plugins/select-skill-dialog/src/ComboBoxField.tsx b/Composer/packages/ui-plugins/select-skill-dialog/src/ComboBoxField.tsx
index db01ac6252..6173efd8d8 100644
--- a/Composer/packages/ui-plugins/select-skill-dialog/src/ComboBoxField.tsx
+++ b/Composer/packages/ui-plugins/select-skill-dialog/src/ComboBoxField.tsx
@@ -4,7 +4,7 @@
 import React from 'react';
 import { ComboBox, IComboBoxOption } from 'office-ui-fabric-react/lib/ComboBox';
 import { FieldLabel } from '@bfc/adaptive-form';
-import { FieldProps } from '@bfc/extension';
+import { FieldProps } from '@bfc/editor-extension';
 import { Icon } from 'office-ui-fabric-react/lib/Icon';
 import { ISelectableOption } from 'office-ui-fabric-react/lib/utilities/selectableOption';
 import { IRenderFunction } from 'office-ui-fabric-react/lib/Utilities';
diff --git a/Composer/packages/ui-plugins/select-skill-dialog/src/SelectSkillDialogField.tsx b/Composer/packages/ui-plugins/select-skill-dialog/src/SelectSkillDialogField.tsx
index 853093b75b..603614f3fc 100644
--- a/Composer/packages/ui-plugins/select-skill-dialog/src/SelectSkillDialogField.tsx
+++ b/Composer/packages/ui-plugins/select-skill-dialog/src/SelectSkillDialogField.tsx
@@ -3,7 +3,7 @@
 
 import React, { useState } from 'react';
 import { IComboBoxOption, SelectableOptionMenuItemType } from 'office-ui-fabric-react/lib/ComboBox';
-import { FieldProps, useShellApi } from '@bfc/extension';
+import { FieldProps, useShellApi } from '@bfc/editor-extension';
 import formatMessage from 'format-message';
 
 import { ComboBoxField } from './ComboBoxField';
diff --git a/Composer/packages/ui-plugins/select-skill-dialog/src/SkillEndpointField.tsx b/Composer/packages/ui-plugins/select-skill-dialog/src/SkillEndpointField.tsx
index debd92409f..6f7a8dc2b7 100644
--- a/Composer/packages/ui-plugins/select-skill-dialog/src/SkillEndpointField.tsx
+++ b/Composer/packages/ui-plugins/select-skill-dialog/src/SkillEndpointField.tsx
@@ -4,7 +4,7 @@
 /** @jsx jsx */
 import { jsx } from '@emotion/core';
 import React from 'react';
-import { FieldProps, useFormConfig } from '@bfc/extension';
+import { FieldProps, useFormConfig } from '@bfc/editor-extension';
 import {
   getUiLabel,
   getUIOptions,
diff --git a/Composer/packages/ui-plugins/select-skill-dialog/src/__tests__/BeginSkillDialogField.test.tsx b/Composer/packages/ui-plugins/select-skill-dialog/src/__tests__/BeginSkillDialogField.test.tsx
index 2a1f54eac5..98f102ea95 100644
--- a/Composer/packages/ui-plugins/select-skill-dialog/src/__tests__/BeginSkillDialogField.test.tsx
+++ b/Composer/packages/ui-plugins/select-skill-dialog/src/__tests__/BeginSkillDialogField.test.tsx
@@ -4,7 +4,7 @@
 
 import React from 'react';
 import { fireEvent, getAllByRole, render } from '@bfc/test-utils';
-import { Extension, JSONSchema7 } from '@bfc/extension';
+import { Extension, JSONSchema7 } from '@bfc/editor-extension';
 import { SDKKinds } from '@bfc/shared';
 
 import { BeginSkillDialogField } from '../BeginSkillDialogField';
diff --git a/Composer/packages/ui-plugins/select-skill-dialog/src/__tests__/SelectSkillDialog.test.tsx b/Composer/packages/ui-plugins/select-skill-dialog/src/__tests__/SelectSkillDialog.test.tsx
index 56fc9e952d..6e33193840 100644
--- a/Composer/packages/ui-plugins/select-skill-dialog/src/__tests__/SelectSkillDialog.test.tsx
+++ b/Composer/packages/ui-plugins/select-skill-dialog/src/__tests__/SelectSkillDialog.test.tsx
@@ -5,7 +5,7 @@
 
 import React from 'react';
 import { fireEvent, getAllByRole, render, act } from '@bfc/test-utils';
-import { Extension } from '@bfc/extension';
+import { Extension } from '@bfc/editor-extension';
 
 import { SelectSkillDialog } from '../SelectSkillDialogField';
 
diff --git a/Composer/packages/ui-plugins/select-skill-dialog/src/index.ts b/Composer/packages/ui-plugins/select-skill-dialog/src/index.ts
index 6996e03bd7..a2f6912657 100644
--- a/Composer/packages/ui-plugins/select-skill-dialog/src/index.ts
+++ b/Composer/packages/ui-plugins/select-skill-dialog/src/index.ts
@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
-import { PluginConfig } from '@bfc/extension';
+import { PluginConfig } from '@bfc/editor-extension';
 import formatMessage from 'format-message';
 import { SDKKinds } from '@bfc/shared';
 

From 6738dbff296023993d33587c93fe7a9d2a7572f7 Mon Sep 17 00:00:00 2001
From: Andy Brown <asbrown002@gmail.com>
Date: Wed, 9 Sep 2020 14:45:54 -0700
Subject: [PATCH 04/10] merge editor-extension and extension-client

---
 Composer/package.json                         |  3 +-
 .../AdaptiveFlowEditor.test.tsx               |  6 ++--
 .../renderers/NodeWrapper.test.tsx            |  6 ++--
 .../utils/widgetRenderer.test.tsx             |  2 +-
 Composer/packages/adaptive-flow/package.json  |  2 +-
 .../AdaptiveFlowEditor.tsx                    |  2 +-
 .../hooks/useEditorEventApi.ts                |  2 +-
 .../hooks/useFlowUIOptions.ts                 |  2 +-
 .../renderers/EdgeMenu/EdgeMenu.tsx           |  2 +-
 .../renderers/EdgeMenu/createSchemaMenu.tsx   |  2 +-
 .../renderers/NodeWrapper.tsx                 |  2 +-
 .../adaptive/AdaptiveDialog.tsx               |  2 +-
 .../configs/builtinWidgets.tsx                |  2 +-
 .../contexts/SchemaContext.ts                 |  2 +-
 .../utils/visual/widgetRenderer.tsx           |  2 +-
 Composer/packages/adaptive-form/package.json  |  4 +--
 .../src/components/AdaptiveForm.tsx           |  2 +-
 .../adaptive-form/src/components/FormRow.tsx  |  2 +-
 .../src/components/FormTitle.tsx              |  2 +-
 .../src/components/SchemaField.tsx            |  2 +-
 .../components/__tests__/SchemaField.test.tsx |  4 +--
 .../src/components/fields/ArrayField.tsx      |  2 +-
 .../src/components/fields/ArrayFieldItem.tsx  |  2 +-
 .../src/components/fields/BooleanField.tsx    |  2 +-
 .../src/components/fields/EditableField.tsx   |  2 +-
 .../ExpressionField/ExpressionEditor.tsx      |  2 +-
 .../ExpressionField/ExpressionField.tsx       |  2 +-
 .../fields/ExpressionField/utils.ts           |  2 +-
 .../components/fields/IntellisenseField.tsx   |  2 +-
 .../src/components/fields/IntentField.tsx     |  2 +-
 .../src/components/fields/JsonField.tsx       |  2 +-
 .../src/components/fields/NumberField.tsx     |  2 +-
 .../components/fields/ObjectArrayField.tsx    |  2 +-
 .../src/components/fields/ObjectField.tsx     |  2 +-
 .../fields/OneOfField/OneOfField.tsx          |  2 +-
 .../src/components/fields/OneOfField/utils.ts |  2 +-
 .../fields/OpenObjectField/ObjectItem.tsx     |  2 +-
 .../OpenObjectField/OpenObjectField.tsx       |  2 +-
 .../src/components/fields/QnAActionsField.tsx |  2 +-
 .../src/components/fields/RecognizerField.tsx |  2 +-
 .../components/fields/RegexIntentField.tsx    |  2 +-
 .../src/components/fields/SelectField.tsx     |  2 +-
 .../src/components/fields/StringField.tsx     |  2 +-
 .../components/fields/UnsupportedField.tsx    |  2 +-
 .../fields/__tests__/IntentField.test.tsx     |  4 +--
 .../fields/__tests__/JsonField.test.tsx       |  2 +-
 .../__tests__/ObjectArrayField.test.tsx       |  4 +--
 .../fields/__tests__/RecognizerField.test.tsx |  4 +--
 .../__tests__/RegexIntentField.test.tsx       |  4 +--
 .../components/fields/__tests__/testUtils.ts  |  2 +-
 .../adaptive-form/src/defaultRecognizers.ts   |  2 +-
 .../src/utils/__tests__/getUIOptions.test.ts  |  2 +-
 .../utils/__tests__/uiOptionsHelpers.test.ts  |  2 +-
 .../adaptive-form/src/utils/arrayUtils.ts     |  2 +-
 .../src/utils/getHiddenProperties.ts          |  2 +-
 .../src/utils/getOrderedProperties.ts         |  2 +-
 .../adaptive-form/src/utils/getUIOptions.ts   |  2 +-
 .../adaptive-form/src/utils/objectUtils.ts    |  2 +-
 .../src/utils/resolveFieldWidget.ts           |  2 +-
 .../src/utils/resolvePropSchema.ts            |  2 +-
 .../adaptive-form/src/utils/resolveRef.ts     |  2 +-
 .../src/utils/uiOptionsHelpers.ts             |  2 +-
 Composer/packages/client/package.json         |  2 +-
 .../client/src/pages/design/DesignPage.tsx    | 10 +++---
 .../src/pages/design/PropertyEditor.tsx       |  2 +-
 .../design/exportSkillModal/constants.tsx     |  2 +-
 .../exportSkillModal/content/Description.tsx  |  2 +-
 .../exportSkillModal/content/Endpoints.tsx    |  2 +-
 .../exportSkillModal/generateSkillManifest.ts |  2 +-
 .../pages/design/exportSkillModal/index.tsx   |  2 +-
 Composer/packages/client/src/plugins.ts       |  2 +-
 .../packages/client/src/recoilModel/types.ts  |  2 +-
 Composer/packages/editor-extension/.gitignore |  1 -
 .../packages/editor-extension/package.json    | 31 -------------------
 .../packages/editor-extension/src/index.ts    | 13 --------
 .../packages/editor-extension/tsconfig.json   |  7 -----
 .../.eslintrc.js                              |  0
 .../jest.config.js                            |  0
 .../packages/extension-client/package.json    | 15 +++++++--
 .../src/EditorExtensionContext.ts}            |  8 ++---
 .../src/components/EditorExtension.tsx}       | 11 +++----
 .../src/components/index.ts                   |  3 +-
 .../hooks/__tests__/useFlowConfig.test.tsx    |  4 +--
 .../hooks/__tests__/useFormConfig.test.tsx    |  4 +--
 .../hooks/__tests__/useMenuConfig.test.tsx    |  4 +--
 .../__tests__/useRecognizerConfig.test.tsx    |  4 +--
 .../src/hooks/index.ts                        |  0
 .../src/hooks/useActionApi.ts                 |  0
 .../src/hooks/useDebounce.ts                  |  0
 .../src/hooks/useDialogApi.ts                 |  0
 .../src/hooks/useDialogEditApi.ts             |  0
 .../src/hooks/useFlowConfig.ts                |  4 +--
 .../src/hooks/useFormConfig.ts                |  4 +--
 .../src/hooks/useLgApi.ts                     |  0
 .../src/hooks/useLuApi.ts                     |  0
 .../src/hooks/useMenuConfig.ts                |  4 +--
 .../src/hooks/useRecognizerConfig.ts          |  4 +--
 .../src/hooks/useShellApi.ts                  |  4 +--
 .../src/hooks/useTriggerApi.ts                |  0
 .../packages/extension-client/src/index.ts    |  5 +++
 .../src/types/extension.ts                    |  0
 .../src/types/flowSchema.ts                   |  0
 .../src/types/form.ts                         |  0
 .../src/types/formSchema.ts                   |  0
 .../src/types/index.ts                        |  0
 .../src/types/menuSchema.ts                   |  0
 .../__tests__/mergePluginConfigs.test.ts      |  0
 .../src/utils/index.ts                        |  0
 .../src/utils/mergePluginConfigs.ts           |  0
 .../tsconfig.build.json                       |  0
 Composer/packages/lib/ui-shared/package.json  |  4 +--
 .../packages/ui-plugins/composer/package.json |  4 +--
 .../composer/src/defaultMenuSchema.ts         |  2 +-
 .../packages/ui-plugins/composer/src/index.ts |  2 +-
 .../ui-plugins/cross-trained/package.json     |  4 +--
 .../ui-plugins/cross-trained/src/index.ts     |  2 +-
 .../packages/ui-plugins/example/package.json  |  4 +--
 .../packages/ui-plugins/example/src/index.ts  |  2 +-
 Composer/packages/ui-plugins/lg/package.json  |  4 +--
 .../packages/ui-plugins/lg/src/LgField.tsx    |  2 +-
 .../ui-plugins/lg/src/LgWidget/LgWidget.tsx   |  2 +-
 .../lg/src/LgWidget/useLgTemplate.ts          |  2 +-
 Composer/packages/ui-plugins/lg/src/index.ts  |  2 +-
 .../packages/ui-plugins/luis/package.json     |  4 +--
 .../ui-plugins/luis/src/LuisIntentEditor.tsx  |  2 +-
 .../packages/ui-plugins/luis/src/index.ts     |  2 +-
 .../packages/ui-plugins/prompts/package.json  |  4 +--
 .../prompts/src/PromptField/UserInput.tsx     |  2 +-
 .../prompts/src/PromptField/index.tsx         |  2 +-
 .../prompts/src/PromptField/types.ts          |  2 +-
 .../packages/ui-plugins/prompts/src/index.tsx |  2 +-
 .../ui-plugins/schema-editor/package.json     |  4 +--
 .../src/Fields/AdaptiveDialogField.tsx        |  2 +-
 .../src/Fields/CollapsedField.tsx             |  2 +-
 .../src/Fields/SchemaEditorField.tsx          |  2 +-
 .../src/Fields/ValueRefField.tsx              |  2 +-
 .../src/__tests__/SchemaEditorField.test.tsx  |  6 ++--
 .../schema-editor/src/formSchema.ts           |  2 +-
 .../ui-plugins/schema-editor/src/index.ts     |  2 +-
 .../ui-plugins/schema-editor/src/schema.ts    |  2 +-
 .../ui-plugins/schema-editor/src/uiOptions.ts |  2 +-
 .../schema-editor/src/utils/getDefinitions.ts |  2 +-
 .../ui-plugins/select-dialog/package.json     |  4 +--
 .../select-dialog/src/ComboBoxField.tsx       |  2 +-
 .../select-dialog/src/SelectDialog.tsx        |  2 +-
 .../src/__tests__/selectDialog.test.tsx       |  6 ++--
 .../ui-plugins/select-dialog/src/index.ts     |  2 +-
 .../select-skill-dialog/package.json          |  4 +--
 .../src/BeginSkillDialogField.tsx             |  2 +-
 .../select-skill-dialog/src/ComboBoxField.tsx |  2 +-
 .../src/SelectSkillDialogField.tsx            |  2 +-
 .../src/SkillEndpointField.tsx                |  2 +-
 .../__tests__/BeginSkillDialogField.test.tsx  |  6 ++--
 .../src/__tests__/SelectSkillDialog.test.tsx  |  6 ++--
 .../select-skill-dialog/src/index.ts          |  2 +-
 releases/1.1.1.md                             |  2 +-
 156 files changed, 195 insertions(+), 236 deletions(-)
 delete mode 100644 Composer/packages/editor-extension/.gitignore
 delete mode 100644 Composer/packages/editor-extension/package.json
 delete mode 100644 Composer/packages/editor-extension/src/index.ts
 delete mode 100644 Composer/packages/editor-extension/tsconfig.json
 rename Composer/packages/{editor-extension => extension-client}/.eslintrc.js (100%)
 rename Composer/packages/{editor-extension => extension-client}/jest.config.js (100%)
 rename Composer/packages/{editor-extension/src/extensionContext.ts => extension-client/src/EditorExtensionContext.ts} (67%)
 rename Composer/packages/{editor-extension/src/components/Extension.tsx => extension-client/src/components/EditorExtension.tsx} (55%)
 rename Composer/packages/{editor-extension => extension-client}/src/components/index.ts (67%)
 rename Composer/packages/{editor-extension => extension-client}/src/hooks/__tests__/useFlowConfig.test.tsx (81%)
 rename Composer/packages/{editor-extension => extension-client}/src/hooks/__tests__/useFormConfig.test.tsx (81%)
 rename Composer/packages/{editor-extension => extension-client}/src/hooks/__tests__/useMenuConfig.test.tsx (81%)
 rename Composer/packages/{editor-extension => extension-client}/src/hooks/__tests__/useRecognizerConfig.test.tsx (81%)
 rename Composer/packages/{editor-extension => extension-client}/src/hooks/index.ts (100%)
 rename Composer/packages/{editor-extension => extension-client}/src/hooks/useActionApi.ts (100%)
 rename Composer/packages/{editor-extension => extension-client}/src/hooks/useDebounce.ts (100%)
 rename Composer/packages/{editor-extension => extension-client}/src/hooks/useDialogApi.ts (100%)
 rename Composer/packages/{editor-extension => extension-client}/src/hooks/useDialogEditApi.ts (100%)
 rename Composer/packages/{editor-extension => extension-client}/src/hooks/useFlowConfig.ts (74%)
 rename Composer/packages/{editor-extension => extension-client}/src/hooks/useFormConfig.ts (74%)
 rename Composer/packages/{editor-extension => extension-client}/src/hooks/useLgApi.ts (100%)
 rename Composer/packages/{editor-extension => extension-client}/src/hooks/useLuApi.ts (100%)
 rename Composer/packages/{editor-extension => extension-client}/src/hooks/useMenuConfig.ts (72%)
 rename Composer/packages/{editor-extension => extension-client}/src/hooks/useRecognizerConfig.ts (60%)
 rename Composer/packages/{editor-extension => extension-client}/src/hooks/useShellApi.ts (83%)
 rename Composer/packages/{editor-extension => extension-client}/src/hooks/useTriggerApi.ts (100%)
 rename Composer/packages/{editor-extension => extension-client}/src/types/extension.ts (100%)
 rename Composer/packages/{editor-extension => extension-client}/src/types/flowSchema.ts (100%)
 rename Composer/packages/{editor-extension => extension-client}/src/types/form.ts (100%)
 rename Composer/packages/{editor-extension => extension-client}/src/types/formSchema.ts (100%)
 rename Composer/packages/{editor-extension => extension-client}/src/types/index.ts (100%)
 rename Composer/packages/{editor-extension => extension-client}/src/types/menuSchema.ts (100%)
 rename Composer/packages/{editor-extension => extension-client}/src/utils/__tests__/mergePluginConfigs.test.ts (100%)
 rename Composer/packages/{editor-extension => extension-client}/src/utils/index.ts (100%)
 rename Composer/packages/{editor-extension => extension-client}/src/utils/mergePluginConfigs.ts (100%)
 rename Composer/packages/{editor-extension => extension-client}/tsconfig.build.json (100%)

diff --git a/Composer/package.json b/Composer/package.json
index 0d89abc56b..65fe84e5ac 100644
--- a/Composer/package.json
+++ b/Composer/package.json
@@ -21,7 +21,6 @@
     "packages/client",
     "packages/electron-server",
     "packages/extension-client",
-    "packages/editor-extension",
     "packages/intellisense",
     "packages/lib",
     "packages/lib/*",
@@ -41,7 +40,7 @@
     "build:test": "yarn workspace @bfc/test-utils build",
     "build:lib": "yarn workspace @bfc/libs build:all",
     "build:electron": "yarn workspace @bfc/electron-server build",
-    "build:extensions": "wsrun -lt -p @bfc/plugin-loader @bfc/intellisense @bfc/extension @bfc/adaptive-form @bfc/adaptive-flow @bfc/ui-plugin-* @bfc/extension-client -c build",
+    "build:extensions": "wsrun -lt -p @bfc/plugin-loader @bfc/intellisense @bfc/extension-client @bfc/adaptive-form @bfc/adaptive-flow @bfc/ui-plugin-*  -c build",
     "build:server": "yarn workspace @bfc/server build",
     "build:client": "yarn workspace @bfc/client build",
     "build:tools": "yarn workspace @bfc/tools build:all",
diff --git a/Composer/packages/adaptive-flow/__tests__/adaptive-flow-editor/AdaptiveFlowEditor.test.tsx b/Composer/packages/adaptive-flow/__tests__/adaptive-flow-editor/AdaptiveFlowEditor.test.tsx
index cba8f0854c..5717e536d3 100644
--- a/Composer/packages/adaptive-flow/__tests__/adaptive-flow-editor/AdaptiveFlowEditor.test.tsx
+++ b/Composer/packages/adaptive-flow/__tests__/adaptive-flow-editor/AdaptiveFlowEditor.test.tsx
@@ -3,7 +3,7 @@
 
 import React from 'react';
 import { render } from '@bfc/test-utils';
-import { ExtensionContext } from '@bfc/editor-extension';
+import { EditorExtensionContext } from '@bfc/extension-client';
 
 import AdaptiveFlowEditor from '../../src/adaptive-flow-editor/AdaptiveFlowEditor';
 
@@ -12,7 +12,7 @@ import { ShellApiStub } from './stubs/ShellApiStub';
 describe('<VisualDesigner/>', () => {
   it('can render.', () => {
     const visualDesigner = render(
-      <ExtensionContext.Provider
+      <EditorExtensionContext.Provider
         value={{
           shellApi: ShellApiStub,
           shellData: {} as any,
@@ -20,7 +20,7 @@ describe('<VisualDesigner/>', () => {
         }}
       >
         <AdaptiveFlowEditor />
-      </ExtensionContext.Provider>
+      </EditorExtensionContext.Provider>
     );
     expect(visualDesigner).toBeTruthy();
   });
diff --git a/Composer/packages/adaptive-flow/__tests__/adaptive-flow-editor/renderers/NodeWrapper.test.tsx b/Composer/packages/adaptive-flow/__tests__/adaptive-flow-editor/renderers/NodeWrapper.test.tsx
index 8ae45c2f02..a7fe88f63b 100644
--- a/Composer/packages/adaptive-flow/__tests__/adaptive-flow-editor/renderers/NodeWrapper.test.tsx
+++ b/Composer/packages/adaptive-flow/__tests__/adaptive-flow-editor/renderers/NodeWrapper.test.tsx
@@ -3,7 +3,7 @@
 
 import React from 'react';
 import { render, fireEvent } from '@bfc/test-utils';
-import ExtensionContext from '@bfc/extension/lib/extensionContext';
+import EditorExtensionContext from '@bfc/extension-client';
 
 import { ActionNodeWrapper } from '../../../src/adaptive-flow-editor/renderers/NodeWrapper';
 import { ShellApiStub } from '../stubs/ShellApiStub';
@@ -12,7 +12,7 @@ describe('<ActionNodeWrapper>', () => {
   it('can render.', () => {
     const mockOnEvent = jest.fn();
     const ele = render(
-      <ExtensionContext.Provider
+      <EditorExtensionContext.Provider
         value={{
           shellApi: ShellApiStub,
           shellData: {} as any,
@@ -20,7 +20,7 @@ describe('<ActionNodeWrapper>', () => {
         }}
       >
         <ActionNodeWrapper data={{}} id="test" onEvent={mockOnEvent} />
-      </ExtensionContext.Provider>
+      </EditorExtensionContext.Provider>
     );
     expect(ele.getByTestId('ActionNodeWrapper')).toBeTruthy();
 
diff --git a/Composer/packages/adaptive-flow/__tests__/adaptive-flow-renderer/utils/widgetRenderer.test.tsx b/Composer/packages/adaptive-flow/__tests__/adaptive-flow-renderer/utils/widgetRenderer.test.tsx
index a71f9f33b0..e87c793bb2 100644
--- a/Composer/packages/adaptive-flow/__tests__/adaptive-flow-renderer/utils/widgetRenderer.test.tsx
+++ b/Composer/packages/adaptive-flow/__tests__/adaptive-flow-renderer/utils/widgetRenderer.test.tsx
@@ -3,7 +3,7 @@
 
 import React from 'react';
 import { render } from '@bfc/test-utils';
-import { WidgetComponent, FlowEditorWidgetMap } from '@bfc/editor-extension';
+import { WidgetComponent, FlowEditorWidgetMap } from '@bfc/extension-client';
 
 import { renderUIWidget, UIWidgetContext } from '../../../src/adaptive-flow-renderer/utils/visual/widgetRenderer';
 import { FlowWidget } from '../../../src/adaptive-flow-renderer/types/flowRenderer.types';
diff --git a/Composer/packages/adaptive-flow/package.json b/Composer/packages/adaptive-flow/package.json
index 78d46f6d84..7c2cdc9ddc 100644
--- a/Composer/packages/adaptive-flow/package.json
+++ b/Composer/packages/adaptive-flow/package.json
@@ -23,7 +23,7 @@
     "lint:fix": "yarn lint --fix"
   },
   "dependencies": {
-    "@bfc/editor-extension": "*",
+    "@bfc/extension-client": "*",
     "@bfc/shared": "*",
     "@bfc/ui-shared": "*",
     "@emotion/core": "^10.0.27",
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 784e557979..9ef83f84c2 100644
--- a/Composer/packages/adaptive-flow/src/adaptive-flow-editor/AdaptiveFlowEditor.tsx
+++ b/Composer/packages/adaptive-flow/src/adaptive-flow-editor/AdaptiveFlowEditor.tsx
@@ -8,7 +8,7 @@ import React, { useRef, useMemo, useEffect } from 'react';
 import isEqual from 'lodash/isEqual';
 import formatMessage from 'format-message';
 import { DialogFactory } from '@bfc/shared';
-import { useShellApi, JSONSchema7 } from '@bfc/editor-extension';
+import { useShellApi, JSONSchema7 } from '@bfc/extension-client';
 import { MarqueeSelection } from 'office-ui-fabric-react/lib/MarqueeSelection';
 
 import { FlowSchema, FlowWidget } from '../adaptive-flow-renderer/types/flowRenderer.types';
diff --git a/Composer/packages/adaptive-flow/src/adaptive-flow-editor/hooks/useEditorEventApi.ts b/Composer/packages/adaptive-flow/src/adaptive-flow-editor/hooks/useEditorEventApi.ts
index 3070ab7b14..3477d7573f 100644
--- a/Composer/packages/adaptive-flow/src/adaptive-flow-editor/hooks/useEditorEventApi.ts
+++ b/Composer/packages/adaptive-flow/src/adaptive-flow-editor/hooks/useEditorEventApi.ts
@@ -3,7 +3,7 @@
 
 import { DialogUtils, SDKKinds, ShellApi, registerEditorAPI } from '@bfc/shared';
 import get from 'lodash/get';
-import { useDialogEditApi, useDialogApi, useActionApi } from '@bfc/editor-extension';
+import { useDialogEditApi, useDialogApi, useActionApi } from '@bfc/extension-client';
 
 // TODO: leak of visual-sdk domain (designerCache)
 import { designerCache } from '../../adaptive-flow-renderer/utils/visual/DesignerCache';
diff --git a/Composer/packages/adaptive-flow/src/adaptive-flow-editor/hooks/useFlowUIOptions.ts b/Composer/packages/adaptive-flow/src/adaptive-flow-editor/hooks/useFlowUIOptions.ts
index cd6b25911b..bb4ed6e910 100644
--- a/Composer/packages/adaptive-flow/src/adaptive-flow-editor/hooks/useFlowUIOptions.ts
+++ b/Composer/packages/adaptive-flow/src/adaptive-flow-editor/hooks/useFlowUIOptions.ts
@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
-import { useShellApi, useFlowConfig } from '@bfc/editor-extension';
+import { useShellApi, useFlowConfig } from '@bfc/extension-client';
 
 export function useFlowUIOptions() {
   const { plugins } = useShellApi();
diff --git a/Composer/packages/adaptive-flow/src/adaptive-flow-editor/renderers/EdgeMenu/EdgeMenu.tsx b/Composer/packages/adaptive-flow/src/adaptive-flow-editor/renderers/EdgeMenu/EdgeMenu.tsx
index 7ff9a773b0..4480a54344 100644
--- a/Composer/packages/adaptive-flow/src/adaptive-flow-editor/renderers/EdgeMenu/EdgeMenu.tsx
+++ b/Composer/packages/adaptive-flow/src/adaptive-flow-editor/renderers/EdgeMenu/EdgeMenu.tsx
@@ -7,7 +7,7 @@ import { useContext, useState } from 'react';
 import formatMessage from 'format-message';
 import { DefinitionSummary } from '@bfc/shared';
 import { TooltipHost, DirectionalHint } from 'office-ui-fabric-react/lib/Tooltip';
-import { useMenuConfig, MenuUISchema } from '@bfc/editor-extension';
+import { useMenuConfig, MenuUISchema } from '@bfc/extension-client';
 
 // TODO: leak of visual-sdk domain (EdgeAddButtonSize)
 import { EdgeAddButtonSize } from '../../../adaptive-flow-renderer/constants/ElementSizes';
diff --git a/Composer/packages/adaptive-flow/src/adaptive-flow-editor/renderers/EdgeMenu/createSchemaMenu.tsx b/Composer/packages/adaptive-flow/src/adaptive-flow-editor/renderers/EdgeMenu/createSchemaMenu.tsx
index bda292d094..1215fad996 100644
--- a/Composer/packages/adaptive-flow/src/adaptive-flow-editor/renderers/EdgeMenu/createSchemaMenu.tsx
+++ b/Composer/packages/adaptive-flow/src/adaptive-flow-editor/renderers/EdgeMenu/createSchemaMenu.tsx
@@ -10,7 +10,7 @@ import {
 import { SDKKinds, DefinitionSummary } from '@bfc/shared';
 import { FontIcon } from 'office-ui-fabric-react/lib/Icon';
 import formatMessage from 'format-message';
-import { MenuUISchema, MenuOptions } from '@bfc/editor-extension';
+import { MenuUISchema, MenuOptions } from '@bfc/extension-client';
 import set from 'lodash/set';
 
 import { MenuEventTypes } from '../../constants/MenuTypes';
diff --git a/Composer/packages/adaptive-flow/src/adaptive-flow-editor/renderers/NodeWrapper.tsx b/Composer/packages/adaptive-flow/src/adaptive-flow-editor/renderers/NodeWrapper.tsx
index 6a7550e118..4290e6d763 100644
--- a/Composer/packages/adaptive-flow/src/adaptive-flow-editor/renderers/NodeWrapper.tsx
+++ b/Composer/packages/adaptive-flow/src/adaptive-flow-editor/renderers/NodeWrapper.tsx
@@ -5,7 +5,7 @@
 import { jsx, css } from '@emotion/core';
 import { FC, useContext, useCallback } from 'react';
 import { generateSDKTitle, PromptTab } from '@bfc/shared';
-import { useShellApi } from '@bfc/editor-extension';
+import { useShellApi } from '@bfc/extension-client';
 
 import { AttrNames } from '../constants/ElementAttributes';
 import { NodeRendererContext } from '../contexts/NodeRendererContext';
diff --git a/Composer/packages/adaptive-flow/src/adaptive-flow-renderer/adaptive/AdaptiveDialog.tsx b/Composer/packages/adaptive-flow/src/adaptive-flow-renderer/adaptive/AdaptiveDialog.tsx
index 5638d408d4..4b6a02d17f 100644
--- a/Composer/packages/adaptive-flow/src/adaptive-flow-renderer/adaptive/AdaptiveDialog.tsx
+++ b/Composer/packages/adaptive-flow/src/adaptive-flow-renderer/adaptive/AdaptiveDialog.tsx
@@ -5,7 +5,7 @@
 import { jsx } from '@emotion/core';
 import { FC, Fragment } from 'react';
 import get from 'lodash/get';
-import { FlowEditorWidgetMap as NodeWidgetMap } from '@bfc/editor-extension';
+import { FlowEditorWidgetMap as NodeWidgetMap } from '@bfc/extension-client';
 
 import { FlowSchema } from '../types/flowRenderer.types';
 import { EditorEventHandler } from '../constants/NodeEventTypes';
diff --git a/Composer/packages/adaptive-flow/src/adaptive-flow-renderer/configs/builtinWidgets.tsx b/Composer/packages/adaptive-flow/src/adaptive-flow-renderer/configs/builtinWidgets.tsx
index e2e26bc327..d86b551e95 100644
--- a/Composer/packages/adaptive-flow/src/adaptive-flow-renderer/configs/builtinWidgets.tsx
+++ b/Composer/packages/adaptive-flow/src/adaptive-flow-renderer/configs/builtinWidgets.tsx
@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
-import { FlowEditorWidgetMap } from '@bfc/editor-extension';
+import { FlowEditorWidgetMap } from '@bfc/extension-client';
 
 import {
   ActionCard,
diff --git a/Composer/packages/adaptive-flow/src/adaptive-flow-renderer/contexts/SchemaContext.ts b/Composer/packages/adaptive-flow/src/adaptive-flow-renderer/contexts/SchemaContext.ts
index 2ce8fd8ce8..6d8306fce6 100644
--- a/Composer/packages/adaptive-flow/src/adaptive-flow-renderer/contexts/SchemaContext.ts
+++ b/Composer/packages/adaptive-flow/src/adaptive-flow-renderer/contexts/SchemaContext.ts
@@ -2,7 +2,7 @@
 // Licensed under the MIT License.
 
 import React from 'react';
-import { FlowEditorWidgetMap } from '@bfc/editor-extension';
+import { FlowEditorWidgetMap } from '@bfc/extension-client';
 
 import { WidgetSchemaProvider } from '../utils/visual/WidgetSchemaProvider';
 
diff --git a/Composer/packages/adaptive-flow/src/adaptive-flow-renderer/utils/visual/widgetRenderer.tsx b/Composer/packages/adaptive-flow/src/adaptive-flow-renderer/utils/visual/widgetRenderer.tsx
index bc347add57..2fb00e7de9 100644
--- a/Composer/packages/adaptive-flow/src/adaptive-flow-renderer/utils/visual/widgetRenderer.tsx
+++ b/Composer/packages/adaptive-flow/src/adaptive-flow-renderer/utils/visual/widgetRenderer.tsx
@@ -3,7 +3,7 @@
 
 import React from 'react';
 import { BaseSchema } from '@bfc/shared';
-import { FlowEditorWidgetMap } from '@bfc/editor-extension';
+import { FlowEditorWidgetMap } from '@bfc/extension-client';
 
 import { FlowWidget, FlowWidgetProp, WidgetEventHandler } from '../../types/flowRenderer.types';
 import { Boundary } from '../../models/Boundary';
diff --git a/Composer/packages/adaptive-form/package.json b/Composer/packages/adaptive-form/package.json
index 83541dcf0d..50c4f1ab2d 100644
--- a/Composer/packages/adaptive-form/package.json
+++ b/Composer/packages/adaptive-form/package.json
@@ -19,7 +19,7 @@
   "license": "MIT",
   "peerDependencies": {
     "@bfc/code-editor": "*",
-    "@bfc/editor-extension": "*",
+    "@bfc/extension-client": "*",
     "@bfc/intellisense": "*",
     "@uifabric/fluent-theme": "^7.1.4",
     "@uifabric/icons": "^7.3.0",
@@ -31,7 +31,7 @@
   },
   "devDependencies": {
     "@bfc/code-editor": "*",
-    "@bfc/editor-extension": "*",
+    "@bfc/extension-client": "*",
     "@bfc/intellisense": "*",
     "@bfc/test-utils": "*",
     "@types/lodash": "^4.14.149",
diff --git a/Composer/packages/adaptive-form/src/components/AdaptiveForm.tsx b/Composer/packages/adaptive-form/src/components/AdaptiveForm.tsx
index 04118bcad5..32aaf5d8c3 100644
--- a/Composer/packages/adaptive-form/src/components/AdaptiveForm.tsx
+++ b/Composer/packages/adaptive-form/src/components/AdaptiveForm.tsx
@@ -4,7 +4,7 @@
 /** @jsx jsx */
 import { jsx, css } from '@emotion/core';
 import React from 'react';
-import { FormErrors, JSONSchema7, UIOptions } from '@bfc/editor-extension';
+import { FormErrors, JSONSchema7, UIOptions } from '@bfc/extension-client';
 import ErrorBoundary from 'react-error-boundary';
 import formatMessage from 'format-message';
 
diff --git a/Composer/packages/adaptive-form/src/components/FormRow.tsx b/Composer/packages/adaptive-form/src/components/FormRow.tsx
index 8fbdf9f503..95aa9352b1 100644
--- a/Composer/packages/adaptive-form/src/components/FormRow.tsx
+++ b/Composer/packages/adaptive-form/src/components/FormRow.tsx
@@ -2,7 +2,7 @@
 // Licensed under the MIT License.
 
 /** @jsx jsx */
-import { FieldProps, UIOptions } from '@bfc/editor-extension';
+import { FieldProps, UIOptions } from '@bfc/extension-client';
 import { css, jsx } from '@emotion/core';
 import React from 'react';
 
diff --git a/Composer/packages/adaptive-form/src/components/FormTitle.tsx b/Composer/packages/adaptive-form/src/components/FormTitle.tsx
index f56c9ce0ea..9fe7ba4b38 100644
--- a/Composer/packages/adaptive-form/src/components/FormTitle.tsx
+++ b/Composer/packages/adaptive-form/src/components/FormTitle.tsx
@@ -7,7 +7,7 @@ import React, { useMemo, useRef } from 'react';
 import { FontWeights } from '@uifabric/styling';
 import { FontSizes } from '@uifabric/fluent-theme';
 import formatMessage from 'format-message';
-import { UIOptions, JSONSchema7, useShellApi, useRecognizerConfig } from '@bfc/editor-extension';
+import { UIOptions, JSONSchema7, useShellApi, useRecognizerConfig } from '@bfc/extension-client';
 import { css } from '@emotion/core';
 import { SDKKinds } from '@bfc/shared';
 import debounce from 'lodash/debounce';
diff --git a/Composer/packages/adaptive-form/src/components/SchemaField.tsx b/Composer/packages/adaptive-form/src/components/SchemaField.tsx
index 8dfcf86c3e..1af81d22c6 100644
--- a/Composer/packages/adaptive-form/src/components/SchemaField.tsx
+++ b/Composer/packages/adaptive-form/src/components/SchemaField.tsx
@@ -3,7 +3,7 @@
 /** @jsx jsx */
 import { jsx, css } from '@emotion/core';
 import React, { useEffect } from 'react';
-import { FieldProps, UIOptions, useFormConfig } from '@bfc/editor-extension';
+import { FieldProps, UIOptions, useFormConfig } from '@bfc/extension-client';
 
 import { getUIOptions, resolveFieldWidget, resolveRef, getUiLabel, getUiPlaceholder, getUiDescription } from '../utils';
 
diff --git a/Composer/packages/adaptive-form/src/components/__tests__/SchemaField.test.tsx b/Composer/packages/adaptive-form/src/components/__tests__/SchemaField.test.tsx
index a0678abb8b..76bd26f4f1 100644
--- a/Composer/packages/adaptive-form/src/components/__tests__/SchemaField.test.tsx
+++ b/Composer/packages/adaptive-form/src/components/__tests__/SchemaField.test.tsx
@@ -3,7 +3,7 @@
 
 import React from 'react';
 import { render, waitFor, fireEvent } from '@bfc/test-utils';
-import { FieldProps, useFormConfig } from '@bfc/editor-extension';
+import { FieldProps, useFormConfig } from '@bfc/extension-client';
 import assign from 'lodash/assign';
 
 import { SchemaField } from '../SchemaField';
@@ -18,7 +18,7 @@ jest.mock('../../utils/resolveFieldWidget', () => ({
   resolveFieldWidget: jest.fn(),
 }));
 
-jest.mock('@bfc/editor-extension', () => ({
+jest.mock('@bfc/extension-client', () => ({
   useFormConfig: jest.fn(),
 }));
 
diff --git a/Composer/packages/adaptive-form/src/components/fields/ArrayField.tsx b/Composer/packages/adaptive-form/src/components/fields/ArrayField.tsx
index 9fef11c0a4..d7a6c6f244 100644
--- a/Composer/packages/adaptive-form/src/components/fields/ArrayField.tsx
+++ b/Composer/packages/adaptive-form/src/components/fields/ArrayField.tsx
@@ -7,7 +7,7 @@ import { TextField } from 'office-ui-fabric-react/lib/TextField';
 import { IconButton } from 'office-ui-fabric-react/lib/Button';
 import { TooltipHost } from 'office-ui-fabric-react/lib/Tooltip';
 import { SharedColors, NeutralColors, FontSizes } from '@uifabric/fluent-theme';
-import { FieldProps } from '@bfc/editor-extension';
+import { FieldProps } from '@bfc/extension-client';
 import formatMessage from 'format-message';
 
 import { getArrayItemProps, useArrayItems } from '../../utils';
diff --git a/Composer/packages/adaptive-form/src/components/fields/ArrayFieldItem.tsx b/Composer/packages/adaptive-form/src/components/fields/ArrayFieldItem.tsx
index 64bb087e5f..f08c6b2bec 100644
--- a/Composer/packages/adaptive-form/src/components/fields/ArrayFieldItem.tsx
+++ b/Composer/packages/adaptive-form/src/components/fields/ArrayFieldItem.tsx
@@ -3,7 +3,7 @@
 /** @jsx jsx */
 import { jsx } from '@emotion/core';
 import React from 'react';
-import { FieldProps } from '@bfc/editor-extension';
+import { FieldProps } from '@bfc/extension-client';
 import { NeutralColors } from '@uifabric/fluent-theme';
 import { IconButton } from 'office-ui-fabric-react/lib/Button';
 import { FontSizes } from '@uifabric/styling';
diff --git a/Composer/packages/adaptive-form/src/components/fields/BooleanField.tsx b/Composer/packages/adaptive-form/src/components/fields/BooleanField.tsx
index f151df0584..ab2dc4b300 100644
--- a/Composer/packages/adaptive-form/src/components/fields/BooleanField.tsx
+++ b/Composer/packages/adaptive-form/src/components/fields/BooleanField.tsx
@@ -3,7 +3,7 @@
 /** @jsx jsx */
 import { jsx } from '@emotion/core';
 import React from 'react';
-import { FieldProps } from '@bfc/editor-extension';
+import { FieldProps } from '@bfc/extension-client';
 import { Dropdown, IDropdownOption, ResponsiveMode } from 'office-ui-fabric-react/lib/Dropdown';
 import formatMessage from 'format-message';
 
diff --git a/Composer/packages/adaptive-form/src/components/fields/EditableField.tsx b/Composer/packages/adaptive-form/src/components/fields/EditableField.tsx
index b0d3c55d36..623a3c29d1 100644
--- a/Composer/packages/adaptive-form/src/components/fields/EditableField.tsx
+++ b/Composer/packages/adaptive-form/src/components/fields/EditableField.tsx
@@ -5,7 +5,7 @@ import React, { useState, useEffect } from 'react';
 import { TextField, ITextFieldStyles } from 'office-ui-fabric-react/lib/TextField';
 import { NeutralColors } from '@uifabric/fluent-theme';
 import { mergeStyleSets } from '@uifabric/styling';
-import { FieldProps } from '@bfc/editor-extension';
+import { FieldProps } from '@bfc/extension-client';
 
 interface EditableFieldProps extends Omit<FieldProps, 'definitions'> {
   fontSize?: string;
diff --git a/Composer/packages/adaptive-form/src/components/fields/ExpressionField/ExpressionEditor.tsx b/Composer/packages/adaptive-form/src/components/fields/ExpressionField/ExpressionEditor.tsx
index e935b32682..21473ad28e 100644
--- a/Composer/packages/adaptive-form/src/components/fields/ExpressionField/ExpressionEditor.tsx
+++ b/Composer/packages/adaptive-form/src/components/fields/ExpressionField/ExpressionEditor.tsx
@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
-import { FieldProps, useShellApi } from '@bfc/editor-extension';
+import { FieldProps, useShellApi } from '@bfc/extension-client';
 import { IntellisenseTextField } from '@bfc/intellisense';
 import { Icon } from 'office-ui-fabric-react/lib/Icon';
 import React from 'react';
diff --git a/Composer/packages/adaptive-form/src/components/fields/ExpressionField/ExpressionField.tsx b/Composer/packages/adaptive-form/src/components/fields/ExpressionField/ExpressionField.tsx
index 7bb0318fe0..4c372133a9 100644
--- a/Composer/packages/adaptive-form/src/components/fields/ExpressionField/ExpressionField.tsx
+++ b/Composer/packages/adaptive-form/src/components/fields/ExpressionField/ExpressionField.tsx
@@ -3,7 +3,7 @@
 
 /** @jsx jsx */
 import { JsonEditor } from '@bfc/code-editor';
-import { FieldProps, useFormConfig, useShellApi } from '@bfc/editor-extension';
+import { FieldProps, useFormConfig, useShellApi } from '@bfc/extension-client';
 import { css, jsx } from '@emotion/core';
 import formatMessage from 'format-message';
 import { Dropdown, IDropdownOption, ResponsiveMode } from 'office-ui-fabric-react/lib/Dropdown';
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 868319f815..1bf98d71f2 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/editor-extension';
+import { JSONSchema7, JSONSchema7Definition, SchemaDefinitions } from '@bfc/extension-client';
 import { IDropdownOption } from 'office-ui-fabric-react/lib/Dropdown';
 
 import { resolveRef, getValueType } from '../../../utils';
diff --git a/Composer/packages/adaptive-form/src/components/fields/IntellisenseField.tsx b/Composer/packages/adaptive-form/src/components/fields/IntellisenseField.tsx
index 5cd6ef9283..90e5f2f294 100644
--- a/Composer/packages/adaptive-form/src/components/fields/IntellisenseField.tsx
+++ b/Composer/packages/adaptive-form/src/components/fields/IntellisenseField.tsx
@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
-import { FieldProps } from '@bfc/editor-extension';
+import { FieldProps } from '@bfc/extension-client';
 import { IntellisenseTextField } from '@bfc/intellisense';
 import React from 'react';
 import { TextField } from 'office-ui-fabric-react/lib/TextField';
diff --git a/Composer/packages/adaptive-form/src/components/fields/IntentField.tsx b/Composer/packages/adaptive-form/src/components/fields/IntentField.tsx
index 86541d6826..60fb592079 100644
--- a/Composer/packages/adaptive-form/src/components/fields/IntentField.tsx
+++ b/Composer/packages/adaptive-form/src/components/fields/IntentField.tsx
@@ -2,7 +2,7 @@
 // Licensed under the MIT License.
 
 import React from 'react';
-import { FieldProps, useShellApi, useRecognizerConfig, FieldWidget } from '@bfc/editor-extension';
+import { FieldProps, useShellApi, useRecognizerConfig, FieldWidget } from '@bfc/extension-client';
 import formatMessage from 'format-message';
 import { SDKKinds } from '@bfc/shared';
 
diff --git a/Composer/packages/adaptive-form/src/components/fields/JsonField.tsx b/Composer/packages/adaptive-form/src/components/fields/JsonField.tsx
index 16d517c7f1..a55da4e20b 100644
--- a/Composer/packages/adaptive-form/src/components/fields/JsonField.tsx
+++ b/Composer/packages/adaptive-form/src/components/fields/JsonField.tsx
@@ -4,7 +4,7 @@
 /** @jsx jsx */
 import { jsx, css } from '@emotion/core';
 import React from 'react';
-import { FieldProps, useShellApi } from '@bfc/editor-extension';
+import { FieldProps, useShellApi } from '@bfc/extension-client';
 import { JsonEditor } from '@bfc/code-editor';
 
 import { FieldLabel } from '../FieldLabel';
diff --git a/Composer/packages/adaptive-form/src/components/fields/NumberField.tsx b/Composer/packages/adaptive-form/src/components/fields/NumberField.tsx
index f7521dc6a3..b718c3a8f0 100644
--- a/Composer/packages/adaptive-form/src/components/fields/NumberField.tsx
+++ b/Composer/packages/adaptive-form/src/components/fields/NumberField.tsx
@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
-import { FieldProps } from '@bfc/editor-extension';
+import { FieldProps } from '@bfc/extension-client';
 import formatMessage from 'format-message';
 import { SpinButton } from 'office-ui-fabric-react/lib/SpinButton';
 import React from 'react';
diff --git a/Composer/packages/adaptive-form/src/components/fields/ObjectArrayField.tsx b/Composer/packages/adaptive-form/src/components/fields/ObjectArrayField.tsx
index f52c88c1af..169c0a7ef9 100644
--- a/Composer/packages/adaptive-form/src/components/fields/ObjectArrayField.tsx
+++ b/Composer/packages/adaptive-form/src/components/fields/ObjectArrayField.tsx
@@ -4,7 +4,7 @@
 /** @jsx jsx */
 import { jsx } from '@emotion/core';
 import React, { useState, useMemo, useRef } from 'react';
-import { FieldProps, useShellApi } from '@bfc/editor-extension';
+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';
diff --git a/Composer/packages/adaptive-form/src/components/fields/ObjectField.tsx b/Composer/packages/adaptive-form/src/components/fields/ObjectField.tsx
index c609f37589..1f7a9aad0f 100644
--- a/Composer/packages/adaptive-form/src/components/fields/ObjectField.tsx
+++ b/Composer/packages/adaptive-form/src/components/fields/ObjectField.tsx
@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 import React from 'react';
-import { FieldProps } from '@bfc/editor-extension';
+import { FieldProps } from '@bfc/extension-client';
 
 import { getOrderedProperties } from '../../utils';
 import { FormRow } from '../FormRow';
diff --git a/Composer/packages/adaptive-form/src/components/fields/OneOfField/OneOfField.tsx b/Composer/packages/adaptive-form/src/components/fields/OneOfField/OneOfField.tsx
index f1a91c2cbf..128ff1b9d4 100644
--- a/Composer/packages/adaptive-form/src/components/fields/OneOfField/OneOfField.tsx
+++ b/Composer/packages/adaptive-form/src/components/fields/OneOfField/OneOfField.tsx
@@ -4,7 +4,7 @@
 /** @jsx jsx */
 import { jsx } from '@emotion/core';
 import React, { useState, useMemo } from 'react';
-import { FieldProps, useFormConfig } from '@bfc/editor-extension';
+import { FieldProps, useFormConfig } from '@bfc/extension-client';
 import { Dropdown, IDropdownOption, ResponsiveMode } from 'office-ui-fabric-react/lib/Dropdown';
 import formatMessage from 'format-message';
 
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 6994f832e9..0bfbadf8b7 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/editor-extension';
+import { FieldProps, JSONSchema7, JSONSchema7Definition } from '@bfc/extension-client';
 import merge from 'lodash/merge';
 import omit from 'lodash/omit';
 import { IDropdownOption } from 'office-ui-fabric-react/lib/Dropdown';
diff --git a/Composer/packages/adaptive-form/src/components/fields/OpenObjectField/ObjectItem.tsx b/Composer/packages/adaptive-form/src/components/fields/OpenObjectField/ObjectItem.tsx
index 07fd0a742d..4acc199a9a 100644
--- a/Composer/packages/adaptive-form/src/components/fields/OpenObjectField/ObjectItem.tsx
+++ b/Composer/packages/adaptive-form/src/components/fields/OpenObjectField/ObjectItem.tsx
@@ -6,7 +6,7 @@ import { jsx } from '@emotion/core';
 import React, { useState, useCallback, useMemo } from 'react';
 import { FontSizes, NeutralColors } from '@uifabric/fluent-theme';
 import { IconButton } from 'office-ui-fabric-react/lib/Button';
-import { FieldProps } from '@bfc/editor-extension';
+import { FieldProps } from '@bfc/extension-client';
 import { IContextualMenuItem } from 'office-ui-fabric-react/lib/ContextualMenu';
 import { TooltipHost } from 'office-ui-fabric-react/lib/Tooltip';
 import formatMessage from 'format-message';
diff --git a/Composer/packages/adaptive-form/src/components/fields/OpenObjectField/OpenObjectField.tsx b/Composer/packages/adaptive-form/src/components/fields/OpenObjectField/OpenObjectField.tsx
index cc01528827..46bfd8e484 100644
--- a/Composer/packages/adaptive-form/src/components/fields/OpenObjectField/OpenObjectField.tsx
+++ b/Composer/packages/adaptive-form/src/components/fields/OpenObjectField/OpenObjectField.tsx
@@ -8,7 +8,7 @@ import { FontSizes, NeutralColors, SharedColors } from '@uifabric/fluent-theme';
 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';
-import { FieldProps } from '@bfc/editor-extension';
+import { FieldProps } from '@bfc/extension-client';
 import formatMessage from 'format-message';
 
 import { FieldLabel } from '../../FieldLabel';
diff --git a/Composer/packages/adaptive-form/src/components/fields/QnAActionsField.tsx b/Composer/packages/adaptive-form/src/components/fields/QnAActionsField.tsx
index 0b4d342de1..560a95ea42 100644
--- a/Composer/packages/adaptive-form/src/components/fields/QnAActionsField.tsx
+++ b/Composer/packages/adaptive-form/src/components/fields/QnAActionsField.tsx
@@ -2,7 +2,7 @@
 // Licensed under the MIT License.
 
 import React from 'react';
-import { FieldProps, useShellApi } from '@bfc/editor-extension';
+import { FieldProps, useShellApi } from '@bfc/extension-client';
 import formatMessage from 'format-message';
 
 import { Link } from '../Link';
diff --git a/Composer/packages/adaptive-form/src/components/fields/RecognizerField.tsx b/Composer/packages/adaptive-form/src/components/fields/RecognizerField.tsx
index 53119c985b..4cb714dd7f 100644
--- a/Composer/packages/adaptive-form/src/components/fields/RecognizerField.tsx
+++ b/Composer/packages/adaptive-form/src/components/fields/RecognizerField.tsx
@@ -3,7 +3,7 @@
 /** @jsx jsx */
 import { jsx } from '@emotion/core';
 import React, { useMemo, useState, useEffect } from 'react';
-import { FieldProps, useShellApi, useRecognizerConfig } from '@bfc/editor-extension';
+import { FieldProps, useShellApi, useRecognizerConfig } from '@bfc/extension-client';
 import { MicrosoftIRecognizer, SDKKinds } from '@bfc/shared';
 import { Dropdown, ResponsiveMode, IDropdownOption } from 'office-ui-fabric-react/lib/Dropdown';
 import formatMessage from 'format-message';
diff --git a/Composer/packages/adaptive-form/src/components/fields/RegexIntentField.tsx b/Composer/packages/adaptive-form/src/components/fields/RegexIntentField.tsx
index 514ccef0b0..f0a0b395b5 100644
--- a/Composer/packages/adaptive-form/src/components/fields/RegexIntentField.tsx
+++ b/Composer/packages/adaptive-form/src/components/fields/RegexIntentField.tsx
@@ -4,7 +4,7 @@
 /** @jsx jsx */
 import { jsx } from '@emotion/core';
 import React, { useState, useEffect } from 'react';
-import { FieldProps, useShellApi } from '@bfc/editor-extension';
+import { FieldProps, useShellApi } from '@bfc/extension-client';
 import { DialogInfo, RegexRecognizer } from '@bfc/shared';
 
 import { StringField } from './StringField';
diff --git a/Composer/packages/adaptive-form/src/components/fields/SelectField.tsx b/Composer/packages/adaptive-form/src/components/fields/SelectField.tsx
index a7350b4d42..3bcb04414e 100644
--- a/Composer/packages/adaptive-form/src/components/fields/SelectField.tsx
+++ b/Composer/packages/adaptive-form/src/components/fields/SelectField.tsx
@@ -2,7 +2,7 @@
 // Licensed under the MIT License.
 import React, { useMemo } from 'react';
 import { Dropdown, IDropdownOption, ResponsiveMode } from 'office-ui-fabric-react/lib/Dropdown';
-import { FieldProps } from '@bfc/editor-extension';
+import { FieldProps } from '@bfc/extension-client';
 import formatMessage from 'format-message';
 
 import { FieldLabel } from '../FieldLabel';
diff --git a/Composer/packages/adaptive-form/src/components/fields/StringField.tsx b/Composer/packages/adaptive-form/src/components/fields/StringField.tsx
index 28a4baaf2c..2ffbbc4bce 100644
--- a/Composer/packages/adaptive-form/src/components/fields/StringField.tsx
+++ b/Composer/packages/adaptive-form/src/components/fields/StringField.tsx
@@ -2,7 +2,7 @@
 // Licensed under the MIT License.
 
 import React from 'react';
-import { FieldProps } from '@bfc/editor-extension';
+import { FieldProps } from '@bfc/extension-client';
 import { NeutralColors } from '@uifabric/fluent-theme';
 import { TextField } from 'office-ui-fabric-react/lib/TextField';
 import formatMessage from 'format-message';
diff --git a/Composer/packages/adaptive-form/src/components/fields/UnsupportedField.tsx b/Composer/packages/adaptive-form/src/components/fields/UnsupportedField.tsx
index 399d19c5d0..b41f0c21c7 100644
--- a/Composer/packages/adaptive-form/src/components/fields/UnsupportedField.tsx
+++ b/Composer/packages/adaptive-form/src/components/fields/UnsupportedField.tsx
@@ -4,7 +4,7 @@
 import { jsx } from '@emotion/core';
 import React, { useState } from 'react';
 import { Link } from 'office-ui-fabric-react/lib/Link';
-import { FieldProps } from '@bfc/editor-extension';
+import { FieldProps } from '@bfc/extension-client';
 import omit from 'lodash/omit';
 
 import { unsupportedField } from './styles';
diff --git a/Composer/packages/adaptive-form/src/components/fields/__tests__/IntentField.test.tsx b/Composer/packages/adaptive-form/src/components/fields/__tests__/IntentField.test.tsx
index af3667456a..73366dc54e 100644
--- a/Composer/packages/adaptive-form/src/components/fields/__tests__/IntentField.test.tsx
+++ b/Composer/packages/adaptive-form/src/components/fields/__tests__/IntentField.test.tsx
@@ -4,13 +4,13 @@
 import React from 'react';
 import { render, fireEvent } from '@bfc/test-utils';
 import assign from 'lodash/assign';
-import { useShellApi, useRecognizerConfig } from '@bfc/editor-extension';
+import { useShellApi, useRecognizerConfig } from '@bfc/extension-client';
 
 import { IntentField } from '../IntentField';
 
 import { fieldProps } from './testUtils';
 
-jest.mock('@bfc/editor-extension', () => ({
+jest.mock('@bfc/extension-client', () => ({
   useShellApi: jest.fn(),
   useRecognizerConfig: jest.fn(),
 }));
diff --git a/Composer/packages/adaptive-form/src/components/fields/__tests__/JsonField.test.tsx b/Composer/packages/adaptive-form/src/components/fields/__tests__/JsonField.test.tsx
index 6f0c645ce3..f04e0aade0 100644
--- a/Composer/packages/adaptive-form/src/components/fields/__tests__/JsonField.test.tsx
+++ b/Composer/packages/adaptive-form/src/components/fields/__tests__/JsonField.test.tsx
@@ -9,7 +9,7 @@ import { JsonField } from '../JsonField';
 
 import { fieldProps } from './testUtils';
 
-jest.mock('@bfc/editor-extension', () => ({
+jest.mock('@bfc/extension-client', () => ({
   useShellApi: () => ({
     userSettings: {},
   }),
diff --git a/Composer/packages/adaptive-form/src/components/fields/__tests__/ObjectArrayField.test.tsx b/Composer/packages/adaptive-form/src/components/fields/__tests__/ObjectArrayField.test.tsx
index cf0b409687..804ead2226 100644
--- a/Composer/packages/adaptive-form/src/components/fields/__tests__/ObjectArrayField.test.tsx
+++ b/Composer/packages/adaptive-form/src/components/fields/__tests__/ObjectArrayField.test.tsx
@@ -4,7 +4,7 @@
 import React from 'react';
 import { render, fireEvent } from '@bfc/test-utils';
 import assign from 'lodash/assign';
-import { useShellApi } from '@bfc/editor-extension';
+import { useShellApi } from '@bfc/extension-client';
 
 import { ObjectArrayField } from '../ObjectArrayField';
 
@@ -25,7 +25,7 @@ const testSchema = (moreItems: object = {}) => ({
 jest.mock('../ArrayFieldItem', () => ({
   ArrayFieldItem: ({ stackArrayItems }) => <div>{stackArrayItems ? 'stacked' : 'not stacked'}</div>,
 }));
-jest.mock('@bfc/editor-extension', () => ({
+jest.mock('@bfc/extension-client', () => ({
   useShellApi: jest.fn(),
 }));
 
diff --git a/Composer/packages/adaptive-form/src/components/fields/__tests__/RecognizerField.test.tsx b/Composer/packages/adaptive-form/src/components/fields/__tests__/RecognizerField.test.tsx
index c591a4f42d..7d0e79090a 100644
--- a/Composer/packages/adaptive-form/src/components/fields/__tests__/RecognizerField.test.tsx
+++ b/Composer/packages/adaptive-form/src/components/fields/__tests__/RecognizerField.test.tsx
@@ -3,14 +3,14 @@
 
 import React from 'react';
 import { render, fireEvent, screen } from '@bfc/test-utils';
-import { useRecognizerConfig, useShellApi } from '@bfc/editor-extension';
+import { useRecognizerConfig, useShellApi } from '@bfc/extension-client';
 import assign from 'lodash/assign';
 
 import { RecognizerField } from '../RecognizerField';
 
 import { fieldProps } from './testUtils';
 
-jest.mock('@bfc/editor-extension', () => ({
+jest.mock('@bfc/extension-client', () => ({
   useShellApi: jest.fn(),
   useRecognizerConfig: jest.fn(),
 }));
diff --git a/Composer/packages/adaptive-form/src/components/fields/__tests__/RegexIntentField.test.tsx b/Composer/packages/adaptive-form/src/components/fields/__tests__/RegexIntentField.test.tsx
index 20f052c42a..496ade1c06 100644
--- a/Composer/packages/adaptive-form/src/components/fields/__tests__/RegexIntentField.test.tsx
+++ b/Composer/packages/adaptive-form/src/components/fields/__tests__/RegexIntentField.test.tsx
@@ -4,13 +4,13 @@
 import React from 'react';
 import { render, fireEvent } from '@bfc/test-utils';
 import assign from 'lodash/assign';
-import { useShellApi } from '@bfc/editor-extension';
+import { useShellApi } from '@bfc/extension-client';
 
 import { RegexIntentField } from '../RegexIntentField';
 
 import { fieldProps } from './testUtils';
 
-jest.mock('@bfc/editor-extension', () => ({
+jest.mock('@bfc/extension-client', () => ({
   useShellApi: jest.fn(),
 }));
 
diff --git a/Composer/packages/adaptive-form/src/components/fields/__tests__/testUtils.ts b/Composer/packages/adaptive-form/src/components/fields/__tests__/testUtils.ts
index b10bda1f86..31ce801608 100644
--- a/Composer/packages/adaptive-form/src/components/fields/__tests__/testUtils.ts
+++ b/Composer/packages/adaptive-form/src/components/fields/__tests__/testUtils.ts
@@ -2,7 +2,7 @@
 // Licensed under the MIT License.
 
 import assign from 'lodash/assign';
-import { FieldProps } from '@bfc/editor-extension';
+import { FieldProps } from '@bfc/extension-client';
 
 const defaults: FieldProps = {
   depth: 0,
diff --git a/Composer/packages/adaptive-form/src/defaultRecognizers.ts b/Composer/packages/adaptive-form/src/defaultRecognizers.ts
index 4521d897fb..c4a245d1e2 100644
--- a/Composer/packages/adaptive-form/src/defaultRecognizers.ts
+++ b/Composer/packages/adaptive-form/src/defaultRecognizers.ts
@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
-import { RecognizerSchema } from '@bfc/editor-extension';
+import { RecognizerSchema } from '@bfc/extension-client';
 import { SDKKinds } from '@bfc/shared';
 import formatMessage from 'format-message';
 
diff --git a/Composer/packages/adaptive-form/src/utils/__tests__/getUIOptions.test.ts b/Composer/packages/adaptive-form/src/utils/__tests__/getUIOptions.test.ts
index 0ebdec63d8..69a8c488cc 100644
--- a/Composer/packages/adaptive-form/src/utils/__tests__/getUIOptions.test.ts
+++ b/Composer/packages/adaptive-form/src/utils/__tests__/getUIOptions.test.ts
@@ -1,6 +1,6 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
-import { UISchema, JSONSchema7, RoleSchema } from '@bfc/editor-extension';
+import { UISchema, JSONSchema7, RoleSchema } from '@bfc/extension-client';
 import { SDKKinds } from '@bfc/shared';
 
 import { getUIOptions } from '../getUIOptions';
diff --git a/Composer/packages/adaptive-form/src/utils/__tests__/uiOptionsHelpers.test.ts b/Composer/packages/adaptive-form/src/utils/__tests__/uiOptionsHelpers.test.ts
index 50c88b8fb5..5fc2b71b7d 100644
--- a/Composer/packages/adaptive-form/src/utils/__tests__/uiOptionsHelpers.test.ts
+++ b/Composer/packages/adaptive-form/src/utils/__tests__/uiOptionsHelpers.test.ts
@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
-import { FieldProps, UIOptions } from '@bfc/editor-extension';
+import { FieldProps, UIOptions } from '@bfc/extension-client';
 
 import { getUiLabel, getUiDescription, getUiPlaceholder } from '../uiOptionsHelpers';
 
diff --git a/Composer/packages/adaptive-form/src/utils/arrayUtils.ts b/Composer/packages/adaptive-form/src/utils/arrayUtils.ts
index fe136fe1ef..1c10778fe3 100644
--- a/Composer/packages/adaptive-form/src/utils/arrayUtils.ts
+++ b/Composer/packages/adaptive-form/src/utils/arrayUtils.ts
@@ -2,7 +2,7 @@
 // Licensed under the MIT License.
 
 import { generateUniqueId } from '@bfc/shared';
-import { ChangeHandler } from '@bfc/editor-extension';
+import { ChangeHandler } from '@bfc/extension-client';
 import { useState } from 'react';
 
 type ArrayChangeHandler<ItemType> = (items: ArrayItem<ItemType>[]) => void;
diff --git a/Composer/packages/adaptive-form/src/utils/getHiddenProperties.ts b/Composer/packages/adaptive-form/src/utils/getHiddenProperties.ts
index e6008af687..afa1eaaed8 100644
--- a/Composer/packages/adaptive-form/src/utils/getHiddenProperties.ts
+++ b/Composer/packages/adaptive-form/src/utils/getHiddenProperties.ts
@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
-import { UIOptions } from '@bfc/editor-extension';
+import { UIOptions } from '@bfc/extension-client';
 
 export const globalHiddenProperties = ['$kind', '$id', '$copy', '$designer', 'id', 'disabled'];
 
diff --git a/Composer/packages/adaptive-form/src/utils/getOrderedProperties.ts b/Composer/packages/adaptive-form/src/utils/getOrderedProperties.ts
index b618b0a77f..9f330ae78f 100644
--- a/Composer/packages/adaptive-form/src/utils/getOrderedProperties.ts
+++ b/Composer/packages/adaptive-form/src/utils/getOrderedProperties.ts
@@ -1,6 +1,6 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
-import { UIOptions, JSONSchema7 } from '@bfc/editor-extension';
+import { UIOptions, JSONSchema7 } from '@bfc/extension-client';
 import cloneDeep from 'lodash/cloneDeep';
 import formatMessage from 'format-message';
 
diff --git a/Composer/packages/adaptive-form/src/utils/getUIOptions.ts b/Composer/packages/adaptive-form/src/utils/getUIOptions.ts
index 8ae6440f6d..b01343d49f 100644
--- a/Composer/packages/adaptive-form/src/utils/getUIOptions.ts
+++ b/Composer/packages/adaptive-form/src/utils/getUIOptions.ts
@@ -1,6 +1,6 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
-import { FormUISchema, UIOptions, JSONSchema7 } from '@bfc/editor-extension';
+import { FormUISchema, UIOptions, JSONSchema7 } from '@bfc/extension-client';
 /**
  * Merges overrides and plugins into default ui schema and returns the UIOptions
  */
diff --git a/Composer/packages/adaptive-form/src/utils/objectUtils.ts b/Composer/packages/adaptive-form/src/utils/objectUtils.ts
index 3fa8ac61d6..68d2cee085 100644
--- a/Composer/packages/adaptive-form/src/utils/objectUtils.ts
+++ b/Composer/packages/adaptive-form/src/utils/objectUtils.ts
@@ -2,7 +2,7 @@
 // Licensed under the MIT License.
 
 import { generateUniqueId } from '@bfc/shared';
-import { ChangeHandler } from '@bfc/editor-extension';
+import { ChangeHandler } from '@bfc/extension-client';
 import { useState } from 'react';
 
 type ItemType<ValueType = unknown> = { [key: string]: ValueType };
diff --git a/Composer/packages/adaptive-form/src/utils/resolveFieldWidget.ts b/Composer/packages/adaptive-form/src/utils/resolveFieldWidget.ts
index 38175e2ed3..ca56b7a2ce 100644
--- a/Composer/packages/adaptive-form/src/utils/resolveFieldWidget.ts
+++ b/Composer/packages/adaptive-form/src/utils/resolveFieldWidget.ts
@@ -1,6 +1,6 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
-import { FieldWidget, FormUISchema, JSONSchema7, UIOptions } from '@bfc/editor-extension';
+import { FieldWidget, FormUISchema, JSONSchema7, UIOptions } from '@bfc/extension-client';
 
 import * as DefaultFields from '../components/fields';
 
diff --git a/Composer/packages/adaptive-form/src/utils/resolvePropSchema.ts b/Composer/packages/adaptive-form/src/utils/resolvePropSchema.ts
index 7ddb23ee49..12fb4b1027 100644
--- a/Composer/packages/adaptive-form/src/utils/resolvePropSchema.ts
+++ b/Composer/packages/adaptive-form/src/utils/resolvePropSchema.ts
@@ -1,6 +1,6 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
-import { JSONSchema7, JSONSchema7Definition } from '@bfc/editor-extension';
+import { JSONSchema7, JSONSchema7Definition } from '@bfc/extension-client';
 
 import { resolveRef } from './resolveRef';
 
diff --git a/Composer/packages/adaptive-form/src/utils/resolveRef.ts b/Composer/packages/adaptive-form/src/utils/resolveRef.ts
index c59f5dd991..5fa870f4d1 100644
--- a/Composer/packages/adaptive-form/src/utils/resolveRef.ts
+++ b/Composer/packages/adaptive-form/src/utils/resolveRef.ts
@@ -1,6 +1,6 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
-import { JSONSchema7, JSONSchema7Definition } from '@bfc/editor-extension';
+import { JSONSchema7, JSONSchema7Definition } from '@bfc/extension-client';
 import formatMessage from 'format-message';
 
 export function resolveRef(
diff --git a/Composer/packages/adaptive-form/src/utils/uiOptionsHelpers.ts b/Composer/packages/adaptive-form/src/utils/uiOptionsHelpers.ts
index 103c929e08..2fb3126786 100644
--- a/Composer/packages/adaptive-form/src/utils/uiOptionsHelpers.ts
+++ b/Composer/packages/adaptive-form/src/utils/uiOptionsHelpers.ts
@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
-import { FieldProps } from '@bfc/editor-extension';
+import { FieldProps } from '@bfc/extension-client';
 import startCase from 'lodash/startCase';
 
 export function getUiLabel(props: FieldProps): string | false | undefined {
diff --git a/Composer/packages/client/package.json b/Composer/packages/client/package.json
index a50e9f41c0..bb5b491bb1 100644
--- a/Composer/packages/client/package.json
+++ b/Composer/packages/client/package.json
@@ -23,7 +23,7 @@
     "@bfc/adaptive-flow": "*",
     "@bfc/adaptive-form": "*",
     "@bfc/code-editor": "*",
-    "@bfc/editor-extension": "*",
+    "@bfc/extension-client": "*",
     "@bfc/indexers": "*",
     "@bfc/shared": "*",
     "@bfc/ui-plugin-composer": "*",
diff --git a/Composer/packages/client/src/pages/design/DesignPage.tsx b/Composer/packages/client/src/pages/design/DesignPage.tsx
index 02d60eb30f..7cccc2fdfa 100644
--- a/Composer/packages/client/src/pages/design/DesignPage.tsx
+++ b/Composer/packages/client/src/pages/design/DesignPage.tsx
@@ -11,7 +11,7 @@ import get from 'lodash/get';
 import { DialogFactory, SDKKinds, DialogInfo, PromptTab, getEditorAPI, registerEditorAPI } from '@bfc/shared';
 import { ActionButton } from 'office-ui-fabric-react/lib/Button';
 import { JsonEditor } from '@bfc/code-editor';
-import Extension, { useTriggerApi, PluginConfig } from '@bfc/editor-extension';
+import { EditorExtension, useTriggerApi, PluginConfig } from '@bfc/extension-client';
 import { useRecoilValue } from 'recoil';
 
 import { LoadingSpinner } from '../../components/LoadingSpinner';
@@ -652,18 +652,18 @@ const DesignPage: React.FC<RouteComponentProps<{ dialogId: string; projectId: st
                     />
                   )
                 ) : (
-                  <Extension plugins={pluginConfig} shell={shellForFlowEditor}>
+                  <EditorExtension plugins={pluginConfig} shell={shellForFlowEditor}>
                     <VisualEditor
                       openNewTriggerModal={openNewTriggerModal}
                       onBlur={() => setFlowEditorFocused(false)}
                       onFocus={() => setFlowEditorFocused(true)}
                     />
-                  </Extension>
+                  </EditorExtension>
                 )}
               </div>
-              <Extension plugins={pluginConfig} shell={shellForPropertyEditor}>
+              <EditorExtension plugins={pluginConfig} shell={shellForPropertyEditor}>
                 <PropertyEditor key={focusPath + undoVersion} />
-              </Extension>
+              </EditorExtension>
             </div>
           </Conversation>
         </div>
diff --git a/Composer/packages/client/src/pages/design/PropertyEditor.tsx b/Composer/packages/client/src/pages/design/PropertyEditor.tsx
index ef478ed063..2c203b8c30 100644
--- a/Composer/packages/client/src/pages/design/PropertyEditor.tsx
+++ b/Composer/packages/client/src/pages/design/PropertyEditor.tsx
@@ -5,7 +5,7 @@
 import { jsx } from '@emotion/core';
 import React, { useEffect, useMemo, useRef, useState } from 'react';
 import AdaptiveForm, { resolveRef, getUIOptions } from '@bfc/adaptive-form';
-import { FormErrors, JSONSchema7, useFormConfig } from '@bfc/editor-extension';
+import { FormErrors, JSONSchema7, useFormConfig } from '@bfc/extension-client';
 import formatMessage from 'format-message';
 import isEqual from 'lodash/isEqual';
 import debounce from 'lodash/debounce';
diff --git a/Composer/packages/client/src/pages/design/exportSkillModal/constants.tsx b/Composer/packages/client/src/pages/design/exportSkillModal/constants.tsx
index 004e1eb96f..6ee8b11aae 100644
--- a/Composer/packages/client/src/pages/design/exportSkillModal/constants.tsx
+++ b/Composer/packages/client/src/pages/design/exportSkillModal/constants.tsx
@@ -2,7 +2,7 @@
 // Licensed under the MIT License.
 
 import formatMessage from 'format-message';
-import { JSONSchema7 } from '@bfc/editor-extension';
+import { JSONSchema7 } from '@bfc/extension-client';
 import { resolveRef } from '@bfc/adaptive-form';
 import { SkillManifest } from '@bfc/shared';
 import startCase from 'lodash/startCase';
diff --git a/Composer/packages/client/src/pages/design/exportSkillModal/content/Description.tsx b/Composer/packages/client/src/pages/design/exportSkillModal/content/Description.tsx
index bb54dcf39e..4ffc85ea1f 100644
--- a/Composer/packages/client/src/pages/design/exportSkillModal/content/Description.tsx
+++ b/Composer/packages/client/src/pages/design/exportSkillModal/content/Description.tsx
@@ -5,7 +5,7 @@
 import { css, jsx } from '@emotion/core';
 import React, { useMemo, useEffect } from 'react';
 import AdaptiveForm, { FieldLabel } from '@bfc/adaptive-form';
-import { FieldProps, JSONSchema7, UIOptions } from '@bfc/editor-extension';
+import { FieldProps, JSONSchema7, UIOptions } from '@bfc/extension-client';
 import { TextField } from 'office-ui-fabric-react/lib/TextField';
 import { useRecoilValue } from 'recoil';
 import { v4 as uuid } from 'uuid';
diff --git a/Composer/packages/client/src/pages/design/exportSkillModal/content/Endpoints.tsx b/Composer/packages/client/src/pages/design/exportSkillModal/content/Endpoints.tsx
index 4dd7caa25e..eb7cd1d58d 100644
--- a/Composer/packages/client/src/pages/design/exportSkillModal/content/Endpoints.tsx
+++ b/Composer/packages/client/src/pages/design/exportSkillModal/content/Endpoints.tsx
@@ -5,7 +5,7 @@
 import { css, jsx } from '@emotion/core';
 import React, { useMemo } from 'react';
 import AdaptiveForm from '@bfc/adaptive-form';
-import { JSONSchema7, UIOptions } from '@bfc/editor-extension';
+import { JSONSchema7, UIOptions } from '@bfc/extension-client';
 
 import { ContentProps } from '../constants';
 
diff --git a/Composer/packages/client/src/pages/design/exportSkillModal/generateSkillManifest.ts b/Composer/packages/client/src/pages/design/exportSkillModal/generateSkillManifest.ts
index 60c1413cf5..7880a97f62 100644
--- a/Composer/packages/client/src/pages/design/exportSkillModal/generateSkillManifest.ts
+++ b/Composer/packages/client/src/pages/design/exportSkillModal/generateSkillManifest.ts
@@ -3,7 +3,7 @@
 
 import get from 'lodash/get';
 import { DialogInfo, DialogSchemaFile, ITrigger, SDKKinds, SkillManifest, LuFile } from '@bfc/shared';
-import { JSONSchema7 } from '@bfc/editor-extension';
+import { JSONSchema7 } from '@bfc/extension-client';
 
 import { Activities, Activity, activityHandlerMap, ActivityTypes, DispatchModels } from './constants';
 
diff --git a/Composer/packages/client/src/pages/design/exportSkillModal/index.tsx b/Composer/packages/client/src/pages/design/exportSkillModal/index.tsx
index ab6dae860b..72770b5497 100644
--- a/Composer/packages/client/src/pages/design/exportSkillModal/index.tsx
+++ b/Composer/packages/client/src/pages/design/exportSkillModal/index.tsx
@@ -7,7 +7,7 @@ import React, { useState } from 'react';
 import formatMessage from 'format-message';
 import { Dialog, DialogFooter, DialogType } from 'office-ui-fabric-react/lib/Dialog';
 import { DefaultButton, PrimaryButton } from 'office-ui-fabric-react/lib/Button';
-import { JSONSchema7 } from '@bfc/editor-extension';
+import { JSONSchema7 } from '@bfc/extension-client';
 import { Link } from 'office-ui-fabric-react/lib/components/Link';
 import { useRecoilValue } from 'recoil';
 import { SkillManifest } from '@bfc/shared';
diff --git a/Composer/packages/client/src/plugins.ts b/Composer/packages/client/src/plugins.ts
index 5d9891d279..9a67db6574 100644
--- a/Composer/packages/client/src/plugins.ts
+++ b/Composer/packages/client/src/plugins.ts
@@ -5,7 +5,7 @@ import isArray from 'lodash/isArray';
 // this is just a type import
 // eslint-disable-next-line lodash/import-scope
 import type { MergeWithCustomizer } from 'lodash';
-import type { PluginConfig } from '@bfc/editor-extension';
+import type { PluginConfig } from '@bfc/extension-client';
 import composer from '@bfc/ui-plugin-composer';
 import prompts from '@bfc/ui-plugin-prompts';
 import schemaEditor from '@bfc/ui-plugin-dialog-schema-editor';
diff --git a/Composer/packages/client/src/recoilModel/types.ts b/Composer/packages/client/src/recoilModel/types.ts
index c16bfddedf..d792e1f783 100644
--- a/Composer/packages/client/src/recoilModel/types.ts
+++ b/Composer/packages/client/src/recoilModel/types.ts
@@ -1,6 +1,6 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
-import { JSONSchema7 } from '@bfc/editor-extension';
+import { JSONSchema7 } from '@bfc/extension-client';
 import { AppUpdaterSettings, CodeEditorSettings, PromptTab } from '@bfc/shared';
 
 import { AppUpdaterStatus } from '../constants';
diff --git a/Composer/packages/editor-extension/.gitignore b/Composer/packages/editor-extension/.gitignore
deleted file mode 100644
index a65b41774a..0000000000
--- a/Composer/packages/editor-extension/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-lib
diff --git a/Composer/packages/editor-extension/package.json b/Composer/packages/editor-extension/package.json
deleted file mode 100644
index e31fe5baac..0000000000
--- a/Composer/packages/editor-extension/package.json
+++ /dev/null
@@ -1,31 +0,0 @@
-{
-  "name": "@bfc/editor-extension",
-  "version": "0.0.0",
-  "private": true,
-  "description": "Botframework Composer extension api.",
-  "main": "lib/index.js",
-  "files": [
-    "lib"
-  ],
-  "scripts": {
-    "start": "tsc --watch --preserveWatchOutput",
-    "build": "tsc --build ./tsconfig.build.json",
-    "lint": "eslint --quiet src",
-    "prepare": "yarn build"
-  },
-  "license": "MIT",
-  "peerDependencies": {
-    "react": "16.13.0",
-    "react-dom": "16.13.0"
-  },
-  "devDependencies": {
-    "@bfc/test-utils": "*",
-    "@types/react": "16.9.23",
-    "react": "16.13.0",
-    "react-dom": "16.13.0"
-  },
-  "dependencies": {
-    "@bfc/shared": "*",
-    "lodash": "^4.17.19"
-  }
-}
diff --git a/Composer/packages/editor-extension/src/index.ts b/Composer/packages/editor-extension/src/index.ts
deleted file mode 100644
index b8e4662ac8..0000000000
--- a/Composer/packages/editor-extension/src/index.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-// Copyright (c) Microsoft Corporation.
-// Licensed under the MIT License.
-import { Extension } from './components';
-import extensionContext from './extensionContext';
-
-export * from './components';
-export * from './hooks';
-export * from './types';
-export * from './utils';
-
-export default Extension;
-
-export const ExtensionContext = extensionContext;
diff --git a/Composer/packages/editor-extension/tsconfig.json b/Composer/packages/editor-extension/tsconfig.json
deleted file mode 100644
index 9a58047b72..0000000000
--- a/Composer/packages/editor-extension/tsconfig.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "extends": "../../tsconfig.base.json",
-  "compilerOptions": {
-    "outDir": "./lib/",
-  },
-  "include": ["src"]
-}
diff --git a/Composer/packages/editor-extension/.eslintrc.js b/Composer/packages/extension-client/.eslintrc.js
similarity index 100%
rename from Composer/packages/editor-extension/.eslintrc.js
rename to Composer/packages/extension-client/.eslintrc.js
diff --git a/Composer/packages/editor-extension/jest.config.js b/Composer/packages/extension-client/jest.config.js
similarity index 100%
rename from Composer/packages/editor-extension/jest.config.js
rename to Composer/packages/extension-client/jest.config.js
diff --git a/Composer/packages/extension-client/package.json b/Composer/packages/extension-client/package.json
index 1a3fe3c413..f5e3f627db 100644
--- a/Composer/packages/extension-client/package.json
+++ b/Composer/packages/extension-client/package.json
@@ -7,15 +7,24 @@
   "private": true,
   "scripts": {
     "build": "yarn clean && yarn build:ts",
-    "build:ts": "tsc",
+    "build:ts": "tsc --build tsconfig.build.json",
     "clean": "rimraf lib"
   },
+  "peerDependencies": {
+    "react": "16.13.0",
+    "react-dom": "16.13.0"
+  },
   "devDependencies": {
+    "@bfc/test-utils": "*",
     "@types/react": "16.9.23",
+    "react": "16.13.0",
+    "react-dom": "16.13.0",
     "rimraf": "^3.0.2",
-    "typescript": "^3.8.3"
+    "typescript": "3.9.2"
   },
   "dependencies": {
-    "debug": "^4.1.1"
+    "@bfc/shared": "*",
+    "debug": "^4.1.1",
+    "lodash": "^4.17.19"
   }
 }
diff --git a/Composer/packages/editor-extension/src/extensionContext.ts b/Composer/packages/extension-client/src/EditorExtensionContext.ts
similarity index 67%
rename from Composer/packages/editor-extension/src/extensionContext.ts
rename to Composer/packages/extension-client/src/EditorExtensionContext.ts
index 52d29e6149..64b2052719 100644
--- a/Composer/packages/editor-extension/src/extensionContext.ts
+++ b/Composer/packages/extension-client/src/EditorExtensionContext.ts
@@ -5,16 +5,14 @@ import { ShellApi, ShellData } from '@bfc/shared';
 
 import { PluginConfig } from './types';
 
-interface ExtensionContext {
+interface EditorExtensionContext {
   shellApi: ShellApi;
   shellData: ShellData;
   plugins: PluginConfig;
 }
 
-const ExtensionContext = React.createContext<ExtensionContext>({
+export const EditorExtensionContext = React.createContext<EditorExtensionContext>({
   shellApi: {},
   shellData: {},
   plugins: {},
-} as ExtensionContext);
-
-export default ExtensionContext;
+} as EditorExtensionContext);
diff --git a/Composer/packages/editor-extension/src/components/Extension.tsx b/Composer/packages/extension-client/src/components/EditorExtension.tsx
similarity index 55%
rename from Composer/packages/editor-extension/src/components/Extension.tsx
rename to Composer/packages/extension-client/src/components/EditorExtension.tsx
index e0fec77035..de1056c764 100644
--- a/Composer/packages/editor-extension/src/components/Extension.tsx
+++ b/Composer/packages/extension-client/src/components/EditorExtension.tsx
@@ -1,22 +1,21 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
+
 import React, { useMemo } from 'react';
 import { Shell } from '@bfc/shared';
 
-import ExtensionContext from '../extensionContext';
+import { EditorExtensionContext } from '../EditorExtensionContext';
 import { PluginConfig } from '../types';
 
-interface ExtensionProps {
+interface EditorExtensionProps {
   shell: Shell;
   plugins: PluginConfig;
 }
 
-export const Extension: React.FC<ExtensionProps> = ({ shell, plugins, children }) => {
+export const EditorExtension: React.FC<EditorExtensionProps> = ({ shell, plugins, children }) => {
   const context = useMemo(() => {
     return { shellApi: shell.api, shellData: shell.data, plugins };
   }, [shell.api, shell.data, plugins]);
 
-  return <ExtensionContext.Provider value={context}>{children}</ExtensionContext.Provider>;
+  return <EditorExtensionContext.Provider value={context}>{children}</EditorExtensionContext.Provider>;
 };
-
-export default Extension;
diff --git a/Composer/packages/editor-extension/src/components/index.ts b/Composer/packages/extension-client/src/components/index.ts
similarity index 67%
rename from Composer/packages/editor-extension/src/components/index.ts
rename to Composer/packages/extension-client/src/components/index.ts
index 708ee39e10..1473d12111 100644
--- a/Composer/packages/editor-extension/src/components/index.ts
+++ b/Composer/packages/extension-client/src/components/index.ts
@@ -1,3 +1,4 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
-export * from './Extension';
+
+export * from './EditorExtension';
diff --git a/Composer/packages/editor-extension/src/hooks/__tests__/useFlowConfig.test.tsx b/Composer/packages/extension-client/src/hooks/__tests__/useFlowConfig.test.tsx
similarity index 81%
rename from Composer/packages/editor-extension/src/hooks/__tests__/useFlowConfig.test.tsx
rename to Composer/packages/extension-client/src/hooks/__tests__/useFlowConfig.test.tsx
index e54268f846..354b558a2a 100644
--- a/Composer/packages/editor-extension/src/hooks/__tests__/useFlowConfig.test.tsx
+++ b/Composer/packages/extension-client/src/hooks/__tests__/useFlowConfig.test.tsx
@@ -5,7 +5,7 @@ import React from 'react';
 import { renderHook } from '@bfc/test-utils/lib/hooks';
 
 import { useFlowConfig } from '../useFlowConfig';
-import ExtensionContext from '../../extensionContext';
+import EditorExtensionContext from '../../EditorExtensionContext';
 
 const plugins = {
   uiSchema: {
@@ -22,7 +22,7 @@ const plugins = {
 
 const wrapper: React.FC = ({ children }) => (
   // @ts-expect-error
-  <ExtensionContext.Provider value={{ plugins }}>{children}</ExtensionContext.Provider>
+  <EditorExtensionContext.Provider value={{ plugins }}>{children}</EditorExtensionContext.Provider>
 );
 
 describe('useFlowConfig', () => {
diff --git a/Composer/packages/editor-extension/src/hooks/__tests__/useFormConfig.test.tsx b/Composer/packages/extension-client/src/hooks/__tests__/useFormConfig.test.tsx
similarity index 81%
rename from Composer/packages/editor-extension/src/hooks/__tests__/useFormConfig.test.tsx
rename to Composer/packages/extension-client/src/hooks/__tests__/useFormConfig.test.tsx
index ecc5990e15..b944578114 100644
--- a/Composer/packages/editor-extension/src/hooks/__tests__/useFormConfig.test.tsx
+++ b/Composer/packages/extension-client/src/hooks/__tests__/useFormConfig.test.tsx
@@ -5,7 +5,7 @@ import React from 'react';
 import { renderHook } from '@bfc/test-utils/lib/hooks';
 
 import { useFormConfig } from '../useFormConfig';
-import ExtensionContext from '../../extensionContext';
+import EditorExtensionContext from '../../EditorExtensionContext';
 
 const plugins = {
   uiSchema: {
@@ -22,7 +22,7 @@ const plugins = {
 
 const wrapper: React.FC = ({ children }) => (
   // @ts-expect-error
-  <ExtensionContext.Provider value={{ plugins }}>{children}</ExtensionContext.Provider>
+  <EditorExtensionContext.Provider value={{ plugins }}>{children}</EditorExtensionContext.Provider>
 );
 
 describe('useFormConfig', () => {
diff --git a/Composer/packages/editor-extension/src/hooks/__tests__/useMenuConfig.test.tsx b/Composer/packages/extension-client/src/hooks/__tests__/useMenuConfig.test.tsx
similarity index 81%
rename from Composer/packages/editor-extension/src/hooks/__tests__/useMenuConfig.test.tsx
rename to Composer/packages/extension-client/src/hooks/__tests__/useMenuConfig.test.tsx
index 01c0e2a916..2f6df9869b 100644
--- a/Composer/packages/editor-extension/src/hooks/__tests__/useMenuConfig.test.tsx
+++ b/Composer/packages/extension-client/src/hooks/__tests__/useMenuConfig.test.tsx
@@ -5,7 +5,7 @@ import React from 'react';
 import { renderHook } from '@bfc/test-utils/lib/hooks';
 
 import { useMenuConfig } from '../useMenuConfig';
-import ExtensionContext from '../../extensionContext';
+import EditorExtensionContext from '../../EditorExtensionContext';
 
 const plugins = {
   uiSchema: {
@@ -22,7 +22,7 @@ const plugins = {
 
 const wrapper: React.FC = ({ children }) => (
   // @ts-expect-error
-  <ExtensionContext.Provider value={{ plugins }}>{children}</ExtensionContext.Provider>
+  <EditorExtensionContext.Provider value={{ plugins }}>{children}</EditorExtensionContext.Provider>
 );
 
 describe('useMenuConfig', () => {
diff --git a/Composer/packages/editor-extension/src/hooks/__tests__/useRecognizerConfig.test.tsx b/Composer/packages/extension-client/src/hooks/__tests__/useRecognizerConfig.test.tsx
similarity index 81%
rename from Composer/packages/editor-extension/src/hooks/__tests__/useRecognizerConfig.test.tsx
rename to Composer/packages/extension-client/src/hooks/__tests__/useRecognizerConfig.test.tsx
index d5552d0ba6..8b50364a61 100644
--- a/Composer/packages/editor-extension/src/hooks/__tests__/useRecognizerConfig.test.tsx
+++ b/Composer/packages/extension-client/src/hooks/__tests__/useRecognizerConfig.test.tsx
@@ -5,7 +5,7 @@ import React from 'react';
 import { renderHook } from '@bfc/test-utils/lib/hooks';
 
 import { useRecognizerConfig } from '../useRecognizerConfig';
-import ExtensionContext from '../../extensionContext';
+import EditorExtensionContext from '../../EditorExtensionContext';
 
 const plugins = {
   uiSchema: {
@@ -23,7 +23,7 @@ const plugins = {
 
 const wrapper: React.FC = ({ children }) => (
   // @ts-expect-error
-  <ExtensionContext.Provider value={{ plugins }}>{children}</ExtensionContext.Provider>
+  <EditorExtensionContext.Provider value={{ plugins }}>{children}</EditorExtensionContext.Provider>
 );
 
 describe('useRecognizerConfig', () => {
diff --git a/Composer/packages/editor-extension/src/hooks/index.ts b/Composer/packages/extension-client/src/hooks/index.ts
similarity index 100%
rename from Composer/packages/editor-extension/src/hooks/index.ts
rename to Composer/packages/extension-client/src/hooks/index.ts
diff --git a/Composer/packages/editor-extension/src/hooks/useActionApi.ts b/Composer/packages/extension-client/src/hooks/useActionApi.ts
similarity index 100%
rename from Composer/packages/editor-extension/src/hooks/useActionApi.ts
rename to Composer/packages/extension-client/src/hooks/useActionApi.ts
diff --git a/Composer/packages/editor-extension/src/hooks/useDebounce.ts b/Composer/packages/extension-client/src/hooks/useDebounce.ts
similarity index 100%
rename from Composer/packages/editor-extension/src/hooks/useDebounce.ts
rename to Composer/packages/extension-client/src/hooks/useDebounce.ts
diff --git a/Composer/packages/editor-extension/src/hooks/useDialogApi.ts b/Composer/packages/extension-client/src/hooks/useDialogApi.ts
similarity index 100%
rename from Composer/packages/editor-extension/src/hooks/useDialogApi.ts
rename to Composer/packages/extension-client/src/hooks/useDialogApi.ts
diff --git a/Composer/packages/editor-extension/src/hooks/useDialogEditApi.ts b/Composer/packages/extension-client/src/hooks/useDialogEditApi.ts
similarity index 100%
rename from Composer/packages/editor-extension/src/hooks/useDialogEditApi.ts
rename to Composer/packages/extension-client/src/hooks/useDialogEditApi.ts
diff --git a/Composer/packages/editor-extension/src/hooks/useFlowConfig.ts b/Composer/packages/extension-client/src/hooks/useFlowConfig.ts
similarity index 74%
rename from Composer/packages/editor-extension/src/hooks/useFlowConfig.ts
rename to Composer/packages/extension-client/src/hooks/useFlowConfig.ts
index 64cd8103ad..fc01013e7f 100644
--- a/Composer/packages/editor-extension/src/hooks/useFlowConfig.ts
+++ b/Composer/packages/extension-client/src/hooks/useFlowConfig.ts
@@ -4,11 +4,11 @@
 import { useContext, useMemo } from 'react';
 import mapValues from 'lodash/mapValues';
 
-import ExtensionContext from '../extensionContext';
+import { EditorExtensionContext } from '../EditorExtensionContext';
 import { FlowUISchema } from '../types';
 
 export function useFlowConfig() {
-  const { plugins } = useContext(ExtensionContext);
+  const { plugins } = useContext(EditorExtensionContext);
 
   const config: FlowUISchema = useMemo(() => mapValues(plugins.uiSchema, 'flow'), [plugins.uiSchema]);
   return config;
diff --git a/Composer/packages/editor-extension/src/hooks/useFormConfig.ts b/Composer/packages/extension-client/src/hooks/useFormConfig.ts
similarity index 74%
rename from Composer/packages/editor-extension/src/hooks/useFormConfig.ts
rename to Composer/packages/extension-client/src/hooks/useFormConfig.ts
index ce5c75a692..f104dd9529 100644
--- a/Composer/packages/editor-extension/src/hooks/useFormConfig.ts
+++ b/Composer/packages/extension-client/src/hooks/useFormConfig.ts
@@ -4,11 +4,11 @@
 import { useContext, useMemo } from 'react';
 import mapValues from 'lodash/mapValues';
 
-import ExtensionContext from '../extensionContext';
+import { EditorExtensionContext } from '../EditorExtensionContext';
 import { FormUISchema } from '../types';
 
 export function useFormConfig() {
-  const { plugins } = useContext(ExtensionContext);
+  const { plugins } = useContext(EditorExtensionContext);
 
   const formConfig: FormUISchema = useMemo(() => mapValues(plugins.uiSchema, 'form'), [plugins.uiSchema]);
   return formConfig;
diff --git a/Composer/packages/editor-extension/src/hooks/useLgApi.ts b/Composer/packages/extension-client/src/hooks/useLgApi.ts
similarity index 100%
rename from Composer/packages/editor-extension/src/hooks/useLgApi.ts
rename to Composer/packages/extension-client/src/hooks/useLgApi.ts
diff --git a/Composer/packages/editor-extension/src/hooks/useLuApi.ts b/Composer/packages/extension-client/src/hooks/useLuApi.ts
similarity index 100%
rename from Composer/packages/editor-extension/src/hooks/useLuApi.ts
rename to Composer/packages/extension-client/src/hooks/useLuApi.ts
diff --git a/Composer/packages/editor-extension/src/hooks/useMenuConfig.ts b/Composer/packages/extension-client/src/hooks/useMenuConfig.ts
similarity index 72%
rename from Composer/packages/editor-extension/src/hooks/useMenuConfig.ts
rename to Composer/packages/extension-client/src/hooks/useMenuConfig.ts
index 24e752aaf5..0d41ffbb26 100644
--- a/Composer/packages/editor-extension/src/hooks/useMenuConfig.ts
+++ b/Composer/packages/extension-client/src/hooks/useMenuConfig.ts
@@ -4,11 +4,11 @@
 import { useContext, useMemo } from 'react';
 import mapValues from 'lodash/mapValues';
 
-import ExtensionContext from '../extensionContext';
+import { EditorExtensionContext } from '../EditorExtensionContext';
 import { MenuUISchema } from '../types';
 
 export function useMenuConfig(): MenuUISchema {
-  const { plugins } = useContext(ExtensionContext);
+  const { plugins } = useContext(EditorExtensionContext);
 
   return useMemo(() => mapValues(plugins.uiSchema, 'menu'), [plugins.uiSchema]);
 }
diff --git a/Composer/packages/editor-extension/src/hooks/useRecognizerConfig.ts b/Composer/packages/extension-client/src/hooks/useRecognizerConfig.ts
similarity index 60%
rename from Composer/packages/editor-extension/src/hooks/useRecognizerConfig.ts
rename to Composer/packages/extension-client/src/hooks/useRecognizerConfig.ts
index 77257bb351..1d28715cff 100644
--- a/Composer/packages/editor-extension/src/hooks/useRecognizerConfig.ts
+++ b/Composer/packages/extension-client/src/hooks/useRecognizerConfig.ts
@@ -3,10 +3,10 @@
 
 import { useContext } from 'react';
 
-import ExtensionContext from '../extensionContext';
+import { EditorExtensionContext } from '../EditorExtensionContext';
 
 export function useRecognizerConfig() {
-  const { plugins } = useContext(ExtensionContext);
+  const { plugins } = useContext(EditorExtensionContext);
 
   return plugins.recognizers ?? [];
 }
diff --git a/Composer/packages/editor-extension/src/hooks/useShellApi.ts b/Composer/packages/extension-client/src/hooks/useShellApi.ts
similarity index 83%
rename from Composer/packages/editor-extension/src/hooks/useShellApi.ts
rename to Composer/packages/extension-client/src/hooks/useShellApi.ts
index d06f8e735c..a2887200a1 100644
--- a/Composer/packages/editor-extension/src/hooks/useShellApi.ts
+++ b/Composer/packages/extension-client/src/hooks/useShellApi.ts
@@ -3,7 +3,7 @@
 import { useContext } from 'react';
 import { ShellApi, ShellData } from '@bfc/shared';
 
-import ExtensionContext from '../extensionContext';
+import { EditorExtensionContext } from '../EditorExtensionContext';
 import { PluginConfig } from '../types';
 
 interface ShellContext extends ShellData {
@@ -12,7 +12,7 @@ interface ShellContext extends ShellData {
 }
 
 export function useShellApi(): ShellContext {
-  const { shellApi, shellData, plugins } = useContext(ExtensionContext);
+  const { shellApi, shellData, plugins } = useContext(EditorExtensionContext);
 
   if (!shellApi) {
     // eslint-disable-next-line no-console
diff --git a/Composer/packages/editor-extension/src/hooks/useTriggerApi.ts b/Composer/packages/extension-client/src/hooks/useTriggerApi.ts
similarity index 100%
rename from Composer/packages/editor-extension/src/hooks/useTriggerApi.ts
rename to Composer/packages/extension-client/src/hooks/useTriggerApi.ts
diff --git a/Composer/packages/extension-client/src/index.ts b/Composer/packages/extension-client/src/index.ts
index 7cccef9d08..e0a8bf146b 100644
--- a/Composer/packages/extension-client/src/index.ts
+++ b/Composer/packages/extension-client/src/index.ts
@@ -3,4 +3,9 @@
 
 export * from './auth';
 export * from './common';
+export * from './components';
+export * from './EditorExtensionContext';
+export * from './hooks';
 export * from './publish';
+export * from './types';
+export * from './utils';
diff --git a/Composer/packages/editor-extension/src/types/extension.ts b/Composer/packages/extension-client/src/types/extension.ts
similarity index 100%
rename from Composer/packages/editor-extension/src/types/extension.ts
rename to Composer/packages/extension-client/src/types/extension.ts
diff --git a/Composer/packages/editor-extension/src/types/flowSchema.ts b/Composer/packages/extension-client/src/types/flowSchema.ts
similarity index 100%
rename from Composer/packages/editor-extension/src/types/flowSchema.ts
rename to Composer/packages/extension-client/src/types/flowSchema.ts
diff --git a/Composer/packages/editor-extension/src/types/form.ts b/Composer/packages/extension-client/src/types/form.ts
similarity index 100%
rename from Composer/packages/editor-extension/src/types/form.ts
rename to Composer/packages/extension-client/src/types/form.ts
diff --git a/Composer/packages/editor-extension/src/types/formSchema.ts b/Composer/packages/extension-client/src/types/formSchema.ts
similarity index 100%
rename from Composer/packages/editor-extension/src/types/formSchema.ts
rename to Composer/packages/extension-client/src/types/formSchema.ts
diff --git a/Composer/packages/editor-extension/src/types/index.ts b/Composer/packages/extension-client/src/types/index.ts
similarity index 100%
rename from Composer/packages/editor-extension/src/types/index.ts
rename to Composer/packages/extension-client/src/types/index.ts
diff --git a/Composer/packages/editor-extension/src/types/menuSchema.ts b/Composer/packages/extension-client/src/types/menuSchema.ts
similarity index 100%
rename from Composer/packages/editor-extension/src/types/menuSchema.ts
rename to Composer/packages/extension-client/src/types/menuSchema.ts
diff --git a/Composer/packages/editor-extension/src/utils/__tests__/mergePluginConfigs.test.ts b/Composer/packages/extension-client/src/utils/__tests__/mergePluginConfigs.test.ts
similarity index 100%
rename from Composer/packages/editor-extension/src/utils/__tests__/mergePluginConfigs.test.ts
rename to Composer/packages/extension-client/src/utils/__tests__/mergePluginConfigs.test.ts
diff --git a/Composer/packages/editor-extension/src/utils/index.ts b/Composer/packages/extension-client/src/utils/index.ts
similarity index 100%
rename from Composer/packages/editor-extension/src/utils/index.ts
rename to Composer/packages/extension-client/src/utils/index.ts
diff --git a/Composer/packages/editor-extension/src/utils/mergePluginConfigs.ts b/Composer/packages/extension-client/src/utils/mergePluginConfigs.ts
similarity index 100%
rename from Composer/packages/editor-extension/src/utils/mergePluginConfigs.ts
rename to Composer/packages/extension-client/src/utils/mergePluginConfigs.ts
diff --git a/Composer/packages/editor-extension/tsconfig.build.json b/Composer/packages/extension-client/tsconfig.build.json
similarity index 100%
rename from Composer/packages/editor-extension/tsconfig.build.json
rename to Composer/packages/extension-client/tsconfig.build.json
diff --git a/Composer/packages/lib/ui-shared/package.json b/Composer/packages/lib/ui-shared/package.json
index 1d30800f45..5ef946a1a3 100644
--- a/Composer/packages/lib/ui-shared/package.json
+++ b/Composer/packages/lib/ui-shared/package.json
@@ -23,13 +23,13 @@
     "@bfc/adaptive-form": "*",
     "@emotion/core": "^10.0.27",
     "@emotion/styled": "^10.0.27",
-    "@bfc/editor-extension": "*",
+    "@bfc/extension-client": "*",
     "react": "16.13.0",
     "react-dom": "16.13.0"
   },
   "devDependencies": {
     "@bfc/adaptive-form": "*",
-    "@bfc/editor-extension": "*",
+    "@bfc/extension-client": "*",
     "@bfc/test-utils": "*",
     "@types/react": "16.9.23",
     "@types/react-dom": "16.9.5",
diff --git a/Composer/packages/ui-plugins/composer/package.json b/Composer/packages/ui-plugins/composer/package.json
index 89437f4717..b5314e4e90 100644
--- a/Composer/packages/ui-plugins/composer/package.json
+++ b/Composer/packages/ui-plugins/composer/package.json
@@ -18,7 +18,7 @@
   "license": "MIT",
   "peerDependencies": {
     "@bfc/adaptive-form": "*",
-    "@bfc/editor-extension": "*",
+    "@bfc/extension-client": "*",
     "@bfc/intellisense": "*",
     "@emotion/core": "^10.0.27",
     "@uifabric/fluent-theme": "^7.1.4",
@@ -30,7 +30,7 @@
   },
   "devDependencies": {
     "@bfc/adaptive-form": "*",
-    "@bfc/editor-extension": "*",
+    "@bfc/extension-client": "*",
     "@bfc/intellisense": "*",
     "@bfc/test-utils": "*",
     "@emotion/core": "^10.0.27",
diff --git a/Composer/packages/ui-plugins/composer/src/defaultMenuSchema.ts b/Composer/packages/ui-plugins/composer/src/defaultMenuSchema.ts
index e9b72ee8a0..e076e92b9c 100644
--- a/Composer/packages/ui-plugins/composer/src/defaultMenuSchema.ts
+++ b/Composer/packages/ui-plugins/composer/src/defaultMenuSchema.ts
@@ -2,7 +2,7 @@
 // Licensed under the MIT License.
 
 import formatMessage from 'format-message';
-import { MenuUISchema } from '@bfc/editor-extension';
+import { MenuUISchema } from '@bfc/extension-client';
 import { SDKKinds } from '@bfc/shared';
 
 const SubmenuNames = {
diff --git a/Composer/packages/ui-plugins/composer/src/index.ts b/Composer/packages/ui-plugins/composer/src/index.ts
index e55f6c9545..813fb72d63 100644
--- a/Composer/packages/ui-plugins/composer/src/index.ts
+++ b/Composer/packages/ui-plugins/composer/src/index.ts
@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
-import { PluginConfig, FormUISchema, RecognizerSchema, UISchema, MenuUISchema } from '@bfc/editor-extension';
+import { PluginConfig, FormUISchema, RecognizerSchema, UISchema, MenuUISchema } from '@bfc/extension-client';
 import { SDKKinds } from '@bfc/shared';
 import formatMessage from 'format-message';
 import mapValues from 'lodash/mapValues';
diff --git a/Composer/packages/ui-plugins/cross-trained/package.json b/Composer/packages/ui-plugins/cross-trained/package.json
index 4a0c8fcc6f..382601c127 100644
--- a/Composer/packages/ui-plugins/cross-trained/package.json
+++ b/Composer/packages/ui-plugins/cross-trained/package.json
@@ -21,13 +21,13 @@
   "license": "MIT",
   "peerDependencies": {
     "@bfc/adaptive-form": "*",
-    "@bfc/editor-extension": "*",
+    "@bfc/extension-client": "*",
     "react": "16.13.0",
     "react-dom": "16.13.0"
   },
   "devDependencies": {
     "@bfc/adaptive-form": "*",
-    "@bfc/editor-extension": "*",
+    "@bfc/extension-client": "*",
     "@types/react": "16.9.23",
     "@types/react-dom": "16.9.5",
     "react": "16.13.0",
diff --git a/Composer/packages/ui-plugins/cross-trained/src/index.ts b/Composer/packages/ui-plugins/cross-trained/src/index.ts
index 24d7b3f115..d04096f87d 100644
--- a/Composer/packages/ui-plugins/cross-trained/src/index.ts
+++ b/Composer/packages/ui-plugins/cross-trained/src/index.ts
@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
-import { PluginConfig } from '@bfc/editor-extension';
+import { PluginConfig } from '@bfc/extension-client';
 import { SDKKinds } from '@bfc/shared';
 
 const config: PluginConfig = {
diff --git a/Composer/packages/ui-plugins/example/package.json b/Composer/packages/ui-plugins/example/package.json
index 4325113e02..2cf4bf54e3 100644
--- a/Composer/packages/ui-plugins/example/package.json
+++ b/Composer/packages/ui-plugins/example/package.json
@@ -17,7 +17,7 @@
   "license": "MIT",
   "peerDependencies": {
     "@bfc/adaptive-form": "*",
-    "@bfc/editor-extension": "*",
+    "@bfc/extension-client": "*",
     "@emotion/core": "^10.0.27",
     "@uifabric/fluent-theme": "^7.1.4",
     "@uifabric/icons": "^7.3.0",
@@ -28,7 +28,7 @@
   },
   "devDependencies": {
     "@bfc/adaptive-form": "*",
-    "@bfc/editor-extension": "*",
+    "@bfc/extension-client": "*",
     "@bfc/test-utils": "*",
     "@emotion/core": "^10.0.27",
     "@types/react": "16.9.23",
diff --git a/Composer/packages/ui-plugins/example/src/index.ts b/Composer/packages/ui-plugins/example/src/index.ts
index 15e84d4ae9..da8aeb2ac4 100644
--- a/Composer/packages/ui-plugins/example/src/index.ts
+++ b/Composer/packages/ui-plugins/example/src/index.ts
@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
-import { PluginConfig } from '@bfc/editor-extension';
+import { PluginConfig } from '@bfc/extension-client';
 
 const config: PluginConfig = {};
 
diff --git a/Composer/packages/ui-plugins/lg/package.json b/Composer/packages/ui-plugins/lg/package.json
index 7ff437b1fe..e5586a41ef 100644
--- a/Composer/packages/ui-plugins/lg/package.json
+++ b/Composer/packages/ui-plugins/lg/package.json
@@ -22,13 +22,13 @@
   "license": "MIT",
   "peerDependencies": {
     "@bfc/adaptive-form": "*",
-    "@bfc/editor-extension": "*",
+    "@bfc/extension-client": "*",
     "react": "16.13.0",
     "react-dom": "16.13.0"
   },
   "devDependencies": {
     "@bfc/adaptive-form": "*",
-    "@bfc/editor-extension": "*",
+    "@bfc/extension-client": "*",
     "@bfc/test-utils": "*",
     "@types/react": "16.9.23",
     "@types/react-dom": "16.9.5",
diff --git a/Composer/packages/ui-plugins/lg/src/LgField.tsx b/Composer/packages/ui-plugins/lg/src/LgField.tsx
index 565805882f..eb11ff737a 100644
--- a/Composer/packages/ui-plugins/lg/src/LgField.tsx
+++ b/Composer/packages/ui-plugins/lg/src/LgField.tsx
@@ -5,7 +5,7 @@
 import { jsx } from '@emotion/core';
 import React, { useCallback } from 'react';
 import { LgEditor } from '@bfc/code-editor';
-import { FieldProps, useShellApi } from '@bfc/editor-extension';
+import { FieldProps, useShellApi } from '@bfc/extension-client';
 import { FieldLabel } from '@bfc/adaptive-form';
 import { LgMetaData, LgTemplateRef, LgType, CodeEditorSettings } from '@bfc/shared';
 import { filterTemplateDiagnostics } from '@bfc/indexers';
diff --git a/Composer/packages/ui-plugins/lg/src/LgWidget/LgWidget.tsx b/Composer/packages/ui-plugins/lg/src/LgWidget/LgWidget.tsx
index 6641e1fd8a..293f0b926d 100644
--- a/Composer/packages/ui-plugins/lg/src/LgWidget/LgWidget.tsx
+++ b/Composer/packages/ui-plugins/lg/src/LgWidget/LgWidget.tsx
@@ -3,7 +3,7 @@
 
 import React from 'react';
 import get from 'lodash/get';
-import { WidgetContainerProps } from '@bfc/editor-extension';
+import { WidgetContainerProps } from '@bfc/extension-client';
 import { MultilineTextWithEllipsis } from '@bfc/ui-shared';
 
 import { useLgTemplate } from './useLgTemplate';
diff --git a/Composer/packages/ui-plugins/lg/src/LgWidget/useLgTemplate.ts b/Composer/packages/ui-plugins/lg/src/LgWidget/useLgTemplate.ts
index efbca40f65..14bd531ade 100644
--- a/Composer/packages/ui-plugins/lg/src/LgWidget/useLgTemplate.ts
+++ b/Composer/packages/ui-plugins/lg/src/LgWidget/useLgTemplate.ts
@@ -2,7 +2,7 @@
 // Licensed under the MIT License.
 
 import { LgTemplateRef, LgFile, LgTemplate } from '@bfc/shared';
-import { useShellApi } from '@bfc/editor-extension';
+import { useShellApi } from '@bfc/extension-client';
 
 export const queryLgTemplate = (templateId: string, lgFileId: string, lgFiles: LgFile[]): LgTemplate | undefined => {
   return lgFiles.find(({ id }) => id === lgFileId)?.templates?.find(({ name }) => name === templateId);
diff --git a/Composer/packages/ui-plugins/lg/src/index.ts b/Composer/packages/ui-plugins/lg/src/index.ts
index 527415caa2..b47e9f8075 100644
--- a/Composer/packages/ui-plugins/lg/src/index.ts
+++ b/Composer/packages/ui-plugins/lg/src/index.ts
@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
-import { PluginConfig } from '@bfc/editor-extension';
+import { PluginConfig } from '@bfc/extension-client';
 import { SDKKinds } from '@bfc/shared';
 import { VisualEditorColors as Colors } from '@bfc/ui-shared';
 
diff --git a/Composer/packages/ui-plugins/luis/package.json b/Composer/packages/ui-plugins/luis/package.json
index b44e0fdde9..e979418ea7 100644
--- a/Composer/packages/ui-plugins/luis/package.json
+++ b/Composer/packages/ui-plugins/luis/package.json
@@ -22,14 +22,14 @@
   "license": "MIT",
   "peerDependencies": {
     "@bfc/adaptive-form": "*",
-    "@bfc/editor-extension": "*",
+    "@bfc/extension-client": "*",
     "@bfc/shared": "*",
     "react": "16.13.0",
     "react-dom": "16.13.0"
   },
   "devDependencies": {
     "@bfc/adaptive-form": "*",
-    "@bfc/editor-extension": "*",
+    "@bfc/extension-client": "*",
     "@bfc/test-utils": "*",
     "@types/react": "16.9.23",
     "@types/react-dom": "16.9.5",
diff --git a/Composer/packages/ui-plugins/luis/src/LuisIntentEditor.tsx b/Composer/packages/ui-plugins/luis/src/LuisIntentEditor.tsx
index e475d73f82..d1ea6ab169 100644
--- a/Composer/packages/ui-plugins/luis/src/LuisIntentEditor.tsx
+++ b/Composer/packages/ui-plugins/luis/src/LuisIntentEditor.tsx
@@ -5,7 +5,7 @@
 import { jsx } from '@emotion/core';
 import React, { useMemo } from 'react';
 import { LuEditor, inlineModePlaceholder } from '@bfc/code-editor';
-import { FieldProps, useShellApi } from '@bfc/editor-extension';
+import { FieldProps, useShellApi } from '@bfc/extension-client';
 import { filterSectionDiagnostics } from '@bfc/indexers';
 import { LuIntentSection, CodeEditorSettings, LuMetaData, LuType } from '@bfc/shared';
 
diff --git a/Composer/packages/ui-plugins/luis/src/index.ts b/Composer/packages/ui-plugins/luis/src/index.ts
index 1501ddea13..d82ca88b36 100644
--- a/Composer/packages/ui-plugins/luis/src/index.ts
+++ b/Composer/packages/ui-plugins/luis/src/index.ts
@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
-import { PluginConfig } from '@bfc/editor-extension';
+import { PluginConfig } from '@bfc/extension-client';
 import { SDKKinds } from '@bfc/shared';
 
 import { LuisIntentEditor } from './LuisIntentEditor';
diff --git a/Composer/packages/ui-plugins/prompts/package.json b/Composer/packages/ui-plugins/prompts/package.json
index 6b923524ce..803e95ff08 100644
--- a/Composer/packages/ui-plugins/prompts/package.json
+++ b/Composer/packages/ui-plugins/prompts/package.json
@@ -21,7 +21,7 @@
   "author": "andy.brown@microsoft.com",
   "license": "MIT",
   "peerDependencies": {
-    "@bfc/editor-extension": "*",
+    "@bfc/extension-client": "*",
     "@bfc/adaptive-form": "*",
     "@uifabric/fluent-theme": "^7.1.4",
     "@uifabric/icons": "^7.3.0",
@@ -32,7 +32,7 @@
     "react-dom": "16.13.0"
   },
   "devDependencies": {
-    "@bfc/editor-extension": "*",
+    "@bfc/extension-client": "*",
     "@bfc/adaptive-form": "*",
     "@bfc/test-utils": "*",
     "@types/react": "16.9.23",
diff --git a/Composer/packages/ui-plugins/prompts/src/PromptField/UserInput.tsx b/Composer/packages/ui-plugins/prompts/src/PromptField/UserInput.tsx
index d260cab2cd..e6b481d525 100644
--- a/Composer/packages/ui-plugins/prompts/src/PromptField/UserInput.tsx
+++ b/Composer/packages/ui-plugins/prompts/src/PromptField/UserInput.tsx
@@ -6,7 +6,7 @@ import { jsx } from '@emotion/core';
 import React, { Fragment } from 'react';
 import { SDKKinds, MicrosoftInputDialog, ChoiceInput, ConfirmInput, LuMetaData, LuType } from '@bfc/shared';
 import { FieldLabel, SchemaField } from '@bfc/adaptive-form';
-import { JSONSchema7, useShellApi, useRecognizerConfig } from '@bfc/editor-extension';
+import { JSONSchema7, useShellApi, useRecognizerConfig } from '@bfc/extension-client';
 import formatMessage from 'format-message';
 
 import { PromptFieldProps } from './types';
diff --git a/Composer/packages/ui-plugins/prompts/src/PromptField/index.tsx b/Composer/packages/ui-plugins/prompts/src/PromptField/index.tsx
index ea72c92a52..3b176174ac 100644
--- a/Composer/packages/ui-plugins/prompts/src/PromptField/index.tsx
+++ b/Composer/packages/ui-plugins/prompts/src/PromptField/index.tsx
@@ -4,7 +4,7 @@
 import React from 'react';
 import { Pivot, PivotLinkSize, PivotItem } from 'office-ui-fabric-react/lib/Pivot';
 import get from 'lodash/get';
-import { FieldProps, useShellApi } from '@bfc/editor-extension';
+import { FieldProps, useShellApi } from '@bfc/extension-client';
 import { SchemaField } from '@bfc/adaptive-form';
 import { PromptTab, PropmtTabTitles } from '@bfc/shared';
 
diff --git a/Composer/packages/ui-plugins/prompts/src/PromptField/types.ts b/Composer/packages/ui-plugins/prompts/src/PromptField/types.ts
index 8051fdbaf1..c1d17a7dd9 100644
--- a/Composer/packages/ui-plugins/prompts/src/PromptField/types.ts
+++ b/Composer/packages/ui-plugins/prompts/src/PromptField/types.ts
@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
-import { FieldProps, JSONSchema7 } from '@bfc/editor-extension';
+import { FieldProps, JSONSchema7 } from '@bfc/extension-client';
 import { MicrosoftInputDialog, ChoiceInput, ConfirmInput } from '@bfc/shared';
 
 export type InputDialogKeys = keyof MicrosoftInputDialog | keyof ChoiceInput | keyof ConfirmInput;
diff --git a/Composer/packages/ui-plugins/prompts/src/index.tsx b/Composer/packages/ui-plugins/prompts/src/index.tsx
index 4c52c76e08..bccdbcae66 100644
--- a/Composer/packages/ui-plugins/prompts/src/index.tsx
+++ b/Composer/packages/ui-plugins/prompts/src/index.tsx
@@ -2,7 +2,7 @@
 // Licensed under the MIT License.
 
 import React from 'react';
-import { FlowWidget, PluginConfig, UIOptions } from '@bfc/editor-extension';
+import { FlowWidget, PluginConfig, UIOptions } from '@bfc/extension-client';
 import { SDKKinds, getInputType, PromptTab, PropmtTabTitles } from '@bfc/shared';
 import { VisualEditorColors as Colors, ListOverview, BorderedDiv, FixedInfo } from '@bfc/ui-shared';
 import formatMessage from 'format-message';
diff --git a/Composer/packages/ui-plugins/schema-editor/package.json b/Composer/packages/ui-plugins/schema-editor/package.json
index 7ff77e559d..ce440bd681 100644
--- a/Composer/packages/ui-plugins/schema-editor/package.json
+++ b/Composer/packages/ui-plugins/schema-editor/package.json
@@ -20,7 +20,7 @@
   "author": "tj.durnford@microsoft.com",
   "license": "MIT",
   "peerDependencies": {
-    "@bfc/editor-extension": "*",
+    "@bfc/extension-client": "*",
     "@bfc/adaptive-form": "*",
     "@bfc/code-editor": "*",
     "format-message": "^6.2.3",
@@ -28,7 +28,7 @@
     "react-dom": "16.13.0"
   },
   "devDependencies": {
-    "@bfc/editor-extension": "*",
+    "@bfc/extension-client": "*",
     "@bfc/adaptive-form": "*",
     "@bfc/test-utils": "*",
     "@types/react": "16.9.23",
diff --git a/Composer/packages/ui-plugins/schema-editor/src/Fields/AdaptiveDialogField.tsx b/Composer/packages/ui-plugins/schema-editor/src/Fields/AdaptiveDialogField.tsx
index 452a503fa7..d2a234c39c 100644
--- a/Composer/packages/ui-plugins/schema-editor/src/Fields/AdaptiveDialogField.tsx
+++ b/Composer/packages/ui-plugins/schema-editor/src/Fields/AdaptiveDialogField.tsx
@@ -3,7 +3,7 @@
 
 import React from 'react';
 import { SchemaField } from '@bfc/adaptive-form';
-import { FieldProps } from '@bfc/editor-extension';
+import { FieldProps } from '@bfc/extension-client';
 
 import { SchemaEditorField } from './SchemaEditorField';
 
diff --git a/Composer/packages/ui-plugins/schema-editor/src/Fields/CollapsedField.tsx b/Composer/packages/ui-plugins/schema-editor/src/Fields/CollapsedField.tsx
index 3174dc73de..38d71a97b4 100644
--- a/Composer/packages/ui-plugins/schema-editor/src/Fields/CollapsedField.tsx
+++ b/Composer/packages/ui-plugins/schema-editor/src/Fields/CollapsedField.tsx
@@ -5,7 +5,7 @@
 import { css, jsx } from '@emotion/core';
 import React from 'react';
 import { CollapseField as Collapse, SchemaField } from '@bfc/adaptive-form';
-import { FieldProps } from '@bfc/editor-extension';
+import { FieldProps } from '@bfc/extension-client';
 import formatMessage from 'format-message';
 
 const style = {
diff --git a/Composer/packages/ui-plugins/schema-editor/src/Fields/SchemaEditorField.tsx b/Composer/packages/ui-plugins/schema-editor/src/Fields/SchemaEditorField.tsx
index 3754153e9f..6730f1b4dc 100644
--- a/Composer/packages/ui-plugins/schema-editor/src/Fields/SchemaEditorField.tsx
+++ b/Composer/packages/ui-plugins/schema-editor/src/Fields/SchemaEditorField.tsx
@@ -3,7 +3,7 @@
 
 import React, { useMemo } from 'react';
 import AdaptiveForm from '@bfc/adaptive-form';
-import { useShellApi, JSONSchema7 } from '@bfc/editor-extension';
+import { useShellApi, JSONSchema7 } from '@bfc/extension-client';
 
 import { getDefaultDialogSchema } from '../utils/getDefaultDialogSchema';
 import { getDefinitions } from '../utils/getDefinitions';
diff --git a/Composer/packages/ui-plugins/schema-editor/src/Fields/ValueRefField.tsx b/Composer/packages/ui-plugins/schema-editor/src/Fields/ValueRefField.tsx
index 0a1654e526..be2a103187 100644
--- a/Composer/packages/ui-plugins/schema-editor/src/Fields/ValueRefField.tsx
+++ b/Composer/packages/ui-plugins/schema-editor/src/Fields/ValueRefField.tsx
@@ -4,7 +4,7 @@
 import React, { useMemo } from 'react';
 import { Dropdown, IDropdownOption, ResponsiveMode } from 'office-ui-fabric-react/lib/Dropdown';
 import { FieldLabel } from '@bfc/adaptive-form';
-import { FieldProps } from '@bfc/editor-extension';
+import { FieldProps } from '@bfc/extension-client';
 import startCase from 'lodash/startCase';
 
 import { valueTypeDefinitions } from '../schema';
diff --git a/Composer/packages/ui-plugins/schema-editor/src/__tests__/SchemaEditorField.test.tsx b/Composer/packages/ui-plugins/schema-editor/src/__tests__/SchemaEditorField.test.tsx
index 85daeefefe..0886da3045 100644
--- a/Composer/packages/ui-plugins/schema-editor/src/__tests__/SchemaEditorField.test.tsx
+++ b/Composer/packages/ui-plugins/schema-editor/src/__tests__/SchemaEditorField.test.tsx
@@ -3,7 +3,7 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
 
 import React from 'react';
-import Extension from '@bfc/editor-extension';
+import { EditorExtension } from '@bfc/extension-client';
 import { render, fireEvent, findAllByRole } from '@bfc/test-utils';
 
 import { SchemaEditorField } from '../Fields/SchemaEditorField';
@@ -25,9 +25,9 @@ const renderSchemaEditor = ({ updateDialogSchema = jest.fn() } = {}) => {
   };
 
   return render(
-    <Extension plugins={{}} shell={shell}>
+    <EditorExtension plugins={{}} shell={shell}>
       <SchemaEditorField />
-    </Extension>
+    </EditorExtension>
   );
 };
 
diff --git a/Composer/packages/ui-plugins/schema-editor/src/formSchema.ts b/Composer/packages/ui-plugins/schema-editor/src/formSchema.ts
index d3f6cc4977..17aecf7aa0 100644
--- a/Composer/packages/ui-plugins/schema-editor/src/formSchema.ts
+++ b/Composer/packages/ui-plugins/schema-editor/src/formSchema.ts
@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
-import { UISchema } from '@bfc/editor-extension';
+import { UISchema } from '@bfc/extension-client';
 import { SDKKinds } from '@bfc/shared';
 
 import { AdaptiveDialogField } from './Fields/AdaptiveDialogField';
diff --git a/Composer/packages/ui-plugins/schema-editor/src/index.ts b/Composer/packages/ui-plugins/schema-editor/src/index.ts
index 12cca1a8b5..2376dd3deb 100644
--- a/Composer/packages/ui-plugins/schema-editor/src/index.ts
+++ b/Composer/packages/ui-plugins/schema-editor/src/index.ts
@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
-import { PluginConfig } from '@bfc/editor-extension';
+import { PluginConfig } from '@bfc/extension-client';
 
 import uiSchema from './formSchema';
 
diff --git a/Composer/packages/ui-plugins/schema-editor/src/schema.ts b/Composer/packages/ui-plugins/schema-editor/src/schema.ts
index 1903ceeddc..1c3bc5ee2f 100644
--- a/Composer/packages/ui-plugins/schema-editor/src/schema.ts
+++ b/Composer/packages/ui-plugins/schema-editor/src/schema.ts
@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
-import { JSONSchema7 } from '@bfc/editor-extension';
+import { JSONSchema7 } from '@bfc/extension-client';
 import formatMessage from 'format-message';
 
 export const schema = (): JSONSchema7 => ({
diff --git a/Composer/packages/ui-plugins/schema-editor/src/uiOptions.ts b/Composer/packages/ui-plugins/schema-editor/src/uiOptions.ts
index 74fbcedc69..ef8b2febf8 100644
--- a/Composer/packages/ui-plugins/schema-editor/src/uiOptions.ts
+++ b/Composer/packages/ui-plugins/schema-editor/src/uiOptions.ts
@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
-import { UIOptions } from '@bfc/editor-extension';
+import { UIOptions } from '@bfc/extension-client';
 import startCase from 'lodash/startCase';
 
 import { CollapsedField } from './Fields/CollapsedField';
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 1622c4137c..1014b0cfb1 100644
--- a/Composer/packages/ui-plugins/schema-editor/src/utils/getDefinitions.ts
+++ b/Composer/packages/ui-plugins/schema-editor/src/utils/getDefinitions.ts
@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
-import { JSONSchema7, JSONSchema7Definition } from '@bfc/editor-extension';
+import { JSONSchema7, JSONSchema7Definition } from '@bfc/extension-client';
 
 export const getDefinitions = (expressions: JSONSchema7[] = [], definitions: { [key: string]: JSONSchema7 }) =>
   expressions.reduce((acc: { [key: string]: JSONSchema7Definition }, schema: any) => {
diff --git a/Composer/packages/ui-plugins/select-dialog/package.json b/Composer/packages/ui-plugins/select-dialog/package.json
index 58c9e67e29..fded97e09a 100644
--- a/Composer/packages/ui-plugins/select-dialog/package.json
+++ b/Composer/packages/ui-plugins/select-dialog/package.json
@@ -21,7 +21,7 @@
   "author": "v-thdurn@microsoft.com",
   "license": "MIT",
   "peerDependencies": {
-    "@bfc/editor-extension": "*",
+    "@bfc/extension-client": "*",
     "@bfc/adaptive-form": "*",
     "@uifabric/fluent-theme": "^7.1.4",
     "@uifabric/icons": "^7.3.0",
@@ -32,7 +32,7 @@
     "react-dom": "16.13.0"
   },
   "devDependencies": {
-    "@bfc/editor-extension": "*",
+    "@bfc/extension-client": "*",
     "@bfc/adaptive-form": "*",
     "@bfc/test-utils": "*",
     "@types/react": "16.9.23",
diff --git a/Composer/packages/ui-plugins/select-dialog/src/ComboBoxField.tsx b/Composer/packages/ui-plugins/select-dialog/src/ComboBoxField.tsx
index d41b72b719..845cd622d1 100644
--- a/Composer/packages/ui-plugins/select-dialog/src/ComboBoxField.tsx
+++ b/Composer/packages/ui-plugins/select-dialog/src/ComboBoxField.tsx
@@ -4,7 +4,7 @@
 import React from 'react';
 import { ComboBox, IComboBoxOption } from 'office-ui-fabric-react/lib/ComboBox';
 import { FieldLabel } from '@bfc/adaptive-form';
-import { FieldProps } from '@bfc/editor-extension';
+import { FieldProps } from '@bfc/extension-client';
 import { Icon } from 'office-ui-fabric-react/lib/Icon';
 import { ISelectableOption } from 'office-ui-fabric-react/lib/utilities/selectableOption';
 import { IRenderFunction } from 'office-ui-fabric-react/lib/Utilities';
diff --git a/Composer/packages/ui-plugins/select-dialog/src/SelectDialog.tsx b/Composer/packages/ui-plugins/select-dialog/src/SelectDialog.tsx
index 126db0186b..9b599d2591 100644
--- a/Composer/packages/ui-plugins/select-dialog/src/SelectDialog.tsx
+++ b/Composer/packages/ui-plugins/select-dialog/src/SelectDialog.tsx
@@ -3,7 +3,7 @@
 
 import React, { useState } from 'react';
 import { IComboBoxOption, SelectableOptionMenuItemType } from 'office-ui-fabric-react/lib/ComboBox';
-import { FieldProps, useShellApi } from '@bfc/editor-extension';
+import { FieldProps, useShellApi } from '@bfc/extension-client';
 import formatMessage from 'format-message';
 
 import ComboBoxField, { ADD_DIALOG } from './ComboBoxField';
diff --git a/Composer/packages/ui-plugins/select-dialog/src/__tests__/selectDialog.test.tsx b/Composer/packages/ui-plugins/select-dialog/src/__tests__/selectDialog.test.tsx
index fd76a2d3e9..5924da6434 100644
--- a/Composer/packages/ui-plugins/select-dialog/src/__tests__/selectDialog.test.tsx
+++ b/Composer/packages/ui-plugins/select-dialog/src/__tests__/selectDialog.test.tsx
@@ -5,7 +5,7 @@
 
 import React from 'react';
 import { fireEvent, getAllByRole, render } from '@bfc/test-utils';
-import { Extension } from '@bfc/editor-extension';
+import { EditorExtension } from '@bfc/extension-client';
 
 import { SelectDialog } from '../SelectDialog';
 
@@ -33,9 +33,9 @@ const renderSelectDialog = ({ createDialog, navTo, onChange } = {}) => {
     ],
   };
   return render(
-    <Extension shell={{ api: shell, data: shellData }}>
+    <EditorExtension shell={{ api: shell, data: shellData }}>
       <SelectDialog {...props} />
-    </Extension>
+    </EditorExtension>
   );
 };
 
diff --git a/Composer/packages/ui-plugins/select-dialog/src/index.ts b/Composer/packages/ui-plugins/select-dialog/src/index.ts
index da75a5665d..ad19ba9ed8 100644
--- a/Composer/packages/ui-plugins/select-dialog/src/index.ts
+++ b/Composer/packages/ui-plugins/select-dialog/src/index.ts
@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
-import { PluginConfig } from '@bfc/editor-extension';
+import { PluginConfig } from '@bfc/extension-client';
 import { SDKKinds } from '@bfc/shared';
 
 import { SelectDialog } from './SelectDialog';
diff --git a/Composer/packages/ui-plugins/select-skill-dialog/package.json b/Composer/packages/ui-plugins/select-skill-dialog/package.json
index 71169d8cb7..3128f70498 100644
--- a/Composer/packages/ui-plugins/select-skill-dialog/package.json
+++ b/Composer/packages/ui-plugins/select-skill-dialog/package.json
@@ -21,7 +21,7 @@
   "author": "v-thdurn@microsoft.com",
   "license": "MIT",
   "peerDependencies": {
-    "@bfc/editor-extension": "*",
+    "@bfc/extension-client": "*",
     "@bfc/adaptive-form": "*",
     "@uifabric/fluent-theme": "^7.1.4",
     "@uifabric/icons": "^7.3.0",
@@ -33,7 +33,7 @@
   },
   "devDependencies": {
     "@bfc/adaptive-form": "*",
-    "@bfc/editor-extension": "*",
+    "@bfc/extension-client": "*",
     "@bfc/test-utils": "*",
     "@types/react": "16.9.23",
     "@types/react-dom": "16.9.5",
diff --git a/Composer/packages/ui-plugins/select-skill-dialog/src/BeginSkillDialogField.tsx b/Composer/packages/ui-plugins/select-skill-dialog/src/BeginSkillDialogField.tsx
index 9cf4249d29..b1952569fa 100644
--- a/Composer/packages/ui-plugins/select-skill-dialog/src/BeginSkillDialogField.tsx
+++ b/Composer/packages/ui-plugins/select-skill-dialog/src/BeginSkillDialogField.tsx
@@ -2,7 +2,7 @@
 // Licensed under the MIT License.
 
 import React, { useMemo } from 'react';
-import { FieldProps, JSONSchema7, useShellApi } from '@bfc/editor-extension';
+import { FieldProps, JSONSchema7, useShellApi } from '@bfc/extension-client';
 import { Link } from 'office-ui-fabric-react/lib/Link';
 import { ObjectField, SchemaField } from '@bfc/adaptive-form';
 import formatMessage from 'format-message';
diff --git a/Composer/packages/ui-plugins/select-skill-dialog/src/ComboBoxField.tsx b/Composer/packages/ui-plugins/select-skill-dialog/src/ComboBoxField.tsx
index 6173efd8d8..54c480bf81 100644
--- a/Composer/packages/ui-plugins/select-skill-dialog/src/ComboBoxField.tsx
+++ b/Composer/packages/ui-plugins/select-skill-dialog/src/ComboBoxField.tsx
@@ -4,7 +4,7 @@
 import React from 'react';
 import { ComboBox, IComboBoxOption } from 'office-ui-fabric-react/lib/ComboBox';
 import { FieldLabel } from '@bfc/adaptive-form';
-import { FieldProps } from '@bfc/editor-extension';
+import { FieldProps } from '@bfc/extension-client';
 import { Icon } from 'office-ui-fabric-react/lib/Icon';
 import { ISelectableOption } from 'office-ui-fabric-react/lib/utilities/selectableOption';
 import { IRenderFunction } from 'office-ui-fabric-react/lib/Utilities';
diff --git a/Composer/packages/ui-plugins/select-skill-dialog/src/SelectSkillDialogField.tsx b/Composer/packages/ui-plugins/select-skill-dialog/src/SelectSkillDialogField.tsx
index 603614f3fc..035f1020a5 100644
--- a/Composer/packages/ui-plugins/select-skill-dialog/src/SelectSkillDialogField.tsx
+++ b/Composer/packages/ui-plugins/select-skill-dialog/src/SelectSkillDialogField.tsx
@@ -3,7 +3,7 @@
 
 import React, { useState } from 'react';
 import { IComboBoxOption, SelectableOptionMenuItemType } from 'office-ui-fabric-react/lib/ComboBox';
-import { FieldProps, useShellApi } from '@bfc/editor-extension';
+import { FieldProps, useShellApi } from '@bfc/extension-client';
 import formatMessage from 'format-message';
 
 import { ComboBoxField } from './ComboBoxField';
diff --git a/Composer/packages/ui-plugins/select-skill-dialog/src/SkillEndpointField.tsx b/Composer/packages/ui-plugins/select-skill-dialog/src/SkillEndpointField.tsx
index 6f7a8dc2b7..3bb6ba0cf6 100644
--- a/Composer/packages/ui-plugins/select-skill-dialog/src/SkillEndpointField.tsx
+++ b/Composer/packages/ui-plugins/select-skill-dialog/src/SkillEndpointField.tsx
@@ -4,7 +4,7 @@
 /** @jsx jsx */
 import { jsx } from '@emotion/core';
 import React from 'react';
-import { FieldProps, useFormConfig } from '@bfc/editor-extension';
+import { FieldProps, useFormConfig } from '@bfc/extension-client';
 import {
   getUiLabel,
   getUIOptions,
diff --git a/Composer/packages/ui-plugins/select-skill-dialog/src/__tests__/BeginSkillDialogField.test.tsx b/Composer/packages/ui-plugins/select-skill-dialog/src/__tests__/BeginSkillDialogField.test.tsx
index 98f102ea95..e5876528da 100644
--- a/Composer/packages/ui-plugins/select-skill-dialog/src/__tests__/BeginSkillDialogField.test.tsx
+++ b/Composer/packages/ui-plugins/select-skill-dialog/src/__tests__/BeginSkillDialogField.test.tsx
@@ -4,7 +4,7 @@
 
 import React from 'react';
 import { fireEvent, getAllByRole, render } from '@bfc/test-utils';
-import { Extension, JSONSchema7 } from '@bfc/editor-extension';
+import { EditorExtension, JSONSchema7 } from '@bfc/extension-client';
 import { SDKKinds } from '@bfc/shared';
 
 import { BeginSkillDialogField } from '../BeginSkillDialogField';
@@ -35,9 +35,9 @@ const renderBeginSkillDialog = ({ value = {}, onChange = jest.fn() } = {}) => {
   };
 
   return render(
-    <Extension plugins={{}} shell={{ api: shell, data: shellData }}>
+    <EditorExtension plugins={{}} shell={{ api: shell, data: shellData }}>
       <BeginSkillDialogField {...props} />
-    </Extension>
+    </EditorExtension>
   );
 };
 
diff --git a/Composer/packages/ui-plugins/select-skill-dialog/src/__tests__/SelectSkillDialog.test.tsx b/Composer/packages/ui-plugins/select-skill-dialog/src/__tests__/SelectSkillDialog.test.tsx
index 6e33193840..87fa0b6714 100644
--- a/Composer/packages/ui-plugins/select-skill-dialog/src/__tests__/SelectSkillDialog.test.tsx
+++ b/Composer/packages/ui-plugins/select-skill-dialog/src/__tests__/SelectSkillDialog.test.tsx
@@ -5,7 +5,7 @@
 
 import React from 'react';
 import { fireEvent, getAllByRole, render, act } from '@bfc/test-utils';
-import { Extension } from '@bfc/editor-extension';
+import { EditorExtension } from '@bfc/extension-client';
 
 import { SelectSkillDialog } from '../SelectSkillDialogField';
 
@@ -55,9 +55,9 @@ const renderSelectSkillDialog = ({ addSkillDialog, onChange } = {}) => {
   };
 
   return render(
-    <Extension shell={{ api: shell, data: shellData }}>
+    <EditorExtension shell={{ api: shell, data: shellData }}>
       <SelectSkillDialog {...props} />
-    </Extension>
+    </EditorExtension>
   );
 };
 
diff --git a/Composer/packages/ui-plugins/select-skill-dialog/src/index.ts b/Composer/packages/ui-plugins/select-skill-dialog/src/index.ts
index a2f6912657..5f9c6293e4 100644
--- a/Composer/packages/ui-plugins/select-skill-dialog/src/index.ts
+++ b/Composer/packages/ui-plugins/select-skill-dialog/src/index.ts
@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
-import { PluginConfig } from '@bfc/editor-extension';
+import { PluginConfig } from '@bfc/extension-client';
 import formatMessage from 'format-message';
 import { SDKKinds } from '@bfc/shared';
 
diff --git a/releases/1.1.1.md b/releases/1.1.1.md
index 53e0ca1f6e..26c4c56108 100644
--- a/releases/1.1.1.md
+++ b/releases/1.1.1.md
@@ -109,7 +109,7 @@ To learn more about Composer and get started today visit the Composer official d
 - chore: remove dulplicate startCommand in setting.runtime ([#3876](https://github.com/microsoft/BotFramework-Composer/pull/3876)) ([@VanyLaw](https://github.com/VanyLaw))
 - chore: bump lodash from 4.17.15 to 4.17.19 in /Composer ([#3648](https://github.com/microsoft/BotFramework-Composer/pull/3648)) dependabot[bot]
 - chore: 1.1 cleanup ([#3927](https://github.com/microsoft/BotFramework-Composer/pull/3927)) ([@cwhitten](https://github.com/cwhitten))
-- chore: separates Form / Flow's ExtensionContext ([#3784](https://github.com/microsoft/BotFramework-Composer/pull/3784)) ([@yeze322](https://github.com/yeze322))
+- chore: separates Form / Flow's EditorExtensionContext ([#3784](https://github.com/microsoft/BotFramework-Composer/pull/3784)) ([@yeze322](https://github.com/yeze322))
 - chore: diff 'action'/ 'trigger' / 'recognizer' from custom schema ([#3773](https://github.com/microsoft/BotFramework-Composer/pull/3773)) ([@yeze322](https://github.com/yeze322))
 - chore: add schema to circular ref list ([#3856](https://github.com/microsoft/BotFramework-Composer/pull/3856)) ([@a-b-r-o-w-n](https://github.com/a-b-r-o-w-n))
 - chore: Fixed backup extension filename ([#3828](https://github.com/microsoft/BotFramework-Composer/pull/3828)) ([@GeoffCoxMSFT](https://github.com/GeoffCoxMSFT))

From d9f9a95fbdb71d396b9c749cc2657f28d68b1046 Mon Sep 17 00:00:00 2001
From: Andy Brown <asbrown002@gmail.com>
Date: Wed, 9 Sep 2020 15:04:03 -0700
Subject: [PATCH 05/10] fix type name

---
 Composer/packages/client/src/recoilModel/atoms/appState.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Composer/packages/client/src/recoilModel/atoms/appState.ts b/Composer/packages/client/src/recoilModel/atoms/appState.ts
index 002d994d82..fa09f6a144 100644
--- a/Composer/packages/client/src/recoilModel/atoms/appState.ts
+++ b/Composer/packages/client/src/recoilModel/atoms/appState.ts
@@ -10,7 +10,7 @@ import {
   RuntimeTemplate,
   AppUpdateState,
   BoilerplateVersion,
-  PluginConfig,
+  ExtensionConfig,
 } from '../../recoilModel/types';
 import { getUserSettings } from '../utils';
 import onboardingStorage from '../../utils/onboardingStorage';
@@ -152,7 +152,7 @@ export const boilerplateVersionState = atom<BoilerplateVersion>({
   },
 });
 
-export const extensionsState = atom<PluginConfig[]>({
+export const extensionsState = atom<ExtensionConfig[]>({
   key: getFullyQualifiedKey('extensions'),
   default: [],
 });

From 63e5cacc11c92263c7ae797233678d9eceaaa840 Mon Sep 17 00:00:00 2001
From: Andy Brown <asbrown002@gmail.com>
Date: Wed, 9 Sep 2020 15:10:01 -0700
Subject: [PATCH 06/10] fix up remaining references to extensions directory

---
 .github/CODEOWNERS                            |   2 +-
 Composer/.dockerignore                        |   1 -
 Composer/Dockerfile                           |   6 +-
 Composer/README.md                            | 163 ------------------
 Composer/TESTING.md                           |   2 +-
 Composer/jest.config.js                       |   8 +-
 .../plugins/mockRemotePublish/package.json    |   2 +-
 Composer/plugins/mockRemotePublish/yarn.lock  |   2 +-
 .../plugins/sample-ui-plugin/package.json     |   2 +-
 Composer/plugins/sample-ui-plugin/yarn.lock   |   2 +-
 10 files changed, 15 insertions(+), 175 deletions(-)

diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 8a15b50af0..2e279f8ebe 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -6,6 +6,6 @@
 
 /Composer/ @cwhitten @boydc2014 @a-b-r-o-w-n @corinagum @beyackle @srinaath @tonyanziano
 
-/Composer/packages/extensions/visual-designer @yeze322 @cwhitten @boydc2014 @a-b-r-o-w-n
+/Composer/packages/adaptive-flow @yeze322 @cwhitten @boydc2014 @a-b-r-o-w-n
 
 /docs/ @cwhitten @boydc2014 @benbrown
diff --git a/Composer/.dockerignore b/Composer/.dockerignore
index 19245eab5f..d942adbebd 100644
--- a/Composer/.dockerignore
+++ b/Composer/.dockerignore
@@ -7,7 +7,6 @@
 **/server/tmp.zip
 # not ignore all lib folder because packages/lib, so probably we should rename that to libs
 packages/lib/*/lib
-packages/extensions/*/lib
 
 Dockerfile
 .dockerignore
diff --git a/Composer/Dockerfile b/Composer/Dockerfile
index 4f6067ba23..973c91683a 100644
--- a/Composer/Dockerfile
+++ b/Composer/Dockerfile
@@ -25,7 +25,11 @@ WORKDIR /app/Composer
 COPY --from=build /src/Composer/yarn.lock .
 COPY --from=build /src/Composer/package.json .
 COPY --from=build /src/Composer/packages/client ./packages/client
-COPY --from=build /src/Composer/packages/extensions ./packages/extensions
+COPY --from=build /src/Composer/packages/adaptive-flow ./packages/adaptive-flow
+COPY --from=build /src/Composer/packages/adaptive-form ./packages/adaptive-form
+COPY --from=build /src/Composer/packages/extension-client ./packages/extension-client
+COPY --from=build /src/Composer/packages/intellisense ./packages/intellisense
+COPY --from=build /src/Composer/packages/plugin-loader ./packages/plugin-loader
 COPY --from=build /src/Composer/packages/server ./packages/server
 COPY --from=build /src/Composer/packages/lib ./packages/lib
 COPY --from=build /src/Composer/packages/tools ./packages/tools
diff --git a/Composer/README.md b/Composer/README.md
index c7142f2575..f2b9bc0bc4 100644
--- a/Composer/README.md
+++ b/Composer/README.md
@@ -30,166 +30,3 @@ If you run into the issue of `There appears to be trouble with your network conn
 
 ## Documentation
 The documentation for Composer [can be found here](/toc.md).
-
-## Extension Framework
-Composer is built on top of an extension framework, which allows anyone to provide an extension as the editor of certain type of bot assets.
-
-All editors, 1st party or 3rd party, are loaded in the same way by the extension framework.
-
-Non-editor extensions are not supported at this time, though the mechanisms for providing extensions will scale outside the dialog editor's.
-
-### What's an extension? what's in it
-Each extension is a standalone React component package ([why React component](#why-react-component)) under Composer's `/packages/extensions` folder, which implements the extension `interface`.
-
-Composer is managed via yarn workspaces, producing such a folder layout.
-```
-|- Composer
-  |- package.json  // define the workspaces
-  |- packages
-    |- client       // composer main app
-    |- server       // composer api server
-    |- extensions
-      |- package.json  // put all extension as one package
-      |- adaptive-form // dialog property editor
-    |- lib
-      |- shared        // shared code
-```
-
-All extensions under `/extensions` folder will be eventually packed into one `extensions` package, then the `client` package will depends on this `extensions` package.
-
-### Extension Interface
-The extension interface defines the way how an extension comminutes to the host.
-
-In React world, interface means the props passed into a component. An extension will be passed ino 3 props:
-- data:any. which is the data to be edited by this editor.
-- onChange: (newData) => void. which is the callback enables an editor to save the edited data.
-- [shellApi](#shell-api). which is a set of apis providing other capabilities than data in\out.
-
-The rendering code of an extension will be sth like this:
-```
-  import SomeEditor from 'someplace'
-
-  <SomeEditor data={..}, onChange={...}, shellApi={...}>
-```
-
-#### data in\out story
-
-With this interface, it's pretty clear how data is in\out extension. Data is passed in through `data` prop, and been saved with `onChange` prop.
-
-#### shell api
-
-Shell api is a set of apis that provides other important functionalities that empower an extension to provide a more powerful and smooth editing experience. including
-
-* OpenSubEditor
-  ```
-  openSubEditor(location:string, data:any, onChange:(newData:any) => void)
-  ```
-  This is the most important api that support a [multiple editors](#multiple-editors) scenario, which allows an editor to delegate some editing task to another editor, and listen the changes.
-
-  Note that, this api doesn't allow you to specify the type or the name of the sub editor. You only get to specify a data, the shell will use a centralized way to manage how editors are registered and picked up. See registration section in the below for more details.
-
-  We may suppport other forms of openSubEditor later, but we expect this is the mosted used one.
-
-* ObjectGraph
-
-  TBD, this will be an api that enable each extension have the knowledge of a global object graph.
-* Alert
-* ReadFile
-* Prompt
-
-### Why React component
-
-There are many options to choose when picking an abstraction for an extension. Different level abstractions have different impacts on many aspects, like developing, testing, debuging and running the extension.
-
-A low-level abstraction like HTML page will give us perfect isolation, great flexibilty (use whatever language you want to build that), but usually result in a relatively high amount of effort to develop a robust api between host and extension because it's using the low-level messaging primitives, and also not good for performance because of the extreme isolation.
-
-A high-level abstraction like React component, will cost a little bit on isolation, but gain the best support from a mature and powerful framework, in every cycle of the development of extensions. It will help most of boosting the productivity, simplifying the architecure, and gain the best performance.
-
-Based on our scenario, we will use React as a start point, and host the extension in an `<IFrame>` to gain a certain level of isolation, for two major reasons:
-
-* we favor produtivity, simplicity, performance at this point over extreme isolation, more choices when developing extensions. We don't expect there are so many extension developers like VS Code . :)
-* we can always go low-level whenever we see fit, all extensions will still work then, not but visa-verse
-
-
-### How an extension is discovered, registered, loaded, & hosted
-
-#### registration
-
-Inside the client package, there is an `EditorMap` module to manage the mapping from `dialog asset type` => `registered editor`.
-
-The extension registration is done by modifying `/Composer/packages/client/src/extension-container/EditorMap.js` to add an entry in the registration table
-
-```
-ExtensionMap.js
-
-const EditorRegistration = [
-    {
-        when: (data) => getSuffix(data.name) === ".dialog",
-        pick: FormEditor
-    },
-
-    {
-        when: (data) => getSuffix(data.name) === ".lu",
-        pick: JsonEditor
-    },
-
-    {
-        when: (data) => true,
-        pick: JsonEditor
-    }
-]
-
-```
-
-As you can see in above, editors are registered in such an registration table with each entry includes two properties:
-* when. A lamdba that tests whether this kind of data is interested or not
-* pick. The target extenion type to be picked up.
-
-In this design, we treat file the same way as any json object, by wrapping it into an data object, such as
-```
- {
-   name: "xx.lu",
-   content: "file content"
- }
-```
-
-With this unification into a data object and a lambda on top of that, it's simple, powerful and flexible to define extension at any level of content.
-
-#### discovery
-
-In the runtime, each time an data is to be edited, the shell will go through the table, run the condition of each entry, and pick a proper editor for that.
-
-#### loading
-
-The loading of the extension is totally controlled by composer, common loading patterns (lazy, prefetch) can be utilized but is not a concern of the extension.
-
-Here in this protoype, we showed how a typical lazy-loading process looks like:
-
-When the composer starts up, composer will try to read all bot assets, starting from the .bot file, then resolve all it's dependencies. And list all files into the sidebar on the left.
-
-When user click a ".lu" file, the composer knows which extension can handle this ".lu" file, based on the mapping produced by `ExtensionMap`. The Composer sends a signal to the mounted Extension and an appropriate payload to give it the data and interface it needs for Composer to edit the current Dialog.
-
-Loading an editor in the json-schema sense is the following:
-
-1. Edit sends a signal to the Extension that it is time to render, and a payload representing the current `formData`
-2. Extension loads its schemas `schema`, `uiSchema` (descriptions on what and how the form is the be rendered) with the given `formData`
-3. On change of a value in a form control, we construct a not-yet-saved Dialog that when saved persists it to the Bot asset. Saving conventions are not yet defined, but could be a debounced auto-save, or save on demand, etc.
-
-#### hosting
-
-Extensions are gauranteed to be hosted in an isolated (from the main composer window) container, like `<iframe />`.
-
-Communication between the Composer and the extension is using the React conventions: props, since we assume an extension is an React component.
-
-
-### Dialog editing
-
-If the field being edited is part of a parent Dialog, we may need to provide an alert allowing the user to let us know if the intention is to edit the base Dialog or create a new dialog with this edited override. (business requirement needed). If the user chooses to modify the base dialog, this will update all Dialogs that currently inhereit from it.
-
-### extending an extension
-
-As designed, the Extension is sealed to its current React Component implementation. If during a design session one wanted to add a property on a Dialog configured to a particular Extension that was not supported by the Editors current schema, this would require a new schema, which would map to a new Editor type.
-
-## multiple editors
-
-This section will explain how multiple editors are supported in details, including how editors are organized in a hierachy way, how data is bubbled up from children to parent, then to shell, etc.
diff --git a/Composer/TESTING.md b/Composer/TESTING.md
index 9276fb4e78..cade1c5a2a 100644
--- a/Composer/TESTING.md
+++ b/Composer/TESTING.md
@@ -2,7 +2,7 @@
 
 Tests inside of the Composer project are run via Jest ([documentation](https://jestjs.io/docs/en/24.0/getting-started.html)), with coverage reporting from Jest's built-in reporting tool istanbul.
 
-Tests are scoped to each of the packages within the Composer project, and can be found in the `__tests__` directory inside of each package directory. For example, **client** tests can be found under the `<root>/Composer/packages/client/__tests__/` directory, **Adaptive Flow** tests can be found under the `<root>/Composer/packages/extensions/adaptive-flow/__tests__` directory, etc.
+Tests are scoped to each of the packages within the Composer project, and can be found in the `__tests__` directory inside of each package directory. For example, **client** tests can be found under the `<root>/Composer/packages/client/__tests__/` directory, **Adaptive Flow** tests can be found under the `<root>/Composer/packages/adaptive-flow/__tests__` directory, etc.
 
 ## Running Tests
 
diff --git a/Composer/jest.config.js b/Composer/jest.config.js
index dd47f54c7e..0aca293414 100644
--- a/Composer/jest.config.js
+++ b/Composer/jest.config.js
@@ -39,10 +39,10 @@ module.exports = {
   testPathIgnorePatterns: ['/node_modules/', '/scripts/', '/jestMocks/', '__tests__/setup.(j|t)s', '/cypress/'],
   projects: [
     '<rootDir>/packages/client',
-    '<rootDir>/packages/extensions/adaptive-form',
-    '<rootDir>/packages/extensions/adaptive-flow',
-    '<rootDir>/packages/extensions/extension',
-    '<rootDir>/packages/extensions/intellisense',
+    '<rootDir>/packages/adaptive-form',
+    '<rootDir>/packages/adaptive-flow',
+    '<rootDir>/packages/extension-client',
+    '<rootDir>/packages/intellisense',
     '<rootDir>/packages/lib/code-editor',
     '<rootDir>/packages/lib/shared',
     '<rootDir>/packages/server',
diff --git a/Composer/plugins/mockRemotePublish/package.json b/Composer/plugins/mockRemotePublish/package.json
index 7527d2fa84..52118ec07b 100644
--- a/Composer/plugins/mockRemotePublish/package.json
+++ b/Composer/plugins/mockRemotePublish/package.json
@@ -14,7 +14,7 @@
     "uuid": "^7.0.1"
   },
   "devDependencies": {
-    "@bfc/plugin-loader": "file:../../packages/extensions/plugin-loader",
+    "@bfc/plugin-loader": "file:../../packages/plugin-loader",
     "@types/uuid": "^7.0.2"
   }
 }
diff --git a/Composer/plugins/mockRemotePublish/yarn.lock b/Composer/plugins/mockRemotePublish/yarn.lock
index 8772b82f22..e161cf729f 100644
--- a/Composer/plugins/mockRemotePublish/yarn.lock
+++ b/Composer/plugins/mockRemotePublish/yarn.lock
@@ -2,7 +2,7 @@
 # yarn lockfile v1
 
 
-"@bfc/plugin-loader@file:../../packages/extensions/plugin-loader":
+"@bfc/plugin-loader@file:../../packages/plugin-loader":
   version "1.0.0"
   dependencies:
     debug "^4.1.1"
diff --git a/Composer/plugins/sample-ui-plugin/package.json b/Composer/plugins/sample-ui-plugin/package.json
index f9fd199cf5..8cc70507a4 100644
--- a/Composer/plugins/sample-ui-plugin/package.json
+++ b/Composer/plugins/sample-ui-plugin/package.json
@@ -34,7 +34,7 @@
   "extendsComposer": false,
   "main": "dist/index.js",
   "dependencies": {
-    "@bfc/extension-client": "file:../../packages/extensions/extension-client",
+    "@bfc/extension-client": "file:../../packages/extension-client",
     "emotion": "^10.0.27",
     "react": "^16.13.0",
     "react-dom": "^16.13.0"
diff --git a/Composer/plugins/sample-ui-plugin/yarn.lock b/Composer/plugins/sample-ui-plugin/yarn.lock
index fa4e872be9..6cdfd82ac0 100644
--- a/Composer/plugins/sample-ui-plugin/yarn.lock
+++ b/Composer/plugins/sample-ui-plugin/yarn.lock
@@ -46,7 +46,7 @@
     lodash "^4.17.19"
     to-fast-properties "^2.0.0"
 
-"@bfc/extension-client@file:../../packages/extensions/extension-client":
+"@bfc/extension-client@file:../../packages/extension-client":
   version "1.0.0"
   dependencies:
     debug "^4.1.1"

From 6a60e6cd0fd16840c1f5f907acba7317a5c068cd Mon Sep 17 00:00:00 2001
From: Andy Brown <asbrown002@gmail.com>
Date: Wed, 9 Sep 2020 16:59:15 -0700
Subject: [PATCH 07/10] rename plugin-loader to extension

---
 Composer/Dockerfile                           |  2 +-
 Composer/package.json                         |  4 +--
 .../{plugin-loader => extension}/.eslintrc.js |  0
 .../{plugin-loader => extension}/.gitignore   |  0
 .../{plugin-loader => extension}/package.json |  2 +-
 .../{plugin-loader => extension}/src/index.ts |  0
 .../src/loader/composerPluginRegistration.ts  |  0
 .../src/loader/index.ts                       |  0
 .../src/loader/pluginLoader.ts                |  0
 .../src/logger.ts                             |  0
 .../src/manager/index.ts                      |  0
 .../src/manager/manager.ts                    |  6 ++--
 .../src/storage/extensionManifestStore.ts     |  0
 .../src/storage/index.ts                      |  0
 .../src/types/extension.ts                    |  0
 .../src/types/types.ts                        |  0
 .../tsconfig.json                             |  0
 .../__tests__/controllers/eject.test.ts       |  4 +--
 .../__tests__/controllers/project.test.ts     |  4 +--
 .../__tests__/controllers/publisher.test.ts   |  2 +-
 .../models/asset/assetManager.test.ts         |  4 +--
 Composer/packages/server/package.json         |  2 +-
 .../packages/server/src/controllers/eject.ts  |  2 +-
 .../server/src/controllers/extensions.ts      | 30 +++++++++----------
 .../server/src/controllers/project.ts         |  2 +-
 .../server/src/controllers/publisher.ts       |  2 +-
 .../server/src/controllers/storage.ts         |  2 +-
 .../server/src/models/asset/assetManager.ts   |  2 +-
 .../server/src/models/bot/botProject.ts       |  2 +-
 .../models/settings/defaultSettingManager.ts  |  2 +-
 .../src/models/settings/fileSettingManager.ts |  2 +-
 .../src/models/storage/storageFactory.ts      |  2 +-
 Composer/packages/server/src/server.ts        |  4 +--
 .../packages/server/src/services/project.ts   |  2 +-
 .../packages/server/src/services/storage.ts   |  2 +-
 Composer/plugins/azurePublish/package.json    |  2 +-
 Composer/plugins/azurePublish/src/index.ts    |  2 +-
 Composer/plugins/azurePublish/src/schema.ts   |  2 +-
 Composer/plugins/azurePublish/yarn.lock       |  2 +-
 .../plugins/mockRemotePublish/package.json    |  2 +-
 .../plugins/mockRemotePublish/src/index.ts    |  2 +-
 .../plugins/mockRemotePublish/src/schema.ts   |  2 +-
 Composer/plugins/mockRemotePublish/yarn.lock  |  2 +-
 43 files changed, 51 insertions(+), 51 deletions(-)
 rename Composer/packages/{plugin-loader => extension}/.eslintrc.js (100%)
 rename Composer/packages/{plugin-loader => extension}/.gitignore (100%)
 rename Composer/packages/{plugin-loader => extension}/package.json (95%)
 rename Composer/packages/{plugin-loader => extension}/src/index.ts (100%)
 rename Composer/packages/{plugin-loader => extension}/src/loader/composerPluginRegistration.ts (100%)
 rename Composer/packages/{plugin-loader => extension}/src/loader/index.ts (100%)
 rename Composer/packages/{plugin-loader => extension}/src/loader/pluginLoader.ts (100%)
 rename Composer/packages/{plugin-loader => extension}/src/logger.ts (100%)
 rename Composer/packages/{plugin-loader => extension}/src/manager/index.ts (100%)
 rename Composer/packages/{plugin-loader => extension}/src/manager/manager.ts (98%)
 rename Composer/packages/{plugin-loader => extension}/src/storage/extensionManifestStore.ts (100%)
 rename Composer/packages/{plugin-loader => extension}/src/storage/index.ts (100%)
 rename Composer/packages/{plugin-loader => extension}/src/types/extension.ts (100%)
 rename Composer/packages/{plugin-loader => extension}/src/types/types.ts (100%)
 rename Composer/packages/{plugin-loader => extension}/tsconfig.json (100%)

diff --git a/Composer/Dockerfile b/Composer/Dockerfile
index 973c91683a..cd3532955d 100644
--- a/Composer/Dockerfile
+++ b/Composer/Dockerfile
@@ -27,9 +27,9 @@ COPY --from=build /src/Composer/package.json .
 COPY --from=build /src/Composer/packages/client ./packages/client
 COPY --from=build /src/Composer/packages/adaptive-flow ./packages/adaptive-flow
 COPY --from=build /src/Composer/packages/adaptive-form ./packages/adaptive-form
+COPY --from=build /src/Composer/packages/extension ./packages/extension
 COPY --from=build /src/Composer/packages/extension-client ./packages/extension-client
 COPY --from=build /src/Composer/packages/intellisense ./packages/intellisense
-COPY --from=build /src/Composer/packages/plugin-loader ./packages/plugin-loader
 COPY --from=build /src/Composer/packages/server ./packages/server
 COPY --from=build /src/Composer/packages/lib ./packages/lib
 COPY --from=build /src/Composer/packages/tools ./packages/tools
diff --git a/Composer/package.json b/Composer/package.json
index 65fe84e5ac..0c6325058e 100644
--- a/Composer/package.json
+++ b/Composer/package.json
@@ -20,11 +20,11 @@
     "packages/adaptive-form",
     "packages/client",
     "packages/electron-server",
+    "packages/extension",
     "packages/extension-client",
     "packages/intellisense",
     "packages/lib",
     "packages/lib/*",
-    "packages/plugin-loader",
     "packages/server",
     "packages/test-utils",
     "packages/tools",
@@ -40,7 +40,7 @@
     "build:test": "yarn workspace @bfc/test-utils build",
     "build:lib": "yarn workspace @bfc/libs build:all",
     "build:electron": "yarn workspace @bfc/electron-server build",
-    "build:extensions": "wsrun -lt -p @bfc/plugin-loader @bfc/intellisense @bfc/extension-client @bfc/adaptive-form @bfc/adaptive-flow @bfc/ui-plugin-*  -c build",
+    "build:extensions": "wsrun -lt -p @bfc/extension @bfc/intellisense @bfc/extension-client @bfc/adaptive-form @bfc/adaptive-flow @bfc/ui-plugin-*  -c build",
     "build:server": "yarn workspace @bfc/server build",
     "build:client": "yarn workspace @bfc/client build",
     "build:tools": "yarn workspace @bfc/tools build:all",
diff --git a/Composer/packages/plugin-loader/.eslintrc.js b/Composer/packages/extension/.eslintrc.js
similarity index 100%
rename from Composer/packages/plugin-loader/.eslintrc.js
rename to Composer/packages/extension/.eslintrc.js
diff --git a/Composer/packages/plugin-loader/.gitignore b/Composer/packages/extension/.gitignore
similarity index 100%
rename from Composer/packages/plugin-loader/.gitignore
rename to Composer/packages/extension/.gitignore
diff --git a/Composer/packages/plugin-loader/package.json b/Composer/packages/extension/package.json
similarity index 95%
rename from Composer/packages/plugin-loader/package.json
rename to Composer/packages/extension/package.json
index fd32377739..c48d6b1f87 100644
--- a/Composer/packages/plugin-loader/package.json
+++ b/Composer/packages/extension/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "@bfc/plugin-loader",
+  "name": "@bfc/extension",
   "version": "1.0.0",
   "description": "Exposes interfaces used by the Composer plugin system.",
   "main": "lib/index.js",
diff --git a/Composer/packages/plugin-loader/src/index.ts b/Composer/packages/extension/src/index.ts
similarity index 100%
rename from Composer/packages/plugin-loader/src/index.ts
rename to Composer/packages/extension/src/index.ts
diff --git a/Composer/packages/plugin-loader/src/loader/composerPluginRegistration.ts b/Composer/packages/extension/src/loader/composerPluginRegistration.ts
similarity index 100%
rename from Composer/packages/plugin-loader/src/loader/composerPluginRegistration.ts
rename to Composer/packages/extension/src/loader/composerPluginRegistration.ts
diff --git a/Composer/packages/plugin-loader/src/loader/index.ts b/Composer/packages/extension/src/loader/index.ts
similarity index 100%
rename from Composer/packages/plugin-loader/src/loader/index.ts
rename to Composer/packages/extension/src/loader/index.ts
diff --git a/Composer/packages/plugin-loader/src/loader/pluginLoader.ts b/Composer/packages/extension/src/loader/pluginLoader.ts
similarity index 100%
rename from Composer/packages/plugin-loader/src/loader/pluginLoader.ts
rename to Composer/packages/extension/src/loader/pluginLoader.ts
diff --git a/Composer/packages/plugin-loader/src/logger.ts b/Composer/packages/extension/src/logger.ts
similarity index 100%
rename from Composer/packages/plugin-loader/src/logger.ts
rename to Composer/packages/extension/src/logger.ts
diff --git a/Composer/packages/plugin-loader/src/manager/index.ts b/Composer/packages/extension/src/manager/index.ts
similarity index 100%
rename from Composer/packages/plugin-loader/src/manager/index.ts
rename to Composer/packages/extension/src/manager/index.ts
diff --git a/Composer/packages/plugin-loader/src/manager/manager.ts b/Composer/packages/extension/src/manager/manager.ts
similarity index 98%
rename from Composer/packages/plugin-loader/src/manager/manager.ts
rename to Composer/packages/extension/src/manager/manager.ts
index b7e5c72a0a..d62c7f1e57 100644
--- a/Composer/packages/plugin-loader/src/manager/manager.ts
+++ b/Composer/packages/extension/src/manager/manager.ts
@@ -59,7 +59,7 @@ function getExtensionMetadata(extensionPath: string, packageJson: PackageJSON):
   };
 }
 
-class PluginManager {
+class ExtensionManager {
   private searchCache = new Map<string, ExtensionSearchResult>();
   private _manifest: ExtensionManifestStore | undefined;
 
@@ -300,6 +300,6 @@ class PluginManager {
   }
 }
 
-const manager = new PluginManager();
+const manager = new ExtensionManager();
 
-export { manager as PluginManager };
+export { manager as ExtensionManager };
diff --git a/Composer/packages/plugin-loader/src/storage/extensionManifestStore.ts b/Composer/packages/extension/src/storage/extensionManifestStore.ts
similarity index 100%
rename from Composer/packages/plugin-loader/src/storage/extensionManifestStore.ts
rename to Composer/packages/extension/src/storage/extensionManifestStore.ts
diff --git a/Composer/packages/plugin-loader/src/storage/index.ts b/Composer/packages/extension/src/storage/index.ts
similarity index 100%
rename from Composer/packages/plugin-loader/src/storage/index.ts
rename to Composer/packages/extension/src/storage/index.ts
diff --git a/Composer/packages/plugin-loader/src/types/extension.ts b/Composer/packages/extension/src/types/extension.ts
similarity index 100%
rename from Composer/packages/plugin-loader/src/types/extension.ts
rename to Composer/packages/extension/src/types/extension.ts
diff --git a/Composer/packages/plugin-loader/src/types/types.ts b/Composer/packages/extension/src/types/types.ts
similarity index 100%
rename from Composer/packages/plugin-loader/src/types/types.ts
rename to Composer/packages/extension/src/types/types.ts
diff --git a/Composer/packages/plugin-loader/tsconfig.json b/Composer/packages/extension/tsconfig.json
similarity index 100%
rename from Composer/packages/plugin-loader/tsconfig.json
rename to Composer/packages/extension/tsconfig.json
diff --git a/Composer/packages/server/__tests__/controllers/eject.test.ts b/Composer/packages/server/__tests__/controllers/eject.test.ts
index f2f6310f16..cc8983562a 100644
--- a/Composer/packages/server/__tests__/controllers/eject.test.ts
+++ b/Composer/packages/server/__tests__/controllers/eject.test.ts
@@ -3,13 +3,13 @@
 
 import { Request, Response } from 'express';
 import rimraf from 'rimraf';
-import { pluginLoader } from '@bfc/plugin-loader';
+import { pluginLoader } from '@bfc/extension';
 
 import { BotProjectService } from '../../src/services/project';
 import { Path } from '../../src/utility/path';
 import { EjectController } from '../../src/controllers/eject';
 
-jest.mock('@bfc/plugin-loader', () => {
+jest.mock('@bfc/extension', () => {
   return {
     pluginLoader: {
       extensions: {
diff --git a/Composer/packages/server/__tests__/controllers/project.test.ts b/Composer/packages/server/__tests__/controllers/project.test.ts
index 033013430e..01e30225c0 100644
--- a/Composer/packages/server/__tests__/controllers/project.test.ts
+++ b/Composer/packages/server/__tests__/controllers/project.test.ts
@@ -3,13 +3,13 @@
 
 import { Request, Response } from 'express';
 import rimraf from 'rimraf';
-import { pluginLoader } from '@bfc/plugin-loader';
+import { pluginLoader } from '@bfc/extension';
 
 import { BotProjectService } from '../../src/services/project';
 import { ProjectController } from '../../src/controllers/project';
 import { Path } from '../../src/utility/path';
 
-jest.mock('@bfc/plugin-loader', () => {
+jest.mock('@bfc/extension', () => {
   return {
     pluginLoader: {
       extensions: {
diff --git a/Composer/packages/server/__tests__/controllers/publisher.test.ts b/Composer/packages/server/__tests__/controllers/publisher.test.ts
index 1cc7453c47..33d7c44329 100644
--- a/Composer/packages/server/__tests__/controllers/publisher.test.ts
+++ b/Composer/packages/server/__tests__/controllers/publisher.test.ts
@@ -5,7 +5,7 @@ import path from 'path';
 
 import { Request, Response } from 'express';
 import rimraf from 'rimraf';
-import { pluginLoader } from '@bfc/plugin-loader';
+import { pluginLoader } from '@bfc/extension';
 
 import { BotProjectService } from '../../src/services/project';
 import { Path } from '../../src/utility/path';
diff --git a/Composer/packages/server/__tests__/models/asset/assetManager.test.ts b/Composer/packages/server/__tests__/models/asset/assetManager.test.ts
index 863d827570..bd87f44055 100644
--- a/Composer/packages/server/__tests__/models/asset/assetManager.test.ts
+++ b/Composer/packages/server/__tests__/models/asset/assetManager.test.ts
@@ -2,7 +2,7 @@
 // Licensed under the MIT License.
 
 import rimraf from 'rimraf';
-import { pluginLoader } from '@bfc/plugin-loader';
+import { pluginLoader } from '@bfc/extension';
 
 import { Path } from '../../../src/utility/path';
 import { AssetManager } from '../../../src/models/asset/assetManager';
@@ -10,7 +10,7 @@ jest.mock('azure-storage', () => {
   return {};
 });
 
-jest.mock('@bfc/plugin-loader', () => {
+jest.mock('@bfc/extension', () => {
   //const p = require('path');
   return {
     pluginLoader: {
diff --git a/Composer/packages/server/package.json b/Composer/packages/server/package.json
index f7398853e8..a0e84f3977 100644
--- a/Composer/packages/server/package.json
+++ b/Composer/packages/server/package.json
@@ -59,7 +59,7 @@
     "@bfc/intellisense-languageserver": "*",
     "@bfc/lg-languageserver": "*",
     "@bfc/lu-languageserver": "*",
-    "@bfc/plugin-loader": "*",
+    "@bfc/extension": "*",
     "@bfc/shared": "*",
     "@microsoft/bf-dispatcher": "^4.10.0-preview.141651",
     "@microsoft/bf-lu": "^4.10.0-dev.20200808.5a7c973",
diff --git a/Composer/packages/server/src/controllers/eject.ts b/Composer/packages/server/src/controllers/eject.ts
index 93f750c134..ca997a23dc 100644
--- a/Composer/packages/server/src/controllers/eject.ts
+++ b/Composer/packages/server/src/controllers/eject.ts
@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
-import { pluginLoader, PluginLoader } from '@bfc/plugin-loader';
+import { pluginLoader, PluginLoader } from '@bfc/extension';
 
 import { BotProjectService } from '../services/project';
 import { LocalDiskStorage } from '../models/storage/localDiskStorage';
diff --git a/Composer/packages/server/src/controllers/extensions.ts b/Composer/packages/server/src/controllers/extensions.ts
index 0cec6db29d..833ed092ee 100644
--- a/Composer/packages/server/src/controllers/extensions.ts
+++ b/Composer/packages/server/src/controllers/extensions.ts
@@ -2,7 +2,7 @@
 // Licensed under the MIT License.
 
 import { Request, Response } from 'express';
-import { PluginManager } from '@bfc/plugin-loader';
+import { ExtensionManager } from '@bfc/extension';
 
 interface AddExtensionRequest extends Request {
   body: {
@@ -45,7 +45,7 @@ interface ExtensionFetchRequest extends Request {
 }
 
 export async function listExtensions(req: Request, res: Response) {
-  res.json(PluginManager.getAll()); // might need to have this list all enabled extensions ?
+  res.json(ExtensionManager.getAll()); // might need to have this list all enabled extensions ?
 }
 
 export async function addExtension(req: AddExtensionRequest, res: Response) {
@@ -56,9 +56,9 @@ export async function addExtension(req: AddExtensionRequest, res: Response) {
     return;
   }
 
-  await PluginManager.installRemote(name, version);
-  await PluginManager.load(name);
-  res.json(PluginManager.find(name));
+  await ExtensionManager.installRemote(name, version);
+  await ExtensionManager.load(name);
+  res.json(ExtensionManager.find(name));
 }
 
 export async function toggleExtension(req: ToggleExtensionRequest, res: Response) {
@@ -69,18 +69,18 @@ export async function toggleExtension(req: ToggleExtensionRequest, res: Response
     return;
   }
 
-  if (!PluginManager.find(id)) {
+  if (!ExtensionManager.find(id)) {
     res.status(404).json({ error: `extension \`${id}\` not found` });
     return;
   }
 
   if (enabled === true) {
-    await PluginManager.enable(id);
+    await ExtensionManager.enable(id);
   } else {
-    await PluginManager.disable(id);
+    await ExtensionManager.disable(id);
   }
 
-  res.json(PluginManager.find(id));
+  res.json(ExtensionManager.find(id));
 }
 
 export async function removeExtension(req: RemoveExtensionRequest, res: Response) {
@@ -91,27 +91,27 @@ export async function removeExtension(req: RemoveExtensionRequest, res: Response
     return;
   }
 
-  if (!PluginManager.find(id)) {
+  if (!ExtensionManager.find(id)) {
     res.status(404).json({ error: `extension \`${id}\` not found` });
     return;
   }
 
-  await PluginManager.remove(id);
-  res.json(PluginManager.getAll());
+  await ExtensionManager.remove(id);
+  res.json(ExtensionManager.getAll());
 }
 
 export async function searchExtensions(req: SearchExtensionsRequest, res: Response) {
   const { q } = req.query;
 
-  const results = await PluginManager.search(q ?? '');
+  const results = await ExtensionManager.search(q ?? '');
   res.json(results);
 }
 
 export async function getBundleForView(req: ExtensionViewBundleRequest, res: Response) {
   const { id, view } = req.params;
-  const extension = PluginManager.find(id);
+  const extension = ExtensionManager.find(id);
   const bundleId = extension.contributes.views?.[view].bundleId as string;
-  const bundle = PluginManager.getBundle(id, bundleId);
+  const bundle = ExtensionManager.getBundle(id, bundleId);
   if (bundle) {
     res.sendFile(bundle);
   } else {
diff --git a/Composer/packages/server/src/controllers/project.ts b/Composer/packages/server/src/controllers/project.ts
index 945b9e2fbb..a40231876a 100644
--- a/Composer/packages/server/src/controllers/project.ts
+++ b/Composer/packages/server/src/controllers/project.ts
@@ -5,7 +5,7 @@ import * as fs from 'fs';
 
 import { Request, Response } from 'express';
 import { Archiver } from 'archiver';
-import { PluginLoader } from '@bfc/plugin-loader';
+import { PluginLoader } from '@bfc/extension';
 
 import log from '../logger';
 import { BotProjectService } from '../services/project';
diff --git a/Composer/packages/server/src/controllers/publisher.ts b/Composer/packages/server/src/controllers/publisher.ts
index 789d15a319..6d788483c2 100644
--- a/Composer/packages/server/src/controllers/publisher.ts
+++ b/Composer/packages/server/src/controllers/publisher.ts
@@ -2,7 +2,7 @@
 // Licensed under the MIT License.
 
 import merge from 'lodash/merge';
-import { pluginLoader, PluginLoader } from '@bfc/plugin-loader';
+import { pluginLoader, PluginLoader } from '@bfc/extension';
 import { defaultPublishConfig } from '@bfc/shared';
 
 import { BotProjectService } from '../services/project';
diff --git a/Composer/packages/server/src/controllers/storage.ts b/Composer/packages/server/src/controllers/storage.ts
index 2b40f33278..a404c983d4 100644
--- a/Composer/packages/server/src/controllers/storage.ts
+++ b/Composer/packages/server/src/controllers/storage.ts
@@ -2,7 +2,7 @@
 // Licensed under the MIT License.
 
 import { Request, Response } from 'express';
-import { PluginLoader } from '@bfc/plugin-loader';
+import { PluginLoader } from '@bfc/extension';
 
 import StorageService from '../services/storage';
 import { Path } from '../utility/path';
diff --git a/Composer/packages/server/src/models/asset/assetManager.ts b/Composer/packages/server/src/models/asset/assetManager.ts
index d1a3107b88..fd9c92e2aa 100644
--- a/Composer/packages/server/src/models/asset/assetManager.ts
+++ b/Composer/packages/server/src/models/asset/assetManager.ts
@@ -4,7 +4,7 @@
 import fs from 'fs';
 
 import find from 'lodash/find';
-import { UserIdentity, pluginLoader } from '@bfc/plugin-loader';
+import { UserIdentity, pluginLoader } from '@bfc/extension';
 
 import log from '../../logger';
 import { LocalDiskStorage } from '../storage/localDiskStorage';
diff --git a/Composer/packages/server/src/models/bot/botProject.ts b/Composer/packages/server/src/models/bot/botProject.ts
index 5968b81df5..457107b112 100644
--- a/Composer/packages/server/src/models/bot/botProject.ts
+++ b/Composer/packages/server/src/models/bot/botProject.ts
@@ -7,7 +7,7 @@ import fs from 'fs';
 import axios from 'axios';
 import { autofixReferInDialog } from '@bfc/indexers';
 import { getNewDesigner, FileInfo, Skill, Diagnostic, IBotProject, DialogSetting } from '@bfc/shared';
-import { UserIdentity, pluginLoader } from '@bfc/plugin-loader';
+import { UserIdentity, pluginLoader } from '@bfc/extension';
 
 import { Path } from '../../utility/path';
 import { copyDir } from '../../utility/storage';
diff --git a/Composer/packages/server/src/models/settings/defaultSettingManager.ts b/Composer/packages/server/src/models/settings/defaultSettingManager.ts
index be3b616588..b45ba857f1 100644
--- a/Composer/packages/server/src/models/settings/defaultSettingManager.ts
+++ b/Composer/packages/server/src/models/settings/defaultSettingManager.ts
@@ -3,7 +3,7 @@
 
 import set from 'lodash/set';
 import { SensitiveProperties } from '@bfc/shared';
-import { UserIdentity } from '@bfc/plugin-loader';
+import { UserIdentity } from '@bfc/extension';
 
 import { Path } from '../../utility/path';
 import log from '../../logger';
diff --git a/Composer/packages/server/src/models/settings/fileSettingManager.ts b/Composer/packages/server/src/models/settings/fileSettingManager.ts
index 71b637b284..3e342a5125 100644
--- a/Composer/packages/server/src/models/settings/fileSettingManager.ts
+++ b/Composer/packages/server/src/models/settings/fileSettingManager.ts
@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
-import { UserIdentity } from '@bfc/plugin-loader';
+import { UserIdentity } from '@bfc/extension';
 
 import { Path } from '../../utility/path';
 import { IFileStorage } from '../storage/interface';
diff --git a/Composer/packages/server/src/models/storage/storageFactory.ts b/Composer/packages/server/src/models/storage/storageFactory.ts
index fe9fe931be..8c2a32c055 100644
--- a/Composer/packages/server/src/models/storage/storageFactory.ts
+++ b/Composer/packages/server/src/models/storage/storageFactory.ts
@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
-import { pluginLoader, UserIdentity } from '@bfc/plugin-loader';
+import { pluginLoader, UserIdentity } from '@bfc/extension';
 
 import { LocalDiskStorage } from './localDiskStorage';
 import { StorageConnection, IFileStorage } from './interface';
diff --git a/Composer/packages/server/src/server.ts b/Composer/packages/server/src/server.ts
index bce05a0186..25f79a702a 100644
--- a/Composer/packages/server/src/server.ts
+++ b/Composer/packages/server/src/server.ts
@@ -17,7 +17,7 @@ import { IntellisenseServer } from '@bfc/intellisense-languageserver';
 import { LGServer } from '@bfc/lg-languageserver';
 import { LUServer } from '@bfc/lu-languageserver';
 import chalk from 'chalk';
-import { pluginLoader, PluginManager } from '@bfc/plugin-loader';
+import { pluginLoader, ExtensionManager } from '@bfc/extension';
 
 import { BotProjectService } from './services/project';
 import { getAuthProvider } from './router/auth';
@@ -50,7 +50,7 @@ export async function start(): Promise<number | string> {
   setEnvDefault('COMPOSER_EXTENSION_DATA', path.resolve(__dirname, '../extensions.json'));
   setEnvDefault('COMPOSER_BUILTIN_PLUGINS_DIR', path.resolve(__dirname, '../../../plugins'));
   setEnvDefault('COMPOSER_REMOTE_PLUGINS_DIR', path.resolve(__dirname, '../../../.composer'));
-  await PluginManager.loadBuiltinPlugins();
+  await ExtensionManager.loadBuiltinPlugins();
   // TODO (toanzian / abrown): load 3P plugins
 
   const { login, authorize } = getAuthProvider();
diff --git a/Composer/packages/server/src/services/project.ts b/Composer/packages/server/src/services/project.ts
index d437d41843..7aa5863ab1 100644
--- a/Composer/packages/server/src/services/project.ts
+++ b/Composer/packages/server/src/services/project.ts
@@ -6,7 +6,7 @@ import find from 'lodash/find';
 import flatten from 'lodash/flatten';
 import { importResolverGenerator, ResolverResource } from '@bfc/shared';
 import extractMemoryPaths from '@bfc/indexers/lib/dialogUtils/extractMemoryPaths';
-import { UserIdentity } from '@bfc/plugin-loader';
+import { UserIdentity } from '@bfc/extension';
 
 import { BotProject } from '../models/bot/botProject';
 import { LocationRef } from '../models/bot/interface';
diff --git a/Composer/packages/server/src/services/storage.ts b/Composer/packages/server/src/services/storage.ts
index efbbbd4d22..633cdb88b1 100644
--- a/Composer/packages/server/src/services/storage.ts
+++ b/Composer/packages/server/src/services/storage.ts
@@ -3,7 +3,7 @@
 
 import * as fs from 'fs';
 
-import { UserIdentity } from '@bfc/plugin-loader';
+import { UserIdentity } from '@bfc/extension';
 
 import { Path } from '../utility/path';
 import { StorageConnection, IFileStorage } from '../models/storage/interface';
diff --git a/Composer/plugins/azurePublish/package.json b/Composer/plugins/azurePublish/package.json
index 66f433ade2..c62a63babe 100644
--- a/Composer/plugins/azurePublish/package.json
+++ b/Composer/plugins/azurePublish/package.json
@@ -20,7 +20,7 @@
     "@azure/ms-rest-browserauth": "0.1.4",
     "@azure/ms-rest-nodeauth": "3.0.3",
     "@bfc/indexers": "../../packages/lib/indexers",
-    "@bfc/plugin-loader": "../../packages/plugin-loader",
+    "@bfc/extension": "../../packages/extension",
     "@bfc/shared": "../../packages/lib/shared",
     "@microsoft/bf-lu": "^4.10.0-dev.20200728.930f45e",
     "@microsoft/bf-luis-cli": "^4.10.0-dev.20200721.8bb21ac",
diff --git a/Composer/plugins/azurePublish/src/index.ts b/Composer/plugins/azurePublish/src/index.ts
index bfb4d6ebd8..70fce38471 100644
--- a/Composer/plugins/azurePublish/src/index.ts
+++ b/Composer/plugins/azurePublish/src/index.ts
@@ -7,7 +7,7 @@ import { v4 as uuid } from 'uuid';
 import md5 from 'md5';
 import { copy, rmdir, emptyDir, readJson, pathExists, writeJson, mkdirSync, writeFileSync } from 'fs-extra';
 import { IBotProject } from '@bfc/shared';
-import { JSONSchema7 } from '@bfc/plugin-loader';
+import { JSONSchema7 } from '@bfc/extension';
 import { Debugger } from 'debug';
 
 import { mergeDeep } from './mergeDeep';
diff --git a/Composer/plugins/azurePublish/src/schema.ts b/Composer/plugins/azurePublish/src/schema.ts
index fbcbec0207..da5089f0ea 100644
--- a/Composer/plugins/azurePublish/src/schema.ts
+++ b/Composer/plugins/azurePublish/src/schema.ts
@@ -1,6 +1,6 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
-import { JSONSchema7 } from '@bfc/plugin-loader';
+import { JSONSchema7 } from '@bfc/extension';
 const schema: JSONSchema7 = {
   type: 'object',
   properties: {
diff --git a/Composer/plugins/azurePublish/yarn.lock b/Composer/plugins/azurePublish/yarn.lock
index f29cbceb2a..8056f896d0 100644
--- a/Composer/plugins/azurePublish/yarn.lock
+++ b/Composer/plugins/azurePublish/yarn.lock
@@ -164,7 +164,7 @@
     botbuilder-lg "^4.10.0-preview-150886"
     lodash "^4.17.19"
 
-"@bfc/plugin-loader@../../packages/plugin-loader":
+"@bfc/extension@../../packages/extension":
   version "1.0.0"
   dependencies:
     debug "^4.1.1"
diff --git a/Composer/plugins/mockRemotePublish/package.json b/Composer/plugins/mockRemotePublish/package.json
index 52118ec07b..4273ac003b 100644
--- a/Composer/plugins/mockRemotePublish/package.json
+++ b/Composer/plugins/mockRemotePublish/package.json
@@ -14,7 +14,7 @@
     "uuid": "^7.0.1"
   },
   "devDependencies": {
-    "@bfc/plugin-loader": "file:../../packages/plugin-loader",
+    "@bfc/extension": "file:../../packages/extension",
     "@types/uuid": "^7.0.2"
   }
 }
diff --git a/Composer/plugins/mockRemotePublish/src/index.ts b/Composer/plugins/mockRemotePublish/src/index.ts
index a5137fc0f3..3a113c7f2d 100644
--- a/Composer/plugins/mockRemotePublish/src/index.ts
+++ b/Composer/plugins/mockRemotePublish/src/index.ts
@@ -8,7 +8,7 @@
  */
 
 import { v4 as uuid } from 'uuid';
-import { ComposerPluginRegistration, PublishResponse, PublishPlugin, JSONSchema7 } from '@bfc/plugin-loader';
+import { ComposerPluginRegistration, PublishResponse, PublishPlugin, JSONSchema7 } from '@bfc/extension';
 
 import schema from './schema';
 
diff --git a/Composer/plugins/mockRemotePublish/src/schema.ts b/Composer/plugins/mockRemotePublish/src/schema.ts
index 30cc119dfd..aa6bf8986e 100644
--- a/Composer/plugins/mockRemotePublish/src/schema.ts
+++ b/Composer/plugins/mockRemotePublish/src/schema.ts
@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
-import { JSONSchema7 } from '@bfc/plugin-loader';
+import { JSONSchema7 } from '@bfc/extension';
 
 const schema: JSONSchema7 = {
   type: 'object',
diff --git a/Composer/plugins/mockRemotePublish/yarn.lock b/Composer/plugins/mockRemotePublish/yarn.lock
index e161cf729f..1ce8b846a7 100644
--- a/Composer/plugins/mockRemotePublish/yarn.lock
+++ b/Composer/plugins/mockRemotePublish/yarn.lock
@@ -2,7 +2,7 @@
 # yarn lockfile v1
 
 
-"@bfc/plugin-loader@file:../../packages/plugin-loader":
+"@bfc/extension@file:../../packages/extension":
   version "1.0.0"
   dependencies:
     debug "^4.1.1"

From edccdeec6a9f938f456799796a1f2be8146b788e Mon Sep 17 00:00:00 2001
From: Tony Anziano <tonyanziano5@gmail.com>
Date: Thu, 10 Sep 2020 13:36:17 -0700
Subject: [PATCH 08/10] Aligned electron remote plugin dir with server remote
 plugin dir.

---
 Composer/packages/electron-server/src/main.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Composer/packages/electron-server/src/main.ts b/Composer/packages/electron-server/src/main.ts
index 7528966df8..851c5fb63a 100644
--- a/Composer/packages/electron-server/src/main.ts
+++ b/Composer/packages/electron-server/src/main.ts
@@ -57,7 +57,7 @@ async function createAppDataDir() {
   const azurePublishPath: string = join(composerAppDataPath, 'publishBots');
   process.env.COMPOSER_APP_DATA = join(composerAppDataPath, 'data.json'); // path to the actual data file
   process.env.COMPOSER_EXTENSION_DATA = join(composerAppDataPath, 'extensions.json');
-  process.env.COMPOSER_REMOTE_PLUGINS_DIR = join(composerAppDataPath, 'extensions');
+  process.env.COMPOSER_REMOTE_PLUGINS_DIR = join(composerAppDataPath, '.composer');
 
   log('creating composer app data path at: ', composerAppDataPath);
 

From 82979dc202832097b512a94893b82132ba24788a Mon Sep 17 00:00:00 2001
From: Tony Anziano <tonyanziano5@gmail.com>
Date: Thu, 10 Sep 2020 14:23:53 -0700
Subject: [PATCH 09/10] Fixed tests.

---
 .../adaptive-flow-editor/renderers/NodeWrapper.test.tsx         | 2 +-
 .../extension-client/src/hooks/__tests__/useFlowConfig.test.tsx | 2 +-
 .../extension-client/src/hooks/__tests__/useFormConfig.test.tsx | 2 +-
 .../extension-client/src/hooks/__tests__/useMenuConfig.test.tsx | 2 +-
 .../src/hooks/__tests__/useRecognizerConfig.test.tsx            | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Composer/packages/adaptive-flow/__tests__/adaptive-flow-editor/renderers/NodeWrapper.test.tsx b/Composer/packages/adaptive-flow/__tests__/adaptive-flow-editor/renderers/NodeWrapper.test.tsx
index a7fe88f63b..e9fbf7bdb0 100644
--- a/Composer/packages/adaptive-flow/__tests__/adaptive-flow-editor/renderers/NodeWrapper.test.tsx
+++ b/Composer/packages/adaptive-flow/__tests__/adaptive-flow-editor/renderers/NodeWrapper.test.tsx
@@ -3,7 +3,7 @@
 
 import React from 'react';
 import { render, fireEvent } from '@bfc/test-utils';
-import EditorExtensionContext from '@bfc/extension-client';
+import { EditorExtensionContext } from '@bfc/extension-client';
 
 import { ActionNodeWrapper } from '../../../src/adaptive-flow-editor/renderers/NodeWrapper';
 import { ShellApiStub } from '../stubs/ShellApiStub';
diff --git a/Composer/packages/extension-client/src/hooks/__tests__/useFlowConfig.test.tsx b/Composer/packages/extension-client/src/hooks/__tests__/useFlowConfig.test.tsx
index 354b558a2a..bae08b5459 100644
--- a/Composer/packages/extension-client/src/hooks/__tests__/useFlowConfig.test.tsx
+++ b/Composer/packages/extension-client/src/hooks/__tests__/useFlowConfig.test.tsx
@@ -5,7 +5,7 @@ import React from 'react';
 import { renderHook } from '@bfc/test-utils/lib/hooks';
 
 import { useFlowConfig } from '../useFlowConfig';
-import EditorExtensionContext from '../../EditorExtensionContext';
+import { EditorExtensionContext } from '../../EditorExtensionContext';
 
 const plugins = {
   uiSchema: {
diff --git a/Composer/packages/extension-client/src/hooks/__tests__/useFormConfig.test.tsx b/Composer/packages/extension-client/src/hooks/__tests__/useFormConfig.test.tsx
index b944578114..b5ae3e59c2 100644
--- a/Composer/packages/extension-client/src/hooks/__tests__/useFormConfig.test.tsx
+++ b/Composer/packages/extension-client/src/hooks/__tests__/useFormConfig.test.tsx
@@ -5,7 +5,7 @@ import React from 'react';
 import { renderHook } from '@bfc/test-utils/lib/hooks';
 
 import { useFormConfig } from '../useFormConfig';
-import EditorExtensionContext from '../../EditorExtensionContext';
+import { EditorExtensionContext } from '../../EditorExtensionContext';
 
 const plugins = {
   uiSchema: {
diff --git a/Composer/packages/extension-client/src/hooks/__tests__/useMenuConfig.test.tsx b/Composer/packages/extension-client/src/hooks/__tests__/useMenuConfig.test.tsx
index 2f6df9869b..9fa50c6f35 100644
--- a/Composer/packages/extension-client/src/hooks/__tests__/useMenuConfig.test.tsx
+++ b/Composer/packages/extension-client/src/hooks/__tests__/useMenuConfig.test.tsx
@@ -5,7 +5,7 @@ import React from 'react';
 import { renderHook } from '@bfc/test-utils/lib/hooks';
 
 import { useMenuConfig } from '../useMenuConfig';
-import EditorExtensionContext from '../../EditorExtensionContext';
+import { EditorExtensionContext } from '../../EditorExtensionContext';
 
 const plugins = {
   uiSchema: {
diff --git a/Composer/packages/extension-client/src/hooks/__tests__/useRecognizerConfig.test.tsx b/Composer/packages/extension-client/src/hooks/__tests__/useRecognizerConfig.test.tsx
index 8b50364a61..efea8491c1 100644
--- a/Composer/packages/extension-client/src/hooks/__tests__/useRecognizerConfig.test.tsx
+++ b/Composer/packages/extension-client/src/hooks/__tests__/useRecognizerConfig.test.tsx
@@ -5,7 +5,7 @@ import React from 'react';
 import { renderHook } from '@bfc/test-utils/lib/hooks';
 
 import { useRecognizerConfig } from '../useRecognizerConfig';
-import EditorExtensionContext from '../../EditorExtensionContext';
+import { EditorExtensionContext } from '../../EditorExtensionContext';
 
 const plugins = {
   uiSchema: {

From c1c5aa7b6a1f4028f328e8d9c4cf39fada68f410 Mon Sep 17 00:00:00 2001
From: Tony Anziano <tonyanziano5@gmail.com>
Date: Thu, 10 Sep 2020 15:25:26 -0700
Subject: [PATCH 10/10] Typecheck fix

---
 Composer/packages/server/src/controllers/formDialog.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Composer/packages/server/src/controllers/formDialog.ts b/Composer/packages/server/src/controllers/formDialog.ts
index 484987aaa7..19c8f4e38e 100644
--- a/Composer/packages/server/src/controllers/formDialog.ts
+++ b/Composer/packages/server/src/controllers/formDialog.ts
@@ -2,7 +2,7 @@
 // Licensed under the MIT License.
 
 import { Request, Response } from 'express';
-import { PluginLoader } from '@bfc/plugin-loader';
+import { PluginLoader } from '@bfc/extension';
 import { schemas, expandPropertyDefinition } from '@microsoft/bf-generate-library';
 
 import { BotProjectService } from '../services/project';