diff --git a/.eslintignore b/.eslintignore
index 9e2cea19ff3..f9be8b1dd54 100644
--- a/.eslintignore
+++ b/.eslintignore
@@ -1,11 +1,19 @@
-node_modules/**
-dist/**
+node_modules/
+dist/
 src.gen/**
 **/*.json
+**/*.gen.ts
+types/*.d.ts
+
+# Duplicate entries because prettier can be ran from root or within the workspace/subpackage.
+# TODO: Avoid this.
 src/shared/telemetry/clienttelemetry.d.ts
 src/codewhisperer/client/codewhispererclient.d.ts
 src/codewhisperer/client/codewhispereruserclient.d.ts
 src/amazonqFeatureDev/client/featuredevproxyclient.d.ts
-**/*.gen.ts
 src/testFixtures/**
-types/*.d.ts
+packages/toolkit/src/shared/telemetry/clienttelemetry.d.ts
+packages/toolkit/src/codewhisperer/client/codewhispererclient.d.ts
+packages/toolkit/src/codewhisperer/client/codewhispereruserclient.d.ts
+packages/toolkit/src/amazonqFeatureDev/client/featuredevproxyclient.d.ts
+packages/toolkit/src/testFixtures/**
diff --git a/.eslintrc.js b/.eslintrc.js
index 4d573bb0504..3121a6bee60 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -4,7 +4,7 @@ module.exports = {
     parserOptions: {
         ecmaVersion: 'latest',
         sourceType: 'module',
-        project: './tsconfig.json',
+        project: ['./packages/*/tsconfig.json', './plugins/*/tsconfig.json'],
         tsconfigRootDir: __dirname,
     },
     env: {
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 27179c277bb..427ef5acee1 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -1,5 +1,5 @@
 * @aws/aws-ides-team
-src/codewhisperer/ @aws/codewhisperer-team
-src/amazonqFeatureDev/ @aws/earlybird
-src/codewhispererChat/ @aws/aws-mynah
-src/amazonq/ @aws/aws-mynah
+packages/toolkit/src/codewhisperer/ @aws/codewhisperer-team
+packages/toolkit/src/amazonqFeatureDev/ @aws/earlybird
+packages/toolkit/src/codewhispererChat/ @aws/aws-mynah
+packages/toolkit/src/amazonq/ @aws/aws-mynah
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index 4e58e7899fc..0fc44ac4610 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -7,7 +7,7 @@
 version: 2
 updates:
     - package-ecosystem: 'npm'
-      directory: '/' # Location of package manifests.
+      directory: './packages/toolkit/' # Location of package manifests.
       target-branch: 'master' # Avoid updates to "staging".
       commit-message:
           prefix: 'deps'
@@ -25,7 +25,7 @@ updates:
                   - '@smithy*'
                   - 'smithy*'
     - package-ecosystem: 'github-actions'
-      directory: '/'
+      directory: './packages/toolkit/'
       target-branch: 'master' # Avoid updates to "staging".
       commit-message:
           prefix: 'deps'
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 3a7e63b5a5e..b63ebdfd03b 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -52,7 +52,7 @@ jobs:
             - name: vsix
               run: |
                   npm run createRelease  # Generate CHANGELOG.md
-                  npm run generateNonCodeFiles
+                  npm run generateNonCodeFiles -w packages/toolkit
                   cp ./README.quickstart.vscode.md ./README.md
                   npm run package -- --feature "$FEAT_NAME"
             - uses: actions/upload-artifact@v4
diff --git a/.gitignore b/.gitignore
index 416ac20f07d..caa4923591f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,8 +1,8 @@
 out
 dist
 node_modules
-.vscode-test/
-coverage/
+.vscode-test
+coverage
 *.vsix
 *.bk
 **/.DS_Store
@@ -12,34 +12,40 @@ quickStart*.html
 README.quickstart.cloud9.md
 README.quickstart.vscode.md
 .gitcommit
-resources/debugger/__pycache__
+__pycache__
 
 # Generated if running the `depcruise` command from the documentation example
 /dependency-graph.svg
 
 # Auto generated definitions
-src/**/*.gen.ts
+packages/toolkit/src/**/*.gen.ts
 src.gen/*
 # Telemetry definition for testing adding telemetry
-src/shared/telemetry/vscodeTelemetry.json
+packages/toolkit/src/shared/telemetry/vscodeTelemetry.json
 
 # Test reports
-.test-reports/
+.test-reports
 
 # Auto generated type definitions
-src/shared/telemetry/clienttelemetry.d.ts
-src/codewhisperer/client/codewhispererclient.d.ts
-src/codewhisperer/client/codewhispereruserclient.d.ts
-src/amazonqFeatureDev/client/featuredevproxyclient.d.ts
+packages/toolkit/src/shared/telemetry/clienttelemetry.d.ts
+packages/toolkit/src/codewhisperer/client/codewhispererclient.d.ts
+packages/toolkit/src/codewhisperer/client/codewhispereruserclient.d.ts
+packages/toolkit/src/amazonqFeatureDev/client/featuredevproxyclient.d.ts
 
 # Generated by tests
-src/testFixtures/**/bin
-src/testFixtures/**/obj
+packages/toolkit/src/testFixtures/**/bin
+packages/toolkit/src/testFixtures/**/obj
+
+# Generated by copyFiles.ts
+packages/toolkit/README*
+packages/toolkit/CHANGELOG.md
+packages/toolkit/LICENSE
+packages/toolkit/NOTICE
 
 # Icons
-resources/icons/cloud9/generated/**
-resources/fonts/aws-toolkit-icons.woff
-resources/css/icons.css
+packages/toolkit/resources/icons/cloud9/generated/**
+packages/toolkit/resources/fonts/aws-toolkit-icons.woff
+packages/toolkit/resources/css/icons.css
 
 # local configuration
 .local.env
diff --git a/.prettierignore b/.prettierignore
index 16f7af38fb6..c7b34ad2f10 100644
--- a/.prettierignore
+++ b/.prettierignore
@@ -1,12 +1,15 @@
 out
-resources/endpoints.json
 CHANGELOG.md
-src/shared/telemetry/service-2.json
 .changes
-src/testFixtures/**
 *.d.ts
 *.gen.ts
-dist/**
-types/*.d.ts
+dist
 src.gen/**
-plugins/*/dist/**
+
+# Duplicate entries because prettier can be ran from root or within the workspace/subpackage.
+# TODO: Avoid this.
+src/shared/telemetry/service-2.json
+src/testFixtures/**
+
+packages/toolkit/src/shared/telemetry/service-2.json
+packages/toolkit/src/testFixtures/**
diff --git a/.vscode/settings.json b/.vscode/settings.json
index d5240393191..f954c48cf36 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -11,5 +11,6 @@
     },
     "typescript.preferences.importModuleSpecifier": "relative",
     "javascript.preferences.importModuleSpecifier": "relative",
-    "typescript.tsdk": "node_modules/typescript/lib"
+    "typescript.tsdk": "node_modules/typescript/lib",
+    "npm.packageManager": "npm"
 }
diff --git a/.vscodeignore b/.vscodeignore
deleted file mode 100644
index 86b0cff0376..00000000000
--- a/.vscodeignore
+++ /dev/null
@@ -1,20 +0,0 @@
-# Ignore everything by default. #1899
-*
-*/**
-
-# Allowlist
-!dist/*
-!dist/libs
-!dist/*/!(testFixtures|test)/**/!(*.*.map)
-!dist/*/!(*.*.map)
-!resources/**
-!syntaxes/**
-!templates/**
-!types/**
-!LICENSE
-!NOTICE
-!package.json
-!package.nls.json
-!quickStart**
-!README.**
-!CHANGELOG.md
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index c048ee10a68..b009dfdc2ae 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -8,6 +8,10 @@ codebase and sending pull requests.
 
 ## Getting Started
 
+This project is set up as a typescript monorepo. The documentation throughout this project
+is referring to the subproject in [`packages/toolkit/`](./packages/toolkit/). For more information,
+see [ARCHITECTURE.md](./docs/ARCHITECTURE.md#monorepo-structure)
+
 ### Find things to do
 
 If you're looking for ideas about where to contribute, consider
@@ -35,6 +39,9 @@ Then clone the repository and install NPM packages:
 
 ### Run
 
+Due to the monorepo structure of the project, you can run the extension in VSCode by either opening the
+`aws-toolkit-vscode/packages/toolkit` folder directly, or adding it as a root folder in the VSCode Workspace.
+
 To run the extension from VSCode as a Node.js app:
 
 1. Select the Run panel from the sidebar.
@@ -153,7 +160,9 @@ See [browser.md](./docs/browser.md) for working with the browser implementation
 See [TESTPLAN.md](./docs/TESTPLAN.md) to understand the project's test
 structure, mechanics and philosophy.
 
-You can run tests directly from VSCode:
+You can run tests directly from VSCode. Due to the monorepo structure of the project, you must either open
+the `aws-toolkit-vscode/packages/toolkit/` folder directly, or add it as a root folder in the VSCode Workspace.
+Then:
 
 1. Select `View > Debug`, or select the Debug pane from the sidebar.
 2. From the dropdown at the top of the Debug pane, select the `Extension Tests` configuration.
@@ -208,7 +217,7 @@ To run tests against a specific folder in VSCode, do any one of:
 
 Running the extension in the browser (eg: [vscode.dev](https://vscode.dev/)).
 
-[See documentation here](./src/browser/README.md).
+[See documentation here](./packages/toolkit/src/browser/README.md).
 
 ### Coverage report
 
diff --git a/buildspec/packageTestVsix.yml b/buildspec/packageTestVsix.yml
index 44ae94f521e..f6710783fb6 100644
--- a/buildspec/packageTestVsix.yml
+++ b/buildspec/packageTestVsix.yml
@@ -27,7 +27,7 @@ phases:
             - export HOME=/home/codebuild-user
             # Generate CHANGELOG.md
             - npm run createRelease
-            - npm run generateNonCodeFiles
+            - npm run generateNonCodeFiles -w packages/toolkit
             - cp ./README.quickstart.vscode.md ./README.md
             - npm run package
 
diff --git a/codecov.yml b/codecov.yml
index 3b44b7a1b42..4c4129c979e 100644
--- a/codecov.yml
+++ b/codecov.yml
@@ -38,7 +38,7 @@ github_checks:
 flags:
     codewhisperer:
         paths:
-            - src/codewhisperer/
+            - packages/toolkit/src/codewhisperer/
     amazonqFeatureDev:
         paths:
-            - src/amazonqFeatureDev/
+            - packages/toolkit/src/amazonqFeatureDev/
diff --git a/designs/credentials/credentials-management.md b/designs/credentials/credentials-management.md
index 3c9daf2e4a3..f6b6701f24b 100644
--- a/designs/credentials/credentials-management.md
+++ b/designs/credentials/credentials-management.md
@@ -31,11 +31,11 @@ A formatted version of the Credentials Provider Id may be surfaced to users, how
 
 When the user connects to AWS in the Toolkit, a Credentials Provider is requested, which is then used to obtain credentials. The toolkit requests a Credentials Provider by checking which credentials provider factories support the provider's credentials type. The factories of interest are queried to see which (if any) have the requested Credentials Provider.
 
-At the time this document was written, Shared Credentials are the only supported Credentials. Additional credentials providers will reside at [/src/credentials/providers](/src/credentials/providers) as they are implemented.
+At the time this document was written, Shared Credentials are the only supported Credentials. Additional credentials providers will reside at [/src/credentials/providers](/packages/toolkit/src/credentials/providers) as they are implemented.
 
 ### Shared Credentials Profiles
 
-Profiles are retrieved from the user's shared credentials files. The profile is handled and validated differently based on which fields are present. Handling and validation logic can be found in [sharedCredentialsProvider.ts](/src/credentials/providers/sharedCredentialsProvider.ts).
+Profiles are retrieved from the user's shared credentials files. The profile is handled and validated differently based on which fields are present. Handling and validation logic can be found in [sharedCredentialsProvider.ts](/packages/toolkit/src/credentials/providers/sharedCredentialsProvider.ts).
 
 Only profiles that are considered valid are provided to the toolkit. When validation issues are detected, they are written to the logs to help users understand why the toolkit is having difficulties with a profile. Users running the 'Connect to AWS' command will not see invalid profiles in the list of Credentials.
 
diff --git a/designs/modify-resources-attached-to-code-pipeline.md b/designs/modify-resources-attached-to-code-pipeline.md
index 8b8960ac471..3da351d72e7 100644
--- a/designs/modify-resources-attached-to-code-pipeline.md
+++ b/designs/modify-resources-attached-to-code-pipeline.md
@@ -150,7 +150,7 @@ The confirmation prompt can be implemented using one of two UI facilities:
 
 ### API Client
 
-The `ResourceGroupsTaggingAPI` service client will be used. The client will be set up in a manner consistent with the Lambda and CloudFormation clients, allowing the clients to be stubbed out in unit tests. See the Toolkit's Lambda Client [Interface](/src/shared/clients/lambdaClient.ts) and [Implementation](/src/shared/clients/defaultLambdaClient.ts) as an example. A new client factory will be added to [ToolkitClientBuilder](/src/shared/clients/toolkitClientBuilder.ts) and [DefaultToolkitClientBuilder](/src/shared/clients/defaultToolkitClientBuilder.ts).
+The `ResourceGroupsTaggingAPI` service client will be used. The client will be set up in a manner consistent with the Lambda and CloudFormation clients, allowing the clients to be stubbed out in unit tests. See the Toolkit's Lambda Client [Interface](/packages/toolkit/src/shared/clients/lambdaClient.ts) and [Implementation](/packages/toolkit/src/shared/clients/defaultLambdaClient.ts) as an example. A new client factory will be added to [ToolkitClientBuilder](/packages/toolkit/src/shared/clients/toolkitClientBuilder.ts) and [DefaultToolkitClientBuilder](/packages/toolkit/src/shared/clients/defaultToolkitClientBuilder.ts).
 
 ### <a id="fallback-handling"></a>Fallback Handling
 
diff --git a/docs/ARCHITECTURE.md b/docs/ARCHITECTURE.md
index aee0f26935c..c1775c1ce05 100644
--- a/docs/ARCHITECTURE.md
+++ b/docs/ARCHITECTURE.md
@@ -2,11 +2,42 @@
 
 An overview of the architecture for various components within the Toolkit.
 
+## Monorepo Structure
+
+This project is currently set up as a typescript monorepo with a single subproject.
+We are currently working on splitting the Toolkit into various subprojects to help with
+sharing code between modules, browser extension development, etc. For now, there is just
+one monolithic subproject with all the extension functionality: [`packages/toolkit/`](./packages/toolkit/).
+
+Unless otherwise stated, the documentation throughout this project is referring to the code and
+functionality of that subproject.
+
+Current quirks of the current monorepo status that should be resolved/evaluated in later versions (TODO):
+
+-   The [root package.json](../package.json) contains common dependencies for subprojects, and workspace
+    entries for each of the subprojects.
+    -   This package contains shortcuts to some of the `npm` scripts found in the subproject(s).
+    -   Other scripts, like `createRelease` and `newChange` run at the root level.
+    -   To run a script not present in the root `package.json`, use `npm run -w packages/toolkit <script>`
+-   `coverage/`, `.test-reports/`, `node_modules/` are hoisted to the project root. As more subprojects are added,
+    we will need to evaluate how to merge and publish coverage reports.
+    -   `dist/` however remains at the subproject level, along with a local `node_modules/`. See [`npm workspaces`](https://docs.npmjs.com/cli/v8/using-npm/workspaces)
+        for more info on how `node_modules/` hoisting works.
+    -   Because of `node_modules/` hoisting, references to this folder in code access the root project modules folder. This may be
+        an issue if more subprojects are added and the contents of the root and local modules folders differ.
+-   [`globalSetup.test.ts`](../packages/toolkit/src/test/globalSetup.test.ts) should be configured to work as a library/run tests for all subprojects.
+-   Subproject `tsconfig.json`s should extend a root `tsconfig.packages.json`.
+-   Linting tests should run at the root level, not subproject level.
+-   `packages/toolkit/scripts/` should be generalized and moved to the root of the project as needed.
+-   LICENSE, README.md, and other non-code artifacts that must be packaged into the .vsix are currently
+    being copied into the packaging subproject directory from the root project directory as part of the `copyFiles` task.
+-   [**Running the test suites in VSCode has changed**](../CONTRIBUTING.md#test)
+
 ## Commands
 
 Many parts of the VS Code API relies on the use of 'commands' which are simply functions bound to a global ID. For small projects, this simplicity is great. But the base API doesn't offer a lot of common functionality that a large project might want: logging, error handling, etc.
 
-For the Toolkit, common command functionality is implemented in [Commands](../src/shared/vscode/commands2.ts). The goal with this abstraction is to increase consistency across the Toolkit for anything related to commands.
+For the Toolkit, common command functionality is implemented in [Commands](../packages/toolkit/src/shared/vscode/commands2.ts). The goal with this abstraction is to increase consistency across the Toolkit for anything related to commands.
 
 ### Examples
 
@@ -90,7 +121,7 @@ _See also [CODE_GUIDELINES.md](./CODE_GUIDELINES.md#exceptions)._
 
 Large applications often have a correspondingly large number of failure points. For feature-level logic, these failures are often non-recoverable. The best we can do is show the user that something went wrong and maybe offer guidance on how to fix it.
 
-Because this is such a common pattern, shared error handling logic is defined by `ToolkitError` found [here](../src/shared/errors.ts). This class provides the basic structure for errors throughout the Toolkit.
+Because this is such a common pattern, shared error handling logic is defined by `ToolkitError` found [here](../packages/toolkit/src/shared/errors.ts). This class provides the basic structure for errors throughout the Toolkit.
 
 ### Chaining
 
@@ -100,7 +131,7 @@ By adding additional information as the exception bubbles up, we can create a be
 
 ### Handlers
 
-Any code paths exercised via `Commands` will have errors handled by `handleError` in [extensions.ts](../src/extension.ts). A better API for error handling across more than just commands will be added in a future PR.
+Any code paths exercised via `Commands` will have errors handled by `handleError` in [extensions.ts](../packages/toolkit/src/extension.ts). A better API for error handling across more than just commands will be added in a future PR.
 
 ### Best Practices
 
diff --git a/docs/CODE_GUIDELINES.md b/docs/CODE_GUIDELINES.md
index 2e8bd184577..099de0d7c8b 100644
--- a/docs/CODE_GUIDELINES.md
+++ b/docs/CODE_GUIDELINES.md
@@ -183,7 +183,7 @@ _See also [ARCHITECTURE.md](./ARCHITECTURE.md#exceptions)._
 
     -   [Testing Refresh Button](https://github.com/aws/aws-toolkit-vscode/blob/b34c8f7650c862c388992781844695b014b5d974/src/test/shared/ui/prompters/rolePrompter.test.ts#L58-L65)
 
--   Use [`testCommand`](../src/test/shared/vscode/testUtils.ts) for testing commands created by `Commands.declare`
+-   Use [`testCommand`](../packages/toolkit/src/test/shared/vscode/testUtils.ts) for testing commands created by `Commands.declare`
     -   Prefer executing the real command directly when possible
 
 ## Code guidelines
diff --git a/package-lock.json b/package-lock.json
index 8ba9f6b1e09..e1126d0b56a 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,157 +1,40 @@
 {
-    "name": "aws-toolkit-vscode",
-    "version": "2.9.0-SNAPSHOT",
+    "name": "root",
+    "version": "0.0.1",
     "lockfileVersion": 3,
     "requires": true,
     "packages": {
         "": {
-            "name": "aws-toolkit-vscode",
-            "version": "2.9.0-SNAPSHOT",
+            "name": "root",
+            "version": "0.0.1",
             "hasInstallScript": true,
             "license": "Apache-2.0",
             "workspaces": [
-                "src/browser",
+                "packages/toolkit/src/browser",
+                "packages/*",
+                "plugins/*",
                 "src.gen/@amzn/codewhisperer-streaming"
             ],
-            "dependencies": {
-                "@amzn/codewhisperer-streaming": "file:./src.gen/@amzn/codewhisperer-streaming",
-                "@aws-sdk/client-cognito-identity": "3.490.0",
-                "@aws-sdk/client-lambda": "3.385.0",
-                "@aws-sdk/client-sso": "^3.342.0",
-                "@aws-sdk/client-sso-oidc": "^3.181.0",
-                "@aws-sdk/credential-provider-ini": "3.46.0",
-                "@aws-sdk/credential-provider-process": "3.37.0",
-                "@aws-sdk/credential-provider-sso": "^3.345.0",
-                "@aws-sdk/property-provider": "3.46.0",
-                "@aws-sdk/smithy-client": "^3.46.0",
-                "@aws-sdk/util-arn-parser": "^3.46.0",
-                "@aws/mynah-ui": "3.3.3",
-                "@gerhobbelt/gitignore-parser": "^0.2.0-9",
-                "@iarna/toml": "^2.2.5",
-                "@smithy/shared-ini-file-loader": "^2.2.8",
-                "@vscode/debugprotocol": "^1.57.0",
-                "adm-zip": "^0.5.10",
-                "amazon-states-language-service": "^1.11.0",
-                "async-lock": "^1.4.0",
-                "aws-sdk": "^2.1384.0",
-                "aws-ssm-document-language-service": "^1.0.0",
-                "bytes": "^3.1.2",
-                "cross-fetch": "^4.0.0",
-                "cross-spawn": "^7.0.3",
-                "fast-json-patch": "^3.1.1",
-                "fs-extra": "^10.0.1",
-                "glob": "^10.3.10",
-                "got": "^11.8.5",
-                "highlight.js": "^11.9.0",
-                "i18n-ts": "^1.0.5",
-                "immutable": "^4.3.0",
-                "js-yaml": "^4.1.0",
-                "jsonc-parser": "^3.2.0",
-                "lodash": "^4.17.21",
-                "markdown-it": "^13.0.2",
-                "mime-types": "^2.1.32",
-                "node-fetch": "^2.7.0",
-                "portfinder": "^1.0.32",
-                "sanitize-html": "^2.3.3",
-                "semver": "^7.5.4",
-                "strip-ansi": "^5.2.0",
-                "tcp-port-used": "^1.0.1",
-                "typescript": "^5.0.4",
-                "uuid": "^9.0.0",
-                "vscode-languageclient": "^6.1.4",
-                "vscode-languageserver": "^6.1.1",
-                "vscode-languageserver-protocol": "^3.15.3",
-                "vscode-languageserver-textdocument": "^1.0.8",
-                "vscode-nls": "^5.2.0",
-                "vue": "^3.3.4",
-                "web-tree-sitter": "^0.20.7",
-                "whatwg-url": "^14.0.0",
-                "winston": "^3.11.0",
-                "winston-transport": "^4.6.0",
-                "xml2js": "^0.6.1",
-                "yaml-cfn": "^0.3.2"
-            },
             "devDependencies": {
-                "@aws-sdk/types": "^3.13.1",
-                "@aws-toolkits/telemetry": "^1.0.184",
-                "@aws/fully-qualified-names": "^2.1.1",
-                "@cspotcode/source-map-support": "^0.8.1",
-                "@sinonjs/fake-timers": "^10.0.2",
-                "@types/adm-zip": "^0.4.34",
-                "@types/async-lock": "^1.4.0",
-                "@types/bytes": "^3.1.0",
-                "@types/circular-dependency-plugin": "^5.0.8",
-                "@types/cross-spawn": "^6.0.6",
-                "@types/diff": "^5.0.7",
-                "@types/fs-extra": "^9.0.11",
-                "@types/glob": "^8.1.0",
-                "@types/js-yaml": "^4.0.5",
-                "@types/jsdom": "^21.1.6",
-                "@types/lodash": "^4.14.180",
-                "@types/markdown-it": "^13.0.2",
-                "@types/mime-types": "^2.1.4",
-                "@types/mocha": "^10.0.6",
-                "@types/node": "^14.18.63",
-                "@types/node-fetch": "^2.6.8",
-                "@types/prismjs": "^1.26.0",
-                "@types/readline-sync": "^1.4.3",
-                "@types/sanitize-html": "2.3.1",
-                "@types/semver": "^7.5.0",
-                "@types/sinon": "^10.0.5",
-                "@types/sinonjs__fake-timers": "^8.1.2",
-                "@types/tcp-port-used": "^1.0.1",
-                "@types/uuid": "^9.0.1",
                 "@types/vscode": "^1.68.0",
                 "@types/vscode-webview": "^1.57.1",
-                "@types/webpack-env": "^1.18.1",
-                "@types/whatwg-url": "^11.0.4",
-                "@types/xml2js": "^0.4.11",
                 "@typescript-eslint/eslint-plugin": "^5.59.0",
                 "@typescript-eslint/parser": "^5.59.1",
                 "@vscode/codicons": "^0.0.33",
                 "@vscode/test-electron": "^2.3.8",
                 "@vscode/test-web": "^0.0.50",
                 "@vscode/vsce": "^2.19.0",
-                "@vue/compiler-sfc": "^3.3.2",
-                "c8": "^9.0.0",
-                "circular-dependency-plugin": "^5.2.2",
-                "css-loader": "^6.10.0",
-                "diff": "^5.1.0",
-                "esbuild-loader": "2.20.0",
                 "eslint": "^8.56.0",
                 "eslint-config-prettier": "9.1",
                 "eslint-plugin-aws-toolkits": "file:plugins/eslint-plugin-aws-toolkits",
                 "eslint-plugin-header": "^3.1.1",
                 "eslint-plugin-unicorn": "^50.0.1",
-                "file-loader": "^6.2.0",
                 "husky": "^9.0.7",
-                "jsdom": "^23.0.1",
-                "json-schema-to-typescript": "^13.1.1",
-                "marked": "^11.1.1",
-                "mocha": "^10.1.0",
-                "mocha-junit-reporter": "^2.2.1",
-                "mocha-multi-reporters": "^1.5.1",
                 "prettier": "^2.8.8",
                 "prettier-plugin-sh": "^0.12.8",
                 "pretty-quick": "^3.1.3",
-                "readline-sync": "^1.4.9",
-                "sass": "^1.49.8",
-                "sass-loader": "^12.6.0",
-                "sinon": "^14.0.0",
-                "style-loader": "^3.3.1",
                 "ts-node": "^10.9.1",
-                "umd-compat-loader": "^2.1.2",
-                "vscode-nls-dev": "^4.0.4",
-                "vue-loader": "^17.2.2",
-                "vue-style-loader": "^4.1.3",
-                "webfont": "^11.2.26",
-                "webpack": "^5.83.0",
-                "webpack-cli": "^5.1.4",
-                "webpack-dev-server": "^4.15.1"
-            },
-            "engines": {
-                "npm": "^10.1.0",
-                "vscode": "^1.68.0"
+                "typescript": "^5.0.4"
             }
         },
         "@aws/mynah-ui@3.3.3": {
@@ -7772,6 +7655,10 @@
             "resolved": "https://registry.npmjs.org/vscode-uri/-/vscode-uri-1.0.8.tgz",
             "integrity": "sha512-obtSWTlbJ+a+TFRYGaUumtVwb+InIUVI0Lu0VBUAPmj2cU5JutEXg3xUE0c2J5Tcy7h2DEKVJBFi+Y9ZSFzzPQ=="
         },
+        "node_modules/aws-toolkit-vscode": {
+            "resolved": "packages/toolkit",
+            "link": true
+        },
         "node_modules/azure-devops-node-api": {
             "version": "11.2.0",
             "resolved": "https://registry.npmjs.org/azure-devops-node-api/-/azure-devops-node-api-11.2.0.tgz",
@@ -7995,7 +7882,7 @@
             "integrity": "sha512-cKV8tMCEpQs4hK/ik71d6LrPOnpkpGBR0wzxqr68g2m/LB2GxVYQroAjMJZRVM1Y4BCjCKc3vAamxSzOY2RP+w=="
         },
         "node_modules/browser": {
-            "resolved": "src/browser",
+            "resolved": "packages/toolkit/src/browser",
             "link": true
         },
         "node_modules/browser-stdout": {
@@ -17548,6 +17435,7 @@
             "version": "5.0.4",
             "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.0.4.tgz",
             "integrity": "sha512-cW9T5W9xY37cc+jfEnaUvX91foxtHkza3Nw3wkoF4sSlKn0MONdkdEndig/qPBWXNkmplh3NzayQzCiHM4/hqw==",
+            "dev": true,
             "bin": {
                 "tsc": "bin/tsc",
                 "tsserver": "bin/tsserver"
@@ -19182,14 +19070,162 @@
                 "url": "https://github.com/sponsors/sindresorhus"
             }
         },
+        "packages/toolkit": {
+            "name": "aws-toolkit-vscode",
+            "version": "2.9.0-SNAPSHOT",
+            "hasInstallScript": true,
+            "license": "Apache-2.0",
+            "workspaces": [
+                "src/browser"
+            ],
+            "dependencies": {
+                "@amzn/codewhisperer-streaming": "file:../../src.gen/@amzn/codewhisperer-streaming",
+                "@aws-sdk/client-cognito-identity": "3.490.0",
+                "@aws-sdk/client-lambda": "3.385.0",
+                "@aws-sdk/client-sso": "^3.342.0",
+                "@aws-sdk/client-sso-oidc": "^3.181.0",
+                "@aws-sdk/credential-provider-ini": "3.46.0",
+                "@aws-sdk/credential-provider-process": "3.37.0",
+                "@aws-sdk/credential-provider-sso": "^3.345.0",
+                "@aws-sdk/property-provider": "3.46.0",
+                "@aws-sdk/smithy-client": "^3.46.0",
+                "@aws-sdk/util-arn-parser": "^3.46.0",
+                "@aws/mynah-ui": "3.3.3",
+                "@gerhobbelt/gitignore-parser": "^0.2.0-9",
+                "@iarna/toml": "^2.2.5",
+                "@smithy/shared-ini-file-loader": "^2.2.8",
+                "@vscode/debugprotocol": "^1.57.0",
+                "adm-zip": "^0.5.10",
+                "amazon-states-language-service": "^1.11.0",
+                "async-lock": "^1.4.0",
+                "aws-sdk": "^2.1384.0",
+                "aws-ssm-document-language-service": "^1.0.0",
+                "bytes": "^3.1.2",
+                "cross-fetch": "^4.0.0",
+                "cross-spawn": "^7.0.3",
+                "fast-json-patch": "^3.1.1",
+                "fs-extra": "^10.0.1",
+                "glob": "^10.3.10",
+                "got": "^11.8.5",
+                "highlight.js": "^11.9.0",
+                "i18n-ts": "^1.0.5",
+                "immutable": "^4.3.0",
+                "js-yaml": "^4.1.0",
+                "jsonc-parser": "^3.2.0",
+                "lodash": "^4.17.21",
+                "markdown-it": "^13.0.2",
+                "mime-types": "^2.1.32",
+                "node-fetch": "^2.7.0",
+                "portfinder": "^1.0.32",
+                "sanitize-html": "^2.3.3",
+                "semver": "^7.5.4",
+                "strip-ansi": "^5.2.0",
+                "tcp-port-used": "^1.0.1",
+                "uuid": "^9.0.0",
+                "vscode-languageclient": "^6.1.4",
+                "vscode-languageserver": "^6.1.1",
+                "vscode-languageserver-protocol": "^3.15.3",
+                "vscode-languageserver-textdocument": "^1.0.8",
+                "vscode-nls": "^5.2.0",
+                "vue": "^3.3.4",
+                "web-tree-sitter": "^0.20.7",
+                "whatwg-url": "^14.0.0",
+                "winston": "^3.11.0",
+                "winston-transport": "^4.6.0",
+                "xml2js": "^0.6.1",
+                "yaml-cfn": "^0.3.2"
+            },
+            "devDependencies": {
+                "@aws-sdk/types": "^3.13.1",
+                "@aws-toolkits/telemetry": "^1.0.184",
+                "@aws/fully-qualified-names": "^2.1.1",
+                "@cspotcode/source-map-support": "^0.8.1",
+                "@sinonjs/fake-timers": "^10.0.2",
+                "@types/adm-zip": "^0.4.34",
+                "@types/async-lock": "^1.4.0",
+                "@types/bytes": "^3.1.0",
+                "@types/circular-dependency-plugin": "^5.0.8",
+                "@types/cross-spawn": "^6.0.6",
+                "@types/diff": "^5.0.7",
+                "@types/fs-extra": "^9.0.11",
+                "@types/glob": "^8.1.0",
+                "@types/js-yaml": "^4.0.5",
+                "@types/jsdom": "^21.1.6",
+                "@types/lodash": "^4.14.180",
+                "@types/markdown-it": "^13.0.2",
+                "@types/mime-types": "^2.1.4",
+                "@types/mocha": "^10.0.6",
+                "@types/node": "^14.18.63",
+                "@types/node-fetch": "^2.6.8",
+                "@types/prismjs": "^1.26.0",
+                "@types/readline-sync": "^1.4.3",
+                "@types/sanitize-html": "2.3.1",
+                "@types/semver": "^7.5.0",
+                "@types/sinon": "^10.0.5",
+                "@types/sinonjs__fake-timers": "^8.1.2",
+                "@types/tcp-port-used": "^1.0.1",
+                "@types/uuid": "^9.0.1",
+                "@types/webpack-env": "^1.18.1",
+                "@types/whatwg-url": "^11.0.4",
+                "@types/xml2js": "^0.4.11",
+                "@typescript-eslint/eslint-plugin": "^5.59.0",
+                "@typescript-eslint/parser": "^5.59.1",
+                "@vue/compiler-sfc": "^3.3.2",
+                "c8": "^9.0.0",
+                "circular-dependency-plugin": "^5.2.2",
+                "css-loader": "^6.10.0",
+                "diff": "^5.1.0",
+                "esbuild-loader": "2.20.0",
+                "file-loader": "^6.2.0",
+                "jsdom": "^23.0.1",
+                "json-schema-to-typescript": "^13.1.1",
+                "marked": "^11.1.1",
+                "mocha": "^10.1.0",
+                "mocha-junit-reporter": "^2.2.1",
+                "mocha-multi-reporters": "^1.5.1",
+                "readline-sync": "^1.4.9",
+                "sass": "^1.49.8",
+                "sass-loader": "^12.6.0",
+                "sinon": "^14.0.0",
+                "style-loader": "^3.3.1",
+                "ts-node": "^10.9.1",
+                "typescript": "^5.0.4",
+                "umd-compat-loader": "^2.1.2",
+                "vscode-nls-dev": "^4.0.4",
+                "vue-loader": "^17.2.2",
+                "vue-style-loader": "^4.1.3",
+                "webfont": "^11.2.26",
+                "webpack": "^5.83.0",
+                "webpack-cli": "^5.1.4",
+                "webpack-dev-server": "^4.15.1"
+            },
+            "engines": {
+                "npm": "^10.1.0",
+                "vscode": "^1.68.0"
+            }
+        },
+        "packages/toolkit/node_modules/@amzn/codewhisperer-streaming": {
+            "resolved": "src.gen/@amzn/codewhisperer-streaming",
+            "link": true
+        },
+        "packages/toolkit/src/browser": {
+            "license": "Apache-2.0",
+            "dependencies": {
+                "crypto-browserify": "^3.12.0",
+                "os-browserify": "^0.3.0",
+                "path-browserify": "^1.0.1",
+                "process": "^0.11.10",
+                "stream-browserify": "^3.0.0"
+            },
+            "devDependencies": {
+                "assert": "^2.1.0"
+            }
+        },
         "plugins/eslint-plugin-aws-toolkits": {
             "version": "1.0.0",
-            "dev": true,
             "license": "Apache-2.0",
             "devDependencies": {
-                "eslint": "^8.26.0",
-                "mocha": "^10.1.0",
-                "typescript": "^5.0.4"
+                "mocha": "^10.1.0"
             },
             "engines": {
                 "npm": "^10.1.0"
@@ -19469,19 +19505,6 @@
             "bin": {
                 "uuid": "dist/bin/uuid"
             }
-        },
-        "src/browser": {
-            "license": "Apache-2.0",
-            "dependencies": {
-                "crypto-browserify": "^3.12.0",
-                "os-browserify": "^0.3.0",
-                "path-browserify": "^1.0.1",
-                "process": "^0.11.10",
-                "stream-browserify": "^3.0.0"
-            },
-            "devDependencies": {
-                "assert": "^2.1.0"
-            }
         }
     }
 }
diff --git a/package.json b/package.json
index b704adb315e..394b0c4ebaf 100644
--- a/package.json
+++ b/package.json
@@ -1,4425 +1,66 @@
 {
-    "name": "aws-toolkit-vscode",
-    "displayName": "AWS Toolkit - Amazon Q, CodeWhisperer, and more",
-    "description": "Including Amazon Q, CodeWhisperer, CodeCatalyst, Application Composer, and support for Lambda, S3, CloudWatch Logs, CloudFormation, and many other services",
-    "version": "2.9.0-SNAPSHOT",
-    "extensionKind": [
-        "workspace"
+    "name": "root",
+    "workspaces": [
+        "packages/toolkit/src/browser",
+        "packages/*",
+        "plugins/*",
+        "src.gen/@amzn/codewhisperer-streaming"
     ],
-    "publisher": "amazonwebservices",
+    "version": "0.0.1",
+    "private": true,
     "license": "Apache-2.0",
-    "repository": {
-        "type": "git",
-        "url": "https://github.com/aws/aws-toolkit-vscode"
-    },
-    "engines": {
-        "npm": "^10.1.0",
-        "vscode": "^1.68.0"
-    },
-    "icon": "resources/marketplace/aws-icon-256x256.png",
-    "bugs": {
-        "url": "https://github.com/aws/aws-toolkit-vscode/issues"
-    },
-    "galleryBanner": {
-        "color": "#FF9900",
-        "theme": "light"
-    },
-    "categories": [
-        "Debuggers",
-        "Linters",
-        "Visualization",
-        "Other"
-    ],
-    "keywords": [
-        "Lambda",
-        "CodeCatalyst",
-        "CodeWhisperer",
-        "Code",
-        "Whisperer"
-    ],
-    "preview": false,
-    "qna": "https://github.com/aws/aws-toolkit-vscode/issues",
-    "activationEvents": [
-        "onStartupFinished",
-        "onUri",
-        "onDebugResolve:aws-sam",
-        "onView:aws.codeWhisperer.securityPanel",
-        "onDebugInitialConfigurations",
-        "onLanguage:javascript",
-        "onLanguage:java",
-        "onLanguage:python",
-        "onLanguage:csharp",
-        "onLanguage:yaml",
-        "onFileSystem:s3",
-        "onFileSystem:s3-readonly",
-        "onCommand:aws.codeWhisperer.accept"
-    ],
-    "main": "./dist/src/main",
-    "browser": "./dist/src/extensionWeb",
-    "contributes": {
-        "configuration": {
-            "type": "object",
-            "title": "%AWS.productName%",
-            "cloud9": {
-                "cn": {
-                    "title": "%AWS.productName.cn%"
-                }
-            },
-            "properties": {
-                "aws.profile": {
-                    "type": "string",
-                    "deprecationMessage": "The current profile is now stored internally by the Toolkit.",
-                    "description": "%AWS.configuration.profileDescription%"
-                },
-                "aws.ecs.openTerminalCommand": {
-                    "type": "string",
-                    "default": "/bin/sh",
-                    "markdownDescription": "%AWS.configuration.description.ecs.openTerminalCommand%"
-                },
-                "aws.iot.maxItemsPerPage": {
-                    "type": "number",
-                    "default": 100,
-                    "minimum": 1,
-                    "maximum": 250,
-                    "markdownDescription": "%AWS.configuration.description.iot.maxItemsPerPage%"
-                },
-                "aws.s3.maxItemsPerPage": {
-                    "type": "number",
-                    "default": 300,
-                    "minimum": 3,
-                    "maximum": 1000,
-                    "markdownDescription": "%AWS.configuration.description.s3.maxItemsPerPage%"
-                },
-                "aws.samcli.location": {
-                    "type": "string",
-                    "scope": "machine",
-                    "default": "",
-                    "markdownDescription": "%AWS.configuration.description.samcli.location%"
-                },
-                "aws.samcli.lambdaTimeout": {
-                    "type": "number",
-                    "default": 90000,
-                    "markdownDescription": "%AWS.configuration.description.samcli.lambdaTimeout%"
-                },
-                "aws.samcli.legacyDeploy": {
-                    "type": "boolean",
-                    "default": false,
-                    "markdownDescription": "%AWS.configuration.description.samcli.legacyDeploy%"
-                },
-                "aws.logLevel": {
-                    "type": "string",
-                    "default": "info",
-                    "enum": [
-                        "error",
-                        "warn",
-                        "info",
-                        "verbose",
-                        "debug"
-                    ],
-                    "enumDescriptions": [
-                        "Errors Only",
-                        "Errors and Warnings",
-                        "Errors, Warnings, and Info",
-                        "Errors, Warnings, Info, and Verbose",
-                        "Errors, Warnings, Info, Verbose, and Debug"
-                    ],
-                    "markdownDescription": "%AWS.configuration.description.logLevel%",
-                    "cloud9": {
-                        "cn": {
-                            "markdownDescription": "%AWS.configuration.description.logLevel.cn%"
-                        }
-                    }
-                },
-                "aws.telemetry": {
-                    "type": "boolean",
-                    "default": true,
-                    "markdownDescription": "%AWS.configuration.description.telemetry%",
-                    "cloud9": {
-                        "cn": {
-                            "markdownDescription": "%AWS.configuration.description.telemetry.cn%"
-                        }
-                    }
-                },
-                "aws.stepfunctions.asl.format.enable": {
-                    "type": "boolean",
-                    "scope": "window",
-                    "default": true,
-                    "description": "%AWS.stepFunctions.asl.format.enable.desc%"
-                },
-                "aws.stepfunctions.asl.maxItemsComputed": {
-                    "type": "number",
-                    "default": 5000,
-                    "description": "%AWS.stepFunctions.asl.maxItemsComputed.desc%"
-                },
-                "aws.ssmDocument.ssm.maxItemsComputed": {
-                    "type": "number",
-                    "default": 5000,
-                    "description": "%AWS.ssmDocument.ssm.maxItemsComputed.desc%"
-                },
-                "aws.cwl.limit": {
-                    "type": "number",
-                    "default": 10000,
-                    "description": "%AWS.cwl.limit.desc%",
-                    "maximum": 10000
-                },
-                "aws.samcli.manuallySelectedBuckets": {
-                    "type": "object",
-                    "description": "%AWS.samcli.deploy.bucket.recentlyUsed%",
-                    "default": []
-                },
-                "aws.samcli.enableCodeLenses": {
-                    "type": "boolean",
-                    "description": "%AWS.configuration.enableCodeLenses%",
-                    "default": false
-                },
-                "aws.suppressPrompts": {
-                    "type": "object",
-                    "description": "%AWS.configuration.description.suppressPrompts%",
-                    "default": {},
-                    "properties": {
-                        "apprunnerNotifyPricing": {
-                            "type": "boolean",
-                            "default": false
-                        },
-                        "apprunnerNotifyPause": {
-                            "type": "boolean",
-                            "default": false
-                        },
-                        "ecsRunCommand": {
-                            "type": "boolean",
-                            "default": false
-                        },
-                        "ecsRunCommandEnable": {
-                            "type": "boolean",
-                            "default": false
-                        },
-                        "ecsRunCommandDisable": {
-                            "type": "boolean",
-                            "default": false
-                        },
-                        "regionAddAutomatically": {
-                            "type": "boolean",
-                            "default": false
-                        },
-                        "yamlExtPrompt": {
-                            "type": "boolean",
-                            "default": false
-                        },
-                        "fileViewerEdit": {
-                            "type": "boolean",
-                            "default": false
-                        },
-                        "createCredentialsProfile": {
-                            "type": "boolean",
-                            "default": false
-                        },
-                        "samcliConfirmDevStack": {
-                            "type": "boolean",
-                            "default": false
-                        },
-                        "remoteConnected": {
-                            "type": "boolean",
-                            "default": false
-                        },
-                        "codeWhispererNewWelcomeMessage": {
-                            "type": "boolean",
-                            "default": false
-                        },
-                        "codeWhispererConnectionExpired": {
-                            "type": "boolean",
-                            "default": false
-                        },
-                        "amazonQWelcomePage": {
-                            "type": "boolean",
-                            "default": false
-                        }
-                    },
-                    "additionalProperties": false
-                },
-                "aws.experiments": {
-                    "type": "object",
-                    "markdownDescription": "%AWS.configuration.description.experiments%",
-                    "default": {
-                        "jsonResourceModification": false
-                    },
-                    "properties": {
-                        "jsonResourceModification": {
-                            "type": "boolean",
-                            "default": false
-                        }
-                    },
-                    "additionalProperties": false
-                },
-                "aws.codeWhisperer.includeSuggestionsWithCodeReferences": {
-                    "type": "boolean",
-                    "markdownDescription": "%AWS.configuration.description.codewhisperer%",
-                    "default": true
-                },
-                "aws.codeWhisperer.importRecommendation": {
-                    "type": "boolean",
-                    "description": "%AWS.configuration.description.codewhisperer.importRecommendation%",
-                    "default": true
-                },
-                "aws.codeWhisperer.shareCodeWhispererContentWithAWS": {
-                    "type": "boolean",
-                    "markdownDescription": "%AWS.configuration.description.codewhisperer.shareCodeWhispererContentWithAWS%",
-                    "default": true,
-                    "scope": "application"
-                },
-                "aws.codeWhisperer.javaCompilationOutput": {
-                    "type": "string",
-                    "default": "",
-                    "description": "Provide the ABSOLUTE path which is used to store java project compilation results."
-                },
-                "aws.resources.enabledResources": {
-                    "type": "array",
-                    "description": "%AWS.configuration.description.resources.enabledResources%",
-                    "items": {
-                        "type": "string"
-                    }
-                },
-                "aws.lambda.recentlyUploaded": {
-                    "type": "object",
-                    "description": "%AWS.configuration.description.lambda.recentlyUploaded%",
-                    "default": []
-                }
-            }
-        },
-        "debuggers": [
-            {
-                "type": "aws-sam",
-                "when": "isCloud9 || !aws.isWebExtHost",
-                "label": "%AWS.configuration.description.awssam.debug.label%",
-                "configurationAttributes": {
-                    "direct-invoke": {
-                        "$schema": "http://json-schema.org/draft-07/schema#",
-                        "title": "AwsSamDebuggerConfiguration",
-                        "additionalProperties": false,
-                        "properties": {
-                            "aws": {
-                                "title": "AWS Connection",
-                                "description": "%AWS.configuration.description.awssam.debug.aws%",
-                                "properties": {
-                                    "credentials": {
-                                        "description": "%AWS.configuration.description.awssam.debug.credentials%",
-                                        "type": "string",
-                                        "cloud9": {
-                                            "cn": {
-                                                "description": "%AWS.configuration.description.awssam.debug.credentials.cn%"
-                                            }
-                                        }
-                                    },
-                                    "region": {
-                                        "description": "%AWS.configuration.description.awssam.debug.region%",
-                                        "type": "string"
-                                    }
-                                },
-                                "additionalProperties": false,
-                                "type": "object"
-                            },
-                            "invokeTarget": {
-                                "oneOf": [
-                                    {
-                                        "title": "Template Target Properties",
-                                        "description": "%AWS.configuration.description.awssam.debug.invokeTarget%",
-                                        "properties": {
-                                            "templatePath": {
-                                                "description": "%AWS.configuration.description.awssam.debug.templatePath%",
-                                                "type": "string"
-                                            },
-                                            "logicalId": {
-                                                "description": "%AWS.configuration.description.awssam.debug.logicalId%",
-                                                "type": "string"
-                                            },
-                                            "target": {
-                                                "description": "%AWS.configuration.description.awssam.debug.target%",
-                                                "type": "string",
-                                                "enum": [
-                                                    "template"
-                                                ]
-                                            }
-                                        },
-                                        "additionalProperties": false,
-                                        "required": [
-                                            "templatePath",
-                                            "logicalId",
-                                            "target"
-                                        ],
-                                        "type": "object"
-                                    },
-                                    {
-                                        "title": "Code Target Properties",
-                                        "description": "%AWS.configuration.description.awssam.debug.invokeTarget%",
-                                        "properties": {
-                                            "lambdaHandler": {
-                                                "description": "%AWS.configuration.description.awssam.debug.lambdaHandler%",
-                                                "type": "string"
-                                            },
-                                            "projectRoot": {
-                                                "description": "%AWS.configuration.description.awssam.debug.projectRoot%",
-                                                "type": "string"
-                                            },
-                                            "target": {
-                                                "description": "%AWS.configuration.description.awssam.debug.target%",
-                                                "type": "string",
-                                                "enum": [
-                                                    "code"
-                                                ]
-                                            },
-                                            "architecture": {
-                                                "description": "%AWS.configuration.description.awssam.debug.architecture%",
-                                                "type": "string",
-                                                "enum": [
-                                                    "x86_64",
-                                                    "arm64"
-                                                ]
-                                            }
-                                        },
-                                        "additionalProperties": false,
-                                        "required": [
-                                            "lambdaHandler",
-                                            "projectRoot",
-                                            "target"
-                                        ],
-                                        "type": "object"
-                                    },
-                                    {
-                                        "title": "API Target Properties",
-                                        "description": "%AWS.configuration.description.awssam.debug.invokeTarget%",
-                                        "properties": {
-                                            "templatePath": {
-                                                "description": "%AWS.configuration.description.awssam.debug.templatePath%",
-                                                "type": "string"
-                                            },
-                                            "logicalId": {
-                                                "description": "%AWS.configuration.description.awssam.debug.logicalId%",
-                                                "type": "string"
-                                            },
-                                            "target": {
-                                                "description": "%AWS.configuration.description.awssam.debug.target%",
-                                                "type": "string",
-                                                "enum": [
-                                                    "api"
-                                                ]
-                                            }
-                                        },
-                                        "additionalProperties": false,
-                                        "required": [
-                                            "templatePath",
-                                            "logicalId",
-                                            "target"
-                                        ],
-                                        "type": "object"
-                                    }
-                                ]
-                            },
-                            "lambda": {
-                                "title": "Lambda Properties",
-                                "description": "%AWS.configuration.description.awssam.debug.lambda%",
-                                "properties": {
-                                    "environmentVariables": {
-                                        "description": "%AWS.configuration.description.awssam.debug.envvars%",
-                                        "additionalProperties": {
-                                            "type": [
-                                                "string"
-                                            ]
-                                        },
-                                        "type": "object"
-                                    },
-                                    "payload": {
-                                        "description": "%AWS.configuration.description.awssam.debug.event%",
-                                        "properties": {
-                                            "json": {
-                                                "description": "%AWS.configuration.description.awssam.debug.event.json%",
-                                                "type": "object"
-                                            },
-                                            "path": {
-                                                "description": "%AWS.configuration.description.awssam.debug.event.path%",
-                                                "type": "string"
-                                            }
-                                        },
-                                        "additionalProperties": false,
-                                        "type": "object"
-                                    },
-                                    "memoryMb": {
-                                        "description": "%AWS.configuration.description.awssam.debug.memoryMb%",
-                                        "type": "number"
-                                    },
-                                    "runtime": {
-                                        "description": "%AWS.configuration.description.awssam.debug.runtime%",
-                                        "type": "string"
-                                    },
-                                    "timeoutSec": {
-                                        "description": "%AWS.configuration.description.awssam.debug.timeout%",
-                                        "type": "number"
-                                    },
-                                    "pathMappings": {
-                                        "type:": "array",
-                                        "items": {
-                                            "title": "Path Mapping",
-                                            "type": "object",
-                                            "properties": {
-                                                "localRoot": {
-                                                    "type": "string"
-                                                },
-                                                "remoteRoot": {
-                                                    "type": "string"
-                                                }
-                                            },
-                                            "additionalProperties": false,
-                                            "required": [
-                                                "localRoot",
-                                                "remoteRoot"
-                                            ]
-                                        }
-                                    }
-                                },
-                                "additionalProperties": false,
-                                "type": "object"
-                            },
-                            "sam": {
-                                "title": "SAM CLI Properties",
-                                "description": "%AWS.configuration.description.awssam.debug.sam%",
-                                "properties": {
-                                    "buildArguments": {
-                                        "description": "%AWS.configuration.description.awssam.debug.buildArguments%",
-                                        "type": "array",
-                                        "items": {
-                                            "type": "string"
-                                        }
-                                    },
-                                    "buildDir": {
-                                        "description": "%AWS.configuration.description.awssam.debug.buildDir%",
-                                        "type": "string"
-                                    },
-                                    "containerBuild": {
-                                        "description": "%AWS.configuration.description.awssam.debug.containerBuild%",
-                                        "type": "boolean"
-                                    },
-                                    "dockerNetwork": {
-                                        "description": "%AWS.configuration.description.awssam.debug.dockerNetwork%",
-                                        "type": "string"
-                                    },
-                                    "localArguments": {
-                                        "description": "%AWS.configuration.description.awssam.debug.localArguments%",
-                                        "type": "array",
-                                        "items": {
-                                            "type": "string"
-                                        }
-                                    },
-                                    "skipNewImageCheck": {
-                                        "description": "%AWS.configuration.description.awssam.debug.skipNewImageCheck%",
-                                        "type": "boolean"
-                                    },
-                                    "template": {
-                                        "description": "%AWS.configuration.description.awssam.debug.template%",
-                                        "properties": {
-                                            "parameters": {
-                                                "description": "%AWS.configuration.description.awssam.debug.templateParameters%",
-                                                "additionalProperties": {
-                                                    "type": [
-                                                        "string",
-                                                        "number"
-                                                    ]
-                                                },
-                                                "type": "object"
-                                            }
-                                        },
-                                        "type": "object",
-                                        "additionalProperties": false
-                                    }
-                                },
-                                "additionalProperties": false,
-                                "type": "object"
-                            },
-                            "api": {
-                                "title": "API Gateway Properties",
-                                "description": "%AWS.configuration.description.awssam.debug.api%",
-                                "properties": {
-                                    "path": {
-                                        "description": "%AWS.configuration.description.awssam.debug.api.path%",
-                                        "type": "string"
-                                    },
-                                    "httpMethod": {
-                                        "description": "%AWS.configuration.description.awssam.debug.api.httpMethod%",
-                                        "type": "string",
-                                        "enum": [
-                                            "delete",
-                                            "get",
-                                            "head",
-                                            "options",
-                                            "patch",
-                                            "post",
-                                            "put"
-                                        ]
-                                    },
-                                    "payload": {
-                                        "description": "%AWS.configuration.description.awssam.debug.event%",
-                                        "properties": {
-                                            "json": {
-                                                "description": "%AWS.configuration.description.awssam.debug.event.json%",
-                                                "type": "object"
-                                            },
-                                            "path": {
-                                                "description": "%AWS.configuration.description.awssam.debug.event.path%",
-                                                "type": "string"
-                                            }
-                                        },
-                                        "additionalProperties": false,
-                                        "type": "object"
-                                    },
-                                    "headers": {
-                                        "description": "%AWS.configuration.description.awssam.debug.api.headers%",
-                                        "type": "object",
-                                        "additionalProperties": {
-                                            "type": "string"
-                                        }
-                                    },
-                                    "querystring": {
-                                        "description": "%AWS.configuration.description.awssam.debug.api.queryString%",
-                                        "type": "string"
-                                    },
-                                    "stageVariables": {
-                                        "description": "%AWS.configuration.description.awssam.debug.api.stageVariables%",
-                                        "type": "object",
-                                        "additionalProperties": {
-                                            "type": "string"
-                                        }
-                                    },
-                                    "clientCertificateId": {
-                                        "description": "%AWS.configuration.description.awssam.debug.api.clientCertId%",
-                                        "type": "string"
-                                    }
-                                },
-                                "additionalProperties": false,
-                                "required": [
-                                    "path",
-                                    "httpMethod"
-                                ],
-                                "type": "object"
-                            }
-                        },
-                        "required": [
-                            "invokeTarget"
-                        ],
-                        "type": "object"
-                    }
-                },
-                "configurationSnippets": [
-                    {
-                        "label": "%AWS.configuration.description.awssam.debug.snippets.lambdaCode.label%",
-                        "description": "%AWS.configuration.description.awssam.debug.snippets.lambdaCode.description%",
-                        "body": {
-                            "type": "aws-sam",
-                            "request": "direct-invoke",
-                            "name": "${3:Invoke Lambda}",
-                            "invokeTarget": {
-                                "target": "code",
-                                "lambdaHandler": "${1:Function Handler}",
-                                "projectRoot": "^\"\\${workspaceFolder}\""
-                            },
-                            "lambda": {
-                                "runtime": "${2:Lambda Runtime}",
-                                "payload": {
-                                    "json": {}
-                                }
-                            }
-                        },
-                        "cloud9": {
-                            "cn": {
-                                "label": "%AWS.configuration.description.awssam.debug.snippets.lambdaCode.label.cn%",
-                                "description": "%AWS.configuration.description.awssam.debug.snippets.lambdaCode.description.cn%"
-                            }
-                        }
-                    },
-                    {
-                        "label": "%AWS.configuration.description.awssam.debug.snippets.lambdaTemplate.label%",
-                        "description": "%AWS.configuration.description.awssam.debug.snippets.lambdaTemplate.description%",
-                        "body": {
-                            "type": "aws-sam",
-                            "request": "direct-invoke",
-                            "name": "${3:Invoke Lambda}",
-                            "invokeTarget": {
-                                "target": "template",
-                                "templatePath": "${1:Template Location}",
-                                "logicalId": "${2:Function Logical ID}"
-                            },
-                            "lambda": {
-                                "payload": {
-                                    "json": {}
-                                }
-                            }
-                        },
-                        "cloud9": {
-                            "cn": {
-                                "label": "%AWS.configuration.description.awssam.debug.snippets.lambdaTemplate.label.cn%",
-                                "description": "%AWS.configuration.description.awssam.debug.snippets.lambdaTemplate.description.cn%"
-                            }
-                        }
-                    },
-                    {
-                        "label": "%AWS.configuration.description.awssam.debug.snippets.api.label%",
-                        "description": "%AWS.configuration.description.awssam.debug.snippets.api.description%",
-                        "body": {
-                            "type": "aws-sam",
-                            "request": "direct-invoke",
-                            "name": "${5:Invoke Lambda with API Gateway}",
-                            "invokeTarget": {
-                                "target": "api",
-                                "templatePath": "${1:Template Location}",
-                                "logicalId": "${2:Function Logical ID}"
-                            },
-                            "api": {
-                                "path": "${3:Path}",
-                                "httpMethod": "${4:Method}",
-                                "payload": {
-                                    "json": {}
-                                }
-                            }
-                        },
-                        "cloud9": {
-                            "cn": {
-                                "label": "%AWS.configuration.description.awssam.debug.snippets.api.label.cn%",
-                                "description": "%AWS.configuration.description.awssam.debug.snippets.api.description.cn%"
-                            }
-                        }
-                    }
-                ]
-            }
-        ],
-        "viewsContainers": {
-            "activitybar": [
-                {
-                    "id": "aws-explorer",
-                    "title": "%AWS.title%",
-                    "icon": "resources/aws-logo.svg",
-                    "cloud9": {
-                        "cn": {
-                            "title": "%AWS.title.cn%",
-                            "icon": "resources/aws-cn-logo.svg"
-                        }
-                    }
-                },
-                {
-                    "id": "amazonq",
-                    "title": "%AWS.amazonq.title%",
-                    "icon": "resources/amazonq-logo.svg"
-                }
-            ],
-            "panel": [
-                {
-                    "id": "aws-codewhisperer-reference-log",
-                    "title": "Code Reference Log",
-                    "icon": "media/aws-logo.svg"
-                },
-                {
-                    "id": "aws-codewhisperer-transformation-hub",
-                    "title": "Transformation Hub",
-                    "icon": "media/aws-logo.svg"
-                }
-            ]
-        },
-        "views": {
-            "amazonq": [
-                {
-                    "type": "webview",
-                    "id": "aws.AmazonQChatView",
-                    "name": "%AWS.amazonq.chat%",
-                    "when": "!isCloud9 && !aws.isSageMaker"
-                },
-                {
-                    "id": "aws.AmazonQNeverShowBadge",
-                    "name": "",
-                    "when": "false"
-                }
-            ],
-            "aws-explorer": [
-                {
-                    "id": "aws.amazonq",
-                    "name": "%AWS.amazonq.title%",
-                    "when": "!isCloud9 && !aws.isSageMaker"
-                },
-                {
-                    "id": "aws.codewhisperer",
-                    "name": "%AWS.codewhisperer.explorerTitle%"
-                },
-                {
-                    "id": "aws.explorer",
-                    "name": "%AWS.lambda.explorerTitle%",
-                    "when": "isCloud9 || !aws.isWebExtHost"
-                },
-                {
-                    "id": "aws.cdk",
-                    "name": "%AWS.cdk.explorerTitle%"
-                },
-                {
-                    "id": "aws.codecatalyst",
-                    "name": "%AWS.codecatalyst.explorerTitle%",
-                    "when": "!isCloud9 && !aws.isSageMaker || isCloud9CodeCatalyst"
-                }
-            ],
-            "aws-codewhisperer-reference-log": [
-                {
-                    "type": "webview",
-                    "id": "aws.codeWhisperer.referenceLog",
-                    "name": ""
-                }
-            ],
-            "aws-codewhisperer-transformation-hub": [
-                {
-                    "type": "webview",
-                    "id": "aws.amazonq.transformationHub",
-                    "name": "Status",
-                    "when": "gumby.isTransformAvailable || gumby.isStopButtonAvailable"
-                },
-                {
-                    "id": "aws.amazonq.transformationProposedChangesTree",
-                    "name": "Proposed Changes",
-                    "when": "gumby.transformationProposalReviewInProgress"
-                }
-            ]
-        },
-        "viewsWelcome": [
-            {
-                "view": "aws.amazonq.transformationProposedChangesTree",
-                "contents": "Project transformation is complete.\n[Download Proposed Changes](command:aws.amazonq.transformationHub.reviewChanges.startReview)",
-                "when": "gumby.reviewState == NotStarted"
-            },
-            {
-                "view": "aws.amazonq.transformationProposedChangesTree",
-                "contents": "Project transformation is complete.\n Downloading the proposed changes...",
-                "when": "gumby.reviewState == PreparingReview"
-            }
-        ],
-        "submenus": [
-            {
-                "id": "aws.auth",
-                "label": "%AWS.submenu.auth.title%",
-                "icon": "$(ellipsis)",
-                "when": "isCloud9 || !aws.isWebExtHost"
-            },
-            {
-                "id": "aws.codewhisperer.submenu",
-                "label": "%AWS.codewhisperer.submenu.title%",
-                "icon": "$(ellipsis)"
-            },
-            {
-                "id": "aws.amazonq.submenu",
-                "label": "%AWS.codewhisperer.submenu.title%",
-                "icon": "$(ellipsis)"
-            },
-            {
-                "label": "%AWS.submenu.amazonqEditorContextSubmenu.title%",
-                "id": "amazonqEditorContextSubmenu"
-            },
-            {
-                "id": "aws.codecatalyst.submenu",
-                "label": "%AWS.codecatalyst.submenu.title%",
-                "icon": "$(ellipsis)",
-                "when": "isCloud9 || !aws.isWebExtHost"
-            },
-            {
-                "label": "%AWS.generic.feedback%",
-                "id": "aws.submenu.feedback"
-            },
-            {
-                "label": "%AWS.generic.help%",
-                "id": "aws.submenu.help"
-            }
-        ],
-        "menus": {
-            "commandPalette": [
-                {
-                    "command": "aws.apig.copyUrl",
-                    "when": "false"
-                },
-                {
-                    "command": "aws.apig.invokeRemoteRestApi",
-                    "when": "false"
-                },
-                {
-                    "command": "aws.deleteCloudFormation",
-                    "when": "false"
-                },
-                {
-                    "command": "aws.downloadStateMachineDefinition",
-                    "when": "false"
-                },
-                {
-                    "command": "aws.ecr.createRepository",
-                    "when": "false"
-                },
-                {
-                    "command": "aws.executeStateMachine",
-                    "when": "false"
-                },
-                {
-                    "command": "aws.copyArn",
-                    "when": "false"
-                },
-                {
-                    "command": "aws.copyName",
-                    "when": "false"
-                },
-                {
-                    "command": "aws.listCommands",
-                    "when": "false"
-                },
-                {
-                    "command": "aws.codecatalyst.listCommands",
-                    "when": "false"
-                },
-                {
-                    "command": "aws.codecatalyst.openDevEnv",
-                    "when": "!isCloud9"
-                },
-                {
-                    "command": "aws.codecatalyst.createDevEnv",
-                    "when": "!isCloud9"
-                },
-                {
-                    "command": "aws.codewhisperer.signout",
-                    "when": "false"
-                },
-                {
-                    "command": "aws.codewhisperer.reconnect",
-                    "when": "false"
-                },
-                {
-                    "command": "aws.codeWhisperer.openReferencePanel",
-                    "when": "false"
-                },
-                {
-                    "command": "aws.downloadSchemaItemCode",
-                    "when": "false"
-                },
-                {
-                    "command": "aws.deleteLambda",
-                    "when": "false"
-                },
-                {
-                    "command": "aws.downloadLambda",
-                    "when": "false"
-                },
-                {
-                    "command": "aws.invokeLambda",
-                    "when": "false"
-                },
-                {
-                    "command": "aws.copyLambdaUrl",
-                    "when": "false"
-                },
-                {
-                    "command": "aws.viewSchemaItem",
-                    "when": "false"
-                },
-                {
-                    "command": "aws.searchSchema",
-                    "when": "false"
-                },
-                {
-                    "command": "aws.searchSchemaPerRegistry",
-                    "when": "false"
-                },
-                {
-                    "command": "aws.refreshAwsExplorer",
-                    "when": "false"
-                },
-                {
-                    "command": "aws.cdk.refresh",
-                    "when": "false"
-                },
-                {
-                    "command": "aws.cdk.viewDocs",
-                    "when": "false"
-                },
-                {
-                    "command": "aws.ssmDocument.openLocalDocument",
-                    "when": "false"
-                },
-                {
-                    "command": "aws.ssmDocument.openLocalDocumentJson",
-                    "when": "false"
-                },
-                {
-                    "command": "aws.ssmDocument.openLocalDocumentYaml",
-                    "when": "false"
-                },
-                {
-                    "command": "aws.ssmDocument.deleteDocument",
-                    "when": "false"
-                },
-                {
-                    "command": "aws.ssmDocument.updateDocumentVersion",
-                    "when": "false"
-                },
-                {
-                    "command": "aws.copyLogResource",
-                    "when": "resourceScheme == aws-cwl"
-                },
-                {
-                    "command": "aws.saveCurrentLogDataContent",
-                    "when": "resourceScheme == aws-cwl"
-                },
-                {
-                    "command": "aws.s3.editFile",
-                    "when": "resourceScheme == s3-readonly"
-                },
-                {
-                    "command": "aws.cwl.viewLogStream",
-                    "when": "false"
-                },
-                {
-                    "command": "aws.cwl.changeFilterPattern",
-                    "when": "false"
-                },
-                {
-                    "command": "aws.cwl.changeTimeFilter",
-                    "when": "false"
-                },
-                {
-                    "command": "aws.ecr.deleteRepository",
-                    "when": "false"
-                },
-                {
-                    "command": "aws.ecr.copyTagUri",
-                    "when": "false"
-                },
-                {
-                    "command": "aws.ecr.copyRepositoryUri",
-                    "when": "false"
-                },
-                {
-                    "command": "aws.ecr.deleteTag",
-                    "when": "false"
-                },
-                {
-                    "command": "aws.iot.createThing",
-                    "when": "false"
-                },
-                {
-                    "command": "aws.iot.deleteThing",
-                    "when": "false"
-                },
-                {
-                    "command": "aws.iot.createCert",
-                    "when": "false"
-                },
-                {
-                    "command": "aws.iot.deleteCert",
-                    "when": "false"
-                },
-                {
-                    "command": "aws.iot.attachCert",
-                    "when": "false"
-                },
-                {
-                    "command": "aws.iot.attachPolicy",
-                    "when": "false"
-                },
-                {
-                    "command": "aws.iot.activateCert",
-                    "when": "false"
-                },
-                {
-                    "command": "aws.iot.deactivateCert",
-                    "when": "false"
-                },
-                {
-                    "command": "aws.iot.revokeCert",
-                    "when": "false"
-                },
-                {
-                    "command": "aws.iot.createPolicy",
-                    "when": "false"
-                },
-                {
-                    "command": "aws.iot.deletePolicy",
-                    "when": "false"
-                },
-                {
-                    "command": "aws.iot.createPolicyVersion",
-                    "when": "false"
-                },
-                {
-                    "command": "aws.iot.deletePolicyVersion",
-                    "when": "false"
-                },
-                {
-                    "command": "aws.iot.detachCert",
-                    "when": "false"
-                },
-                {
-                    "command": "aws.iot.detachPolicy",
-                    "when": "false"
-                },
-                {
-                    "command": "aws.iot.viewPolicyVersion",
-                    "when": "false"
-                },
-                {
-                    "command": "aws.iot.setDefaultPolicy",
-                    "when": "false"
-                },
-                {
-                    "command": "aws.iot.copyEndpoint",
-                    "when": "false"
-                },
-                {
-                    "command": "aws.deploySamApplication",
-                    "when": "config.aws.samcli.legacyDeploy"
-                },
-                {
-                    "command": "aws.redshift.editConnection",
-                    "when": "false"
-                },
-                {
-                    "command": "aws.redshift.deleteConnection",
-                    "when": "false"
-                },
-                {
-                    "command": "aws.samcli.sync",
-                    "when": "!config.aws.samcli.legacyDeploy"
-                },
-                {
-                    "command": "aws.s3.copyPath",
-                    "when": "false"
-                },
-                {
-                    "command": "aws.s3.createBucket",
-                    "when": "false"
-                },
-                {
-                    "command": "aws.s3.createFolder",
-                    "when": "false"
-                },
-                {
-                    "command": "aws.s3.deleteBucket",
-                    "when": "false"
-                },
-                {
-                    "command": "aws.s3.deleteFile",
-                    "when": "false"
-                },
-                {
-                    "command": "aws.s3.downloadFileAs",
-                    "when": "false"
-                },
-                {
-                    "command": "aws.s3.openFile",
-                    "when": "false"
-                },
-                {
-                    "command": "aws.s3.editFile",
-                    "when": "false"
-                },
-                {
-                    "command": "aws.s3.uploadFileToParent",
-                    "when": "false"
-                },
-                {
-                    "command": "aws.apprunner.startDeployment",
-                    "when": "false"
-                },
-                {
-                    "command": "aws.apprunner.createService",
-                    "when": "false"
-                },
-                {
-                    "command": "aws.apprunner.pauseService",
-                    "when": "false"
-                },
-                {
-                    "command": "aws.apprunner.resumeService",
-                    "when": "false"
-                },
-                {
-                    "command": "aws.apprunner.copyServiceUrl",
-                    "when": "false"
-                },
-                {
-                    "command": "aws.apprunner.open",
-                    "when": "false"
-                },
-                {
-                    "command": "aws.apprunner.deleteService",
-                    "when": "false"
-                },
-                {
-                    "command": "aws.apprunner.createServiceFromEcr",
-                    "when": "false"
-                },
-                {
-                    "command": "aws.resources.copyIdentifier",
-                    "when": "false"
-                },
-                {
-                    "command": "aws.resources.openResourcePreview",
-                    "when": "false"
-                },
-                {
-                    "command": "aws.resources.createResource",
-                    "when": "false"
-                },
-                {
-                    "command": "aws.resources.deleteResource",
-                    "when": "false"
-                },
-                {
-                    "command": "aws.resources.updateResource",
-                    "when": "false"
-                },
-                {
-                    "command": "aws.resources.updateResourceInline",
-                    "when": "false"
-                },
-                {
-                    "command": "aws.resources.saveResource",
-                    "when": "false"
-                },
-                {
-                    "command": "aws.resources.closeResource",
-                    "when": "false"
-                },
-                {
-                    "command": "aws.resources.viewDocs",
-                    "when": "false"
-                },
-                {
-                    "command": "aws.ecs.runCommandInContainer",
-                    "when": "false"
-                },
-                {
-                    "command": "aws.ecs.openTaskInTerminal",
-                    "when": "false"
-                },
-                {
-                    "command": "aws.ecs.enableEcsExec",
-                    "when": "false"
-                },
-                {
-                    "command": "aws.ecs.disableEcsExec",
-                    "when": "false"
-                },
-                {
-                    "command": "aws.ecs.viewDocumentation",
-                    "when": "false"
-                },
-                {
-                    "command": "aws.renderStateMachineGraph",
-                    "when": "false"
-                },
-                {
-                    "command": "aws.auth.addConnection",
-                    "when": "false"
-                },
-                {
-                    "command": "aws.auth.switchConnections",
-                    "when": "false"
-                },
-                {
-                    "command": "aws.auth.signout",
-                    "when": "false"
-                },
-                {
-                    "command": "aws.auth.help",
-                    "when": "false"
-                },
-                {
-                    "command": "aws.auth.manageConnections"
-                },
-                {
-                    "command": "aws.ec2.openRemoteConnection",
-                    "when": "aws.isDevMode"
-                },
-                {
-                    "command": "aws.ec2.openTerminal",
-                    "when": "aws.isDevMode"
-                },
-                {
-                    "command": "aws.ec2.startInstance",
-                    "when": "aws.isDevMode"
-                },
-                {
-                    "command": "aws.ec2.stopInstance",
-                    "whem": "aws.isDevMode"
-                },
-                {
-                    "command": "aws.ec2.rebootInstance",
-                    "whem": "aws.isDevMode"
-                },
-                {
-                    "command": "aws.dev.openMenu",
-                    "when": "aws.isDevMode || isCloud9"
-                },
-                {
-                    "command": "aws.openInApplicationComposer",
-                    "when": "false"
-                },
-                {
-                    "command": "aws.amazonq.learnMore",
-                    "when": "false"
-                }
-            ],
-            "editor/title": [
-                {
-                    "command": "aws.previewStateMachine",
-                    "when": "editorLangId == asl || editorLangId == asl-yaml",
-                    "group": "navigation"
-                },
-                {
-                    "command": "aws.saveCurrentLogDataContent",
-                    "when": "resourceScheme == aws-cwl",
-                    "group": "navigation"
-                },
-                {
-                    "command": "aws.cwl.changeFilterPattern",
-                    "when": "resourceScheme == aws-cwl",
-                    "group": "navigation"
-                },
-                {
-                    "command": "aws.cwl.changeTimeFilter",
-                    "when": "resourceScheme == aws-cwl",
-                    "group": "navigation"
-                },
-                {
-                    "command": "aws.s3.editFile",
-                    "when": "resourceScheme == s3-readonly",
-                    "group": "navigation"
-                },
-                {
-                    "command": "aws.ssmDocument.publishDocument",
-                    "when": "editorLangId =~ /^(ssm-yaml|ssm-json)$/",
-                    "group": "navigation"
-                },
-                {
-                    "command": "aws.resources.updateResourceInline",
-                    "when": "resourceScheme == awsResource && !isCloud9 && config.aws.experiments.jsonResourceModification",
-                    "group": "navigation"
-                },
-                {
-                    "command": "aws.resources.closeResource",
-                    "when": "resourcePath =~ /^.+(awsResource.json)$/",
-                    "group": "navigation"
-                },
-                {
-                    "command": "aws.resources.saveResource",
-                    "when": "resourcePath =~ /^.+(awsResource.json)$/",
-                    "group": "navigation"
-                },
-                {
-                    "command": "aws.openInApplicationComposer",
-                    "when": "editorLangId == json || editorLangId == yaml || resourceFilename =~ /^.*\\.(template)$/",
-                    "group": "navigation"
-                }
-            ],
-            "editor/title/context": [
-                {
-                    "command": "aws.copyLogResource",
-                    "when": "resourceScheme == aws-cwl",
-                    "group": "1_cutcopypaste@1"
-                }
-            ],
-            "view/title": [
-                {
-                    "command": "aws.amazonq.startTransformationInHub",
-                    "when": "view == aws.amazonq.transformationHub",
-                    "group": "navigation@1"
-                },
-                {
-                    "command": "aws.amazonq.stopTransformationInHub",
-                    "when": "view == aws.amazonq.transformationHub",
-                    "group": "navigation@2"
-                },
-                {
-                    "command": "aws.amazonq.showPlanProgressInHub",
-                    "when": "view == aws.amazonq.transformationHub",
-                    "group": "navigation@3"
-                },
-                {
-                    "command": "aws.amazonq.showHistoryInHub",
-                    "when": "view == aws.amazonq.transformationHub",
-                    "group": "navigation@4"
-                },
-                {
-                    "command": "aws.amazonq.transformationHub.summary.reveal",
-                    "when": "view == aws.amazonq.transformationHub"
-                },
-                {
-                    "command": "aws.amazonq.transformationHub.reviewChanges.reveal",
-                    "when": "view == aws.amazonq.transformationHub"
-                },
-                {
-                    "command": "aws.amazonq.showTransformationPlanInHub",
-                    "when": "view == aws.amazonq.transformationHub"
-                },
-                {
-                    "command": "aws.amazonq.transformationHub.reviewChanges.acceptChanges",
-                    "when": "view == aws.amazonq.transformationProposedChangesTree && gumby.reviewState == InReview",
-                    "group": "navigation@1"
-                },
-                {
-                    "command": "aws.amazonq.transformationHub.reviewChanges.rejectChanges",
-                    "when": "view == aws.amazonq.transformationProposedChangesTree && gumby.reviewState == InReview",
-                    "group": "navigation@2"
-                },
-                {
-                    "command": "aws.submitFeedback",
-                    "when": "view == aws.explorer && !aws.isWebExtHost",
-                    "group": "navigation@6"
-                },
-                {
-                    "command": "aws.refreshAwsExplorer",
-                    "when": "view == aws.explorer",
-                    "group": "navigation@5"
-                },
-                {
-                    "command": "aws.login",
-                    "when": "view == aws.explorer",
-                    "group": "1_account@1"
-                },
-                {
-                    "command": "aws.showRegion",
-                    "when": "view == aws.explorer",
-                    "group": "1_account@2"
-                },
-                {
-                    "command": "aws.listCommands",
-                    "when": "view == aws.explorer && !isCloud9",
-                    "group": "1_account@3"
-                },
-                {
-                    "command": "aws.lambda.createNewSamApp",
-                    "when": "view == aws.explorer",
-                    "group": "3_lambda@1"
-                },
-                {
-                    "command": "aws.launchConfigForm",
-                    "when": "view == aws.explorer",
-                    "group": "3_lambda@2"
-                },
-                {
-                    "command": "aws.deploySamApplication",
-                    "when": "config.aws.samcli.legacyDeploy && view == aws.explorer",
-                    "group": "3_lambda@3"
-                },
-                {
-                    "command": "aws.samcli.sync",
-                    "when": "!config.aws.samcli.legacyDeploy && view == aws.explorer",
-                    "group": "3_lambda@3"
-                },
-                {
-                    "submenu": "aws.submenu.feedback",
-                    "when": "view =~ /^aws\\./ && view != aws.AmazonQChatView",
-                    "group": "y_toolkitMeta@1"
-                },
-                {
-                    "submenu": "aws.submenu.help",
-                    "when": "view =~ /^aws\\./ && view != aws.AmazonQChatView",
-                    "group": "y_toolkitMeta@2"
-                },
-                {
-                    "command": "aws.codecatalyst.cloneRepo",
-                    "when": "view == aws.codecatalyst && !isCloud9 && aws.codecatalyst.connected",
-                    "group": "1_codeCatalyst@1"
-                },
-                {
-                    "command": "aws.codecatalyst.createDevEnv",
-                    "when": "view == aws.codecatalyst && !isCloud9 && aws.codecatalyst.connected",
-                    "group": "1_codeCatalyst@1"
-                },
-                {
-                    "command": "aws.codecatalyst.listCommands",
-                    "when": "view == aws.codecatalyst && !isCloud9 && aws.codecatalyst.connected",
-                    "group": "1_codeCatalyst@1"
-                },
-                {
-                    "command": "aws.codecatalyst.openDevEnv",
-                    "when": "view == aws.codecatalyst && !isCloud9 && aws.codecatalyst.connected",
-                    "group": "1_codeCatalyst@1"
-                },
-                {
-                    "command": "aws.codecatalyst.manageConnections",
-                    "when": "view == aws.codecatalyst && !isCloud9 && !aws.codecatalyst.connected",
-                    "group": "2_codeCatalyst@1"
-                },
-                {
-                    "command": "aws.codecatalyst.signout",
-                    "when": "view == aws.codecatalyst && !isCloud9 && aws.codecatalyst.connected",
-                    "group": "2_codeCatalyst@1"
-                },
-                {
-                    "command": "aws.codeWhisperer.openReferencePanel",
-                    "when": "view == aws.AmazonQChatView",
-                    "group": "0_topAmazonQ@1"
-                },
-                {
-                    "command": "aws.amazonq.learnMore",
-                    "when": "view == aws.AmazonQChatView || view == aws.amazonq",
-                    "group": "1_amazonQ@1"
-                },
-                {
-                    "command": "aws.codeWhisperer.introduction",
-                    "when": "view == aws.codewhisperer",
-                    "group": "1_amazonQ@1"
-                },
-                {
-                    "command": "aws.codewhisperer.manageConnections",
-                    "when": "(view == aws.AmazonQChatView || view == aws.codewhisperer ||  view == aws.amazonq) && !aws.codewhisperer.connected",
-                    "group": "2_amazonQ@2"
-                },
-                {
-                    "command": "aws.codewhisperer.signout",
-                    "when": "(view == aws.AmazonQChatView || view == aws.codewhisperer ||  view == aws.amazonq) && aws.codewhisperer.connected",
-                    "group": "2_amazonQ@4"
-                },
-                {
-                    "command": "aws.codewhisperer.reconnect",
-                    "when": "(view == aws.AmazonQChatView || view == aws.codewhisperer ||  view == aws.amazonq) && aws.codewhisperer.connectionExpired",
-                    "group": "2_amazonQ@3"
-                }
-            ],
-            "explorer/context": [
-                {
-                    "command": "aws.deploySamApplication",
-                    "when": "config.aws.samcli.legacyDeploy && isFileSystemResource && resourceFilename =~ /^template\\.(json|yml|yaml)$/",
-                    "group": "z_aws@1"
-                },
-                {
-                    "command": "aws.samcli.sync",
-                    "when": "!config.aws.samcli.legacyDeploy && isFileSystemResource && resourceFilename =~ /^(template\\.(json|yml|yaml))|(samconfig\\.toml)$/",
-                    "group": "z_aws@1"
-                },
-                {
-                    "command": "aws.uploadLambda",
-                    "when": "explorerResourceIsFolder || isFileSystemResource && resourceFilename =~ /^template\\.(json|yml|yaml)$/",
-                    "group": "z_aws@3"
-                },
-                {
-                    "command": "aws.openInApplicationComposer",
-                    "when": "isFileSystemResource && resourceFilename =~ /^.*\\.(json|yml|yaml|template)$/",
-                    "group": "z_aws@1"
-                }
-            ],
-            "amazonqEditorContextSubmenu": [
-                {
-                    "command": "aws.amazonq.explainCode",
-                    "group": "cw_chat@1"
-                },
-                {
-                    "command": "aws.amazonq.refactorCode",
-                    "group": "cw_chat@2"
-                },
-                {
-                    "command": "aws.amazonq.fixCode",
-                    "group": "cw_chat@3"
-                },
-                {
-                    "command": "aws.amazonq.optimizeCode",
-                    "group": "cw_chat@4"
-                },
-                {
-                    "command": "aws.amazonq.sendToPrompt",
-                    "group": "cw_chat@5"
-                }
-            ],
-            "editor/context": [
-                {
-                    "submenu": "amazonqEditorContextSubmenu",
-                    "group": "cw_chat",
-                    "when": "editorHasSelection"
-                }
-            ],
-            "view/item/context": [
-                {
-                    "command": "aws.apig.invokeRemoteRestApi",
-                    "when": "view == aws.explorer && viewItem =~ /^(awsApiGatewayNode)$/",
-                    "group": "0@1"
-                },
-                {
-                    "command": "aws.ec2.openTerminal",
-                    "group": "0@1",
-                    "when": "viewItem =~ /^(awsEc2(Parent|Running)Node)$/"
-                },
-                {
-                    "command": "aws.ec2.openTerminal",
-                    "group": "inline@1",
-                    "when": "viewItem =~ /^(awsEc2(Parent|Running)Node)$/"
-                },
-                {
-                    "command": "aws.ec2.openRemoteConnection",
-                    "group": "0@1",
-                    "when": "viewItem =~ /^(awsEc2(Parent|Running)Node)$/"
-                },
-                {
-                    "command": "aws.ec2.openRemoteConnection",
-                    "group": "inline@1",
-                    "when": "viewItem =~ /^(awsEc2(Parent|Running)Node)$/"
-                },
-                {
-                    "command": "aws.ec2.startInstance",
-                    "group": "0@1",
-                    "when": "viewItem == awsEc2StoppedNode"
-                },
-                {
-                    "command": "aws.ec2.startInstance",
-                    "group": "inline@1",
-                    "when": "viewItem == awsEc2StoppedNode"
-                },
-                {
-                    "command": "aws.ec2.stopInstance",
-                    "group": "0@1",
-                    "when": "viewItem == awsEc2RunningNode"
-                },
-                {
-                    "command": "aws.ec2.stopInstance",
-                    "group": "inline@1",
-                    "when": "viewItem == awsEc2RunningNode"
-                },
-                {
-                    "command": "aws.ec2.rebootInstance",
-                    "group": "0@1",
-                    "when": "viewItem == awsEc2RunningNode"
-                },
-                {
-                    "command": "aws.ec2.rebootInstance",
-                    "group": "inline@1",
-                    "when": "viewItem == awsEc2RunningNode"
-                },
-                {
-                    "command": "aws.ecr.createRepository",
-                    "when": "view == aws.explorer && viewItem == awsEcrNode",
-                    "group": "inline@1"
-                },
-                {
-                    "command": "aws.iot.createThing",
-                    "when": "view == aws.explorer && viewItem == awsIotThingsNode",
-                    "group": "inline@1"
-                },
-                {
-                    "command": "aws.iot.createCert",
-                    "when": "view == aws.explorer && viewItem == awsIotCertsNode",
-                    "group": "inline@1"
-                },
-                {
-                    "command": "aws.iot.createPolicy",
-                    "when": "view == aws.explorer && viewItem == awsIotPoliciesNode",
-                    "group": "inline@1"
-                },
-                {
-                    "command": "aws.iot.attachCert",
-                    "when": "view == aws.explorer && viewItem == awsIotThingNode",
-                    "group": "inline@1"
-                },
-                {
-                    "command": "aws.iot.attachPolicy",
-                    "when": "view == aws.explorer && viewItem =~ /^awsIotCertificateNode.(Things|Policies)/",
-                    "group": "inline@1"
-                },
-                {
-                    "command": "aws.redshift.editConnection",
-                    "when": "view == aws.explorer && viewItem == awsRedshiftWarehouseNode",
-                    "group": "0@1"
-                },
-                {
-                    "command": "aws.redshift.deleteConnection",
-                    "when": "view == aws.explorer && viewItem == awsRedshiftWarehouseNode",
-                    "group": "0@2"
-                },
-                {
-                    "command": "aws.s3.openFile",
-                    "when": "view == aws.explorer && viewItem == awsS3FileNode && !isCloud9",
-                    "group": "0@1"
-                },
-                {
-                    "command": "aws.s3.editFile",
-                    "when": "view == aws.explorer && viewItem == awsS3FileNode && !isCloud9",
-                    "group": "inline@1"
-                },
-                {
-                    "command": "aws.s3.downloadFileAs",
-                    "when": "view == aws.explorer && viewItem == awsS3FileNode",
-                    "group": "inline@2"
-                },
-                {
-                    "command": "aws.s3.createBucket",
-                    "when": "view == aws.explorer && viewItem == awsS3Node",
-                    "group": "inline@1"
-                },
-                {
-                    "command": "aws.s3.createFolder",
-                    "when": "view == aws.explorer && viewItem =~ /^(awsS3BucketNode|awsS3FolderNode)$/",
-                    "group": "inline@1"
-                },
-                {
-                    "command": "aws.ssmDocument.openLocalDocument",
-                    "when": "view == aws.explorer && viewItem =~ /^(awsDocumentItemNode|awsDocumentItemNodeWriteable)$/",
-                    "group": "inline@1"
-                },
-                {
-                    "command": "aws.s3.uploadFile",
-                    "when": "view == aws.explorer && viewItem =~ /^(awsS3BucketNode|awsS3FolderNode)$/",
-                    "group": "inline@2"
-                },
-                {
-                    "command": "aws.showRegion",
-                    "when": "view == aws.explorer && viewItem == awsRegionNode",
-                    "group": "0@1"
-                },
-                {
-                    "command": "aws.lambda.createNewSamApp",
-                    "when": "view == aws.explorer && viewItem == awsLambdaNode || viewItem == awsRegionNode",
-                    "group": "1@1"
-                },
-                {
-                    "command": "aws.launchConfigForm",
-                    "when": "view == aws.explorer && viewItem == awsLambdaNode || viewItem == awsRegionNode || viewItem == awsCloudFormationRootNode",
-                    "group": "1@1"
-                },
-                {
-                    "command": "aws.deploySamApplication",
-                    "when": "config.aws.samcli.legacyDeploy && view == aws.explorer && viewItem =~ /^(awsLambdaNode|awsRegionNode|awsCloudFormationRootNode)$/",
-                    "group": "1@2"
-                },
-                {
-                    "command": "aws.samcli.sync",
-                    "when": "!config.aws.samcli.legacyDeploy && view == aws.explorer && viewItem =~ /^(awsLambdaNode|awsRegionNode|awsCloudFormationRootNode)$/",
-                    "group": "1@2"
-                },
-                {
-                    "command": "aws.ec2.copyInstanceId",
-                    "when": "view == aws.explorer && viewItem =~ /^(awsEc2(Parent|Running|Stopped)Node)$/",
-                    "group": "2@0"
-                },
-                {
-                    "command": "aws.ecr.copyTagUri",
-                    "when": "view == aws.explorer && viewItem == awsEcrTagNode",
-                    "group": "2@1"
-                },
-                {
-                    "command": "aws.ecr.deleteTag",
-                    "when": "view == aws.explorer && viewItem == awsEcrTagNode",
-                    "group": "3@1"
-                },
-                {
-                    "command": "aws.ecr.copyRepositoryUri",
-                    "when": "view == aws.explorer && viewItem == awsEcrRepositoryNode",
-                    "group": "2@1"
-                },
-                {
-                    "command": "aws.ecr.createRepository",
-                    "when": "view == aws.explorer && viewItem == awsEcrNode",
-                    "group": "0@1"
-                },
-                {
-                    "command": "aws.ecr.deleteRepository",
-                    "when": "view == aws.explorer && viewItem == awsEcrRepositoryNode",
-                    "group": "3@1"
-                },
-                {
-                    "command": "aws.invokeLambda",
-                    "when": "view == aws.explorer && viewItem =~ /^(awsRegionFunctionNode|awsRegionFunctionNodeDownloadable|awsCloudFormationFunctionNode)$/",
-                    "group": "0@1"
-                },
-                {
-                    "command": "aws.downloadLambda",
-                    "when": "view == aws.explorer && viewItem =~ /^(awsRegionFunctionNode|awsRegionFunctionNodeDownloadable)$/",
-                    "group": "0@2"
-                },
-                {
-                    "command": "aws.uploadLambda",
-                    "when": "view == aws.explorer && viewItem =~ /^(awsRegionFunctionNode|awsRegionFunctionNodeDownloadable)$/",
-                    "group": "1@1"
-                },
-                {
-                    "command": "aws.deleteLambda",
-                    "when": "view == aws.explorer && viewItem =~ /^(awsRegionFunctionNode|awsRegionFunctionNodeDownloadable)$/",
-                    "group": "4@1"
-                },
-                {
-                    "command": "aws.copyLambdaUrl",
-                    "when": "view == aws.explorer && viewItem =~ /^(awsRegionFunctionNode|awsRegionFunctionNodeDownloadable)$/",
-                    "group": "2@0"
-                },
-                {
-                    "command": "aws.deleteCloudFormation",
-                    "when": "view == aws.explorer && viewItem == awsCloudFormationNode",
-                    "group": "3@5"
-                },
-                {
-                    "command": "aws.searchSchema",
-                    "when": "view == aws.explorer && viewItem == awsSchemasNode",
-                    "group": "0@1"
-                },
-                {
-                    "command": "aws.searchSchemaPerRegistry",
-                    "when": "view == aws.explorer && viewItem == awsRegistryItemNode",
-                    "group": "0@1"
-                },
-                {
-                    "command": "aws.viewSchemaItem",
-                    "when": "view == aws.explorer && viewItem == awsSchemaItemNode",
-                    "group": "0@1"
-                },
-                {
-                    "command": "aws.stepfunctions.createStateMachineFromTemplate",
-                    "when": "view == aws.explorer && viewItem == awsStepFunctionsNode",
-                    "group": "0@1"
-                },
-                {
-                    "command": "aws.downloadStateMachineDefinition",
-                    "when": "view == aws.explorer && viewItem == awsStateMachineNode",
-                    "group": "0@1"
-                },
-                {
-                    "command": "aws.renderStateMachineGraph",
-                    "when": "view == aws.explorer && viewItem == awsStateMachineNode",
-                    "group": "0@2"
-                },
-                {
-                    "command": "aws.cdk.renderStateMachineGraph",
-                    "when": "viewItem == awsCdkStateMachineNode",
-                    "group": "inline@1"
-                },
-                {
-                    "command": "aws.cdk.renderStateMachineGraph",
-                    "when": "viewItem == awsCdkStateMachineNode",
-                    "group": "0@1"
-                },
-                {
-                    "command": "aws.executeStateMachine",
-                    "when": "view == aws.explorer && viewItem == awsStateMachineNode",
-                    "group": "0@3"
-                },
-                {
-                    "command": "aws.iot.createThing",
-                    "when": "view == aws.explorer && viewItem == awsIotThingsNode",
-                    "group": "0@1"
-                },
-                {
-                    "command": "aws.iot.createCert",
-                    "when": "view == aws.explorer && viewItem == awsIotCertsNode",
-                    "group": "0@1"
-                },
-                {
-                    "command": "aws.iot.createPolicy",
-                    "when": "view == aws.explorer && viewItem == awsIotPoliciesNode",
-                    "group": "0@1"
-                },
-                {
-                    "command": "aws.iot.createPolicyVersion",
-                    "when": "view == aws.explorer && viewItem == awsIotPolicyNode.WithVersions",
-                    "group": "0@1"
-                },
-                {
-                    "command": "aws.iot.viewPolicyVersion",
-                    "when": "view == aws.explorer && viewItem =~ /^awsIotPolicyVersionNode./",
-                    "group": "0@1"
-                },
-                {
-                    "command": "aws.iot.attachCert",
-                    "when": "view == aws.explorer && viewItem == awsIotThingNode",
-                    "group": "0@1"
-                },
-                {
-                    "command": "aws.iot.attachPolicy",
-                    "when": "view == aws.explorer && viewItem =~ /^awsIotCertificateNode.(Things|Policies)/",
-                    "group": "0@1"
-                },
-                {
-                    "command": "aws.s3.createBucket",
-                    "when": "view == aws.explorer && viewItem == awsS3Node",
-                    "group": "0@1"
-                },
-                {
-                    "command": "aws.s3.downloadFileAs",
-                    "when": "view == aws.explorer && viewItem == awsS3FileNode",
-                    "group": "0@1"
-                },
-                {
-                    "command": "aws.s3.uploadFile",
-                    "when": "view == aws.explorer && viewItem =~ /^(awsS3BucketNode|awsS3FolderNode)$/",
-                    "group": "0@1"
-                },
-                {
-                    "command": "aws.s3.uploadFileToParent",
-                    "when": "view == aws.explorer && viewItem == awsS3FileNode",
-                    "group": "1@1"
-                },
-                {
-                    "command": "aws.s3.createFolder",
-                    "when": "view == aws.explorer && viewItem =~ /^(awsS3BucketNode|awsS3FolderNode)$/",
-                    "group": "1@1"
-                },
-                {
-                    "command": "aws.iot.deactivateCert",
-                    "when": "view == aws.explorer && viewItem =~ /^awsIotCertificateNode.(Things|Policies).ACTIVE$/",
-                    "group": "1@1"
-                },
-                {
-                    "command": "aws.iot.activateCert",
-                    "when": "view == aws.explorer && viewItem =~ /^awsIotCertificateNode.(Things|Policies).INACTIVE$/",
-                    "group": "1@1"
-                },
-                {
-                    "command": "aws.iot.revokeCert",
-                    "when": "view == aws.explorer && viewItem =~ /^awsIotCertificateNode.(Things|Policies).(ACTIVE|INACTIVE)$/",
-                    "group": "1@2"
-                },
-                {
-                    "command": "aws.iot.setDefaultPolicy",
-                    "when": "view == aws.explorer && viewItem == awsIotPolicyVersionNode.NONDEFAULT",
-                    "group": "1@1"
-                },
-                {
-                    "command": "aws.iot.copyEndpoint",
-                    "when": "view == aws.explorer && viewItem == awsIotNode",
-                    "group": "2@1"
-                },
-                {
-                    "command": "aws.copyName",
-                    "when": "view == aws.explorer && viewItem =~ /^(awsRegionFunctionNode|awsRegionFunctionNodeDownloadable|awsCloudFormationFunctionNode|awsStateMachineNode|awsCloudFormationNode|awsS3BucketNode|awsS3FolderNode|awsS3FileNode|awsApiGatewayNode|awsIotThingNode)$|^(awsAppRunnerServiceNode|awsIotCertificateNode|awsIotPolicyNode|awsIotPolicyVersionNode|(awsEc2(Running|Pending|Stopped)Node))/",
-                    "group": "2@1"
-                },
-                {
-                    "command": "aws.copyArn",
-                    "when": "view == aws.explorer && viewItem =~ /^(awsRegionFunctionNode|awsRegionFunctionNodeDownloadable|awsCloudFormationFunctionNode|awsStateMachineNode|awsCloudFormationNode|awsCloudWatchLogNode|awsS3BucketNode|awsS3FolderNode|awsS3FileNode|awsApiGatewayNode|awsEcrRepositoryNode|awsIotThingNode)$|^(awsAppRunnerServiceNode|awsEcsServiceNode|awsIotCertificateNode|awsIotPolicyNode|awsIotPolicyVersionNode|awsMdeInstanceNode|(awsEc2(Running|Pending|Stopped)Node))/",
-                    "group": "2@2"
-                },
-                {
-                    "command": "aws.cwl.searchLogGroup",
-                    "group": "0@1",
-                    "when": "view == aws.explorer && viewItem =~ /^awsCloudWatchLogNode|awsCloudWatchLogParentNode$/"
-                },
-                {
-                    "command": "aws.cwl.searchLogGroup",
-                    "group": "inline@1",
-                    "when": "view == aws.explorer && viewItem =~ /^awsCloudWatchLogNode|awsCloudWatchLogParentNode$/"
-                },
-                {
-                    "command": "aws.apig.copyUrl",
-                    "when": "view == aws.explorer && viewItem =~ /^(awsApiGatewayNode)$/",
-                    "group": "2@0"
-                },
-                {
-                    "command": "aws.s3.copyPath",
-                    "when": "view == aws.explorer && viewItem =~ /^(awsS3FolderNode|awsS3FileNode)$/",
-                    "group": "2@3"
-                },
-                {
-                    "command": "aws.s3.presignedURL",
-                    "when": "view == aws.explorer && viewItem =~ /^(awsS3FileNode)$/",
-                    "group": "2@4"
-                },
-                {
-                    "command": "aws.iot.detachCert",
-                    "when": "view == aws.explorer && viewItem =~ /^(awsIotCertificateNode.Things)/",
-                    "group": "3@1"
-                },
-                {
-                    "command": "aws.iot.detachPolicy",
-                    "when": "view == aws.explorer && viewItem == awsIotPolicyNode.Certificates",
-                    "group": "3@1"
-                },
-                {
-                    "command": "aws.iot.deleteThing",
-                    "when": "view == aws.explorer && viewItem == awsIotThingNode",
-                    "group": "3@1"
-                },
-                {
-                    "command": "aws.iot.deleteCert",
-                    "when": "view == aws.explorer && viewItem =~ /^awsIotCertificateNode.Policies/",
-                    "group": "3@1"
-                },
-                {
-                    "command": "aws.iot.deletePolicy",
-                    "when": "view == aws.explorer && viewItem == awsIotPolicyNode.WithVersions",
-                    "group": "3@1"
-                },
-                {
-                    "command": "aws.iot.deletePolicyVersion",
-                    "when": "view == aws.explorer && viewItem == awsIotPolicyVersionNode.NONDEFAULT",
-                    "group": "3@1"
-                },
-                {
-                    "command": "aws.s3.deleteBucket",
-                    "when": "view == aws.explorer && viewItem == awsS3BucketNode",
-                    "group": "3@1"
-                },
-                {
-                    "command": "aws.s3.deleteFile",
-                    "when": "view == aws.explorer && viewItem == awsS3FileNode",
-                    "group": "3@1"
-                },
-                {
-                    "command": "aws.downloadSchemaItemCode",
-                    "when": "view == aws.explorer && viewItem == awsSchemaItemNode",
-                    "group": "1@1"
-                },
-                {
-                    "command": "aws.cwl.viewLogStream",
-                    "group": "0@1",
-                    "when": "view == aws.explorer && viewItem == awsCloudWatchLogNode"
-                },
-                {
-                    "command": "aws.ssmDocument.openLocalDocumentYaml",
-                    "group": "0@1",
-                    "when": "view == aws.explorer && viewItem =~ /^(awsDocumentItemNode|awsDocumentItemNodeWriteable)$/"
-                },
-                {
-                    "command": "aws.ssmDocument.openLocalDocumentJson",
-                    "group": "0@2",
-                    "when": "view == aws.explorer && viewItem =~ /^(awsDocumentItemNode|awsDocumentItemNodeWriteable)$/"
-                },
-                {
-                    "command": "aws.ssmDocument.updateDocumentVersion",
-                    "group": "2@1",
-                    "when": "view == aws.explorer && viewItem == awsDocumentItemNodeWriteable"
-                },
-                {
-                    "command": "aws.ssmDocument.deleteDocument",
-                    "group": "3@2",
-                    "when": "view == aws.explorer && viewItem == awsDocumentItemNodeWriteable"
-                },
-                {
-                    "command": "aws.ecs.runCommandInContainer",
-                    "group": "0@1",
-                    "when": "view == aws.explorer && viewItem =~ /^(awsEcsContainerNodeExec)(.*)$/"
-                },
-                {
-                    "command": "aws.ecs.openTaskInTerminal",
-                    "group": "0@2",
-                    "when": "view == aws.explorer && viewItem =~ /^(awsEcsContainerNodeExec)(.*)$/ && !isCloud9"
-                },
-                {
-                    "command": "aws.ecs.enableEcsExec",
-                    "group": "0@2",
-                    "when": "view == aws.explorer && viewItem == awsEcsServiceNode.DISABLED"
-                },
-                {
-                    "command": "aws.ecs.disableEcsExec",
-                    "group": "0@2",
-                    "when": "view == aws.explorer && viewItem == awsEcsServiceNode.ENABLED"
-                },
-                {
-                    "command": "aws.ecs.viewDocumentation",
-                    "group": "1@3",
-                    "when": "view == aws.explorer && viewItem =~ /^(awsEcsClusterNode|awsEcsContainerNode)$|^awsEcsServiceNode/"
-                },
-                {
-                    "command": "aws.resources.configure",
-                    "when": "view == aws.explorer && viewItem == resourcesRootNode",
-                    "group": "1@1"
-                },
-                {
-                    "command": "aws.resources.configure",
-                    "when": "view == aws.explorer && viewItem == resourcesRootNode",
-                    "group": "inline@1"
-                },
-                {
-                    "command": "aws.resources.openResourcePreview",
-                    "when": "view == aws.explorer && viewItem =~ /^(.*)(ResourceNode)$/",
-                    "group": "1@1"
-                },
-                {
-                    "command": "aws.resources.copyIdentifier",
-                    "when": "view == aws.explorer && viewItem =~ /^(.*)(ResourceNode)$/",
-                    "group": "1@1"
-                },
-                {
-                    "command": "aws.resources.viewDocs",
-                    "when": "view == aws.explorer && viewItem =~ /^(.*)(Documented)(.*)(ResourceTypeNode)$/",
-                    "group": "1@1"
-                },
-                {
-                    "command": "aws.resources.createResource",
-                    "when": "view == aws.explorer && viewItem =~ /^(.*)(Creatable)(.*)(ResourceTypeNode)$/ && !isCloud9 && config.aws.experiments.jsonResourceModification",
-                    "group": "2@1"
-                },
-                {
-                    "command": "aws.resources.createResource",
-                    "when": "view == aws.explorer && viewItem =~ /^(.*)(Creatable)(.*)(ResourceTypeNode)$/ && !isCloud9 && config.aws.experiments.jsonResourceModification",
-                    "group": "inline@1"
-                },
-                {
-                    "command": "aws.resources.updateResource",
-                    "when": "view == aws.explorer && viewItem =~ /^(.*)(Updatable)(.*)(ResourceNode)$/ && !isCloud9 && config.aws.experiments.jsonResourceModification",
-                    "group": "2@1"
-                },
-                {
-                    "command": "aws.resources.deleteResource",
-                    "when": "view == aws.explorer && viewItem =~ /^(.*)(Deletable)(.*)(ResourceNode)$/ && !isCloud9 && config.aws.experiments.jsonResourceModification",
-                    "group": "2@2"
-                },
-                {
-                    "command": "aws.apprunner.createServiceFromEcr",
-                    "group": "0@2",
-                    "when": "view == aws.explorer && viewItem =~ /awsEcrTagNode|awsEcrRepositoryNode/"
-                },
-                {
-                    "command": "aws.apprunner.startDeployment",
-                    "group": "0@1",
-                    "when": "view == aws.explorer && viewItem == awsAppRunnerServiceNode.RUNNING"
-                },
-                {
-                    "command": "aws.apprunner.createService",
-                    "group": "0@2",
-                    "when": "view == aws.explorer && viewItem == awsAppRunnerNode"
-                },
-                {
-                    "command": "aws.apprunner.pauseService",
-                    "group": "0@3",
-                    "when": "view == aws.explorer && viewItem == awsAppRunnerServiceNode.RUNNING"
-                },
-                {
-                    "command": "aws.apprunner.resumeService",
-                    "group": "0@3",
-                    "when": "view == aws.explorer && viewItem == awsAppRunnerServiceNode.PAUSED"
-                },
-                {
-                    "command": "aws.apprunner.copyServiceUrl",
-                    "group": "1@1",
-                    "when": "view == aws.explorer && viewItem == awsAppRunnerServiceNode.RUNNING"
-                },
-                {
-                    "command": "aws.apprunner.open",
-                    "group": "1@2",
-                    "when": "view == aws.explorer && viewItem == awsAppRunnerServiceNode.RUNNING"
-                },
-                {
-                    "command": "aws.apprunner.deleteService",
-                    "group": "3@1",
-                    "when": "view == aws.explorer && viewItem =~ /awsAppRunnerServiceNode.[RUNNING|PAUSED|CREATE_FAILED]/"
-                },
-                {
-                    "command": "aws.cloudFormation.newTemplate",
-                    "group": "0@1",
-                    "when": "view == aws.explorer && viewItem == awsCloudFormationRootNode"
-                },
-                {
-                    "command": "aws.sam.newTemplate",
-                    "group": "0@2",
-                    "when": "view == aws.explorer && viewItem == awsCloudFormationRootNode"
-                },
-                {
-                    "command": "aws.codeWhisperer.introduction",
-                    "when": "viewItem =~ /^awsCodeWhispererNode/ && !isCloud9 && CODEWHISPERER_TERMS_ACCEPTED",
-                    "group": "inline@1"
-                },
-                {
-                    "command": "aws.cdk.viewDocs",
-                    "when": "viewItem == awsCdkRootNode",
-                    "group": "0@2"
-                },
-                {
-                    "command": "aws.auth.addConnection",
-                    "when": "viewItem == awsAuthNode",
-                    "group": "0@1"
-                },
-                {
-                    "command": "aws.auth.switchConnections",
-                    "when": "viewItem == awsAuthNode",
-                    "group": "0@2"
-                },
-                {
-                    "command": "aws.auth.signout",
-                    "when": "viewItem == awsAuthNode && !isCloud9",
-                    "group": "0@3"
-                },
-                {
-                    "command": "aws.auth.help",
-                    "when": "viewItem == awsAuthNode",
-                    "group": "inline@1"
-                },
-                {
-                    "submenu": "aws.auth",
-                    "when": "viewItem == awsAuthNode",
-                    "group": "inline@2"
-                },
-                {
-                    "submenu": "aws.codecatalyst.submenu",
-                    "when": "viewItem =~ /^awsCodeCatalystNode/",
-                    "group": "inline@1"
-                },
-                {
-                    "command": "aws.codecatalyst.manageConnections",
-                    "when": "viewItem =~ /^awsCodeCatalystNode/",
-                    "group": "0@1"
-                },
-                {
-                    "command": "aws.codecatalyst.signout",
-                    "when": "viewItem =~ /^awsCodeCatalystNode/&& !isCloud9 && aws.codecatalyst.connected",
-                    "group": "0@2"
-                },
-                {
-                    "submenu": "aws.codewhisperer.submenu",
-                    "when": "viewItem =~ /^awsCodeWhispererNode/",
-                    "group": "inline@1"
-                },
-                {
-                    "submenu": "aws.amazonq.submenu",
-                    "when": "viewItem =~ /^awsAmazonQNode/",
-                    "group": "inline@1"
-                }
-            ],
-            "aws.auth": [
-                {
-                    "command": "aws.auth.manageConnections",
-                    "group": "0@1"
-                },
-                {
-                    "command": "aws.auth.switchConnections",
-                    "group": "0@2"
-                },
-                {
-                    "command": "aws.auth.signout",
-                    "enablement": "!isCloud9",
-                    "group": "0@3"
-                }
-            ],
-            "aws.submenu.feedback": [
-                {
-                    "command": "aws.submitFeedback",
-                    "when": "!aws.isWebExtHost",
-                    "group": "1_feedback@1"
-                },
-                {
-                    "command": "aws.createIssueOnGitHub",
-                    "group": "1_feedback@2"
-                }
-            ],
-            "aws.submenu.help": [
-                {
-                    "command": "aws.quickStart",
-                    "when": "isCloud9",
-                    "group": "1_help@1"
-                },
-                {
-                    "command": "aws.help",
-                    "group": "1_help@2"
-                },
-                {
-                    "command": "aws.github",
-                    "group": "1_help@3"
-                },
-                {
-                    "command": "aws.aboutToolkit",
-                    "group": "1_help@4"
-                },
-                {
-                    "command": "aws.viewLogs",
-                    "group": "1_help@5"
-                }
-            ]
-        },
-        "commands": [
-            {
-                "command": "aws.amazonq.explainCode",
-                "title": "%AWS.command.amazonq.explainCode%",
-                "category": "%AWS.title%"
-            },
-            {
-                "command": "aws.amazonq.refactorCode",
-                "title": "%AWS.command.amazonq.refactorCode%",
-                "category": "%AWS.title%"
-            },
-            {
-                "command": "aws.amazonq.fixCode",
-                "title": "%AWS.command.amazonq.fixCode%",
-                "category": "%AWS.title%"
-            },
-            {
-                "command": "aws.amazonq.optimizeCode",
-                "title": "%AWS.command.amazonq.optimizeCode%",
-                "category": "%AWS.title%"
-            },
-            {
-                "command": "aws.amazonq.sendToPrompt",
-                "title": "%AWS.command.amazonq.sendToPrompt%",
-                "category": "%AWS.title%"
-            },
-            {
-                "command": "aws.launchConfigForm",
-                "title": "%AWS.command.launchConfigForm.title%",
-                "category": "%AWS.title%",
-                "enablement": "isCloud9 || !aws.isWebExtHost",
-                "cloud9": {
-                    "cn": {
-                        "category": "%AWS.title.cn%"
-                    }
-                }
-            },
-            {
-                "command": "aws.apig.copyUrl",
-                "title": "%AWS.command.apig.copyUrl%",
-                "category": "%AWS.title%",
-                "enablement": "isCloud9 || !aws.isWebExtHost",
-                "cloud9": {
-                    "cn": {
-                        "category": "%AWS.title.cn%"
-                    }
-                }
-            },
-            {
-                "command": "aws.apig.invokeRemoteRestApi",
-                "title": "%AWS.command.apig.invokeRemoteRestApi%",
-                "category": "%AWS.title%",
-                "enablement": "isCloud9 || !aws.isWebExtHost",
-                "cloud9": {
-                    "cn": {
-                        "category": "%AWS.title.cn%",
-                        "title": "%AWS.command.apig.invokeRemoteRestApi.cn%"
-                    }
-                }
-            },
-            {
-                "command": "aws.lambda.createNewSamApp",
-                "title": "%AWS.command.createNewSamApp%",
-                "category": "%AWS.title%",
-                "enablement": "isCloud9 || !aws.isWebExtHost",
-                "cloud9": {
-                    "cn": {
-                        "category": "%AWS.title.cn%"
-                    }
-                }
-            },
-            {
-                "command": "aws.login",
-                "title": "%AWS.command.login%",
-                "category": "%AWS.title%",
-                "enablement": "isCloud9 || !aws.isWebExtHost",
-                "cloud9": {
-                    "cn": {
-                        "title": "%AWS.command.login.cn%",
-                        "category": "%AWS.title.cn%"
-                    }
-                }
-            },
-            {
-                "command": "aws.credentials.profile.create",
-                "title": "%AWS.command.credentials.profile.create%",
-                "category": "%AWS.title%",
-                "cloud9": {
-                    "cn": {
-                        "category": "%AWS.title.cn%"
-                    }
-                }
-            },
-            {
-                "command": "aws.credentials.edit",
-                "title": "%AWS.command.credentials.edit%",
-                "category": "%AWS.title%",
-                "cloud9": {
-                    "cn": {
-                        "category": "%AWS.title.cn%"
-                    }
-                }
-            },
-            {
-                "command": "aws.codecatalyst.openOrg",
-                "title": "%AWS.command.codecatalyst.openOrg%",
-                "category": "AWS",
-                "enablement": "isCloud9 || !aws.isWebExtHost"
-            },
-            {
-                "command": "aws.codecatalyst.openProject",
-                "title": "%AWS.command.codecatalyst.openProject%",
-                "category": "AWS",
-                "enablement": "isCloud9 || !aws.isWebExtHost"
-            },
-            {
-                "command": "aws.codecatalyst.openRepo",
-                "title": "%AWS.command.codecatalyst.openRepo%",
-                "category": "AWS",
-                "enablement": "isCloud9 || !aws.isWebExtHost"
-            },
-            {
-                "command": "aws.codecatalyst.openDevEnv",
-                "title": "%AWS.command.codecatalyst.openDevEnv%",
-                "category": "AWS",
-                "enablement": "!isCloud9 && !aws.isWebExtHost"
-            },
-            {
-                "command": "aws.codecatalyst.listCommands",
-                "title": "%AWS.command.codecatalyst.listCommands%",
-                "category": "AWS",
-                "enablement": "!isCloud9 && !aws.isWebExtHost"
-            },
-            {
-                "command": "aws.codecatalyst.cloneRepo",
-                "title": "%AWS.command.codecatalyst.cloneRepo%",
-                "category": "AWS",
-                "enablement": "!isCloud9 && !aws.isWebExtHost"
-            },
-            {
-                "command": "aws.codecatalyst.createDevEnv",
-                "title": "%AWS.command.codecatalyst.createDevEnv%",
-                "category": "AWS",
-                "enablement": "!isCloud9 && !aws.isWebExtHost"
-            },
-            {
-                "command": "aws.codecatalyst.signout",
-                "title": "%AWS.command.codecatalyst.signout%",
-                "category": "AWS",
-                "icon": "$(debug-disconnect)",
-                "enablement": "isCloud9 || !aws.isWebExtHost"
-            },
-            {
-                "command": "aws.logout",
-                "title": "%AWS.command.logout%",
-                "category": "%AWS.title%",
-                "cloud9": {
-                    "cn": {
-                        "category": "%AWS.title.cn%"
-                    }
-                }
-            },
-            {
-                "command": "aws.auth.addConnection",
-                "title": "%AWS.command.auth.addConnection%",
-                "category": "%AWS.title%"
-            },
-            {
-                "command": "aws.auth.manageConnections",
-                "title": "%AWS.command.auth.showConnectionsPage%",
-                "category": "%AWS.title%"
-            },
-            {
-                "command": "aws.codecatalyst.manageConnections",
-                "title": "%AWS.command.auth.showConnectionsPage%",
-                "category": "%AWS.title%"
-            },
-            {
-                "command": "aws.codewhisperer.manageConnections",
-                "title": "%AWS.command.auth.showConnectionsPage%",
-                "category": "%AWS.title%"
-            },
-            {
-                "command": "aws.codewhisperer.reconnect",
-                "title": "%AWS.command.codewhisperer.reconnect%",
-                "category": "%AWS.title%"
-            },
-            {
-                "command": "aws.codeWhisperer.openReferencePanel",
-                "title": "%AWS.command.codewhisperer.openReferencePanel%",
-                "category": "%AWS.title%"
-            },
-            {
-                "command": "aws.amazonq.transformationHub.reviewChanges.acceptChanges",
-                "title": "%AWS.command.q.transform.acceptChanges%"
-            },
-            {
-                "command": "aws.amazonq.transformationHub.reviewChanges.rejectChanges",
-                "title": "%AWS.command.q.transform.rejectChanges%"
-            },
-            {
-                "command": "aws.amazonq.transformationHub.summary.reveal",
-                "title": "%AWS.command.q.transform.showChangeSummary%",
-                "enablement": "gumby.isSummaryAvailable"
-            },
-            {
-                "command": "aws.amazonq.transformationHub.reviewChanges.reveal",
-                "title": "%AWS.command.q.transform.showChanges%",
-                "enablement": "gumby.reviewState == InReview"
-            },
-            {
-                "command": "aws.amazonq.showTransformationPlanInHub",
-                "title": "%AWS.command.q.transform.showTransformationPlan%",
-                "enablement": "gumby.isPlanAvailable"
-            },
-            {
-                "command": "aws.auth.switchConnections",
-                "title": "%AWS.command.auth.switchConnections%",
-                "category": "%AWS.title%"
-            },
-            {
-                "command": "aws.auth.signout",
-                "title": "%AWS.command.auth.signout%",
-                "category": "%AWS.title%",
-                "enablement": "!isCloud9"
-            },
-            {
-                "command": "aws.auth.help",
-                "title": "%AWS.generic.viewDocs%",
-                "category": "%AWS.title%",
-                "icon": "$(question)"
-            },
-            {
-                "command": "aws.createIssueOnGitHub",
-                "title": "%AWS.command.createIssueOnGitHub%",
-                "category": "%AWS.title%",
-                "cloud9": {
-                    "cn": {
-                        "category": "%AWS.title.cn%"
-                    }
-                }
-            },
-            {
-                "command": "aws.ec2.openTerminal",
-                "title": "%AWS.command.ec2.openTerminal%",
-                "icon": "$(terminal-view-icon)",
-                "category": "%AWS.title%",
-                "enablement": "isCloud9 || !aws.isWebExtHost",
-                "cloud9": {
-                    "cn": {
-                        "category": "%AWS.title.cn%"
-                    }
-                }
-            },
-            {
-                "command": "aws.ec2.openRemoteConnection",
-                "title": "%AWS.command.ec2.openRemoteConnection%",
-                "icon": "$(remote-explorer)",
-                "category": "%AWS.title%",
-                "enablement": "isCloud9 || !aws.isWebExtHost",
-                "cloud9": {
-                    "cn": {
-                        "category": "%AWS.title.cn%"
-                    }
-                }
-            },
-            {
-                "command": "aws.ec2.startInstance",
-                "title": "%AWS.command.ec2.startInstance%",
-                "icon": "$(debug-start)",
-                "category": "%AWS.title%",
-                "enablement": "isCloud9 || !aws.isWebExtHost",
-                "cloud9": {
-                    "cn": {
-                        "category": "%AWS.title.cn%"
-                    }
-                }
-            },
-            {
-                "command": "aws.ec2.stopInstance",
-                "title": "%AWS.command.ec2.stopInstance%",
-                "icon": "$(debug-stop)",
-                "category": "%AWS.title%",
-                "enablement": "isCloud9 || !aws.isWebExtHost",
-                "cloud9": {
-                    "cn": {
-                        "category": "%AWS.title.cn%"
-                    }
-                }
-            },
-            {
-                "command": "aws.ec2.rebootInstance",
-                "title": "%AWS.command.ec2.rebootInstance%",
-                "icon": "$(debug-restart)",
-                "category": "%AWS.title%",
-                "enablement": "isCloud9 || !aws.isWebExtHost",
-                "cloud9": {
-                    "cn": {
-                        "category": "%AWS.title.cn%"
-                    }
-                }
-            },
-            {
-                "command": "aws.ec2.copyInstanceId",
-                "title": "%AWS.command.ec2.copyInstanceId%",
-                "category": "%AWS.title%",
-                "enablement": "isCloud9 || !aws.isWebExtHost",
-                "cloud9": {
-                    "cn": {
-                        "category": "%AWS.title.cn%"
-                    }
-                }
-            },
-            {
-                "command": "aws.ecr.copyTagUri",
-                "title": "%AWS.command.ecr.copyTagUri%",
-                "category": "%AWS.title%",
-                "enablement": "isCloud9 || !aws.isWebExtHost",
-                "cloud9": {
-                    "cn": {
-                        "category": "%AWS.title.cn%"
-                    }
-                }
-            },
-            {
-                "command": "aws.ecr.deleteTag",
-                "title": "%AWS.command.ecr.deleteTag%",
-                "category": "%AWS.title%",
-                "enablement": "isCloud9 || !aws.isWebExtHost",
-                "cloud9": {
-                    "cn": {
-                        "category": "%AWS.title.cn%"
-                    }
-                }
-            },
-            {
-                "command": "aws.ecr.copyRepositoryUri",
-                "title": "%AWS.command.ecr.copyRepositoryUri%",
-                "category": "%AWS.title%",
-                "enablement": "isCloud9 || !aws.isWebExtHost",
-                "cloud9": {
-                    "cn": {
-                        "category": "%AWS.title.cn%"
-                    }
-                }
-            },
-            {
-                "command": "aws.ecr.createRepository",
-                "title": "%AWS.command.ecr.createRepository%",
-                "category": "%AWS.title%",
-                "enablement": "isCloud9 || !aws.isWebExtHost",
-                "icon": "$(add)",
-                "cloud9": {
-                    "cn": {
-                        "category": "%AWS.title.cn%"
-                    }
-                }
-            },
-            {
-                "command": "aws.ecr.deleteRepository",
-                "title": "%AWS.command.ecr.deleteRepository%",
-                "category": "%AWS.title%",
-                "enablement": "isCloud9 || !aws.isWebExtHost",
-                "cloud9": {
-                    "cn": {
-                        "category": "%AWS.title.cn%"
-                    }
-                }
-            },
-            {
-                "command": "aws.showRegion",
-                "title": "%AWS.command.showRegion%",
-                "category": "%AWS.title%",
-                "enablement": "isCloud9 || !aws.isWebExtHost",
-                "cloud9": {
-                    "cn": {
-                        "category": "%AWS.title.cn%"
-                    }
-                }
-            },
-            {
-                "command": "aws.iot.createThing",
-                "title": "%AWS.command.iot.createThing%",
-                "category": "%AWS.title%",
-                "enablement": "isCloud9 || !aws.isWebExtHost",
-                "icon": "$(add)",
-                "cloud9": {
-                    "cn": {
-                        "category": "%AWS.title.cn%"
-                    }
-                }
-            },
-            {
-                "command": "aws.iot.deleteThing",
-                "title": "%AWS.generic.promptDelete%",
-                "category": "%AWS.title%",
-                "enablement": "isCloud9 || !aws.isWebExtHost",
-                "cloud9": {
-                    "cn": {
-                        "category": "%AWS.title.cn%"
-                    }
-                }
-            },
-            {
-                "command": "aws.iot.createCert",
-                "title": "%AWS.command.iot.createCert%",
-                "category": "%AWS.title%",
-                "enablement": "isCloud9 || !aws.isWebExtHost",
-                "icon": "$(add)",
-                "cloud9": {
-                    "cn": {
-                        "category": "%AWS.title.cn%"
-                    }
-                }
-            },
-            {
-                "command": "aws.iot.deleteCert",
-                "title": "%AWS.generic.promptDelete%",
-                "category": "%AWS.title%",
-                "enablement": "isCloud9 || !aws.isWebExtHost",
-                "cloud9": {
-                    "cn": {
-                        "category": "%AWS.title.cn%"
-                    }
-                }
-            },
-            {
-                "command": "aws.iot.attachCert",
-                "title": "%AWS.command.iot.attachCert%",
-                "category": "%AWS.title%",
-                "enablement": "isCloud9 || !aws.isWebExtHost",
-                "icon": "$(aws-generic-attach-file)",
-                "cloud9": {
-                    "cn": {
-                        "category": "%AWS.title.cn%"
-                    }
-                }
-            },
-            {
-                "command": "aws.iot.attachPolicy",
-                "title": "%AWS.command.iot.attachPolicy%",
-                "category": "%AWS.title%",
-                "enablement": "isCloud9 || !aws.isWebExtHost",
-                "icon": "$(aws-generic-attach-file)",
-                "cloud9": {
-                    "cn": {
-                        "category": "%AWS.title.cn%"
-                    }
-                }
-            },
-            {
-                "command": "aws.iot.activateCert",
-                "title": "%AWS.command.iot.activateCert%",
-                "category": "%AWS.title%",
-                "enablement": "isCloud9 || !aws.isWebExtHost",
-                "cloud9": {
-                    "cn": {
-                        "category": "%AWS.title.cn%"
-                    }
-                }
-            },
-            {
-                "command": "aws.iot.deactivateCert",
-                "title": "%AWS.command.iot.deactivateCert%",
-                "category": "%AWS.title%",
-                "enablement": "isCloud9 || !aws.isWebExtHost",
-                "cloud9": {
-                    "cn": {
-                        "category": "%AWS.title.cn%"
-                    }
-                }
-            },
-            {
-                "command": "aws.iot.revokeCert",
-                "title": "%AWS.command.iot.revokeCert%",
-                "category": "%AWS.title%",
-                "enablement": "isCloud9 || !aws.isWebExtHost",
-                "cloud9": {
-                    "cn": {
-                        "category": "%AWS.title.cn%"
-                    }
-                }
-            },
-            {
-                "command": "aws.iot.createPolicy",
-                "title": "%AWS.command.iot.createPolicy%",
-                "category": "%AWS.title%",
-                "enablement": "isCloud9 || !aws.isWebExtHost",
-                "icon": "$(add)",
-                "cloud9": {
-                    "cn": {
-                        "category": "%AWS.title.cn%"
-                    }
-                }
-            },
-            {
-                "command": "aws.iot.deletePolicy",
-                "title": "%AWS.generic.promptDelete%",
-                "category": "%AWS.title%",
-                "enablement": "isCloud9 || !aws.isWebExtHost",
-                "cloud9": {
-                    "cn": {
-                        "category": "%AWS.title.cn%"
-                    }
-                }
-            },
-            {
-                "command": "aws.iot.createPolicyVersion",
-                "title": "%AWS.command.iot.createPolicyVersion%",
-                "category": "%AWS.title%",
-                "enablement": "isCloud9 || !aws.isWebExtHost",
-                "cloud9": {
-                    "cn": {
-                        "category": "%AWS.title.cn%"
-                    }
-                }
-            },
-            {
-                "command": "aws.iot.deletePolicyVersion",
-                "title": "%AWS.generic.promptDelete%",
-                "category": "%AWS.title%",
-                "enablement": "isCloud9 || !aws.isWebExtHost",
-                "cloud9": {
-                    "cn": {
-                        "category": "%AWS.title.cn%"
-                    }
-                }
-            },
-            {
-                "command": "aws.iot.detachCert",
-                "title": "%AWS.command.iot.detachCert%",
-                "category": "%AWS.title%",
-                "enablement": "isCloud9 || !aws.isWebExtHost",
-                "cloud9": {
-                    "cn": {
-                        "category": "%AWS.title.cn%"
-                    }
-                }
-            },
-            {
-                "command": "aws.iot.detachPolicy",
-                "title": "%AWS.command.iot.detachCert%",
-                "category": "%AWS.title%",
-                "enablement": "isCloud9 || !aws.isWebExtHost",
-                "cloud9": {
-                    "cn": {
-                        "category": "%AWS.title.cn%"
-                    }
-                }
-            },
-            {
-                "command": "aws.iot.viewPolicyVersion",
-                "title": "%AWS.command.iot.viewPolicyVersion%",
-                "category": "%AWS.title%",
-                "enablement": "isCloud9 || !aws.isWebExtHost",
-                "cloud9": {
-                    "cn": {
-                        "category": "%AWS.title.cn%"
-                    }
-                }
-            },
-            {
-                "command": "aws.iot.setDefaultPolicy",
-                "title": "%AWS.command.iot.setDefaultPolicy%",
-                "category": "%AWS.title%",
-                "enablement": "isCloud9 || !aws.isWebExtHost",
-                "cloud9": {
-                    "cn": {
-                        "category": "%AWS.title.cn%"
-                    }
-                }
-            },
-            {
-                "command": "aws.iot.copyEndpoint",
-                "title": "%AWS.command.iot.copyEndpoint%",
-                "category": "%AWS.title%",
-                "enablement": "isCloud9 || !aws.isWebExtHost",
-                "cloud9": {
-                    "cn": {
-                        "category": "%AWS.title.cn%"
-                    }
-                }
-            },
-            {
-                "command": "aws.redshift.editConnection",
-                "title": "Edit connection",
-                "category": "%AWS.title%"
-            },
-            {
-                "command": "aws.redshift.deleteConnection",
-                "title": "Delete connection",
-                "category": "%AWS.title%"
-            },
-            {
-                "command": "aws.s3.presignedURL",
-                "title": "%AWS.command.s3.presignedURL%",
-                "category": "%AWS.title%",
-                "enablement": "isCloud9 || !aws.isWebExtHost"
-            },
-            {
-                "command": "aws.s3.copyPath",
-                "title": "%AWS.command.s3.copyPath%",
-                "category": "%AWS.title%",
-                "enablement": "isCloud9 || !aws.isWebExtHost",
-                "cloud9": {
-                    "cn": {
-                        "category": "%AWS.title.cn%"
-                    }
-                }
-            },
-            {
-                "command": "aws.s3.downloadFileAs",
-                "title": "%AWS.command.s3.downloadFileAs%",
-                "category": "%AWS.title%",
-                "enablement": "isCloud9 || !aws.isWebExtHost",
-                "icon": "$(cloud-download)",
-                "cloud9": {
-                    "cn": {
-                        "category": "%AWS.title.cn%"
-                    }
-                }
-            },
-            {
-                "command": "aws.s3.openFile",
-                "title": "%AWS.command.s3.openFile%",
-                "category": "%AWS.title%",
-                "enablement": "isCloud9 || !aws.isWebExtHost",
-                "icon": "$(open-preview)"
-            },
-            {
-                "command": "aws.s3.editFile",
-                "title": "%AWS.command.s3.editFile%",
-                "category": "%AWS.title%",
-                "enablement": "isCloud9 || !aws.isWebExtHost",
-                "icon": "$(edit)"
-            },
-            {
-                "command": "aws.s3.uploadFile",
-                "title": "%AWS.command.s3.uploadFile%",
-                "category": "%AWS.title%",
-                "enablement": "isCloud9 || !aws.isWebExtHost",
-                "icon": "$(cloud-upload)",
-                "cloud9": {
-                    "cn": {
-                        "category": "%AWS.title.cn%"
-                    }
-                }
-            },
-            {
-                "command": "aws.s3.uploadFileToParent",
-                "title": "%AWS.command.s3.uploadFileToParent%",
-                "category": "%AWS.title%",
-                "enablement": "isCloud9 || !aws.isWebExtHost",
-                "cloud9": {
-                    "cn": {
-                        "category": "%AWS.title.cn%"
-                    }
-                }
-            },
-            {
-                "command": "aws.s3.createFolder",
-                "title": "%AWS.command.s3.createFolder%",
-                "category": "%AWS.title%",
-                "enablement": "isCloud9 || !aws.isWebExtHost",
-                "icon": "$(new-folder)",
-                "cloud9": {
-                    "cn": {
-                        "category": "%AWS.title.cn%"
-                    }
-                }
-            },
-            {
-                "command": "aws.s3.createBucket",
-                "title": "%AWS.command.s3.createBucket%",
-                "category": "%AWS.title%",
-                "enablement": "isCloud9 || !aws.isWebExtHost",
-                "icon": "$(aws-s3-create-bucket)",
-                "cloud9": {
-                    "cn": {
-                        "category": "%AWS.title.cn%"
-                    }
-                }
-            },
-            {
-                "command": "aws.s3.deleteBucket",
-                "title": "%AWS.generic.promptDelete%",
-                "category": "%AWS.title%",
-                "enablement": "isCloud9 || !aws.isWebExtHost",
-                "cloud9": {
-                    "cn": {
-                        "category": "%AWS.title.cn%"
-                    }
-                }
-            },
-            {
-                "command": "aws.s3.deleteFile",
-                "title": "%AWS.generic.promptDelete%",
-                "category": "%AWS.title%",
-                "enablement": "isCloud9 || !aws.isWebExtHost",
-                "cloud9": {
-                    "cn": {
-                        "category": "%AWS.title.cn%"
-                    }
-                }
-            },
-            {
-                "command": "aws.invokeLambda",
-                "title": "%AWS.command.invokeLambda%",
-                "category": "%AWS.title%",
-                "enablement": "isCloud9 || !aws.isWebExtHost",
-                "cloud9": {
-                    "cn": {
-                        "title": "%AWS.command.invokeLambda.cn%",
-                        "category": "%AWS.title.cn%"
-                    }
-                }
-            },
-            {
-                "command": "aws.downloadLambda",
-                "title": "%AWS.command.downloadLambda%",
-                "category": "%AWS.title%",
-                "enablement": "viewItem == awsRegionFunctionNodeDownloadable",
-                "cloud9": {
-                    "cn": {
-                        "category": "%AWS.title.cn%"
-                    }
-                }
-            },
-            {
-                "command": "aws.uploadLambda",
-                "title": "%AWS.command.uploadLambda%",
-                "enablement": "isCloud9 || !aws.isWebExtHost",
-                "category": "%AWS.title%",
-                "cloud9": {
-                    "cn": {
-                        "category": "%AWS.title.cn%"
-                    }
-                }
-            },
-            {
-                "command": "aws.deleteLambda",
-                "title": "%AWS.generic.promptDelete%",
-                "enablement": "isCloud9 || !aws.isWebExtHost",
-                "category": "%AWS.title%",
-                "cloud9": {
-                    "cn": {
-                        "category": "%AWS.title.cn%"
-                    }
-                }
-            },
-            {
-                "command": "aws.copyLambdaUrl",
-                "title": "%AWS.generic.copyUrl%",
-                "enablement": "isCloud9 || !aws.isWebExtHost",
-                "category": "%AWS.title%",
-                "cloud9": {
-                    "cn": {
-                        "category": "%AWS.title.cn%"
-                    }
-                }
-            },
-            {
-                "command": "aws.deploySamApplication",
-                "title": "%AWS.command.deploySamApplication%",
-                "enablement": "isCloud9 || !aws.isWebExtHost",
-                "category": "%AWS.title%",
-                "cloud9": {
-                    "cn": {
-                        "category": "%AWS.title.cn%"
-                    }
-                }
-            },
-            {
-                "command": "aws.submitFeedback",
-                "title": "%AWS.command.submitFeedback%",
-                "enablement": "!aws.isWebExtHost",
-                "category": "%AWS.title%",
-                "icon": "$(comment)",
-                "cloud9": {
-                    "cn": {
-                        "category": "%AWS.title.cn%"
-                    }
-                }
-            },
-            {
-                "command": "aws.refreshAwsExplorer",
-                "title": "%AWS.command.refreshAwsExplorer%",
-                "enablement": "isCloud9 || !aws.isWebExtHost",
-                "category": "%AWS.title%",
-                "icon": {
-                    "dark": "resources/icons/vscode/dark/refresh.svg",
-                    "light": "resources/icons/vscode/light/refresh.svg"
-                }
-            },
-            {
-                "command": "aws.samcli.detect",
-                "title": "%AWS.command.samcli.detect%",
-                "enablement": "isCloud9 || !aws.isWebExtHost",
-                "category": "%AWS.title%",
-                "cloud9": {
-                    "cn": {
-                        "category": "%AWS.title.cn%"
-                    }
-                }
-            },
-            {
-                "command": "aws.deleteCloudFormation",
-                "title": "%AWS.command.deleteCloudFormation%",
-                "enablement": "isCloud9 || !aws.isWebExtHost",
-                "category": "%AWS.title%",
-                "cloud9": {
-                    "cn": {
-                        "category": "%AWS.title.cn%"
-                    }
-                }
-            },
-            {
-                "command": "aws.downloadStateMachineDefinition",
-                "title": "%AWS.command.downloadStateMachineDefinition%",
-                "enablement": "isCloud9 || !aws.isWebExtHost",
-                "category": "%AWS.title%",
-                "cloud9": {
-                    "cn": {
-                        "category": "%AWS.title.cn%"
-                    }
-                }
-            },
-            {
-                "command": "aws.executeStateMachine",
-                "title": "%AWS.command.executeStateMachine%",
-                "enablement": "isCloud9 || !aws.isWebExtHost",
-                "category": "%AWS.title%",
-                "cloud9": {
-                    "cn": {
-                        "category": "%AWS.title.cn%"
-                    }
-                }
-            },
-            {
-                "command": "aws.renderStateMachineGraph",
-                "title": "%AWS.command.renderStateMachineGraph%",
-                "enablement": "isCloud9 || !aws.isWebExtHost",
-                "category": "%AWS.title%",
-                "cloud9": {
-                    "cn": {
-                        "category": "%AWS.title.cn%"
-                    }
-                }
-            },
-            {
-                "command": "aws.copyArn",
-                "title": "%AWS.command.copyArn%",
-                "category": "%AWS.title%",
-                "enablement": "isCloud9 || !aws.isWebExtHost",
-                "cloud9": {
-                    "cn": {
-                        "category": "%AWS.title.cn%"
-                    }
-                }
-            },
-            {
-                "command": "aws.copyName",
-                "title": "%AWS.command.copyName%",
-                "category": "%AWS.title%",
-                "enablement": "isCloud9 || !aws.isWebExtHost",
-                "cloud9": {
-                    "cn": {
-                        "category": "%AWS.title.cn%"
-                    }
-                }
-            },
-            {
-                "command": "aws.listCommands",
-                "title": "%AWS.command.listCommands%",
-                "category": "%AWS.title%",
-                "cloud9": {
-                    "cn": {
-                        "title": "%AWS.command.listCommands.cn%",
-                        "category": "%AWS.title.cn%"
-                    }
-                }
-            },
-            {
-                "command": "aws.viewSchemaItem",
-                "title": "%AWS.command.viewSchemaItem%",
-                "category": "%AWS.title%",
-                "enablement": "isCloud9 || !aws.isWebExtHost",
-                "cloud9": {
-                    "cn": {
-                        "category": "%AWS.title.cn%"
-                    }
-                }
-            },
-            {
-                "command": "aws.searchSchema",
-                "title": "%AWS.command.searchSchema%",
-                "category": "%AWS.title%",
-                "enablement": "isCloud9 || !aws.isWebExtHost",
-                "cloud9": {
-                    "cn": {
-                        "category": "%AWS.title.cn%"
-                    }
-                }
-            },
-            {
-                "command": "aws.searchSchemaPerRegistry",
-                "title": "%AWS.command.searchSchemaPerRegistry%",
-                "category": "%AWS.title%",
-                "enablement": "isCloud9 || !aws.isWebExtHost",
-                "cloud9": {
-                    "cn": {
-                        "category": "%AWS.title.cn%"
-                    }
-                }
-            },
-            {
-                "command": "aws.downloadSchemaItemCode",
-                "title": "%AWS.command.downloadSchemaItemCode%",
-                "category": "%AWS.title%",
-                "enablement": "isCloud9 || !aws.isWebExtHost",
-                "cloud9": {
-                    "cn": {
-                        "category": "%AWS.title.cn%"
-                    }
-                }
-            },
-            {
-                "command": "aws.viewLogs",
-                "title": "%AWS.command.viewLogs%",
-                "category": "%AWS.title%"
-            },
-            {
-                "command": "aws.help",
-                "title": "%AWS.command.help%",
-                "category": "%AWS.title%",
-                "cloud9": {
-                    "cn": {
-                        "category": "%AWS.title.cn%"
-                    }
-                }
-            },
-            {
-                "command": "aws.github",
-                "title": "%AWS.command.github%",
-                "category": "%AWS.title%",
-                "cloud9": {
-                    "cn": {
-                        "category": "%AWS.title.cn%"
-                    }
-                }
-            },
-            {
-                "command": "aws.quickStart",
-                "title": "%AWS.command.quickStart%",
-                "category": "%AWS.title%",
-                "enablement": "isCloud9",
-                "cloud9": {
-                    "cn": {
-                        "category": "%AWS.title.cn%"
-                    }
-                }
-            },
-            {
-                "command": "aws.cdk.refresh",
-                "title": "%AWS.command.refreshCdkExplorer%",
-                "category": "%AWS.title%",
-                "enablement": "isCloud9 || !aws.isWebExtHost",
-                "icon": {
-                    "dark": "resources/icons/vscode/dark/refresh.svg",
-                    "light": "resources/icons/vscode/light/refresh.svg"
-                },
-                "cloud9": {
-                    "cn": {
-                        "category": "%AWS.title.cn%"
-                    }
-                }
-            },
-            {
-                "command": "aws.cdk.viewDocs",
-                "title": "%AWS.generic.viewDocs%",
-                "category": "%AWS.title%",
-                "enablement": "isCloud9 || !aws.isWebExtHost"
-            },
-            {
-                "command": "aws.stepfunctions.createStateMachineFromTemplate",
-                "title": "%AWS.command.stepFunctions.createStateMachineFromTemplate%",
-                "category": "%AWS.title%",
-                "enablement": "isCloud9 || !aws.isWebExtHost",
-                "cloud9": {
-                    "cn": {
-                        "category": "%AWS.title.cn%"
-                    }
-                }
-            },
-            {
-                "command": "aws.stepfunctions.publishStateMachine",
-                "title": "%AWS.command.stepFunctions.publishStateMachine%",
-                "category": "%AWS.title%",
-                "enablement": "isCloud9 || !aws.isWebExtHost",
-                "cloud9": {
-                    "cn": {
-                        "category": "%AWS.title.cn%"
-                    }
-                }
-            },
-            {
-                "command": "aws.previewStateMachine",
-                "title": "%AWS.command.stepFunctions.previewStateMachine%",
-                "category": "%AWS.title%",
-                "enablement": "isCloud9 || !aws.isWebExtHost",
-                "icon": "$(aws-stepfunctions-preview)",
-                "cloud9": {
-                    "cn": {
-                        "category": "%AWS.title.cn%"
-                    }
-                }
-            },
-            {
-                "command": "aws.cdk.renderStateMachineGraph",
-                "title": "%AWS.command.cdk.previewStateMachine%",
-                "enablement": "isCloud9 || !aws.isWebExtHost",
-                "category": "AWS",
-                "icon": "$(aws-stepfunctions-preview)"
-            },
-            {
-                "command": "aws.aboutToolkit",
-                "title": "%AWS.command.aboutToolkit%",
-                "category": "%AWS.title%"
-            },
-            {
-                "command": "aws.cwl.viewLogStream",
-                "title": "%AWS.command.viewLogStream%",
-                "enablement": "isCloud9 || !aws.isWebExtHost",
-                "category": "%AWS.title%",
-                "cloud9": {
-                    "cn": {
-                        "category": "%AWS.title.cn%"
-                    }
-                }
-            },
-            {
-                "command": "aws.ssmDocument.createLocalDocument",
-                "title": "%AWS.command.ssmDocument.createLocalDocument%",
-                "category": "%AWS.title%",
-                "enablement": "isCloud9 || !aws.isWebExtHost",
-                "cloud9": {
-                    "cn": {
-                        "category": "%AWS.title.cn%"
-                    }
-                }
-            },
-            {
-                "command": "aws.ssmDocument.openLocalDocument",
-                "title": "%AWS.command.ssmDocument.openLocalDocument%",
-                "category": "%AWS.title%",
-                "enablement": "isCloud9 || !aws.isWebExtHost",
-                "icon": "$(cloud-download)",
-                "cloud9": {
-                    "cn": {
-                        "category": "%AWS.title.cn%"
-                    }
-                }
-            },
-            {
-                "command": "aws.ssmDocument.openLocalDocumentJson",
-                "title": "%AWS.command.ssmDocument.openLocalDocumentJson%",
-                "category": "%AWS.title%",
-                "enablement": "isCloud9 || !aws.isWebExtHost",
-                "cloud9": {
-                    "cn": {
-                        "category": "%AWS.title.cn%"
-                    }
-                }
-            },
-            {
-                "command": "aws.ssmDocument.openLocalDocumentYaml",
-                "title": "%AWS.command.ssmDocument.openLocalDocumentYaml%",
-                "category": "%AWS.title%",
-                "enablement": "isCloud9 || !aws.isWebExtHost",
-                "cloud9": {
-                    "cn": {
-                        "category": "%AWS.title.cn%"
-                    }
-                }
-            },
-            {
-                "command": "aws.ssmDocument.deleteDocument",
-                "title": "%AWS.command.ssmDocument.deleteDocument%",
-                "category": "%AWS.title%",
-                "enablement": "isCloud9 || !aws.isWebExtHost",
-                "cloud9": {
-                    "cn": {
-                        "category": "%AWS.title.cn%"
-                    }
-                }
-            },
-            {
-                "command": "aws.ssmDocument.publishDocument",
-                "title": "%AWS.command.ssmDocument.publishDocument%",
-                "category": "%AWS.title%",
-                "enablement": "isCloud9 || !aws.isWebExtHost",
-                "icon": "$(cloud-upload)",
-                "cloud9": {
-                    "cn": {
-                        "category": "%AWS.title.cn%"
-                    }
-                }
-            },
-            {
-                "command": "aws.ssmDocument.updateDocumentVersion",
-                "title": "%AWS.command.ssmDocument.updateDocumentVersion%",
-                "category": "%AWS.title%",
-                "enablement": "isCloud9 || !aws.isWebExtHost",
-                "cloud9": {
-                    "cn": {
-                        "category": "%AWS.title.cn%"
-                    }
-                }
-            },
-            {
-                "command": "aws.copyLogResource",
-                "title": "%AWS.command.copyLogResource%",
-                "category": "%AWS.title%",
-                "enablement": "isCloud9 || !aws.isWebExtHost",
-                "icon": "$(files)",
-                "cloud9": {
-                    "cn": {
-                        "category": "%AWS.title.cn%"
-                    }
-                }
-            },
-            {
-                "command": "aws.cwl.searchLogGroup",
-                "title": "%AWS.command.cloudWatchLogs.searchLogGroup%",
-                "category": "%AWS.title%",
-                "enablement": "isCloud9 || !aws.isWebExtHost",
-                "icon": "$(search-view-icon)",
-                "cloud9": {
-                    "cn": {
-                        "category": "%AWS.title.cn%"
-                    }
-                }
-            },
-            {
-                "command": "aws.saveCurrentLogDataContent",
-                "title": "%AWS.command.saveCurrentLogDataContent%",
-                "category": "%AWS.title%",
-                "enablement": "isCloud9 || !aws.isWebExtHost",
-                "icon": "$(save)",
-                "cloud9": {
-                    "cn": {
-                        "category": "%AWS.title.cn%"
-                    }
-                }
-            },
-            {
-                "command": "aws.cwl.changeFilterPattern",
-                "title": "%AWS.command.cwl.changeFilterPattern%",
-                "category": "%AWS.title%",
-                "enablement": "isCloud9 || !aws.isWebExtHost",
-                "icon": "$(search-view-icon)",
-                "cloud9": {
-                    "cn": {
-                        "category": "%AWS.title.cn%"
-                    }
-                }
-            },
-            {
-                "command": "aws.cwl.changeTimeFilter",
-                "title": "%AWS.command.cwl.changeTimeFilter%",
-                "category": "%AWS.title%",
-                "enablement": "isCloud9 || !aws.isWebExtHost",
-                "icon": "$(calendar)",
-                "cloud9": {
-                    "cn": {
-                        "category": "%AWS.title.cn%"
-                    }
-                }
-            },
-            {
-                "command": "aws.addSamDebugConfig",
-                "title": "%AWS.command.addSamDebugConfig%",
-                "category": "%AWS.title%",
-                "enablement": "isCloud9 || !aws.isWebExtHost",
-                "cloud9": {
-                    "cn": {
-                        "category": "%AWS.title.cn%"
-                    }
-                }
-            },
-            {
-                "command": "aws.toggleSamCodeLenses",
-                "title": "%AWS.command.toggleSamCodeLenses%",
-                "category": "%AWS.title%",
-                "enablement": "isCloud9 || !aws.isWebExtHost",
-                "cloud9": {
-                    "cn": {
-                        "category": "%AWS.title.cn%"
-                    }
-                }
-            },
-            {
-                "command": "aws.ecs.runCommandInContainer",
-                "title": "%AWS.ecs.runCommandInContainer%",
-                "category": "%AWS.title%",
-                "enablement": "viewItem == awsEcsContainerNodeExecEnabled",
-                "cloud9": {
-                    "cn": {
-                        "category": "%AWS.title.cn%"
-                    }
-                }
-            },
-            {
-                "command": "aws.ecs.openTaskInTerminal",
-                "title": "%AWS.ecs.openTaskInTerminal%",
-                "category": "%AWS.title%",
-                "enablement": "viewItem == awsEcsContainerNodeExecEnabled",
-                "cloud9": {
-                    "cn": {
-                        "category": "%AWS.title.cn%"
-                    }
-                }
-            },
-            {
-                "command": "aws.ecs.enableEcsExec",
-                "title": "%AWS.ecs.enableEcsExec%",
-                "category": "%AWS.title%",
-                "enablement": "isCloud9 || !aws.isWebExtHost",
-                "cloud9": {
-                    "cn": {
-                        "category": "%AWS.title.cn%"
-                    }
-                }
-            },
-            {
-                "command": "aws.ecs.viewDocumentation",
-                "title": "%AWS.generic.viewDocs%",
-                "category": "%AWS.title%",
-                "enablement": "isCloud9 || !aws.isWebExtHost",
-                "cloud9": {
-                    "cn": {
-                        "category": "%AWS.title.cn%"
-                    }
-                }
-            },
-            {
-                "command": "aws.resources.copyIdentifier",
-                "title": "%AWS.command.resources.copyIdentifier%",
-                "category": "%AWS.title%",
-                "enablement": "isCloud9 || !aws.isWebExtHost",
-                "cloud9": {
-                    "cn": {
-                        "category": "%AWS.title.cn%"
-                    }
-                }
-            },
-            {
-                "command": "aws.resources.openResourcePreview",
-                "title": "%AWS.generic.preview%",
-                "category": "%AWS.title%",
-                "enablement": "isCloud9 || !aws.isWebExtHost",
-                "icon": "$(open-preview)",
-                "cloud9": {
-                    "cn": {
-                        "category": "%AWS.title.cn%"
-                    }
-                }
-            },
-            {
-                "command": "aws.resources.createResource",
-                "title": "%AWS.generic.create%",
-                "category": "%AWS.title%",
-                "enablement": "isCloud9 || !aws.isWebExtHost",
-                "icon": "$(add)",
-                "cloud9": {
-                    "cn": {
-                        "category": "%AWS.title.cn%"
-                    }
-                }
-            },
-            {
-                "command": "aws.resources.deleteResource",
-                "title": "%AWS.generic.promptDelete%",
-                "category": "%AWS.title%",
-                "enablement": "isCloud9 || !aws.isWebExtHost",
-                "cloud9": {
-                    "cn": {
-                        "category": "%AWS.title.cn%"
-                    }
-                }
-            },
-            {
-                "command": "aws.resources.updateResource",
-                "title": "%AWS.generic.promptUpdate%",
-                "category": "%AWS.title%",
-                "enablement": "isCloud9 || !aws.isWebExtHost",
-                "icon": "$(pencil)",
-                "cloud9": {
-                    "cn": {
-                        "category": "%AWS.title.cn%"
-                    }
-                }
-            },
-            {
-                "command": "aws.resources.updateResourceInline",
-                "title": "%AWS.generic.promptUpdate%",
-                "category": "%AWS.title%",
-                "enablement": "isCloud9 || !aws.isWebExtHost",
-                "icon": "$(pencil)",
-                "cloud9": {
-                    "cn": {
-                        "category": "%AWS.title.cn%"
-                    }
-                }
-            },
-            {
-                "command": "aws.resources.saveResource",
-                "title": "%AWS.generic.save%",
-                "category": "%AWS.title%",
-                "enablement": "isCloud9 || !aws.isWebExtHost",
-                "icon": "$(save)",
-                "cloud9": {
-                    "cn": {
-                        "category": "%AWS.title.cn%"
-                    }
-                }
-            },
-            {
-                "command": "aws.resources.closeResource",
-                "title": "%AWS.generic.close%",
-                "category": "%AWS.title%",
-                "enablement": "isCloud9 || !aws.isWebExtHost",
-                "icon": "$(close)",
-                "cloud9": {
-                    "cn": {
-                        "category": "%AWS.title.cn%"
-                    }
-                }
-            },
-            {
-                "command": "aws.resources.viewDocs",
-                "title": "%AWS.generic.viewDocs%",
-                "category": "%AWS.title%",
-                "enablement": "isCloud9 || !aws.isWebExtHost",
-                "icon": "$(book)",
-                "cloud9": {
-                    "cn": {
-                        "category": "%AWS.title.cn%"
-                    }
-                }
-            },
-            {
-                "command": "aws.resources.configure",
-                "title": "%AWS.command.resources.configure%",
-                "category": "%AWS.title%",
-                "enablement": "isCloud9 || !aws.isWebExtHost",
-                "icon": "$(gear)",
-                "cloud9": {
-                    "cn": {
-                        "category": "%AWS.title.cn%"
-                    }
-                }
-            },
-            {
-                "command": "aws.apprunner.createService",
-                "title": "%AWS.command.apprunner.createService%",
-                "category": "%AWS.title%",
-                "enablement": "isCloud9 || !aws.isWebExtHost",
-                "cloud9": {
-                    "cn": {
-                        "category": "%AWS.title.cn%"
-                    }
-                }
-            },
-            {
-                "command": "aws.ecs.disableEcsExec",
-                "title": "%AWS.ecs.disableEcsExec%",
-                "category": "%AWS.title%",
-                "enablement": "isCloud9 || !aws.isWebExtHost",
-                "cloud9": {
-                    "cn": {
-                        "category": "%AWS.title.cn%"
-                    }
-                }
-            },
-            {
-                "command": "aws.apprunner.createServiceFromEcr",
-                "title": "%AWS.command.apprunner.createServiceFromEcr%",
-                "category": "%AWS.title%",
-                "enablement": "isCloud9 || !aws.isWebExtHost",
-                "cloud9": {
-                    "cn": {
-                        "category": "%AWS.title.cn%"
-                    }
-                }
-            },
-            {
-                "command": "aws.apprunner.pauseService",
-                "title": "%AWS.command.apprunner.pauseService%",
-                "category": "%AWS.title%",
-                "enablement": "isCloud9 || !aws.isWebExtHost",
-                "cloud9": {
-                    "cn": {
-                        "category": "%AWS.title.cn%"
-                    }
-                }
-            },
-            {
-                "command": "aws.apprunner.resumeService",
-                "title": "%AWS.command.apprunner.resumeService%",
-                "category": "AWS",
-                "enablement": "isCloud9 || !aws.isWebExtHost",
-                "cloud9": {
-                    "cn": {
-                        "category": "%AWS.title.cn%"
-                    }
-                }
-            },
-            {
-                "command": "aws.apprunner.copyServiceUrl",
-                "title": "%AWS.command.apprunner.copyServiceUrl%",
-                "category": "%AWS.title%",
-                "enablement": "isCloud9 || !aws.isWebExtHost",
-                "cloud9": {
-                    "cn": {
-                        "category": "%AWS.title.cn%"
-                    }
-                }
-            },
-            {
-                "command": "aws.apprunner.open",
-                "title": "%AWS.command.apprunner.open%",
-                "category": "%AWS.title%",
-                "enablement": "isCloud9 || !aws.isWebExtHost",
-                "cloud9": {
-                    "cn": {
-                        "category": "%AWS.title.cn%"
-                    }
-                }
-            },
-            {
-                "command": "aws.apprunner.deleteService",
-                "title": "%AWS.generic.promptDelete%",
-                "category": "%AWS.title%",
-                "enablement": "isCloud9 || !aws.isWebExtHost",
-                "cloud9": {
-                    "cn": {
-                        "category": "%AWS.title.cn%"
-                    }
-                }
-            },
-            {
-                "command": "aws.apprunner.startDeployment",
-                "title": "%AWS.command.apprunner.startDeployment%",
-                "category": "%AWS.title%",
-                "enablement": "isCloud9 || !aws.isWebExtHost",
-                "cloud9": {
-                    "cn": {
-                        "category": "%AWS.title.cn%"
-                    }
-                }
-            },
-            {
-                "command": "aws.cloudFormation.newTemplate",
-                "title": "%AWS.command.cloudFormation.newTemplate%",
-                "category": "%AWS.title%",
-                "enablement": "isCloud9 || !aws.isWebExtHost",
-                "cloud9": {
-                    "cn": {
-                        "category": "%AWS.title.cn%"
-                    }
-                }
-            },
-            {
-                "command": "aws.sam.newTemplate",
-                "title": "%AWS.command.sam.newTemplate%",
-                "category": "%AWS.title%",
-                "enablement": "isCloud9 || !aws.isWebExtHost",
-                "cloud9": {
-                    "cn": {
-                        "category": "%AWS.title.cn%"
-                    }
-                }
-            },
-            {
-                "command": "aws.samcli.sync",
-                "title": "%AWS.command.samcli.sync%",
-                "category": "%AWS.title%",
-                "enablement": "isCloud9 || !aws.isWebExtHost"
-            },
-            {
-                "command": "aws.codeWhisperer",
-                "title": "%AWS.command.codewhisperer.title%",
-                "category": "%AWS.title%"
-            },
-            {
-                "command": "aws.codeWhisperer.configure",
-                "title": "%AWS.command.codewhisperer.configure%",
-                "category": "%AWS.title%",
-                "icon": "$(gear)",
-                "cloud9": {
-                    "cn": {
-                        "category": "%AWS.title.cn%"
-                    }
-                }
-            },
-            {
-                "command": "aws.codeWhisperer.introduction",
-                "title": "%AWS.command.codewhisperer.introduction%",
-                "category": "%AWS.title%",
-                "icon": "$(question)",
-                "cloud9": {
-                    "cn": {
-                        "category": "%AWS.title.cn%"
-                    }
-                }
-            },
-            {
-                "command": "aws.codewhisperer.signout",
-                "title": "%AWS.command.codewhisperer.signout%",
-                "category": "%AWS.title%",
-                "icon": "$(debug-disconnect)"
-            },
-            {
-                "command": "aws.amazonq.learnMore",
-                "title": "%AWS.amazonq.learnMore%",
-                "category": "%AWS.title%"
-            },
-            {
-                "command": "aws.amazonq.welcome",
-                "title": "%AWS.command.q.welcome%",
-                "category": "%AWS.title%"
-            },
-            {
-                "command": "aws.dev.openMenu",
-                "title": "Open Developer Menu",
-                "category": "AWS (Developer)",
-                "enablement": "aws.isDevMode"
-            },
-            {
-                "command": "aws.dev.viewLogs",
-                "title": "Watch Logs",
-                "category": "AWS (Developer)"
-            },
-            {
-                "command": "aws.openInApplicationComposerDialog",
-                "title": "%AWS.command.applicationComposer.openDialog%",
-                "category": "%AWS.title%",
-                "cloud9": {
-                    "cn": {
-                        "category": "%AWS.title.cn%"
-                    }
-                }
-            },
-            {
-                "command": "aws.openInApplicationComposer",
-                "title": "%AWS.command.applicationComposer.open%",
-                "category": "%AWS.title%",
-                "icon": {
-                    "dark": "resources/icons/aws/applicationcomposer/icon-dark.svg",
-                    "light": "resources/icons/aws/applicationcomposer/icon.svg"
-                },
-                "cloud9": {
-                    "cn": {
-                        "category": "%AWS.title.cn%"
-                    }
-                }
-            },
-            {
-                "command": "aws.amazonq.startTransformationInHub",
-                "title": "Start Transformation",
-                "icon": "$(play)",
-                "enablement": "gumby.isTransformAvailable"
-            },
-            {
-                "command": "aws.amazonq.stopTransformationInHub",
-                "title": "Stop Transformation",
-                "icon": "$(stop)",
-                "enablement": "gumby.isStopButtonAvailable"
-            },
-            {
-                "command": "aws.amazonq.showPlanProgressInHub",
-                "title": "Show Transformation Status",
-                "icon": "$(checklist)"
-            },
-            {
-                "command": "aws.amazonq.showHistoryInHub",
-                "title": "Show Job Status",
-                "icon": "$(history)"
-            },
-            {
-                "command": "aws.amazonq.showTransformationPlanInHub",
-                "title": "Show Transformation Plan",
-                "enablement": "gumby.isPlanAvailable"
-            }
-        ],
-        "jsonValidation": [
-            {
-                "fileMatch": ".aws/templates.json",
-                "url": "./dist/src/templates/templates.json"
-            },
-            {
-                "fileMatch": "*ecs-task-def.json",
-                "url": "https://ecs-intellisense.s3-us-west-2.amazonaws.com/task-definition/schema.json"
-            }
-        ],
-        "languages": [
-            {
-                "id": "asl",
-                "extensions": [
-                    ".asl.json",
-                    ".asl"
-                ],
-                "aliases": [
-                    "Amazon States Language"
-                ]
-            },
-            {
-                "id": "asl-yaml",
-                "aliases": [
-                    "Amazon States Language (YAML)"
-                ],
-                "extensions": [
-                    ".asl.yaml",
-                    ".asl.yml"
-                ]
-            },
-            {
-                "id": "ssm-json",
-                "extensions": [
-                    ".ssm.json"
-                ],
-                "aliases": [
-                    "AWS Systems Manager Document (JSON)"
-                ]
-            },
-            {
-                "id": "ssm-yaml",
-                "extensions": [
-                    ".ssm.yaml",
-                    ".ssm.yml"
-                ],
-                "aliases": [
-                    "AWS Systems Manager Document (YAML)"
-                ]
-            }
-        ],
-        "keybindings": [
-            {
-                "command": "aws.amazonq.explainCode",
-                "win": "win+alt+e",
-                "mac": "cmd+alt+e",
-                "linux": "meta+alt+e",
-                "when": "editorHasSelection"
-            },
-            {
-                "command": "aws.amazonq.refactorCode",
-                "win": "win+alt+u",
-                "mac": "cmd+alt+u",
-                "linux": "meta+alt+u",
-                "when": "editorHasSelection"
-            },
-            {
-                "command": "aws.amazonq.fixCode",
-                "win": "win+alt+y",
-                "mac": "cmd+alt+y",
-                "linux": "meta+alt+y",
-                "when": "editorHasSelection"
-            },
-            {
-                "command": "aws.amazonq.optimizeCode",
-                "win": "win+alt+a",
-                "mac": "cmd+alt+a",
-                "linux": "meta+alt+a",
-                "when": "editorHasSelection"
-            },
-            {
-                "command": "aws.amazonq.sendToPrompt",
-                "key": "win+alt+q",
-                "mac": "cmd+alt+q",
-                "linux": "meta+alt+q"
-            },
-            {
-                "command": "aws.previewStateMachine",
-                "key": "ctrl+shift+v",
-                "mac": "cmd+shift+v",
-                "when": "editorTextFocus && editorLangId == asl || editorTextFocus && editorLangId == asl-yaml"
-            },
-            {
-                "command": "aws.codeWhisperer",
-                "key": "alt+c",
-                "mac": "alt+c",
-                "when": "editorTextFocus && aws.codewhisperer.connected || isCloud9 && editorTextFocus"
-            },
-            {
-                "command": "aws.codeWhisperer.rejectCodeSuggestion",
-                "key": "escape",
-                "mac": "escape",
-                "when": "inlineSuggestionVisible && !editorReadonly && aws.codewhisperer.connected || isCloud9 && suggestWidgetVisible && !editorReadonly"
-            },
-            {
-                "key": "right",
-                "command": "editor.action.inlineSuggest.showNext",
-                "when": "inlineSuggestionVisible && !editorReadonly && aws.codewhisperer.connected"
-            },
-            {
-                "key": "left",
-                "command": "editor.action.inlineSuggest.showPrevious",
-                "when": "inlineSuggestionVisible && !editorReadonly && aws.codewhisperer.connected"
-            }
-        ],
-        "grammars": [
-            {
-                "language": "asl",
-                "scopeName": "source.asl",
-                "path": "./syntaxes/ASL.tmLanguage"
-            },
-            {
-                "language": "asl-yaml",
-                "scopeName": "source.asl.yaml",
-                "path": "./syntaxes/asl-yaml.tmLanguage.json"
-            },
-            {
-                "language": "ssm-json",
-                "scopeName": "source.ssmjson",
-                "path": "./syntaxes/SSMJSON.tmLanguage"
-            },
-            {
-                "language": "ssm-yaml",
-                "scopeName": "source.ssmyaml",
-                "path": "./syntaxes/SSMYAML.tmLanguage"
-            }
-        ],
-        "resourceLabelFormatters": [
-            {
-                "scheme": "aws-cwl",
-                "formatting": {
-                    "label": "${path}",
-                    "separator": "/"
-                }
-            },
-            {
-                "scheme": "s3*",
-                "formatting": {
-                    "label": "[S3] ${path}",
-                    "separator": "/"
-                }
-            }
-        ],
-        "walkthroughs": [],
-        "icons": {
-            "aws-amazonq-q-gradient": {
-                "description": "AWS Contributed Icon",
-                "default": {
-                    "fontPath": "./resources/fonts/aws-toolkit-icons.woff",
-                    "fontCharacter": "\\f1aa"
-                }
-            },
-            "aws-amazonq-q-squid-ink": {
-                "description": "AWS Contributed Icon",
-                "default": {
-                    "fontPath": "./resources/fonts/aws-toolkit-icons.woff",
-                    "fontCharacter": "\\f1ab"
-                }
-            },
-            "aws-amazonq-q-white": {
-                "description": "AWS Contributed Icon",
-                "default": {
-                    "fontPath": "./resources/fonts/aws-toolkit-icons.woff",
-                    "fontCharacter": "\\f1ac"
-                }
-            },
-            "aws-amazonq-transform-landing-page-icon": {
-                "description": "AWS Contributed Icon",
-                "default": {
-                    "fontPath": "./resources/fonts/aws-toolkit-icons.woff",
-                    "fontCharacter": "\\f1ad"
-                }
-            },
-            "aws-applicationcomposer-icon": {
-                "description": "AWS Contributed Icon",
-                "default": {
-                    "fontPath": "./resources/fonts/aws-toolkit-icons.woff",
-                    "fontCharacter": "\\f1ae"
-                }
-            },
-            "aws-applicationcomposer-icon-dark": {
-                "description": "AWS Contributed Icon",
-                "default": {
-                    "fontPath": "./resources/fonts/aws-toolkit-icons.woff",
-                    "fontCharacter": "\\f1af"
-                }
-            },
-            "aws-apprunner-service": {
-                "description": "AWS Contributed Icon",
-                "default": {
-                    "fontPath": "./resources/fonts/aws-toolkit-icons.woff",
-                    "fontCharacter": "\\f1b0"
-                }
-            },
-            "aws-cdk-logo": {
-                "description": "AWS Contributed Icon",
-                "default": {
-                    "fontPath": "./resources/fonts/aws-toolkit-icons.woff",
-                    "fontCharacter": "\\f1b1"
-                }
-            },
-            "aws-cloudformation-stack": {
-                "description": "AWS Contributed Icon",
-                "default": {
-                    "fontPath": "./resources/fonts/aws-toolkit-icons.woff",
-                    "fontCharacter": "\\f1b2"
-                }
-            },
-            "aws-cloudwatch-log-group": {
-                "description": "AWS Contributed Icon",
-                "default": {
-                    "fontPath": "./resources/fonts/aws-toolkit-icons.woff",
-                    "fontCharacter": "\\f1b3"
-                }
-            },
-            "aws-codecatalyst-logo": {
-                "description": "AWS Contributed Icon",
-                "default": {
-                    "fontPath": "./resources/fonts/aws-toolkit-icons.woff",
-                    "fontCharacter": "\\f1b4"
-                }
-            },
-            "aws-codewhisperer-icon-black": {
-                "description": "AWS Contributed Icon",
-                "default": {
-                    "fontPath": "./resources/fonts/aws-toolkit-icons.woff",
-                    "fontCharacter": "\\f1b5"
-                }
-            },
-            "aws-codewhisperer-icon-white": {
-                "description": "AWS Contributed Icon",
-                "default": {
-                    "fontPath": "./resources/fonts/aws-toolkit-icons.woff",
-                    "fontCharacter": "\\f1b6"
-                }
-            },
-            "aws-codewhisperer-learn": {
-                "description": "AWS Contributed Icon",
-                "default": {
-                    "fontPath": "./resources/fonts/aws-toolkit-icons.woff",
-                    "fontCharacter": "\\f1b7"
-                }
-            },
-            "aws-ecr-registry": {
-                "description": "AWS Contributed Icon",
-                "default": {
-                    "fontPath": "./resources/fonts/aws-toolkit-icons.woff",
-                    "fontCharacter": "\\f1b8"
-                }
-            },
-            "aws-ecs-cluster": {
-                "description": "AWS Contributed Icon",
-                "default": {
-                    "fontPath": "./resources/fonts/aws-toolkit-icons.woff",
-                    "fontCharacter": "\\f1b9"
-                }
-            },
-            "aws-ecs-container": {
-                "description": "AWS Contributed Icon",
-                "default": {
-                    "fontPath": "./resources/fonts/aws-toolkit-icons.woff",
-                    "fontCharacter": "\\f1ba"
-                }
-            },
-            "aws-ecs-service": {
-                "description": "AWS Contributed Icon",
-                "default": {
-                    "fontPath": "./resources/fonts/aws-toolkit-icons.woff",
-                    "fontCharacter": "\\f1bb"
-                }
-            },
-            "aws-generic-attach-file": {
-                "description": "AWS Contributed Icon",
-                "default": {
-                    "fontPath": "./resources/fonts/aws-toolkit-icons.woff",
-                    "fontCharacter": "\\f1bc"
-                }
-            },
-            "aws-iot-certificate": {
-                "description": "AWS Contributed Icon",
-                "default": {
-                    "fontPath": "./resources/fonts/aws-toolkit-icons.woff",
-                    "fontCharacter": "\\f1bd"
-                }
-            },
-            "aws-iot-policy": {
-                "description": "AWS Contributed Icon",
-                "default": {
-                    "fontPath": "./resources/fonts/aws-toolkit-icons.woff",
-                    "fontCharacter": "\\f1be"
-                }
-            },
-            "aws-iot-thing": {
-                "description": "AWS Contributed Icon",
-                "default": {
-                    "fontPath": "./resources/fonts/aws-toolkit-icons.woff",
-                    "fontCharacter": "\\f1bf"
-                }
-            },
-            "aws-lambda-function": {
-                "description": "AWS Contributed Icon",
-                "default": {
-                    "fontPath": "./resources/fonts/aws-toolkit-icons.woff",
-                    "fontCharacter": "\\f1c0"
-                }
-            },
-            "aws-mynah-MynahIconBlack": {
-                "description": "AWS Contributed Icon",
-                "default": {
-                    "fontPath": "./resources/fonts/aws-toolkit-icons.woff",
-                    "fontCharacter": "\\f1c1"
-                }
-            },
-            "aws-mynah-MynahIconWhite": {
-                "description": "AWS Contributed Icon",
-                "default": {
-                    "fontPath": "./resources/fonts/aws-toolkit-icons.woff",
-                    "fontCharacter": "\\f1c2"
-                }
-            },
-            "aws-mynah-logo": {
-                "description": "AWS Contributed Icon",
-                "default": {
-                    "fontPath": "./resources/fonts/aws-toolkit-icons.woff",
-                    "fontCharacter": "\\f1c3"
-                }
-            },
-            "aws-redshift-cluster": {
-                "description": "AWS Contributed Icon",
-                "default": {
-                    "fontPath": "./resources/fonts/aws-toolkit-icons.woff",
-                    "fontCharacter": "\\f1c4"
-                }
-            },
-            "aws-redshift-cluster-connected": {
-                "description": "AWS Contributed Icon",
-                "default": {
-                    "fontPath": "./resources/fonts/aws-toolkit-icons.woff",
-                    "fontCharacter": "\\f1c5"
-                }
-            },
-            "aws-redshift-database": {
-                "description": "AWS Contributed Icon",
-                "default": {
-                    "fontPath": "./resources/fonts/aws-toolkit-icons.woff",
-                    "fontCharacter": "\\f1c6"
-                }
-            },
-            "aws-redshift-redshift-cluster-connected": {
-                "description": "AWS Contributed Icon",
-                "default": {
-                    "fontPath": "./resources/fonts/aws-toolkit-icons.woff",
-                    "fontCharacter": "\\f1c7"
-                }
-            },
-            "aws-redshift-schema": {
-                "description": "AWS Contributed Icon",
-                "default": {
-                    "fontPath": "./resources/fonts/aws-toolkit-icons.woff",
-                    "fontCharacter": "\\f1c8"
-                }
-            },
-            "aws-redshift-table": {
-                "description": "AWS Contributed Icon",
-                "default": {
-                    "fontPath": "./resources/fonts/aws-toolkit-icons.woff",
-                    "fontCharacter": "\\f1c9"
-                }
-            },
-            "aws-s3-bucket": {
-                "description": "AWS Contributed Icon",
-                "default": {
-                    "fontPath": "./resources/fonts/aws-toolkit-icons.woff",
-                    "fontCharacter": "\\f1ca"
-                }
-            },
-            "aws-s3-create-bucket": {
-                "description": "AWS Contributed Icon",
-                "default": {
-                    "fontPath": "./resources/fonts/aws-toolkit-icons.woff",
-                    "fontCharacter": "\\f1cb"
-                }
-            },
-            "aws-schemas-registry": {
-                "description": "AWS Contributed Icon",
-                "default": {
-                    "fontPath": "./resources/fonts/aws-toolkit-icons.woff",
-                    "fontCharacter": "\\f1cc"
-                }
-            },
-            "aws-schemas-schema": {
-                "description": "AWS Contributed Icon",
-                "default": {
-                    "fontPath": "./resources/fonts/aws-toolkit-icons.woff",
-                    "fontCharacter": "\\f1cd"
-                }
-            },
-            "aws-stepfunctions-preview": {
-                "description": "AWS Contributed Icon",
-                "default": {
-                    "fontPath": "./resources/fonts/aws-toolkit-icons.woff",
-                    "fontCharacter": "\\f1ce"
-                }
-            }
-        },
-        "notebooks": [
-            {
-                "type": "aws-redshift-sql-notebook",
-                "displayName": "Redshift SQL notebook",
-                "selector": [
-                    {
-                        "filenamePattern": "*.redshiftnb"
-                    }
-                ]
-            }
-        ]
+    "prettier": {
+        "printWidth": 120,
+        "trailingComma": "es5",
+        "tabWidth": 4,
+        "singleQuote": true,
+        "semi": false,
+        "bracketSpacing": true,
+        "arrowParens": "avoid",
+        "endOfLine": "lf"
     },
     "scripts": {
-        "prepare": "ts-node ./scripts/build/prepare.ts",
-        "vscode:prepublish": "npm run clean && npm run buildScripts && webpack --mode production && npm run copyFiles",
-        "clean": "ts-node ./scripts/clean.ts dist",
-        "reset": "npm run clean -- node_modules && npm install",
-        "copyFiles": "ts-node ./scripts/build/copyFiles.ts",
-        "buildScripts": "npm run generateClients && npm run generatePackage && npm run generateNonCodeFiles && npm run copyFiles",
-        "browserWatch": "npm run clean && npm run buildScripts && webpack --config webpack.browser.config.js --watch",
-        "browserRun": "npx @vscode/test-web --open-devtools --browserOption=--disable-web-security --waitForDebugger=9222 --extensionDevelopmentPath=. .",
-        "compile": "npm run clean && npm run buildScripts && webpack --mode development && npm run copyFiles",
-        "watch": "npm run clean && npm run buildScripts && tsc -watch -p ./",
-        "postinstall": "npm run generateTelemetry && npm run generateConfigurationAttributes && npm run buildCustomLintPlugin",
-        "testCompile": "npm run buildScripts && tsc -p ./",
-        "test": "npm run testCompile && c8 ts-node ./scripts/test/test.ts",
-        "testE2E": "npm run testCompile && c8 ts-node ./scripts/test/testE2E.ts",
-        "testInteg": "npm run testCompile && c8 ts-node ./scripts/test/testInteg.ts",
-        "lint": "ts-node ./scripts/lint/testLint.ts && npm run format",
-        "lintfix": "eslint -c .eslintrc.js --fix --ext .ts . && npm run formatfix",
-        "buildCustomLintPlugin": "cd ./plugins/eslint-plugin-aws-toolkits && npm run build",
-        "format": "prettier --check src plugins",
-        "formatfix": "prettier --write src plugins",
-        "package": "ts-node ./scripts/build/package.ts",
-        "install-plugin": "vsce package -o aws-toolkit-vscode-test.vsix && code --install-extension aws-toolkit-vscode-test.vsix",
-        "generateClients": "npm run build -w @amzn/codewhisperer-streaming && ts-node ./scripts/build/generateServiceClient.ts ",
-        "generatePackage": "ts-node ./scripts/build/generateIcons.ts",
-        "generateTelemetry": "node node_modules/@aws-toolkits/telemetry/lib/generateTelemetry.js --extraInput=src/shared/telemetry/vscodeTelemetry.json --output=src/shared/telemetry/telemetry.gen.ts",
-        "generateNonCodeFiles": "ts-node ./scripts/build/generateNonCodeFiles.ts",
-        "generateConfigurationAttributes": "ts-node ./scripts/build/generateConfigurationAttributes.ts",
+        "prepare": "ts-node ./scripts/prepare.ts",
+        "postinstall": "npm run buildCustomLintPlugin",
+        "buildCustomLintPlugin": "npm run build -w plugins/eslint-plugin-aws-toolkits",
+        "compile": "npm run compile -w packages/",
+        "testCompile": "npm run testCompile -w packages/",
+        "test": "npm run test -w packages/",
+        "testE2E": "npm run testE2E -w packages/",
+        "testInteg": "npm run testInteg -w packages/",
+        "package": "npm run package -w packages/",
         "newChange": "ts-node ./scripts/newChange.ts",
-        "createRelease": "ts-node ./scripts/build/createRelease.ts",
-        "serve": "webpack serve --config-name vue-hmr --mode development"
+        "createRelease": "ts-node ./scripts/createRelease.ts",
+        "format": "prettier --check plugins && npm run format -w packages/",
+        "formatfix": "prettier --write plugins && npm run formatfix -w packages/",
+        "lint": "npm run lint -w packages/ && npm run format",
+        "lintfix": "eslint -c .eslintrc.js --fix --ext .ts packages plugins && npm run formatfix",
+        "clean": "npm run clean -w packages/ -w plugins/",
+        "reset": "npm run clean && ts-node ./scripts/clean.ts node_modules packages/toolkit/node_modules && npm install",
+        "generateNonCodeFiles": "npm run generateNonCodeFiles -w packages/",
+        "watch": "npm run watch -w packages/toolkit",
+        "browserRun": "npm run browserRun -w packages/toolkit",
+        "browserWatch": "npm run browserWatch -w packages/toolkit"
     },
     "devDependencies": {
-        "@aws-sdk/types": "^3.13.1",
-        "@aws-toolkits/telemetry": "^1.0.184",
-        "@aws/fully-qualified-names": "^2.1.1",
-        "@cspotcode/source-map-support": "^0.8.1",
-        "@sinonjs/fake-timers": "^10.0.2",
-        "@types/adm-zip": "^0.4.34",
-        "@types/async-lock": "^1.4.0",
-        "@types/bytes": "^3.1.0",
-        "@types/circular-dependency-plugin": "^5.0.8",
-        "@types/cross-spawn": "^6.0.6",
-        "@types/diff": "^5.0.7",
-        "@types/fs-extra": "^9.0.11",
-        "@types/glob": "^8.1.0",
-        "@types/js-yaml": "^4.0.5",
-        "@types/jsdom": "^21.1.6",
-        "@types/lodash": "^4.14.180",
-        "@types/markdown-it": "^13.0.2",
-        "@types/mime-types": "^2.1.4",
-        "@types/mocha": "^10.0.6",
-        "@types/node": "^14.18.63",
-        "@types/node-fetch": "^2.6.8",
-        "@types/prismjs": "^1.26.0",
-        "@types/readline-sync": "^1.4.3",
-        "@types/sanitize-html": "2.3.1",
-        "@types/semver": "^7.5.0",
-        "@types/sinon": "^10.0.5",
-        "@types/sinonjs__fake-timers": "^8.1.2",
-        "@types/tcp-port-used": "^1.0.1",
-        "@types/uuid": "^9.0.1",
-        "@types/vscode": "^1.68.0",
-        "@types/vscode-webview": "^1.57.1",
-        "@types/webpack-env": "^1.18.1",
-        "@types/whatwg-url": "^11.0.4",
-        "@types/xml2js": "^0.4.11",
+        "eslint": "^8.56.0",
+        "eslint-config-prettier": "9.1",
+        "eslint-plugin-aws-toolkits": "file:plugins/eslint-plugin-aws-toolkits",
+        "eslint-plugin-header": "^3.1.1",
+        "eslint-plugin-unicorn": "^50.0.1",
         "@typescript-eslint/eslint-plugin": "^5.59.0",
         "@typescript-eslint/parser": "^5.59.1",
+        "@types/vscode": "^1.68.0",
+        "@types/vscode-webview": "^1.57.1",
         "@vscode/codicons": "^0.0.33",
         "@vscode/test-electron": "^2.3.8",
         "@vscode/test-web": "^0.0.50",
         "@vscode/vsce": "^2.19.0",
-        "@vue/compiler-sfc": "^3.3.2",
-        "c8": "^9.0.0",
-        "circular-dependency-plugin": "^5.2.2",
-        "css-loader": "^6.10.0",
-        "diff": "^5.1.0",
-        "esbuild-loader": "2.20.0",
-        "eslint": "^8.56.0",
-        "eslint-config-prettier": "9.1",
-        "eslint-plugin-aws-toolkits": "file:plugins/eslint-plugin-aws-toolkits",
-        "eslint-plugin-header": "^3.1.1",
-        "eslint-plugin-unicorn": "^50.0.1",
-        "file-loader": "^6.2.0",
-        "husky": "^9.0.7",
-        "jsdom": "^23.0.1",
-        "json-schema-to-typescript": "^13.1.1",
-        "marked": "^11.1.1",
-        "mocha": "^10.1.0",
-        "mocha-junit-reporter": "^2.2.1",
-        "mocha-multi-reporters": "^1.5.1",
         "prettier": "^2.8.8",
         "prettier-plugin-sh": "^0.12.8",
         "pretty-quick": "^3.1.3",
-        "readline-sync": "^1.4.9",
-        "sass": "^1.49.8",
-        "sass-loader": "^12.6.0",
-        "sinon": "^14.0.0",
-        "style-loader": "^3.3.1",
-        "ts-node": "^10.9.1",
-        "umd-compat-loader": "^2.1.2",
-        "vscode-nls-dev": "^4.0.4",
-        "vue-loader": "^17.2.2",
-        "vue-style-loader": "^4.1.3",
-        "webfont": "^11.2.26",
-        "webpack": "^5.83.0",
-        "webpack-cli": "^5.1.4",
-        "webpack-dev-server": "^4.15.1"
-    },
-    "dependencies": {
-        "@amzn/codewhisperer-streaming": "file:./src.gen/@amzn/codewhisperer-streaming",
-        "@aws-sdk/client-cognito-identity": "3.490.0",
-        "@aws-sdk/client-lambda": "3.385.0",
-        "@aws-sdk/client-sso": "^3.342.0",
-        "@aws-sdk/client-sso-oidc": "^3.181.0",
-        "@aws-sdk/credential-provider-ini": "3.46.0",
-        "@aws-sdk/credential-provider-process": "3.37.0",
-        "@aws-sdk/credential-provider-sso": "^3.345.0",
-        "@aws-sdk/property-provider": "3.46.0",
-        "@aws-sdk/smithy-client": "^3.46.0",
-        "@aws-sdk/util-arn-parser": "^3.46.0",
-        "@aws/mynah-ui": "3.3.3",
-        "@gerhobbelt/gitignore-parser": "^0.2.0-9",
-        "@iarna/toml": "^2.2.5",
-        "@smithy/shared-ini-file-loader": "^2.2.8",
-        "@vscode/debugprotocol": "^1.57.0",
-        "adm-zip": "^0.5.10",
-        "amazon-states-language-service": "^1.11.0",
-        "async-lock": "^1.4.0",
-        "aws-sdk": "^2.1384.0",
-        "aws-ssm-document-language-service": "^1.0.0",
-        "bytes": "^3.1.2",
-        "cross-fetch": "^4.0.0",
-        "cross-spawn": "^7.0.3",
-        "fast-json-patch": "^3.1.1",
-        "fs-extra": "^10.0.1",
-        "glob": "^10.3.10",
-        "got": "^11.8.5",
-        "highlight.js": "^11.9.0",
-        "i18n-ts": "^1.0.5",
-        "immutable": "^4.3.0",
-        "js-yaml": "^4.1.0",
-        "jsonc-parser": "^3.2.0",
-        "lodash": "^4.17.21",
-        "markdown-it": "^13.0.2",
-        "mime-types": "^2.1.32",
-        "node-fetch": "^2.7.0",
-        "portfinder": "^1.0.32",
-        "sanitize-html": "^2.3.3",
-        "semver": "^7.5.4",
-        "strip-ansi": "^5.2.0",
-        "tcp-port-used": "^1.0.1",
+        "husky": "^9.0.7",
         "typescript": "^5.0.4",
-        "uuid": "^9.0.0",
-        "vscode-languageclient": "^6.1.4",
-        "vscode-languageserver": "^6.1.1",
-        "vscode-languageserver-protocol": "^3.15.3",
-        "vscode-languageserver-textdocument": "^1.0.8",
-        "vscode-nls": "^5.2.0",
-        "vue": "^3.3.4",
-        "web-tree-sitter": "^0.20.7",
-        "whatwg-url": "^14.0.0",
-        "winston": "^3.11.0",
-        "winston-transport": "^4.6.0",
-        "xml2js": "^0.6.1",
-        "yaml-cfn": "^0.3.2"
-    },
-    "overrides": {
-        "webfont": {
-            "xml2js": "0.5.0"
-        }
-    },
-    "prettier": {
-        "printWidth": 120,
-        "trailingComma": "es5",
-        "tabWidth": 4,
-        "singleQuote": true,
-        "semi": false,
-        "bracketSpacing": true,
-        "arrowParens": "avoid",
-        "endOfLine": "lf"
-    },
-    "workspaces": [
-        "src/browser",
-        "src.gen/@amzn/codewhisperer-streaming"
-    ]
+        "ts-node": "^10.9.1"
+    }
 }
diff --git a/.c8rc.json b/packages/toolkit/.c8rc.json
similarity index 93%
rename from .c8rc.json
rename to packages/toolkit/.c8rc.json
index a4e69f03a63..951d9286a55 100644
--- a/.c8rc.json
+++ b/packages/toolkit/.c8rc.json
@@ -1,5 +1,5 @@
 {
-    "report-dir": "./coverage",
+    "report-dir": "../../coverage",
     "reporter": ["lcov"],
     "all": true,
     "include": ["src/**", "dist/src/**"],
diff --git a/.vscode/extensions.json b/packages/toolkit/.vscode/extensions.json
similarity index 100%
rename from .vscode/extensions.json
rename to packages/toolkit/.vscode/extensions.json
diff --git a/.vscode/launch.json b/packages/toolkit/.vscode/launch.json
similarity index 100%
rename from .vscode/launch.json
rename to packages/toolkit/.vscode/launch.json
diff --git a/packages/toolkit/.vscode/settings.json b/packages/toolkit/.vscode/settings.json
new file mode 100644
index 00000000000..9fe89c1fa56
--- /dev/null
+++ b/packages/toolkit/.vscode/settings.json
@@ -0,0 +1,16 @@
+{
+    "files.exclude": {
+        "**/src/testFixtures": true
+    },
+    "search.exclude": {
+        "dist": true,
+        "node_modules": true
+    },
+    "files.watcherExclude": {
+        "**/src/testFixtures": true
+    },
+    "typescript.preferences.importModuleSpecifier": "relative",
+    "javascript.preferences.importModuleSpecifier": "relative",
+    "typescript.tsdk": "../../node_modules/typescript/lib",
+    "npm.packageManager": "npm"
+}
diff --git a/.vscode/tasks.json b/packages/toolkit/.vscode/tasks.json
similarity index 100%
rename from .vscode/tasks.json
rename to packages/toolkit/.vscode/tasks.json
diff --git a/packages/toolkit/.vscodeignore b/packages/toolkit/.vscodeignore
new file mode 100644
index 00000000000..bdf4ff96d22
--- /dev/null
+++ b/packages/toolkit/.vscodeignore
@@ -0,0 +1,29 @@
+# Ignore everything by default. #1899
+*
+*/**
+
+# Ignore outside dirs up to the root package.json, otherwise those will be collected as well
+# (until vsce officially supports workspaces: https://github.com/microsoft/vscode-vsce/issues/580)
+../*
+../../*
+../../*/**
+
+# Allowlist
+# ---------
+!dist/*
+!dist/libs
+!dist/*/!(testFixtures|test)/**/!(*.*.map)
+!dist/*/!(*.*.map)
+!resources/**
+!syntaxes/**
+!templates/**
+!types/**
+!package.json
+!package.nls.json
+
+# Automatically copied from root project directory
+!quickStart**
+!README.**
+!CHANGELOG.md
+!LICENSE
+!NOTICE
diff --git a/packages/toolkit/package.json b/packages/toolkit/package.json
new file mode 100644
index 00000000000..e341f7fc234
--- /dev/null
+++ b/packages/toolkit/package.json
@@ -0,0 +1,4394 @@
+{
+    "name": "aws-toolkit-vscode",
+    "displayName": "AWS Toolkit - Amazon Q, CodeWhisperer, and more",
+    "description": "Including Amazon Q, CodeWhisperer, CodeCatalyst, Application Composer, and support for Lambda, S3, CloudWatch Logs, CloudFormation, and many other services",
+    "version": "2.9.0-SNAPSHOT",
+    "extensionKind": [
+        "workspace"
+    ],
+    "publisher": "amazonwebservices",
+    "license": "Apache-2.0",
+    "repository": {
+        "type": "git",
+        "url": "https://github.com/aws/aws-toolkit-vscode"
+    },
+    "engines": {
+        "npm": "^10.1.0",
+        "vscode": "^1.68.0"
+    },
+    "icon": "resources/marketplace/aws-icon-256x256.png",
+    "bugs": {
+        "url": "https://github.com/aws/aws-toolkit-vscode/issues"
+    },
+    "galleryBanner": {
+        "color": "#FF9900",
+        "theme": "light"
+    },
+    "categories": [
+        "Debuggers",
+        "Linters",
+        "Visualization",
+        "Other"
+    ],
+    "keywords": [
+        "Lambda",
+        "CodeCatalyst",
+        "CodeWhisperer",
+        "Code",
+        "Whisperer"
+    ],
+    "preview": false,
+    "qna": "https://github.com/aws/aws-toolkit-vscode/issues",
+    "activationEvents": [
+        "onStartupFinished",
+        "onUri",
+        "onDebugResolve:aws-sam",
+        "onView:aws.codeWhisperer.securityPanel",
+        "onDebugInitialConfigurations",
+        "onLanguage:javascript",
+        "onLanguage:java",
+        "onLanguage:python",
+        "onLanguage:csharp",
+        "onLanguage:yaml",
+        "onFileSystem:s3",
+        "onFileSystem:s3-readonly",
+        "onCommand:aws.codeWhisperer.accept"
+    ],
+    "main": "./dist/src/main.js",
+    "browser": "./dist/src/extensionWeb",
+    "contributes": {
+        "configuration": {
+            "type": "object",
+            "title": "%AWS.productName%",
+            "cloud9": {
+                "cn": {
+                    "title": "%AWS.productName.cn%"
+                }
+            },
+            "properties": {
+                "aws.profile": {
+                    "type": "string",
+                    "deprecationMessage": "The current profile is now stored internally by the Toolkit.",
+                    "description": "%AWS.configuration.profileDescription%"
+                },
+                "aws.ecs.openTerminalCommand": {
+                    "type": "string",
+                    "default": "/bin/sh",
+                    "markdownDescription": "%AWS.configuration.description.ecs.openTerminalCommand%"
+                },
+                "aws.iot.maxItemsPerPage": {
+                    "type": "number",
+                    "default": 100,
+                    "minimum": 1,
+                    "maximum": 250,
+                    "markdownDescription": "%AWS.configuration.description.iot.maxItemsPerPage%"
+                },
+                "aws.s3.maxItemsPerPage": {
+                    "type": "number",
+                    "default": 300,
+                    "minimum": 3,
+                    "maximum": 1000,
+                    "markdownDescription": "%AWS.configuration.description.s3.maxItemsPerPage%"
+                },
+                "aws.samcli.location": {
+                    "type": "string",
+                    "scope": "machine",
+                    "default": "",
+                    "markdownDescription": "%AWS.configuration.description.samcli.location%"
+                },
+                "aws.samcli.lambdaTimeout": {
+                    "type": "number",
+                    "default": 90000,
+                    "markdownDescription": "%AWS.configuration.description.samcli.lambdaTimeout%"
+                },
+                "aws.samcli.legacyDeploy": {
+                    "type": "boolean",
+                    "default": false,
+                    "markdownDescription": "%AWS.configuration.description.samcli.legacyDeploy%"
+                },
+                "aws.logLevel": {
+                    "type": "string",
+                    "default": "info",
+                    "enum": [
+                        "error",
+                        "warn",
+                        "info",
+                        "verbose",
+                        "debug"
+                    ],
+                    "enumDescriptions": [
+                        "Errors Only",
+                        "Errors and Warnings",
+                        "Errors, Warnings, and Info",
+                        "Errors, Warnings, Info, and Verbose",
+                        "Errors, Warnings, Info, Verbose, and Debug"
+                    ],
+                    "markdownDescription": "%AWS.configuration.description.logLevel%",
+                    "cloud9": {
+                        "cn": {
+                            "markdownDescription": "%AWS.configuration.description.logLevel.cn%"
+                        }
+                    }
+                },
+                "aws.telemetry": {
+                    "type": "boolean",
+                    "default": true,
+                    "markdownDescription": "%AWS.configuration.description.telemetry%",
+                    "cloud9": {
+                        "cn": {
+                            "markdownDescription": "%AWS.configuration.description.telemetry.cn%"
+                        }
+                    }
+                },
+                "aws.stepfunctions.asl.format.enable": {
+                    "type": "boolean",
+                    "scope": "window",
+                    "default": true,
+                    "description": "%AWS.stepFunctions.asl.format.enable.desc%"
+                },
+                "aws.stepfunctions.asl.maxItemsComputed": {
+                    "type": "number",
+                    "default": 5000,
+                    "description": "%AWS.stepFunctions.asl.maxItemsComputed.desc%"
+                },
+                "aws.ssmDocument.ssm.maxItemsComputed": {
+                    "type": "number",
+                    "default": 5000,
+                    "description": "%AWS.ssmDocument.ssm.maxItemsComputed.desc%"
+                },
+                "aws.cwl.limit": {
+                    "type": "number",
+                    "default": 10000,
+                    "description": "%AWS.cwl.limit.desc%",
+                    "maximum": 10000
+                },
+                "aws.samcli.manuallySelectedBuckets": {
+                    "type": "object",
+                    "description": "%AWS.samcli.deploy.bucket.recentlyUsed%",
+                    "default": []
+                },
+                "aws.samcli.enableCodeLenses": {
+                    "type": "boolean",
+                    "description": "%AWS.configuration.enableCodeLenses%",
+                    "default": false
+                },
+                "aws.suppressPrompts": {
+                    "type": "object",
+                    "description": "%AWS.configuration.description.suppressPrompts%",
+                    "default": {},
+                    "properties": {
+                        "apprunnerNotifyPricing": {
+                            "type": "boolean",
+                            "default": false
+                        },
+                        "apprunnerNotifyPause": {
+                            "type": "boolean",
+                            "default": false
+                        },
+                        "ecsRunCommand": {
+                            "type": "boolean",
+                            "default": false
+                        },
+                        "ecsRunCommandEnable": {
+                            "type": "boolean",
+                            "default": false
+                        },
+                        "ecsRunCommandDisable": {
+                            "type": "boolean",
+                            "default": false
+                        },
+                        "regionAddAutomatically": {
+                            "type": "boolean",
+                            "default": false
+                        },
+                        "yamlExtPrompt": {
+                            "type": "boolean",
+                            "default": false
+                        },
+                        "fileViewerEdit": {
+                            "type": "boolean",
+                            "default": false
+                        },
+                        "createCredentialsProfile": {
+                            "type": "boolean",
+                            "default": false
+                        },
+                        "samcliConfirmDevStack": {
+                            "type": "boolean",
+                            "default": false
+                        },
+                        "remoteConnected": {
+                            "type": "boolean",
+                            "default": false
+                        },
+                        "codeWhispererNewWelcomeMessage": {
+                            "type": "boolean",
+                            "default": false
+                        },
+                        "codeWhispererConnectionExpired": {
+                            "type": "boolean",
+                            "default": false
+                        },
+                        "amazonQWelcomePage": {
+                            "type": "boolean",
+                            "default": false
+                        }
+                    },
+                    "additionalProperties": false
+                },
+                "aws.experiments": {
+                    "type": "object",
+                    "markdownDescription": "%AWS.configuration.description.experiments%",
+                    "default": {
+                        "jsonResourceModification": false
+                    },
+                    "properties": {
+                        "jsonResourceModification": {
+                            "type": "boolean",
+                            "default": false
+                        }
+                    },
+                    "additionalProperties": false
+                },
+                "aws.codeWhisperer.includeSuggestionsWithCodeReferences": {
+                    "type": "boolean",
+                    "markdownDescription": "%AWS.configuration.description.codewhisperer%",
+                    "default": true
+                },
+                "aws.codeWhisperer.importRecommendation": {
+                    "type": "boolean",
+                    "description": "%AWS.configuration.description.codewhisperer.importRecommendation%",
+                    "default": true
+                },
+                "aws.codeWhisperer.shareCodeWhispererContentWithAWS": {
+                    "type": "boolean",
+                    "markdownDescription": "%AWS.configuration.description.codewhisperer.shareCodeWhispererContentWithAWS%",
+                    "default": true,
+                    "scope": "application"
+                },
+                "aws.codeWhisperer.javaCompilationOutput": {
+                    "type": "string",
+                    "default": "",
+                    "description": "Provide the ABSOLUTE path which is used to store java project compilation results."
+                },
+                "aws.resources.enabledResources": {
+                    "type": "array",
+                    "description": "%AWS.configuration.description.resources.enabledResources%",
+                    "items": {
+                        "type": "string"
+                    }
+                },
+                "aws.lambda.recentlyUploaded": {
+                    "type": "object",
+                    "description": "%AWS.configuration.description.lambda.recentlyUploaded%",
+                    "default": []
+                }
+            }
+        },
+        "debuggers": [
+            {
+                "type": "aws-sam",
+                "when": "isCloud9 || !aws.isWebExtHost",
+                "label": "%AWS.configuration.description.awssam.debug.label%",
+                "configurationAttributes": {
+                    "direct-invoke": {
+                        "$schema": "http://json-schema.org/draft-07/schema#",
+                        "title": "AwsSamDebuggerConfiguration",
+                        "additionalProperties": false,
+                        "properties": {
+                            "aws": {
+                                "title": "AWS Connection",
+                                "description": "%AWS.configuration.description.awssam.debug.aws%",
+                                "properties": {
+                                    "credentials": {
+                                        "description": "%AWS.configuration.description.awssam.debug.credentials%",
+                                        "type": "string",
+                                        "cloud9": {
+                                            "cn": {
+                                                "description": "%AWS.configuration.description.awssam.debug.credentials.cn%"
+                                            }
+                                        }
+                                    },
+                                    "region": {
+                                        "description": "%AWS.configuration.description.awssam.debug.region%",
+                                        "type": "string"
+                                    }
+                                },
+                                "additionalProperties": false,
+                                "type": "object"
+                            },
+                            "invokeTarget": {
+                                "oneOf": [
+                                    {
+                                        "title": "Template Target Properties",
+                                        "description": "%AWS.configuration.description.awssam.debug.invokeTarget%",
+                                        "properties": {
+                                            "templatePath": {
+                                                "description": "%AWS.configuration.description.awssam.debug.templatePath%",
+                                                "type": "string"
+                                            },
+                                            "logicalId": {
+                                                "description": "%AWS.configuration.description.awssam.debug.logicalId%",
+                                                "type": "string"
+                                            },
+                                            "target": {
+                                                "description": "%AWS.configuration.description.awssam.debug.target%",
+                                                "type": "string",
+                                                "enum": [
+                                                    "template"
+                                                ]
+                                            }
+                                        },
+                                        "additionalProperties": false,
+                                        "required": [
+                                            "templatePath",
+                                            "logicalId",
+                                            "target"
+                                        ],
+                                        "type": "object"
+                                    },
+                                    {
+                                        "title": "Code Target Properties",
+                                        "description": "%AWS.configuration.description.awssam.debug.invokeTarget%",
+                                        "properties": {
+                                            "lambdaHandler": {
+                                                "description": "%AWS.configuration.description.awssam.debug.lambdaHandler%",
+                                                "type": "string"
+                                            },
+                                            "projectRoot": {
+                                                "description": "%AWS.configuration.description.awssam.debug.projectRoot%",
+                                                "type": "string"
+                                            },
+                                            "target": {
+                                                "description": "%AWS.configuration.description.awssam.debug.target%",
+                                                "type": "string",
+                                                "enum": [
+                                                    "code"
+                                                ]
+                                            },
+                                            "architecture": {
+                                                "description": "%AWS.configuration.description.awssam.debug.architecture%",
+                                                "type": "string",
+                                                "enum": [
+                                                    "x86_64",
+                                                    "arm64"
+                                                ]
+                                            }
+                                        },
+                                        "additionalProperties": false,
+                                        "required": [
+                                            "lambdaHandler",
+                                            "projectRoot",
+                                            "target"
+                                        ],
+                                        "type": "object"
+                                    },
+                                    {
+                                        "title": "API Target Properties",
+                                        "description": "%AWS.configuration.description.awssam.debug.invokeTarget%",
+                                        "properties": {
+                                            "templatePath": {
+                                                "description": "%AWS.configuration.description.awssam.debug.templatePath%",
+                                                "type": "string"
+                                            },
+                                            "logicalId": {
+                                                "description": "%AWS.configuration.description.awssam.debug.logicalId%",
+                                                "type": "string"
+                                            },
+                                            "target": {
+                                                "description": "%AWS.configuration.description.awssam.debug.target%",
+                                                "type": "string",
+                                                "enum": [
+                                                    "api"
+                                                ]
+                                            }
+                                        },
+                                        "additionalProperties": false,
+                                        "required": [
+                                            "templatePath",
+                                            "logicalId",
+                                            "target"
+                                        ],
+                                        "type": "object"
+                                    }
+                                ]
+                            },
+                            "lambda": {
+                                "title": "Lambda Properties",
+                                "description": "%AWS.configuration.description.awssam.debug.lambda%",
+                                "properties": {
+                                    "environmentVariables": {
+                                        "description": "%AWS.configuration.description.awssam.debug.envvars%",
+                                        "additionalProperties": {
+                                            "type": [
+                                                "string"
+                                            ]
+                                        },
+                                        "type": "object"
+                                    },
+                                    "payload": {
+                                        "description": "%AWS.configuration.description.awssam.debug.event%",
+                                        "properties": {
+                                            "json": {
+                                                "description": "%AWS.configuration.description.awssam.debug.event.json%",
+                                                "type": "object"
+                                            },
+                                            "path": {
+                                                "description": "%AWS.configuration.description.awssam.debug.event.path%",
+                                                "type": "string"
+                                            }
+                                        },
+                                        "additionalProperties": false,
+                                        "type": "object"
+                                    },
+                                    "memoryMb": {
+                                        "description": "%AWS.configuration.description.awssam.debug.memoryMb%",
+                                        "type": "number"
+                                    },
+                                    "runtime": {
+                                        "description": "%AWS.configuration.description.awssam.debug.runtime%",
+                                        "type": "string"
+                                    },
+                                    "timeoutSec": {
+                                        "description": "%AWS.configuration.description.awssam.debug.timeout%",
+                                        "type": "number"
+                                    },
+                                    "pathMappings": {
+                                        "type:": "array",
+                                        "items": {
+                                            "title": "Path Mapping",
+                                            "type": "object",
+                                            "properties": {
+                                                "localRoot": {
+                                                    "type": "string"
+                                                },
+                                                "remoteRoot": {
+                                                    "type": "string"
+                                                }
+                                            },
+                                            "additionalProperties": false,
+                                            "required": [
+                                                "localRoot",
+                                                "remoteRoot"
+                                            ]
+                                        }
+                                    }
+                                },
+                                "additionalProperties": false,
+                                "type": "object"
+                            },
+                            "sam": {
+                                "title": "SAM CLI Properties",
+                                "description": "%AWS.configuration.description.awssam.debug.sam%",
+                                "properties": {
+                                    "buildArguments": {
+                                        "description": "%AWS.configuration.description.awssam.debug.buildArguments%",
+                                        "type": "array",
+                                        "items": {
+                                            "type": "string"
+                                        }
+                                    },
+                                    "buildDir": {
+                                        "description": "%AWS.configuration.description.awssam.debug.buildDir%",
+                                        "type": "string"
+                                    },
+                                    "containerBuild": {
+                                        "description": "%AWS.configuration.description.awssam.debug.containerBuild%",
+                                        "type": "boolean"
+                                    },
+                                    "dockerNetwork": {
+                                        "description": "%AWS.configuration.description.awssam.debug.dockerNetwork%",
+                                        "type": "string"
+                                    },
+                                    "localArguments": {
+                                        "description": "%AWS.configuration.description.awssam.debug.localArguments%",
+                                        "type": "array",
+                                        "items": {
+                                            "type": "string"
+                                        }
+                                    },
+                                    "skipNewImageCheck": {
+                                        "description": "%AWS.configuration.description.awssam.debug.skipNewImageCheck%",
+                                        "type": "boolean"
+                                    },
+                                    "template": {
+                                        "description": "%AWS.configuration.description.awssam.debug.template%",
+                                        "properties": {
+                                            "parameters": {
+                                                "description": "%AWS.configuration.description.awssam.debug.templateParameters%",
+                                                "additionalProperties": {
+                                                    "type": [
+                                                        "string",
+                                                        "number"
+                                                    ]
+                                                },
+                                                "type": "object"
+                                            }
+                                        },
+                                        "type": "object",
+                                        "additionalProperties": false
+                                    }
+                                },
+                                "additionalProperties": false,
+                                "type": "object"
+                            },
+                            "api": {
+                                "title": "API Gateway Properties",
+                                "description": "%AWS.configuration.description.awssam.debug.api%",
+                                "properties": {
+                                    "path": {
+                                        "description": "%AWS.configuration.description.awssam.debug.api.path%",
+                                        "type": "string"
+                                    },
+                                    "httpMethod": {
+                                        "description": "%AWS.configuration.description.awssam.debug.api.httpMethod%",
+                                        "type": "string",
+                                        "enum": [
+                                            "delete",
+                                            "get",
+                                            "head",
+                                            "options",
+                                            "patch",
+                                            "post",
+                                            "put"
+                                        ]
+                                    },
+                                    "payload": {
+                                        "description": "%AWS.configuration.description.awssam.debug.event%",
+                                        "properties": {
+                                            "json": {
+                                                "description": "%AWS.configuration.description.awssam.debug.event.json%",
+                                                "type": "object"
+                                            },
+                                            "path": {
+                                                "description": "%AWS.configuration.description.awssam.debug.event.path%",
+                                                "type": "string"
+                                            }
+                                        },
+                                        "additionalProperties": false,
+                                        "type": "object"
+                                    },
+                                    "headers": {
+                                        "description": "%AWS.configuration.description.awssam.debug.api.headers%",
+                                        "type": "object",
+                                        "additionalProperties": {
+                                            "type": "string"
+                                        }
+                                    },
+                                    "querystring": {
+                                        "description": "%AWS.configuration.description.awssam.debug.api.queryString%",
+                                        "type": "string"
+                                    },
+                                    "stageVariables": {
+                                        "description": "%AWS.configuration.description.awssam.debug.api.stageVariables%",
+                                        "type": "object",
+                                        "additionalProperties": {
+                                            "type": "string"
+                                        }
+                                    },
+                                    "clientCertificateId": {
+                                        "description": "%AWS.configuration.description.awssam.debug.api.clientCertId%",
+                                        "type": "string"
+                                    }
+                                },
+                                "additionalProperties": false,
+                                "required": [
+                                    "path",
+                                    "httpMethod"
+                                ],
+                                "type": "object"
+                            }
+                        },
+                        "required": [
+                            "invokeTarget"
+                        ],
+                        "type": "object"
+                    }
+                },
+                "configurationSnippets": [
+                    {
+                        "label": "%AWS.configuration.description.awssam.debug.snippets.lambdaCode.label%",
+                        "description": "%AWS.configuration.description.awssam.debug.snippets.lambdaCode.description%",
+                        "body": {
+                            "type": "aws-sam",
+                            "request": "direct-invoke",
+                            "name": "${3:Invoke Lambda}",
+                            "invokeTarget": {
+                                "target": "code",
+                                "lambdaHandler": "${1:Function Handler}",
+                                "projectRoot": "^\"\\${workspaceFolder}\""
+                            },
+                            "lambda": {
+                                "runtime": "${2:Lambda Runtime}",
+                                "payload": {
+                                    "json": {}
+                                }
+                            }
+                        },
+                        "cloud9": {
+                            "cn": {
+                                "label": "%AWS.configuration.description.awssam.debug.snippets.lambdaCode.label.cn%",
+                                "description": "%AWS.configuration.description.awssam.debug.snippets.lambdaCode.description.cn%"
+                            }
+                        }
+                    },
+                    {
+                        "label": "%AWS.configuration.description.awssam.debug.snippets.lambdaTemplate.label%",
+                        "description": "%AWS.configuration.description.awssam.debug.snippets.lambdaTemplate.description%",
+                        "body": {
+                            "type": "aws-sam",
+                            "request": "direct-invoke",
+                            "name": "${3:Invoke Lambda}",
+                            "invokeTarget": {
+                                "target": "template",
+                                "templatePath": "${1:Template Location}",
+                                "logicalId": "${2:Function Logical ID}"
+                            },
+                            "lambda": {
+                                "payload": {
+                                    "json": {}
+                                }
+                            }
+                        },
+                        "cloud9": {
+                            "cn": {
+                                "label": "%AWS.configuration.description.awssam.debug.snippets.lambdaTemplate.label.cn%",
+                                "description": "%AWS.configuration.description.awssam.debug.snippets.lambdaTemplate.description.cn%"
+                            }
+                        }
+                    },
+                    {
+                        "label": "%AWS.configuration.description.awssam.debug.snippets.api.label%",
+                        "description": "%AWS.configuration.description.awssam.debug.snippets.api.description%",
+                        "body": {
+                            "type": "aws-sam",
+                            "request": "direct-invoke",
+                            "name": "${5:Invoke Lambda with API Gateway}",
+                            "invokeTarget": {
+                                "target": "api",
+                                "templatePath": "${1:Template Location}",
+                                "logicalId": "${2:Function Logical ID}"
+                            },
+                            "api": {
+                                "path": "${3:Path}",
+                                "httpMethod": "${4:Method}",
+                                "payload": {
+                                    "json": {}
+                                }
+                            }
+                        },
+                        "cloud9": {
+                            "cn": {
+                                "label": "%AWS.configuration.description.awssam.debug.snippets.api.label.cn%",
+                                "description": "%AWS.configuration.description.awssam.debug.snippets.api.description.cn%"
+                            }
+                        }
+                    }
+                ]
+            }
+        ],
+        "viewsContainers": {
+            "activitybar": [
+                {
+                    "id": "aws-explorer",
+                    "title": "%AWS.title%",
+                    "icon": "resources/aws-logo.svg",
+                    "cloud9": {
+                        "cn": {
+                            "title": "%AWS.title.cn%",
+                            "icon": "resources/aws-cn-logo.svg"
+                        }
+                    }
+                },
+                {
+                    "id": "amazonq",
+                    "title": "%AWS.amazonq.title%",
+                    "icon": "resources/amazonq-logo.svg"
+                }
+            ],
+            "panel": [
+                {
+                    "id": "aws-codewhisperer-reference-log",
+                    "title": "Code Reference Log",
+                    "icon": "media/aws-logo.svg"
+                },
+                {
+                    "id": "aws-codewhisperer-transformation-hub",
+                    "title": "Transformation Hub",
+                    "icon": "media/aws-logo.svg"
+                }
+            ]
+        },
+        "views": {
+            "amazonq": [
+                {
+                    "type": "webview",
+                    "id": "aws.AmazonQChatView",
+                    "name": "%AWS.amazonq.chat%",
+                    "when": "!isCloud9 && !aws.isSageMaker"
+                },
+                {
+                    "id": "aws.AmazonQNeverShowBadge",
+                    "name": "",
+                    "when": "false"
+                }
+            ],
+            "aws-explorer": [
+                {
+                    "id": "aws.amazonq",
+                    "name": "%AWS.amazonq.title%",
+                    "when": "!isCloud9 && !aws.isSageMaker"
+                },
+                {
+                    "id": "aws.codewhisperer",
+                    "name": "%AWS.codewhisperer.explorerTitle%"
+                },
+                {
+                    "id": "aws.explorer",
+                    "name": "%AWS.lambda.explorerTitle%",
+                    "when": "isCloud9 || !aws.isWebExtHost"
+                },
+                {
+                    "id": "aws.cdk",
+                    "name": "%AWS.cdk.explorerTitle%"
+                },
+                {
+                    "id": "aws.codecatalyst",
+                    "name": "%AWS.codecatalyst.explorerTitle%",
+                    "when": "!isCloud9 && !aws.isSageMaker || isCloud9CodeCatalyst"
+                }
+            ],
+            "aws-codewhisperer-reference-log": [
+                {
+                    "type": "webview",
+                    "id": "aws.codeWhisperer.referenceLog",
+                    "name": ""
+                }
+            ],
+            "aws-codewhisperer-transformation-hub": [
+                {
+                    "type": "webview",
+                    "id": "aws.amazonq.transformationHub",
+                    "name": "Status",
+                    "when": "gumby.isTransformAvailable || gumby.isStopButtonAvailable"
+                },
+                {
+                    "id": "aws.amazonq.transformationProposedChangesTree",
+                    "name": "Proposed Changes",
+                    "when": "gumby.transformationProposalReviewInProgress"
+                }
+            ]
+        },
+        "viewsWelcome": [
+            {
+                "view": "aws.amazonq.transformationProposedChangesTree",
+                "contents": "Project transformation is complete.\n[Download Proposed Changes](command:aws.amazonq.transformationHub.reviewChanges.startReview)",
+                "when": "gumby.reviewState == NotStarted"
+            },
+            {
+                "view": "aws.amazonq.transformationProposedChangesTree",
+                "contents": "Project transformation is complete.\n Downloading the proposed changes...",
+                "when": "gumby.reviewState == PreparingReview"
+            }
+        ],
+        "submenus": [
+            {
+                "id": "aws.auth",
+                "label": "%AWS.submenu.auth.title%",
+                "icon": "$(ellipsis)",
+                "when": "isCloud9 || !aws.isWebExtHost"
+            },
+            {
+                "id": "aws.codewhisperer.submenu",
+                "label": "%AWS.codewhisperer.submenu.title%",
+                "icon": "$(ellipsis)"
+            },
+            {
+                "id": "aws.amazonq.submenu",
+                "label": "%AWS.codewhisperer.submenu.title%",
+                "icon": "$(ellipsis)"
+            },
+            {
+                "label": "%AWS.submenu.amazonqEditorContextSubmenu.title%",
+                "id": "amazonqEditorContextSubmenu"
+            },
+            {
+                "id": "aws.codecatalyst.submenu",
+                "label": "%AWS.codecatalyst.submenu.title%",
+                "icon": "$(ellipsis)",
+                "when": "isCloud9 || !aws.isWebExtHost"
+            },
+            {
+                "label": "%AWS.generic.feedback%",
+                "id": "aws.submenu.feedback"
+            },
+            {
+                "label": "%AWS.generic.help%",
+                "id": "aws.submenu.help"
+            }
+        ],
+        "menus": {
+            "commandPalette": [
+                {
+                    "command": "aws.apig.copyUrl",
+                    "when": "false"
+                },
+                {
+                    "command": "aws.apig.invokeRemoteRestApi",
+                    "when": "false"
+                },
+                {
+                    "command": "aws.deleteCloudFormation",
+                    "when": "false"
+                },
+                {
+                    "command": "aws.downloadStateMachineDefinition",
+                    "when": "false"
+                },
+                {
+                    "command": "aws.ecr.createRepository",
+                    "when": "false"
+                },
+                {
+                    "command": "aws.executeStateMachine",
+                    "when": "false"
+                },
+                {
+                    "command": "aws.copyArn",
+                    "when": "false"
+                },
+                {
+                    "command": "aws.copyName",
+                    "when": "false"
+                },
+                {
+                    "command": "aws.listCommands",
+                    "when": "false"
+                },
+                {
+                    "command": "aws.codecatalyst.listCommands",
+                    "when": "false"
+                },
+                {
+                    "command": "aws.codecatalyst.openDevEnv",
+                    "when": "!isCloud9"
+                },
+                {
+                    "command": "aws.codecatalyst.createDevEnv",
+                    "when": "!isCloud9"
+                },
+                {
+                    "command": "aws.codewhisperer.signout",
+                    "when": "false"
+                },
+                {
+                    "command": "aws.codewhisperer.reconnect",
+                    "when": "false"
+                },
+                {
+                    "command": "aws.codeWhisperer.openReferencePanel",
+                    "when": "false"
+                },
+                {
+                    "command": "aws.downloadSchemaItemCode",
+                    "when": "false"
+                },
+                {
+                    "command": "aws.deleteLambda",
+                    "when": "false"
+                },
+                {
+                    "command": "aws.downloadLambda",
+                    "when": "false"
+                },
+                {
+                    "command": "aws.invokeLambda",
+                    "when": "false"
+                },
+                {
+                    "command": "aws.copyLambdaUrl",
+                    "when": "false"
+                },
+                {
+                    "command": "aws.viewSchemaItem",
+                    "when": "false"
+                },
+                {
+                    "command": "aws.searchSchema",
+                    "when": "false"
+                },
+                {
+                    "command": "aws.searchSchemaPerRegistry",
+                    "when": "false"
+                },
+                {
+                    "command": "aws.refreshAwsExplorer",
+                    "when": "false"
+                },
+                {
+                    "command": "aws.cdk.refresh",
+                    "when": "false"
+                },
+                {
+                    "command": "aws.cdk.viewDocs",
+                    "when": "false"
+                },
+                {
+                    "command": "aws.ssmDocument.openLocalDocument",
+                    "when": "false"
+                },
+                {
+                    "command": "aws.ssmDocument.openLocalDocumentJson",
+                    "when": "false"
+                },
+                {
+                    "command": "aws.ssmDocument.openLocalDocumentYaml",
+                    "when": "false"
+                },
+                {
+                    "command": "aws.ssmDocument.deleteDocument",
+                    "when": "false"
+                },
+                {
+                    "command": "aws.ssmDocument.updateDocumentVersion",
+                    "when": "false"
+                },
+                {
+                    "command": "aws.copyLogResource",
+                    "when": "resourceScheme == aws-cwl"
+                },
+                {
+                    "command": "aws.saveCurrentLogDataContent",
+                    "when": "resourceScheme == aws-cwl"
+                },
+                {
+                    "command": "aws.s3.editFile",
+                    "when": "resourceScheme == s3-readonly"
+                },
+                {
+                    "command": "aws.cwl.viewLogStream",
+                    "when": "false"
+                },
+                {
+                    "command": "aws.cwl.changeFilterPattern",
+                    "when": "false"
+                },
+                {
+                    "command": "aws.cwl.changeTimeFilter",
+                    "when": "false"
+                },
+                {
+                    "command": "aws.ecr.deleteRepository",
+                    "when": "false"
+                },
+                {
+                    "command": "aws.ecr.copyTagUri",
+                    "when": "false"
+                },
+                {
+                    "command": "aws.ecr.copyRepositoryUri",
+                    "when": "false"
+                },
+                {
+                    "command": "aws.ecr.deleteTag",
+                    "when": "false"
+                },
+                {
+                    "command": "aws.iot.createThing",
+                    "when": "false"
+                },
+                {
+                    "command": "aws.iot.deleteThing",
+                    "when": "false"
+                },
+                {
+                    "command": "aws.iot.createCert",
+                    "when": "false"
+                },
+                {
+                    "command": "aws.iot.deleteCert",
+                    "when": "false"
+                },
+                {
+                    "command": "aws.iot.attachCert",
+                    "when": "false"
+                },
+                {
+                    "command": "aws.iot.attachPolicy",
+                    "when": "false"
+                },
+                {
+                    "command": "aws.iot.activateCert",
+                    "when": "false"
+                },
+                {
+                    "command": "aws.iot.deactivateCert",
+                    "when": "false"
+                },
+                {
+                    "command": "aws.iot.revokeCert",
+                    "when": "false"
+                },
+                {
+                    "command": "aws.iot.createPolicy",
+                    "when": "false"
+                },
+                {
+                    "command": "aws.iot.deletePolicy",
+                    "when": "false"
+                },
+                {
+                    "command": "aws.iot.createPolicyVersion",
+                    "when": "false"
+                },
+                {
+                    "command": "aws.iot.deletePolicyVersion",
+                    "when": "false"
+                },
+                {
+                    "command": "aws.iot.detachCert",
+                    "when": "false"
+                },
+                {
+                    "command": "aws.iot.detachPolicy",
+                    "when": "false"
+                },
+                {
+                    "command": "aws.iot.viewPolicyVersion",
+                    "when": "false"
+                },
+                {
+                    "command": "aws.iot.setDefaultPolicy",
+                    "when": "false"
+                },
+                {
+                    "command": "aws.iot.copyEndpoint",
+                    "when": "false"
+                },
+                {
+                    "command": "aws.deploySamApplication",
+                    "when": "config.aws.samcli.legacyDeploy"
+                },
+                {
+                    "command": "aws.redshift.editConnection",
+                    "when": "false"
+                },
+                {
+                    "command": "aws.redshift.deleteConnection",
+                    "when": "false"
+                },
+                {
+                    "command": "aws.samcli.sync",
+                    "when": "!config.aws.samcli.legacyDeploy"
+                },
+                {
+                    "command": "aws.s3.copyPath",
+                    "when": "false"
+                },
+                {
+                    "command": "aws.s3.createBucket",
+                    "when": "false"
+                },
+                {
+                    "command": "aws.s3.createFolder",
+                    "when": "false"
+                },
+                {
+                    "command": "aws.s3.deleteBucket",
+                    "when": "false"
+                },
+                {
+                    "command": "aws.s3.deleteFile",
+                    "when": "false"
+                },
+                {
+                    "command": "aws.s3.downloadFileAs",
+                    "when": "false"
+                },
+                {
+                    "command": "aws.s3.openFile",
+                    "when": "false"
+                },
+                {
+                    "command": "aws.s3.editFile",
+                    "when": "false"
+                },
+                {
+                    "command": "aws.s3.uploadFileToParent",
+                    "when": "false"
+                },
+                {
+                    "command": "aws.apprunner.startDeployment",
+                    "when": "false"
+                },
+                {
+                    "command": "aws.apprunner.createService",
+                    "when": "false"
+                },
+                {
+                    "command": "aws.apprunner.pauseService",
+                    "when": "false"
+                },
+                {
+                    "command": "aws.apprunner.resumeService",
+                    "when": "false"
+                },
+                {
+                    "command": "aws.apprunner.copyServiceUrl",
+                    "when": "false"
+                },
+                {
+                    "command": "aws.apprunner.open",
+                    "when": "false"
+                },
+                {
+                    "command": "aws.apprunner.deleteService",
+                    "when": "false"
+                },
+                {
+                    "command": "aws.apprunner.createServiceFromEcr",
+                    "when": "false"
+                },
+                {
+                    "command": "aws.resources.copyIdentifier",
+                    "when": "false"
+                },
+                {
+                    "command": "aws.resources.openResourcePreview",
+                    "when": "false"
+                },
+                {
+                    "command": "aws.resources.createResource",
+                    "when": "false"
+                },
+                {
+                    "command": "aws.resources.deleteResource",
+                    "when": "false"
+                },
+                {
+                    "command": "aws.resources.updateResource",
+                    "when": "false"
+                },
+                {
+                    "command": "aws.resources.updateResourceInline",
+                    "when": "false"
+                },
+                {
+                    "command": "aws.resources.saveResource",
+                    "when": "false"
+                },
+                {
+                    "command": "aws.resources.closeResource",
+                    "when": "false"
+                },
+                {
+                    "command": "aws.resources.viewDocs",
+                    "when": "false"
+                },
+                {
+                    "command": "aws.ecs.runCommandInContainer",
+                    "when": "false"
+                },
+                {
+                    "command": "aws.ecs.openTaskInTerminal",
+                    "when": "false"
+                },
+                {
+                    "command": "aws.ecs.enableEcsExec",
+                    "when": "false"
+                },
+                {
+                    "command": "aws.ecs.disableEcsExec",
+                    "when": "false"
+                },
+                {
+                    "command": "aws.ecs.viewDocumentation",
+                    "when": "false"
+                },
+                {
+                    "command": "aws.renderStateMachineGraph",
+                    "when": "false"
+                },
+                {
+                    "command": "aws.auth.addConnection",
+                    "when": "false"
+                },
+                {
+                    "command": "aws.auth.switchConnections",
+                    "when": "false"
+                },
+                {
+                    "command": "aws.auth.signout",
+                    "when": "false"
+                },
+                {
+                    "command": "aws.auth.help",
+                    "when": "false"
+                },
+                {
+                    "command": "aws.auth.manageConnections"
+                },
+                {
+                    "command": "aws.ec2.openRemoteConnection",
+                    "when": "aws.isDevMode"
+                },
+                {
+                    "command": "aws.ec2.openTerminal",
+                    "when": "aws.isDevMode"
+                },
+                {
+                    "command": "aws.ec2.startInstance",
+                    "when": "aws.isDevMode"
+                },
+                {
+                    "command": "aws.ec2.stopInstance",
+                    "whem": "aws.isDevMode"
+                },
+                {
+                    "command": "aws.ec2.rebootInstance",
+                    "whem": "aws.isDevMode"
+                },
+                {
+                    "command": "aws.dev.openMenu",
+                    "when": "aws.isDevMode || isCloud9"
+                },
+                {
+                    "command": "aws.openInApplicationComposer",
+                    "when": "false"
+                },
+                {
+                    "command": "aws.amazonq.learnMore",
+                    "when": "false"
+                }
+            ],
+            "editor/title": [
+                {
+                    "command": "aws.previewStateMachine",
+                    "when": "editorLangId == asl || editorLangId == asl-yaml",
+                    "group": "navigation"
+                },
+                {
+                    "command": "aws.saveCurrentLogDataContent",
+                    "when": "resourceScheme == aws-cwl",
+                    "group": "navigation"
+                },
+                {
+                    "command": "aws.cwl.changeFilterPattern",
+                    "when": "resourceScheme == aws-cwl",
+                    "group": "navigation"
+                },
+                {
+                    "command": "aws.cwl.changeTimeFilter",
+                    "when": "resourceScheme == aws-cwl",
+                    "group": "navigation"
+                },
+                {
+                    "command": "aws.s3.editFile",
+                    "when": "resourceScheme == s3-readonly",
+                    "group": "navigation"
+                },
+                {
+                    "command": "aws.ssmDocument.publishDocument",
+                    "when": "editorLangId =~ /^(ssm-yaml|ssm-json)$/",
+                    "group": "navigation"
+                },
+                {
+                    "command": "aws.resources.updateResourceInline",
+                    "when": "resourceScheme == awsResource && !isCloud9 && config.aws.experiments.jsonResourceModification",
+                    "group": "navigation"
+                },
+                {
+                    "command": "aws.resources.closeResource",
+                    "when": "resourcePath =~ /^.+(awsResource.json)$/",
+                    "group": "navigation"
+                },
+                {
+                    "command": "aws.resources.saveResource",
+                    "when": "resourcePath =~ /^.+(awsResource.json)$/",
+                    "group": "navigation"
+                },
+                {
+                    "command": "aws.openInApplicationComposer",
+                    "when": "editorLangId == json || editorLangId == yaml || resourceFilename =~ /^.*\\.(template)$/",
+                    "group": "navigation"
+                }
+            ],
+            "editor/title/context": [
+                {
+                    "command": "aws.copyLogResource",
+                    "when": "resourceScheme == aws-cwl",
+                    "group": "1_cutcopypaste@1"
+                }
+            ],
+            "view/title": [
+                {
+                    "command": "aws.amazonq.startTransformationInHub",
+                    "when": "view == aws.amazonq.transformationHub",
+                    "group": "navigation@1"
+                },
+                {
+                    "command": "aws.amazonq.stopTransformationInHub",
+                    "when": "view == aws.amazonq.transformationHub",
+                    "group": "navigation@2"
+                },
+                {
+                    "command": "aws.amazonq.showPlanProgressInHub",
+                    "when": "view == aws.amazonq.transformationHub",
+                    "group": "navigation@3"
+                },
+                {
+                    "command": "aws.amazonq.showHistoryInHub",
+                    "when": "view == aws.amazonq.transformationHub",
+                    "group": "navigation@4"
+                },
+                {
+                    "command": "aws.amazonq.transformationHub.summary.reveal",
+                    "when": "view == aws.amazonq.transformationHub"
+                },
+                {
+                    "command": "aws.amazonq.transformationHub.reviewChanges.reveal",
+                    "when": "view == aws.amazonq.transformationHub"
+                },
+                {
+                    "command": "aws.amazonq.showTransformationPlanInHub",
+                    "when": "view == aws.amazonq.transformationHub"
+                },
+                {
+                    "command": "aws.amazonq.transformationHub.reviewChanges.acceptChanges",
+                    "when": "view == aws.amazonq.transformationProposedChangesTree && gumby.reviewState == InReview",
+                    "group": "navigation@1"
+                },
+                {
+                    "command": "aws.amazonq.transformationHub.reviewChanges.rejectChanges",
+                    "when": "view == aws.amazonq.transformationProposedChangesTree && gumby.reviewState == InReview",
+                    "group": "navigation@2"
+                },
+                {
+                    "command": "aws.submitFeedback",
+                    "when": "view == aws.explorer && !aws.isWebExtHost",
+                    "group": "navigation@6"
+                },
+                {
+                    "command": "aws.refreshAwsExplorer",
+                    "when": "view == aws.explorer",
+                    "group": "navigation@5"
+                },
+                {
+                    "command": "aws.login",
+                    "when": "view == aws.explorer",
+                    "group": "1_account@1"
+                },
+                {
+                    "command": "aws.showRegion",
+                    "when": "view == aws.explorer",
+                    "group": "1_account@2"
+                },
+                {
+                    "command": "aws.listCommands",
+                    "when": "view == aws.explorer && !isCloud9",
+                    "group": "1_account@3"
+                },
+                {
+                    "command": "aws.lambda.createNewSamApp",
+                    "when": "view == aws.explorer",
+                    "group": "3_lambda@1"
+                },
+                {
+                    "command": "aws.launchConfigForm",
+                    "when": "view == aws.explorer",
+                    "group": "3_lambda@2"
+                },
+                {
+                    "command": "aws.deploySamApplication",
+                    "when": "config.aws.samcli.legacyDeploy && view == aws.explorer",
+                    "group": "3_lambda@3"
+                },
+                {
+                    "command": "aws.samcli.sync",
+                    "when": "!config.aws.samcli.legacyDeploy && view == aws.explorer",
+                    "group": "3_lambda@3"
+                },
+                {
+                    "submenu": "aws.submenu.feedback",
+                    "when": "view =~ /^aws\\./ && view != aws.AmazonQChatView",
+                    "group": "y_toolkitMeta@1"
+                },
+                {
+                    "submenu": "aws.submenu.help",
+                    "when": "view =~ /^aws\\./ && view != aws.AmazonQChatView",
+                    "group": "y_toolkitMeta@2"
+                },
+                {
+                    "command": "aws.codecatalyst.cloneRepo",
+                    "when": "view == aws.codecatalyst && !isCloud9 && aws.codecatalyst.connected",
+                    "group": "1_codeCatalyst@1"
+                },
+                {
+                    "command": "aws.codecatalyst.createDevEnv",
+                    "when": "view == aws.codecatalyst && !isCloud9 && aws.codecatalyst.connected",
+                    "group": "1_codeCatalyst@1"
+                },
+                {
+                    "command": "aws.codecatalyst.listCommands",
+                    "when": "view == aws.codecatalyst && !isCloud9 && aws.codecatalyst.connected",
+                    "group": "1_codeCatalyst@1"
+                },
+                {
+                    "command": "aws.codecatalyst.openDevEnv",
+                    "when": "view == aws.codecatalyst && !isCloud9 && aws.codecatalyst.connected",
+                    "group": "1_codeCatalyst@1"
+                },
+                {
+                    "command": "aws.codecatalyst.manageConnections",
+                    "when": "view == aws.codecatalyst && !isCloud9 && !aws.codecatalyst.connected",
+                    "group": "2_codeCatalyst@1"
+                },
+                {
+                    "command": "aws.codecatalyst.signout",
+                    "when": "view == aws.codecatalyst && !isCloud9 && aws.codecatalyst.connected",
+                    "group": "2_codeCatalyst@1"
+                },
+                {
+                    "command": "aws.codeWhisperer.openReferencePanel",
+                    "when": "view == aws.AmazonQChatView",
+                    "group": "0_topAmazonQ@1"
+                },
+                {
+                    "command": "aws.amazonq.learnMore",
+                    "when": "view == aws.AmazonQChatView || view == aws.amazonq",
+                    "group": "1_amazonQ@1"
+                },
+                {
+                    "command": "aws.codeWhisperer.introduction",
+                    "when": "view == aws.codewhisperer",
+                    "group": "1_amazonQ@1"
+                },
+                {
+                    "command": "aws.codewhisperer.manageConnections",
+                    "when": "(view == aws.AmazonQChatView || view == aws.codewhisperer ||  view == aws.amazonq) && !aws.codewhisperer.connected",
+                    "group": "2_amazonQ@2"
+                },
+                {
+                    "command": "aws.codewhisperer.signout",
+                    "when": "(view == aws.AmazonQChatView || view == aws.codewhisperer ||  view == aws.amazonq) && aws.codewhisperer.connected",
+                    "group": "2_amazonQ@4"
+                },
+                {
+                    "command": "aws.codewhisperer.reconnect",
+                    "when": "(view == aws.AmazonQChatView || view == aws.codewhisperer ||  view == aws.amazonq) && aws.codewhisperer.connectionExpired",
+                    "group": "2_amazonQ@3"
+                }
+            ],
+            "explorer/context": [
+                {
+                    "command": "aws.deploySamApplication",
+                    "when": "config.aws.samcli.legacyDeploy && isFileSystemResource && resourceFilename =~ /^template\\.(json|yml|yaml)$/",
+                    "group": "z_aws@1"
+                },
+                {
+                    "command": "aws.samcli.sync",
+                    "when": "!config.aws.samcli.legacyDeploy && isFileSystemResource && resourceFilename =~ /^(template\\.(json|yml|yaml))|(samconfig\\.toml)$/",
+                    "group": "z_aws@1"
+                },
+                {
+                    "command": "aws.uploadLambda",
+                    "when": "explorerResourceIsFolder || isFileSystemResource && resourceFilename =~ /^template\\.(json|yml|yaml)$/",
+                    "group": "z_aws@3"
+                },
+                {
+                    "command": "aws.openInApplicationComposer",
+                    "when": "isFileSystemResource && resourceFilename =~ /^.*\\.(json|yml|yaml|template)$/",
+                    "group": "z_aws@1"
+                }
+            ],
+            "amazonqEditorContextSubmenu": [
+                {
+                    "command": "aws.amazonq.explainCode",
+                    "group": "cw_chat@1"
+                },
+                {
+                    "command": "aws.amazonq.refactorCode",
+                    "group": "cw_chat@2"
+                },
+                {
+                    "command": "aws.amazonq.fixCode",
+                    "group": "cw_chat@3"
+                },
+                {
+                    "command": "aws.amazonq.optimizeCode",
+                    "group": "cw_chat@4"
+                },
+                {
+                    "command": "aws.amazonq.sendToPrompt",
+                    "group": "cw_chat@5"
+                }
+            ],
+            "editor/context": [
+                {
+                    "submenu": "amazonqEditorContextSubmenu",
+                    "group": "cw_chat",
+                    "when": "editorHasSelection"
+                }
+            ],
+            "view/item/context": [
+                {
+                    "command": "aws.apig.invokeRemoteRestApi",
+                    "when": "view == aws.explorer && viewItem =~ /^(awsApiGatewayNode)$/",
+                    "group": "0@1"
+                },
+                {
+                    "command": "aws.ec2.openTerminal",
+                    "group": "0@1",
+                    "when": "viewItem =~ /^(awsEc2(Parent|Running)Node)$/"
+                },
+                {
+                    "command": "aws.ec2.openTerminal",
+                    "group": "inline@1",
+                    "when": "viewItem =~ /^(awsEc2(Parent|Running)Node)$/"
+                },
+                {
+                    "command": "aws.ec2.openRemoteConnection",
+                    "group": "0@1",
+                    "when": "viewItem =~ /^(awsEc2(Parent|Running)Node)$/"
+                },
+                {
+                    "command": "aws.ec2.openRemoteConnection",
+                    "group": "inline@1",
+                    "when": "viewItem =~ /^(awsEc2(Parent|Running)Node)$/"
+                },
+                {
+                    "command": "aws.ec2.startInstance",
+                    "group": "0@1",
+                    "when": "viewItem == awsEc2StoppedNode"
+                },
+                {
+                    "command": "aws.ec2.startInstance",
+                    "group": "inline@1",
+                    "when": "viewItem == awsEc2StoppedNode"
+                },
+                {
+                    "command": "aws.ec2.stopInstance",
+                    "group": "0@1",
+                    "when": "viewItem == awsEc2RunningNode"
+                },
+                {
+                    "command": "aws.ec2.stopInstance",
+                    "group": "inline@1",
+                    "when": "viewItem == awsEc2RunningNode"
+                },
+                {
+                    "command": "aws.ec2.rebootInstance",
+                    "group": "0@1",
+                    "when": "viewItem == awsEc2RunningNode"
+                },
+                {
+                    "command": "aws.ec2.rebootInstance",
+                    "group": "inline@1",
+                    "when": "viewItem == awsEc2RunningNode"
+                },
+                {
+                    "command": "aws.ecr.createRepository",
+                    "when": "view == aws.explorer && viewItem == awsEcrNode",
+                    "group": "inline@1"
+                },
+                {
+                    "command": "aws.iot.createThing",
+                    "when": "view == aws.explorer && viewItem == awsIotThingsNode",
+                    "group": "inline@1"
+                },
+                {
+                    "command": "aws.iot.createCert",
+                    "when": "view == aws.explorer && viewItem == awsIotCertsNode",
+                    "group": "inline@1"
+                },
+                {
+                    "command": "aws.iot.createPolicy",
+                    "when": "view == aws.explorer && viewItem == awsIotPoliciesNode",
+                    "group": "inline@1"
+                },
+                {
+                    "command": "aws.iot.attachCert",
+                    "when": "view == aws.explorer && viewItem == awsIotThingNode",
+                    "group": "inline@1"
+                },
+                {
+                    "command": "aws.iot.attachPolicy",
+                    "when": "view == aws.explorer && viewItem =~ /^awsIotCertificateNode.(Things|Policies)/",
+                    "group": "inline@1"
+                },
+                {
+                    "command": "aws.redshift.editConnection",
+                    "when": "view == aws.explorer && viewItem == awsRedshiftWarehouseNode",
+                    "group": "0@1"
+                },
+                {
+                    "command": "aws.redshift.deleteConnection",
+                    "when": "view == aws.explorer && viewItem == awsRedshiftWarehouseNode",
+                    "group": "0@2"
+                },
+                {
+                    "command": "aws.s3.openFile",
+                    "when": "view == aws.explorer && viewItem == awsS3FileNode && !isCloud9",
+                    "group": "0@1"
+                },
+                {
+                    "command": "aws.s3.editFile",
+                    "when": "view == aws.explorer && viewItem == awsS3FileNode && !isCloud9",
+                    "group": "inline@1"
+                },
+                {
+                    "command": "aws.s3.downloadFileAs",
+                    "when": "view == aws.explorer && viewItem == awsS3FileNode",
+                    "group": "inline@2"
+                },
+                {
+                    "command": "aws.s3.createBucket",
+                    "when": "view == aws.explorer && viewItem == awsS3Node",
+                    "group": "inline@1"
+                },
+                {
+                    "command": "aws.s3.createFolder",
+                    "when": "view == aws.explorer && viewItem =~ /^(awsS3BucketNode|awsS3FolderNode)$/",
+                    "group": "inline@1"
+                },
+                {
+                    "command": "aws.ssmDocument.openLocalDocument",
+                    "when": "view == aws.explorer && viewItem =~ /^(awsDocumentItemNode|awsDocumentItemNodeWriteable)$/",
+                    "group": "inline@1"
+                },
+                {
+                    "command": "aws.s3.uploadFile",
+                    "when": "view == aws.explorer && viewItem =~ /^(awsS3BucketNode|awsS3FolderNode)$/",
+                    "group": "inline@2"
+                },
+                {
+                    "command": "aws.showRegion",
+                    "when": "view == aws.explorer && viewItem == awsRegionNode",
+                    "group": "0@1"
+                },
+                {
+                    "command": "aws.lambda.createNewSamApp",
+                    "when": "view == aws.explorer && viewItem == awsLambdaNode || viewItem == awsRegionNode",
+                    "group": "1@1"
+                },
+                {
+                    "command": "aws.launchConfigForm",
+                    "when": "view == aws.explorer && viewItem == awsLambdaNode || viewItem == awsRegionNode || viewItem == awsCloudFormationRootNode",
+                    "group": "1@1"
+                },
+                {
+                    "command": "aws.deploySamApplication",
+                    "when": "config.aws.samcli.legacyDeploy && view == aws.explorer && viewItem =~ /^(awsLambdaNode|awsRegionNode|awsCloudFormationRootNode)$/",
+                    "group": "1@2"
+                },
+                {
+                    "command": "aws.samcli.sync",
+                    "when": "!config.aws.samcli.legacyDeploy && view == aws.explorer && viewItem =~ /^(awsLambdaNode|awsRegionNode|awsCloudFormationRootNode)$/",
+                    "group": "1@2"
+                },
+                {
+                    "command": "aws.ec2.copyInstanceId",
+                    "when": "view == aws.explorer && viewItem =~ /^(awsEc2(Parent|Running|Stopped)Node)$/",
+                    "group": "2@0"
+                },
+                {
+                    "command": "aws.ecr.copyTagUri",
+                    "when": "view == aws.explorer && viewItem == awsEcrTagNode",
+                    "group": "2@1"
+                },
+                {
+                    "command": "aws.ecr.deleteTag",
+                    "when": "view == aws.explorer && viewItem == awsEcrTagNode",
+                    "group": "3@1"
+                },
+                {
+                    "command": "aws.ecr.copyRepositoryUri",
+                    "when": "view == aws.explorer && viewItem == awsEcrRepositoryNode",
+                    "group": "2@1"
+                },
+                {
+                    "command": "aws.ecr.createRepository",
+                    "when": "view == aws.explorer && viewItem == awsEcrNode",
+                    "group": "0@1"
+                },
+                {
+                    "command": "aws.ecr.deleteRepository",
+                    "when": "view == aws.explorer && viewItem == awsEcrRepositoryNode",
+                    "group": "3@1"
+                },
+                {
+                    "command": "aws.invokeLambda",
+                    "when": "view == aws.explorer && viewItem =~ /^(awsRegionFunctionNode|awsRegionFunctionNodeDownloadable|awsCloudFormationFunctionNode)$/",
+                    "group": "0@1"
+                },
+                {
+                    "command": "aws.downloadLambda",
+                    "when": "view == aws.explorer && viewItem =~ /^(awsRegionFunctionNode|awsRegionFunctionNodeDownloadable)$/",
+                    "group": "0@2"
+                },
+                {
+                    "command": "aws.uploadLambda",
+                    "when": "view == aws.explorer && viewItem =~ /^(awsRegionFunctionNode|awsRegionFunctionNodeDownloadable)$/",
+                    "group": "1@1"
+                },
+                {
+                    "command": "aws.deleteLambda",
+                    "when": "view == aws.explorer && viewItem =~ /^(awsRegionFunctionNode|awsRegionFunctionNodeDownloadable)$/",
+                    "group": "4@1"
+                },
+                {
+                    "command": "aws.copyLambdaUrl",
+                    "when": "view == aws.explorer && viewItem =~ /^(awsRegionFunctionNode|awsRegionFunctionNodeDownloadable)$/",
+                    "group": "2@0"
+                },
+                {
+                    "command": "aws.deleteCloudFormation",
+                    "when": "view == aws.explorer && viewItem == awsCloudFormationNode",
+                    "group": "3@5"
+                },
+                {
+                    "command": "aws.searchSchema",
+                    "when": "view == aws.explorer && viewItem == awsSchemasNode",
+                    "group": "0@1"
+                },
+                {
+                    "command": "aws.searchSchemaPerRegistry",
+                    "when": "view == aws.explorer && viewItem == awsRegistryItemNode",
+                    "group": "0@1"
+                },
+                {
+                    "command": "aws.viewSchemaItem",
+                    "when": "view == aws.explorer && viewItem == awsSchemaItemNode",
+                    "group": "0@1"
+                },
+                {
+                    "command": "aws.stepfunctions.createStateMachineFromTemplate",
+                    "when": "view == aws.explorer && viewItem == awsStepFunctionsNode",
+                    "group": "0@1"
+                },
+                {
+                    "command": "aws.downloadStateMachineDefinition",
+                    "when": "view == aws.explorer && viewItem == awsStateMachineNode",
+                    "group": "0@1"
+                },
+                {
+                    "command": "aws.renderStateMachineGraph",
+                    "when": "view == aws.explorer && viewItem == awsStateMachineNode",
+                    "group": "0@2"
+                },
+                {
+                    "command": "aws.cdk.renderStateMachineGraph",
+                    "when": "viewItem == awsCdkStateMachineNode",
+                    "group": "inline@1"
+                },
+                {
+                    "command": "aws.cdk.renderStateMachineGraph",
+                    "when": "viewItem == awsCdkStateMachineNode",
+                    "group": "0@1"
+                },
+                {
+                    "command": "aws.executeStateMachine",
+                    "when": "view == aws.explorer && viewItem == awsStateMachineNode",
+                    "group": "0@3"
+                },
+                {
+                    "command": "aws.iot.createThing",
+                    "when": "view == aws.explorer && viewItem == awsIotThingsNode",
+                    "group": "0@1"
+                },
+                {
+                    "command": "aws.iot.createCert",
+                    "when": "view == aws.explorer && viewItem == awsIotCertsNode",
+                    "group": "0@1"
+                },
+                {
+                    "command": "aws.iot.createPolicy",
+                    "when": "view == aws.explorer && viewItem == awsIotPoliciesNode",
+                    "group": "0@1"
+                },
+                {
+                    "command": "aws.iot.createPolicyVersion",
+                    "when": "view == aws.explorer && viewItem == awsIotPolicyNode.WithVersions",
+                    "group": "0@1"
+                },
+                {
+                    "command": "aws.iot.viewPolicyVersion",
+                    "when": "view == aws.explorer && viewItem =~ /^awsIotPolicyVersionNode./",
+                    "group": "0@1"
+                },
+                {
+                    "command": "aws.iot.attachCert",
+                    "when": "view == aws.explorer && viewItem == awsIotThingNode",
+                    "group": "0@1"
+                },
+                {
+                    "command": "aws.iot.attachPolicy",
+                    "when": "view == aws.explorer && viewItem =~ /^awsIotCertificateNode.(Things|Policies)/",
+                    "group": "0@1"
+                },
+                {
+                    "command": "aws.s3.createBucket",
+                    "when": "view == aws.explorer && viewItem == awsS3Node",
+                    "group": "0@1"
+                },
+                {
+                    "command": "aws.s3.downloadFileAs",
+                    "when": "view == aws.explorer && viewItem == awsS3FileNode",
+                    "group": "0@1"
+                },
+                {
+                    "command": "aws.s3.uploadFile",
+                    "when": "view == aws.explorer && viewItem =~ /^(awsS3BucketNode|awsS3FolderNode)$/",
+                    "group": "0@1"
+                },
+                {
+                    "command": "aws.s3.uploadFileToParent",
+                    "when": "view == aws.explorer && viewItem == awsS3FileNode",
+                    "group": "1@1"
+                },
+                {
+                    "command": "aws.s3.createFolder",
+                    "when": "view == aws.explorer && viewItem =~ /^(awsS3BucketNode|awsS3FolderNode)$/",
+                    "group": "1@1"
+                },
+                {
+                    "command": "aws.iot.deactivateCert",
+                    "when": "view == aws.explorer && viewItem =~ /^awsIotCertificateNode.(Things|Policies).ACTIVE$/",
+                    "group": "1@1"
+                },
+                {
+                    "command": "aws.iot.activateCert",
+                    "when": "view == aws.explorer && viewItem =~ /^awsIotCertificateNode.(Things|Policies).INACTIVE$/",
+                    "group": "1@1"
+                },
+                {
+                    "command": "aws.iot.revokeCert",
+                    "when": "view == aws.explorer && viewItem =~ /^awsIotCertificateNode.(Things|Policies).(ACTIVE|INACTIVE)$/",
+                    "group": "1@2"
+                },
+                {
+                    "command": "aws.iot.setDefaultPolicy",
+                    "when": "view == aws.explorer && viewItem == awsIotPolicyVersionNode.NONDEFAULT",
+                    "group": "1@1"
+                },
+                {
+                    "command": "aws.iot.copyEndpoint",
+                    "when": "view == aws.explorer && viewItem == awsIotNode",
+                    "group": "2@1"
+                },
+                {
+                    "command": "aws.copyName",
+                    "when": "view == aws.explorer && viewItem =~ /^(awsRegionFunctionNode|awsRegionFunctionNodeDownloadable|awsCloudFormationFunctionNode|awsStateMachineNode|awsCloudFormationNode|awsS3BucketNode|awsS3FolderNode|awsS3FileNode|awsApiGatewayNode|awsIotThingNode)$|^(awsAppRunnerServiceNode|awsIotCertificateNode|awsIotPolicyNode|awsIotPolicyVersionNode|(awsEc2(Running|Pending|Stopped)Node))/",
+                    "group": "2@1"
+                },
+                {
+                    "command": "aws.copyArn",
+                    "when": "view == aws.explorer && viewItem =~ /^(awsRegionFunctionNode|awsRegionFunctionNodeDownloadable|awsCloudFormationFunctionNode|awsStateMachineNode|awsCloudFormationNode|awsCloudWatchLogNode|awsS3BucketNode|awsS3FolderNode|awsS3FileNode|awsApiGatewayNode|awsEcrRepositoryNode|awsIotThingNode)$|^(awsAppRunnerServiceNode|awsEcsServiceNode|awsIotCertificateNode|awsIotPolicyNode|awsIotPolicyVersionNode|awsMdeInstanceNode|(awsEc2(Running|Pending|Stopped)Node))/",
+                    "group": "2@2"
+                },
+                {
+                    "command": "aws.cwl.searchLogGroup",
+                    "group": "0@1",
+                    "when": "view == aws.explorer && viewItem =~ /^awsCloudWatchLogNode|awsCloudWatchLogParentNode$/"
+                },
+                {
+                    "command": "aws.cwl.searchLogGroup",
+                    "group": "inline@1",
+                    "when": "view == aws.explorer && viewItem =~ /^awsCloudWatchLogNode|awsCloudWatchLogParentNode$/"
+                },
+                {
+                    "command": "aws.apig.copyUrl",
+                    "when": "view == aws.explorer && viewItem =~ /^(awsApiGatewayNode)$/",
+                    "group": "2@0"
+                },
+                {
+                    "command": "aws.s3.copyPath",
+                    "when": "view == aws.explorer && viewItem =~ /^(awsS3FolderNode|awsS3FileNode)$/",
+                    "group": "2@3"
+                },
+                {
+                    "command": "aws.s3.presignedURL",
+                    "when": "view == aws.explorer && viewItem =~ /^(awsS3FileNode)$/",
+                    "group": "2@4"
+                },
+                {
+                    "command": "aws.iot.detachCert",
+                    "when": "view == aws.explorer && viewItem =~ /^(awsIotCertificateNode.Things)/",
+                    "group": "3@1"
+                },
+                {
+                    "command": "aws.iot.detachPolicy",
+                    "when": "view == aws.explorer && viewItem == awsIotPolicyNode.Certificates",
+                    "group": "3@1"
+                },
+                {
+                    "command": "aws.iot.deleteThing",
+                    "when": "view == aws.explorer && viewItem == awsIotThingNode",
+                    "group": "3@1"
+                },
+                {
+                    "command": "aws.iot.deleteCert",
+                    "when": "view == aws.explorer && viewItem =~ /^awsIotCertificateNode.Policies/",
+                    "group": "3@1"
+                },
+                {
+                    "command": "aws.iot.deletePolicy",
+                    "when": "view == aws.explorer && viewItem == awsIotPolicyNode.WithVersions",
+                    "group": "3@1"
+                },
+                {
+                    "command": "aws.iot.deletePolicyVersion",
+                    "when": "view == aws.explorer && viewItem == awsIotPolicyVersionNode.NONDEFAULT",
+                    "group": "3@1"
+                },
+                {
+                    "command": "aws.s3.deleteBucket",
+                    "when": "view == aws.explorer && viewItem == awsS3BucketNode",
+                    "group": "3@1"
+                },
+                {
+                    "command": "aws.s3.deleteFile",
+                    "when": "view == aws.explorer && viewItem == awsS3FileNode",
+                    "group": "3@1"
+                },
+                {
+                    "command": "aws.downloadSchemaItemCode",
+                    "when": "view == aws.explorer && viewItem == awsSchemaItemNode",
+                    "group": "1@1"
+                },
+                {
+                    "command": "aws.cwl.viewLogStream",
+                    "group": "0@1",
+                    "when": "view == aws.explorer && viewItem == awsCloudWatchLogNode"
+                },
+                {
+                    "command": "aws.ssmDocument.openLocalDocumentYaml",
+                    "group": "0@1",
+                    "when": "view == aws.explorer && viewItem =~ /^(awsDocumentItemNode|awsDocumentItemNodeWriteable)$/"
+                },
+                {
+                    "command": "aws.ssmDocument.openLocalDocumentJson",
+                    "group": "0@2",
+                    "when": "view == aws.explorer && viewItem =~ /^(awsDocumentItemNode|awsDocumentItemNodeWriteable)$/"
+                },
+                {
+                    "command": "aws.ssmDocument.updateDocumentVersion",
+                    "group": "2@1",
+                    "when": "view == aws.explorer && viewItem == awsDocumentItemNodeWriteable"
+                },
+                {
+                    "command": "aws.ssmDocument.deleteDocument",
+                    "group": "3@2",
+                    "when": "view == aws.explorer && viewItem == awsDocumentItemNodeWriteable"
+                },
+                {
+                    "command": "aws.ecs.runCommandInContainer",
+                    "group": "0@1",
+                    "when": "view == aws.explorer && viewItem =~ /^(awsEcsContainerNodeExec)(.*)$/"
+                },
+                {
+                    "command": "aws.ecs.openTaskInTerminal",
+                    "group": "0@2",
+                    "when": "view == aws.explorer && viewItem =~ /^(awsEcsContainerNodeExec)(.*)$/ && !isCloud9"
+                },
+                {
+                    "command": "aws.ecs.enableEcsExec",
+                    "group": "0@2",
+                    "when": "view == aws.explorer && viewItem == awsEcsServiceNode.DISABLED"
+                },
+                {
+                    "command": "aws.ecs.disableEcsExec",
+                    "group": "0@2",
+                    "when": "view == aws.explorer && viewItem == awsEcsServiceNode.ENABLED"
+                },
+                {
+                    "command": "aws.ecs.viewDocumentation",
+                    "group": "1@3",
+                    "when": "view == aws.explorer && viewItem =~ /^(awsEcsClusterNode|awsEcsContainerNode)$|^awsEcsServiceNode/"
+                },
+                {
+                    "command": "aws.resources.configure",
+                    "when": "view == aws.explorer && viewItem == resourcesRootNode",
+                    "group": "1@1"
+                },
+                {
+                    "command": "aws.resources.configure",
+                    "when": "view == aws.explorer && viewItem == resourcesRootNode",
+                    "group": "inline@1"
+                },
+                {
+                    "command": "aws.resources.openResourcePreview",
+                    "when": "view == aws.explorer && viewItem =~ /^(.*)(ResourceNode)$/",
+                    "group": "1@1"
+                },
+                {
+                    "command": "aws.resources.copyIdentifier",
+                    "when": "view == aws.explorer && viewItem =~ /^(.*)(ResourceNode)$/",
+                    "group": "1@1"
+                },
+                {
+                    "command": "aws.resources.viewDocs",
+                    "when": "view == aws.explorer && viewItem =~ /^(.*)(Documented)(.*)(ResourceTypeNode)$/",
+                    "group": "1@1"
+                },
+                {
+                    "command": "aws.resources.createResource",
+                    "when": "view == aws.explorer && viewItem =~ /^(.*)(Creatable)(.*)(ResourceTypeNode)$/ && !isCloud9 && config.aws.experiments.jsonResourceModification",
+                    "group": "2@1"
+                },
+                {
+                    "command": "aws.resources.createResource",
+                    "when": "view == aws.explorer && viewItem =~ /^(.*)(Creatable)(.*)(ResourceTypeNode)$/ && !isCloud9 && config.aws.experiments.jsonResourceModification",
+                    "group": "inline@1"
+                },
+                {
+                    "command": "aws.resources.updateResource",
+                    "when": "view == aws.explorer && viewItem =~ /^(.*)(Updatable)(.*)(ResourceNode)$/ && !isCloud9 && config.aws.experiments.jsonResourceModification",
+                    "group": "2@1"
+                },
+                {
+                    "command": "aws.resources.deleteResource",
+                    "when": "view == aws.explorer && viewItem =~ /^(.*)(Deletable)(.*)(ResourceNode)$/ && !isCloud9 && config.aws.experiments.jsonResourceModification",
+                    "group": "2@2"
+                },
+                {
+                    "command": "aws.apprunner.createServiceFromEcr",
+                    "group": "0@2",
+                    "when": "view == aws.explorer && viewItem =~ /awsEcrTagNode|awsEcrRepositoryNode/"
+                },
+                {
+                    "command": "aws.apprunner.startDeployment",
+                    "group": "0@1",
+                    "when": "view == aws.explorer && viewItem == awsAppRunnerServiceNode.RUNNING"
+                },
+                {
+                    "command": "aws.apprunner.createService",
+                    "group": "0@2",
+                    "when": "view == aws.explorer && viewItem == awsAppRunnerNode"
+                },
+                {
+                    "command": "aws.apprunner.pauseService",
+                    "group": "0@3",
+                    "when": "view == aws.explorer && viewItem == awsAppRunnerServiceNode.RUNNING"
+                },
+                {
+                    "command": "aws.apprunner.resumeService",
+                    "group": "0@3",
+                    "when": "view == aws.explorer && viewItem == awsAppRunnerServiceNode.PAUSED"
+                },
+                {
+                    "command": "aws.apprunner.copyServiceUrl",
+                    "group": "1@1",
+                    "when": "view == aws.explorer && viewItem == awsAppRunnerServiceNode.RUNNING"
+                },
+                {
+                    "command": "aws.apprunner.open",
+                    "group": "1@2",
+                    "when": "view == aws.explorer && viewItem == awsAppRunnerServiceNode.RUNNING"
+                },
+                {
+                    "command": "aws.apprunner.deleteService",
+                    "group": "3@1",
+                    "when": "view == aws.explorer && viewItem =~ /awsAppRunnerServiceNode.[RUNNING|PAUSED|CREATE_FAILED]/"
+                },
+                {
+                    "command": "aws.cloudFormation.newTemplate",
+                    "group": "0@1",
+                    "when": "view == aws.explorer && viewItem == awsCloudFormationRootNode"
+                },
+                {
+                    "command": "aws.sam.newTemplate",
+                    "group": "0@2",
+                    "when": "view == aws.explorer && viewItem == awsCloudFormationRootNode"
+                },
+                {
+                    "command": "aws.codeWhisperer.introduction",
+                    "when": "viewItem =~ /^awsCodeWhispererNode/ && !isCloud9 && CODEWHISPERER_TERMS_ACCEPTED",
+                    "group": "inline@1"
+                },
+                {
+                    "command": "aws.cdk.viewDocs",
+                    "when": "viewItem == awsCdkRootNode",
+                    "group": "0@2"
+                },
+                {
+                    "command": "aws.auth.addConnection",
+                    "when": "viewItem == awsAuthNode",
+                    "group": "0@1"
+                },
+                {
+                    "command": "aws.auth.switchConnections",
+                    "when": "viewItem == awsAuthNode",
+                    "group": "0@2"
+                },
+                {
+                    "command": "aws.auth.signout",
+                    "when": "viewItem == awsAuthNode && !isCloud9",
+                    "group": "0@3"
+                },
+                {
+                    "command": "aws.auth.help",
+                    "when": "viewItem == awsAuthNode",
+                    "group": "inline@1"
+                },
+                {
+                    "submenu": "aws.auth",
+                    "when": "viewItem == awsAuthNode",
+                    "group": "inline@2"
+                },
+                {
+                    "submenu": "aws.codecatalyst.submenu",
+                    "when": "viewItem =~ /^awsCodeCatalystNode/",
+                    "group": "inline@1"
+                },
+                {
+                    "command": "aws.codecatalyst.manageConnections",
+                    "when": "viewItem =~ /^awsCodeCatalystNode/",
+                    "group": "0@1"
+                },
+                {
+                    "command": "aws.codecatalyst.signout",
+                    "when": "viewItem =~ /^awsCodeCatalystNode/&& !isCloud9 && aws.codecatalyst.connected",
+                    "group": "0@2"
+                },
+                {
+                    "submenu": "aws.codewhisperer.submenu",
+                    "when": "viewItem =~ /^awsCodeWhispererNode/",
+                    "group": "inline@1"
+                },
+                {
+                    "submenu": "aws.amazonq.submenu",
+                    "when": "viewItem =~ /^awsAmazonQNode/",
+                    "group": "inline@1"
+                }
+            ],
+            "aws.auth": [
+                {
+                    "command": "aws.auth.manageConnections",
+                    "group": "0@1"
+                },
+                {
+                    "command": "aws.auth.switchConnections",
+                    "group": "0@2"
+                },
+                {
+                    "command": "aws.auth.signout",
+                    "enablement": "!isCloud9",
+                    "group": "0@3"
+                }
+            ],
+            "aws.submenu.feedback": [
+                {
+                    "command": "aws.submitFeedback",
+                    "when": "!aws.isWebExtHost",
+                    "group": "1_feedback@1"
+                },
+                {
+                    "command": "aws.createIssueOnGitHub",
+                    "group": "1_feedback@2"
+                }
+            ],
+            "aws.submenu.help": [
+                {
+                    "command": "aws.quickStart",
+                    "when": "isCloud9",
+                    "group": "1_help@1"
+                },
+                {
+                    "command": "aws.help",
+                    "group": "1_help@2"
+                },
+                {
+                    "command": "aws.github",
+                    "group": "1_help@3"
+                },
+                {
+                    "command": "aws.aboutToolkit",
+                    "group": "1_help@4"
+                },
+                {
+                    "command": "aws.viewLogs",
+                    "group": "1_help@5"
+                }
+            ]
+        },
+        "commands": [
+            {
+                "command": "aws.amazonq.explainCode",
+                "title": "%AWS.command.amazonq.explainCode%",
+                "category": "%AWS.title%"
+            },
+            {
+                "command": "aws.amazonq.refactorCode",
+                "title": "%AWS.command.amazonq.refactorCode%",
+                "category": "%AWS.title%"
+            },
+            {
+                "command": "aws.amazonq.fixCode",
+                "title": "%AWS.command.amazonq.fixCode%",
+                "category": "%AWS.title%"
+            },
+            {
+                "command": "aws.amazonq.optimizeCode",
+                "title": "%AWS.command.amazonq.optimizeCode%",
+                "category": "%AWS.title%"
+            },
+            {
+                "command": "aws.amazonq.sendToPrompt",
+                "title": "%AWS.command.amazonq.sendToPrompt%",
+                "category": "%AWS.title%"
+            },
+            {
+                "command": "aws.launchConfigForm",
+                "title": "%AWS.command.launchConfigForm.title%",
+                "category": "%AWS.title%",
+                "enablement": "isCloud9 || !aws.isWebExtHost",
+                "cloud9": {
+                    "cn": {
+                        "category": "%AWS.title.cn%"
+                    }
+                }
+            },
+            {
+                "command": "aws.apig.copyUrl",
+                "title": "%AWS.command.apig.copyUrl%",
+                "category": "%AWS.title%",
+                "enablement": "isCloud9 || !aws.isWebExtHost",
+                "cloud9": {
+                    "cn": {
+                        "category": "%AWS.title.cn%"
+                    }
+                }
+            },
+            {
+                "command": "aws.apig.invokeRemoteRestApi",
+                "title": "%AWS.command.apig.invokeRemoteRestApi%",
+                "category": "%AWS.title%",
+                "enablement": "isCloud9 || !aws.isWebExtHost",
+                "cloud9": {
+                    "cn": {
+                        "category": "%AWS.title.cn%",
+                        "title": "%AWS.command.apig.invokeRemoteRestApi.cn%"
+                    }
+                }
+            },
+            {
+                "command": "aws.lambda.createNewSamApp",
+                "title": "%AWS.command.createNewSamApp%",
+                "category": "%AWS.title%",
+                "enablement": "isCloud9 || !aws.isWebExtHost",
+                "cloud9": {
+                    "cn": {
+                        "category": "%AWS.title.cn%"
+                    }
+                }
+            },
+            {
+                "command": "aws.login",
+                "title": "%AWS.command.login%",
+                "category": "%AWS.title%",
+                "enablement": "isCloud9 || !aws.isWebExtHost",
+                "cloud9": {
+                    "cn": {
+                        "title": "%AWS.command.login.cn%",
+                        "category": "%AWS.title.cn%"
+                    }
+                }
+            },
+            {
+                "command": "aws.credentials.profile.create",
+                "title": "%AWS.command.credentials.profile.create%",
+                "category": "%AWS.title%",
+                "cloud9": {
+                    "cn": {
+                        "category": "%AWS.title.cn%"
+                    }
+                }
+            },
+            {
+                "command": "aws.credentials.edit",
+                "title": "%AWS.command.credentials.edit%",
+                "category": "%AWS.title%",
+                "cloud9": {
+                    "cn": {
+                        "category": "%AWS.title.cn%"
+                    }
+                }
+            },
+            {
+                "command": "aws.codecatalyst.openOrg",
+                "title": "%AWS.command.codecatalyst.openOrg%",
+                "category": "AWS",
+                "enablement": "isCloud9 || !aws.isWebExtHost"
+            },
+            {
+                "command": "aws.codecatalyst.openProject",
+                "title": "%AWS.command.codecatalyst.openProject%",
+                "category": "AWS",
+                "enablement": "isCloud9 || !aws.isWebExtHost"
+            },
+            {
+                "command": "aws.codecatalyst.openRepo",
+                "title": "%AWS.command.codecatalyst.openRepo%",
+                "category": "AWS",
+                "enablement": "isCloud9 || !aws.isWebExtHost"
+            },
+            {
+                "command": "aws.codecatalyst.openDevEnv",
+                "title": "%AWS.command.codecatalyst.openDevEnv%",
+                "category": "AWS",
+                "enablement": "!isCloud9 && !aws.isWebExtHost"
+            },
+            {
+                "command": "aws.codecatalyst.listCommands",
+                "title": "%AWS.command.codecatalyst.listCommands%",
+                "category": "AWS",
+                "enablement": "!isCloud9 && !aws.isWebExtHost"
+            },
+            {
+                "command": "aws.codecatalyst.cloneRepo",
+                "title": "%AWS.command.codecatalyst.cloneRepo%",
+                "category": "AWS",
+                "enablement": "!isCloud9 && !aws.isWebExtHost"
+            },
+            {
+                "command": "aws.codecatalyst.createDevEnv",
+                "title": "%AWS.command.codecatalyst.createDevEnv%",
+                "category": "AWS",
+                "enablement": "!isCloud9 && !aws.isWebExtHost"
+            },
+            {
+                "command": "aws.codecatalyst.signout",
+                "title": "%AWS.command.codecatalyst.signout%",
+                "category": "AWS",
+                "icon": "$(debug-disconnect)",
+                "enablement": "isCloud9 || !aws.isWebExtHost"
+            },
+            {
+                "command": "aws.logout",
+                "title": "%AWS.command.logout%",
+                "category": "%AWS.title%",
+                "cloud9": {
+                    "cn": {
+                        "category": "%AWS.title.cn%"
+                    }
+                }
+            },
+            {
+                "command": "aws.auth.addConnection",
+                "title": "%AWS.command.auth.addConnection%",
+                "category": "%AWS.title%"
+            },
+            {
+                "command": "aws.auth.manageConnections",
+                "title": "%AWS.command.auth.showConnectionsPage%",
+                "category": "%AWS.title%"
+            },
+            {
+                "command": "aws.codecatalyst.manageConnections",
+                "title": "%AWS.command.auth.showConnectionsPage%",
+                "category": "%AWS.title%"
+            },
+            {
+                "command": "aws.codewhisperer.manageConnections",
+                "title": "%AWS.command.auth.showConnectionsPage%",
+                "category": "%AWS.title%"
+            },
+            {
+                "command": "aws.codewhisperer.reconnect",
+                "title": "%AWS.command.codewhisperer.reconnect%",
+                "category": "%AWS.title%"
+            },
+            {
+                "command": "aws.codeWhisperer.openReferencePanel",
+                "title": "%AWS.command.codewhisperer.openReferencePanel%",
+                "category": "%AWS.title%"
+            },
+            {
+                "command": "aws.amazonq.transformationHub.reviewChanges.acceptChanges",
+                "title": "%AWS.command.q.transform.acceptChanges%"
+            },
+            {
+                "command": "aws.amazonq.transformationHub.reviewChanges.rejectChanges",
+                "title": "%AWS.command.q.transform.rejectChanges%"
+            },
+            {
+                "command": "aws.amazonq.transformationHub.summary.reveal",
+                "title": "%AWS.command.q.transform.showChangeSummary%",
+                "enablement": "gumby.isSummaryAvailable"
+            },
+            {
+                "command": "aws.amazonq.transformationHub.reviewChanges.reveal",
+                "title": "%AWS.command.q.transform.showChanges%",
+                "enablement": "gumby.reviewState == InReview"
+            },
+            {
+                "command": "aws.amazonq.showTransformationPlanInHub",
+                "title": "%AWS.command.q.transform.showTransformationPlan%",
+                "enablement": "gumby.isPlanAvailable"
+            },
+            {
+                "command": "aws.auth.switchConnections",
+                "title": "%AWS.command.auth.switchConnections%",
+                "category": "%AWS.title%"
+            },
+            {
+                "command": "aws.auth.signout",
+                "title": "%AWS.command.auth.signout%",
+                "category": "%AWS.title%",
+                "enablement": "!isCloud9"
+            },
+            {
+                "command": "aws.auth.help",
+                "title": "%AWS.generic.viewDocs%",
+                "category": "%AWS.title%",
+                "icon": "$(question)"
+            },
+            {
+                "command": "aws.createIssueOnGitHub",
+                "title": "%AWS.command.createIssueOnGitHub%",
+                "category": "%AWS.title%",
+                "cloud9": {
+                    "cn": {
+                        "category": "%AWS.title.cn%"
+                    }
+                }
+            },
+            {
+                "command": "aws.ec2.openTerminal",
+                "title": "%AWS.command.ec2.openTerminal%",
+                "icon": "$(terminal-view-icon)",
+                "category": "%AWS.title%",
+                "enablement": "isCloud9 || !aws.isWebExtHost",
+                "cloud9": {
+                    "cn": {
+                        "category": "%AWS.title.cn%"
+                    }
+                }
+            },
+            {
+                "command": "aws.ec2.openRemoteConnection",
+                "title": "%AWS.command.ec2.openRemoteConnection%",
+                "icon": "$(remote-explorer)",
+                "category": "%AWS.title%",
+                "enablement": "isCloud9 || !aws.isWebExtHost",
+                "cloud9": {
+                    "cn": {
+                        "category": "%AWS.title.cn%"
+                    }
+                }
+            },
+            {
+                "command": "aws.ec2.startInstance",
+                "title": "%AWS.command.ec2.startInstance%",
+                "icon": "$(debug-start)",
+                "category": "%AWS.title%",
+                "enablement": "isCloud9 || !aws.isWebExtHost",
+                "cloud9": {
+                    "cn": {
+                        "category": "%AWS.title.cn%"
+                    }
+                }
+            },
+            {
+                "command": "aws.ec2.stopInstance",
+                "title": "%AWS.command.ec2.stopInstance%",
+                "icon": "$(debug-stop)",
+                "category": "%AWS.title%",
+                "enablement": "isCloud9 || !aws.isWebExtHost",
+                "cloud9": {
+                    "cn": {
+                        "category": "%AWS.title.cn%"
+                    }
+                }
+            },
+            {
+                "command": "aws.ec2.rebootInstance",
+                "title": "%AWS.command.ec2.rebootInstance%",
+                "icon": "$(debug-restart)",
+                "category": "%AWS.title%",
+                "enablement": "isCloud9 || !aws.isWebExtHost",
+                "cloud9": {
+                    "cn": {
+                        "category": "%AWS.title.cn%"
+                    }
+                }
+            },
+            {
+                "command": "aws.ec2.copyInstanceId",
+                "title": "%AWS.command.ec2.copyInstanceId%",
+                "category": "%AWS.title%",
+                "enablement": "isCloud9 || !aws.isWebExtHost",
+                "cloud9": {
+                    "cn": {
+                        "category": "%AWS.title.cn%"
+                    }
+                }
+            },
+            {
+                "command": "aws.ecr.copyTagUri",
+                "title": "%AWS.command.ecr.copyTagUri%",
+                "category": "%AWS.title%",
+                "enablement": "isCloud9 || !aws.isWebExtHost",
+                "cloud9": {
+                    "cn": {
+                        "category": "%AWS.title.cn%"
+                    }
+                }
+            },
+            {
+                "command": "aws.ecr.deleteTag",
+                "title": "%AWS.command.ecr.deleteTag%",
+                "category": "%AWS.title%",
+                "enablement": "isCloud9 || !aws.isWebExtHost",
+                "cloud9": {
+                    "cn": {
+                        "category": "%AWS.title.cn%"
+                    }
+                }
+            },
+            {
+                "command": "aws.ecr.copyRepositoryUri",
+                "title": "%AWS.command.ecr.copyRepositoryUri%",
+                "category": "%AWS.title%",
+                "enablement": "isCloud9 || !aws.isWebExtHost",
+                "cloud9": {
+                    "cn": {
+                        "category": "%AWS.title.cn%"
+                    }
+                }
+            },
+            {
+                "command": "aws.ecr.createRepository",
+                "title": "%AWS.command.ecr.createRepository%",
+                "category": "%AWS.title%",
+                "enablement": "isCloud9 || !aws.isWebExtHost",
+                "icon": "$(add)",
+                "cloud9": {
+                    "cn": {
+                        "category": "%AWS.title.cn%"
+                    }
+                }
+            },
+            {
+                "command": "aws.ecr.deleteRepository",
+                "title": "%AWS.command.ecr.deleteRepository%",
+                "category": "%AWS.title%",
+                "enablement": "isCloud9 || !aws.isWebExtHost",
+                "cloud9": {
+                    "cn": {
+                        "category": "%AWS.title.cn%"
+                    }
+                }
+            },
+            {
+                "command": "aws.showRegion",
+                "title": "%AWS.command.showRegion%",
+                "category": "%AWS.title%",
+                "enablement": "isCloud9 || !aws.isWebExtHost",
+                "cloud9": {
+                    "cn": {
+                        "category": "%AWS.title.cn%"
+                    }
+                }
+            },
+            {
+                "command": "aws.iot.createThing",
+                "title": "%AWS.command.iot.createThing%",
+                "category": "%AWS.title%",
+                "enablement": "isCloud9 || !aws.isWebExtHost",
+                "icon": "$(add)",
+                "cloud9": {
+                    "cn": {
+                        "category": "%AWS.title.cn%"
+                    }
+                }
+            },
+            {
+                "command": "aws.iot.deleteThing",
+                "title": "%AWS.generic.promptDelete%",
+                "category": "%AWS.title%",
+                "enablement": "isCloud9 || !aws.isWebExtHost",
+                "cloud9": {
+                    "cn": {
+                        "category": "%AWS.title.cn%"
+                    }
+                }
+            },
+            {
+                "command": "aws.iot.createCert",
+                "title": "%AWS.command.iot.createCert%",
+                "category": "%AWS.title%",
+                "enablement": "isCloud9 || !aws.isWebExtHost",
+                "icon": "$(add)",
+                "cloud9": {
+                    "cn": {
+                        "category": "%AWS.title.cn%"
+                    }
+                }
+            },
+            {
+                "command": "aws.iot.deleteCert",
+                "title": "%AWS.generic.promptDelete%",
+                "category": "%AWS.title%",
+                "enablement": "isCloud9 || !aws.isWebExtHost",
+                "cloud9": {
+                    "cn": {
+                        "category": "%AWS.title.cn%"
+                    }
+                }
+            },
+            {
+                "command": "aws.iot.attachCert",
+                "title": "%AWS.command.iot.attachCert%",
+                "category": "%AWS.title%",
+                "enablement": "isCloud9 || !aws.isWebExtHost",
+                "icon": "$(aws-generic-attach-file)",
+                "cloud9": {
+                    "cn": {
+                        "category": "%AWS.title.cn%"
+                    }
+                }
+            },
+            {
+                "command": "aws.iot.attachPolicy",
+                "title": "%AWS.command.iot.attachPolicy%",
+                "category": "%AWS.title%",
+                "enablement": "isCloud9 || !aws.isWebExtHost",
+                "icon": "$(aws-generic-attach-file)",
+                "cloud9": {
+                    "cn": {
+                        "category": "%AWS.title.cn%"
+                    }
+                }
+            },
+            {
+                "command": "aws.iot.activateCert",
+                "title": "%AWS.command.iot.activateCert%",
+                "category": "%AWS.title%",
+                "enablement": "isCloud9 || !aws.isWebExtHost",
+                "cloud9": {
+                    "cn": {
+                        "category": "%AWS.title.cn%"
+                    }
+                }
+            },
+            {
+                "command": "aws.iot.deactivateCert",
+                "title": "%AWS.command.iot.deactivateCert%",
+                "category": "%AWS.title%",
+                "enablement": "isCloud9 || !aws.isWebExtHost",
+                "cloud9": {
+                    "cn": {
+                        "category": "%AWS.title.cn%"
+                    }
+                }
+            },
+            {
+                "command": "aws.iot.revokeCert",
+                "title": "%AWS.command.iot.revokeCert%",
+                "category": "%AWS.title%",
+                "enablement": "isCloud9 || !aws.isWebExtHost",
+                "cloud9": {
+                    "cn": {
+                        "category": "%AWS.title.cn%"
+                    }
+                }
+            },
+            {
+                "command": "aws.iot.createPolicy",
+                "title": "%AWS.command.iot.createPolicy%",
+                "category": "%AWS.title%",
+                "enablement": "isCloud9 || !aws.isWebExtHost",
+                "icon": "$(add)",
+                "cloud9": {
+                    "cn": {
+                        "category": "%AWS.title.cn%"
+                    }
+                }
+            },
+            {
+                "command": "aws.iot.deletePolicy",
+                "title": "%AWS.generic.promptDelete%",
+                "category": "%AWS.title%",
+                "enablement": "isCloud9 || !aws.isWebExtHost",
+                "cloud9": {
+                    "cn": {
+                        "category": "%AWS.title.cn%"
+                    }
+                }
+            },
+            {
+                "command": "aws.iot.createPolicyVersion",
+                "title": "%AWS.command.iot.createPolicyVersion%",
+                "category": "%AWS.title%",
+                "enablement": "isCloud9 || !aws.isWebExtHost",
+                "cloud9": {
+                    "cn": {
+                        "category": "%AWS.title.cn%"
+                    }
+                }
+            },
+            {
+                "command": "aws.iot.deletePolicyVersion",
+                "title": "%AWS.generic.promptDelete%",
+                "category": "%AWS.title%",
+                "enablement": "isCloud9 || !aws.isWebExtHost",
+                "cloud9": {
+                    "cn": {
+                        "category": "%AWS.title.cn%"
+                    }
+                }
+            },
+            {
+                "command": "aws.iot.detachCert",
+                "title": "%AWS.command.iot.detachCert%",
+                "category": "%AWS.title%",
+                "enablement": "isCloud9 || !aws.isWebExtHost",
+                "cloud9": {
+                    "cn": {
+                        "category": "%AWS.title.cn%"
+                    }
+                }
+            },
+            {
+                "command": "aws.iot.detachPolicy",
+                "title": "%AWS.command.iot.detachCert%",
+                "category": "%AWS.title%",
+                "enablement": "isCloud9 || !aws.isWebExtHost",
+                "cloud9": {
+                    "cn": {
+                        "category": "%AWS.title.cn%"
+                    }
+                }
+            },
+            {
+                "command": "aws.iot.viewPolicyVersion",
+                "title": "%AWS.command.iot.viewPolicyVersion%",
+                "category": "%AWS.title%",
+                "enablement": "isCloud9 || !aws.isWebExtHost",
+                "cloud9": {
+                    "cn": {
+                        "category": "%AWS.title.cn%"
+                    }
+                }
+            },
+            {
+                "command": "aws.iot.setDefaultPolicy",
+                "title": "%AWS.command.iot.setDefaultPolicy%",
+                "category": "%AWS.title%",
+                "enablement": "isCloud9 || !aws.isWebExtHost",
+                "cloud9": {
+                    "cn": {
+                        "category": "%AWS.title.cn%"
+                    }
+                }
+            },
+            {
+                "command": "aws.iot.copyEndpoint",
+                "title": "%AWS.command.iot.copyEndpoint%",
+                "category": "%AWS.title%",
+                "enablement": "isCloud9 || !aws.isWebExtHost",
+                "cloud9": {
+                    "cn": {
+                        "category": "%AWS.title.cn%"
+                    }
+                }
+            },
+            {
+                "command": "aws.redshift.editConnection",
+                "title": "Edit connection",
+                "category": "%AWS.title%"
+            },
+            {
+                "command": "aws.redshift.deleteConnection",
+                "title": "Delete connection",
+                "category": "%AWS.title%"
+            },
+            {
+                "command": "aws.s3.presignedURL",
+                "title": "%AWS.command.s3.presignedURL%",
+                "category": "%AWS.title%",
+                "enablement": "isCloud9 || !aws.isWebExtHost"
+            },
+            {
+                "command": "aws.s3.copyPath",
+                "title": "%AWS.command.s3.copyPath%",
+                "category": "%AWS.title%",
+                "enablement": "isCloud9 || !aws.isWebExtHost",
+                "cloud9": {
+                    "cn": {
+                        "category": "%AWS.title.cn%"
+                    }
+                }
+            },
+            {
+                "command": "aws.s3.downloadFileAs",
+                "title": "%AWS.command.s3.downloadFileAs%",
+                "category": "%AWS.title%",
+                "enablement": "isCloud9 || !aws.isWebExtHost",
+                "icon": "$(cloud-download)",
+                "cloud9": {
+                    "cn": {
+                        "category": "%AWS.title.cn%"
+                    }
+                }
+            },
+            {
+                "command": "aws.s3.openFile",
+                "title": "%AWS.command.s3.openFile%",
+                "category": "%AWS.title%",
+                "enablement": "isCloud9 || !aws.isWebExtHost",
+                "icon": "$(open-preview)"
+            },
+            {
+                "command": "aws.s3.editFile",
+                "title": "%AWS.command.s3.editFile%",
+                "category": "%AWS.title%",
+                "enablement": "isCloud9 || !aws.isWebExtHost",
+                "icon": "$(edit)"
+            },
+            {
+                "command": "aws.s3.uploadFile",
+                "title": "%AWS.command.s3.uploadFile%",
+                "category": "%AWS.title%",
+                "enablement": "isCloud9 || !aws.isWebExtHost",
+                "icon": "$(cloud-upload)",
+                "cloud9": {
+                    "cn": {
+                        "category": "%AWS.title.cn%"
+                    }
+                }
+            },
+            {
+                "command": "aws.s3.uploadFileToParent",
+                "title": "%AWS.command.s3.uploadFileToParent%",
+                "category": "%AWS.title%",
+                "enablement": "isCloud9 || !aws.isWebExtHost",
+                "cloud9": {
+                    "cn": {
+                        "category": "%AWS.title.cn%"
+                    }
+                }
+            },
+            {
+                "command": "aws.s3.createFolder",
+                "title": "%AWS.command.s3.createFolder%",
+                "category": "%AWS.title%",
+                "enablement": "isCloud9 || !aws.isWebExtHost",
+                "icon": "$(new-folder)",
+                "cloud9": {
+                    "cn": {
+                        "category": "%AWS.title.cn%"
+                    }
+                }
+            },
+            {
+                "command": "aws.s3.createBucket",
+                "title": "%AWS.command.s3.createBucket%",
+                "category": "%AWS.title%",
+                "enablement": "isCloud9 || !aws.isWebExtHost",
+                "icon": "$(aws-s3-create-bucket)",
+                "cloud9": {
+                    "cn": {
+                        "category": "%AWS.title.cn%"
+                    }
+                }
+            },
+            {
+                "command": "aws.s3.deleteBucket",
+                "title": "%AWS.generic.promptDelete%",
+                "category": "%AWS.title%",
+                "enablement": "isCloud9 || !aws.isWebExtHost",
+                "cloud9": {
+                    "cn": {
+                        "category": "%AWS.title.cn%"
+                    }
+                }
+            },
+            {
+                "command": "aws.s3.deleteFile",
+                "title": "%AWS.generic.promptDelete%",
+                "category": "%AWS.title%",
+                "enablement": "isCloud9 || !aws.isWebExtHost",
+                "cloud9": {
+                    "cn": {
+                        "category": "%AWS.title.cn%"
+                    }
+                }
+            },
+            {
+                "command": "aws.invokeLambda",
+                "title": "%AWS.command.invokeLambda%",
+                "category": "%AWS.title%",
+                "enablement": "isCloud9 || !aws.isWebExtHost",
+                "cloud9": {
+                    "cn": {
+                        "title": "%AWS.command.invokeLambda.cn%",
+                        "category": "%AWS.title.cn%"
+                    }
+                }
+            },
+            {
+                "command": "aws.downloadLambda",
+                "title": "%AWS.command.downloadLambda%",
+                "category": "%AWS.title%",
+                "enablement": "viewItem == awsRegionFunctionNodeDownloadable",
+                "cloud9": {
+                    "cn": {
+                        "category": "%AWS.title.cn%"
+                    }
+                }
+            },
+            {
+                "command": "aws.uploadLambda",
+                "title": "%AWS.command.uploadLambda%",
+                "enablement": "isCloud9 || !aws.isWebExtHost",
+                "category": "%AWS.title%",
+                "cloud9": {
+                    "cn": {
+                        "category": "%AWS.title.cn%"
+                    }
+                }
+            },
+            {
+                "command": "aws.deleteLambda",
+                "title": "%AWS.generic.promptDelete%",
+                "enablement": "isCloud9 || !aws.isWebExtHost",
+                "category": "%AWS.title%",
+                "cloud9": {
+                    "cn": {
+                        "category": "%AWS.title.cn%"
+                    }
+                }
+            },
+            {
+                "command": "aws.copyLambdaUrl",
+                "title": "%AWS.generic.copyUrl%",
+                "enablement": "isCloud9 || !aws.isWebExtHost",
+                "category": "%AWS.title%",
+                "cloud9": {
+                    "cn": {
+                        "category": "%AWS.title.cn%"
+                    }
+                }
+            },
+            {
+                "command": "aws.deploySamApplication",
+                "title": "%AWS.command.deploySamApplication%",
+                "enablement": "isCloud9 || !aws.isWebExtHost",
+                "category": "%AWS.title%",
+                "cloud9": {
+                    "cn": {
+                        "category": "%AWS.title.cn%"
+                    }
+                }
+            },
+            {
+                "command": "aws.submitFeedback",
+                "title": "%AWS.command.submitFeedback%",
+                "enablement": "!aws.isWebExtHost",
+                "category": "%AWS.title%",
+                "icon": "$(comment)",
+                "cloud9": {
+                    "cn": {
+                        "category": "%AWS.title.cn%"
+                    }
+                }
+            },
+            {
+                "command": "aws.refreshAwsExplorer",
+                "title": "%AWS.command.refreshAwsExplorer%",
+                "enablement": "isCloud9 || !aws.isWebExtHost",
+                "category": "%AWS.title%",
+                "icon": {
+                    "dark": "resources/icons/vscode/dark/refresh.svg",
+                    "light": "resources/icons/vscode/light/refresh.svg"
+                }
+            },
+            {
+                "command": "aws.samcli.detect",
+                "title": "%AWS.command.samcli.detect%",
+                "enablement": "isCloud9 || !aws.isWebExtHost",
+                "category": "%AWS.title%",
+                "cloud9": {
+                    "cn": {
+                        "category": "%AWS.title.cn%"
+                    }
+                }
+            },
+            {
+                "command": "aws.deleteCloudFormation",
+                "title": "%AWS.command.deleteCloudFormation%",
+                "enablement": "isCloud9 || !aws.isWebExtHost",
+                "category": "%AWS.title%",
+                "cloud9": {
+                    "cn": {
+                        "category": "%AWS.title.cn%"
+                    }
+                }
+            },
+            {
+                "command": "aws.downloadStateMachineDefinition",
+                "title": "%AWS.command.downloadStateMachineDefinition%",
+                "enablement": "isCloud9 || !aws.isWebExtHost",
+                "category": "%AWS.title%",
+                "cloud9": {
+                    "cn": {
+                        "category": "%AWS.title.cn%"
+                    }
+                }
+            },
+            {
+                "command": "aws.executeStateMachine",
+                "title": "%AWS.command.executeStateMachine%",
+                "enablement": "isCloud9 || !aws.isWebExtHost",
+                "category": "%AWS.title%",
+                "cloud9": {
+                    "cn": {
+                        "category": "%AWS.title.cn%"
+                    }
+                }
+            },
+            {
+                "command": "aws.renderStateMachineGraph",
+                "title": "%AWS.command.renderStateMachineGraph%",
+                "enablement": "isCloud9 || !aws.isWebExtHost",
+                "category": "%AWS.title%",
+                "cloud9": {
+                    "cn": {
+                        "category": "%AWS.title.cn%"
+                    }
+                }
+            },
+            {
+                "command": "aws.copyArn",
+                "title": "%AWS.command.copyArn%",
+                "category": "%AWS.title%",
+                "enablement": "isCloud9 || !aws.isWebExtHost",
+                "cloud9": {
+                    "cn": {
+                        "category": "%AWS.title.cn%"
+                    }
+                }
+            },
+            {
+                "command": "aws.copyName",
+                "title": "%AWS.command.copyName%",
+                "category": "%AWS.title%",
+                "enablement": "isCloud9 || !aws.isWebExtHost",
+                "cloud9": {
+                    "cn": {
+                        "category": "%AWS.title.cn%"
+                    }
+                }
+            },
+            {
+                "command": "aws.listCommands",
+                "title": "%AWS.command.listCommands%",
+                "category": "%AWS.title%",
+                "cloud9": {
+                    "cn": {
+                        "title": "%AWS.command.listCommands.cn%",
+                        "category": "%AWS.title.cn%"
+                    }
+                }
+            },
+            {
+                "command": "aws.viewSchemaItem",
+                "title": "%AWS.command.viewSchemaItem%",
+                "category": "%AWS.title%",
+                "enablement": "isCloud9 || !aws.isWebExtHost",
+                "cloud9": {
+                    "cn": {
+                        "category": "%AWS.title.cn%"
+                    }
+                }
+            },
+            {
+                "command": "aws.searchSchema",
+                "title": "%AWS.command.searchSchema%",
+                "category": "%AWS.title%",
+                "enablement": "isCloud9 || !aws.isWebExtHost",
+                "cloud9": {
+                    "cn": {
+                        "category": "%AWS.title.cn%"
+                    }
+                }
+            },
+            {
+                "command": "aws.searchSchemaPerRegistry",
+                "title": "%AWS.command.searchSchemaPerRegistry%",
+                "category": "%AWS.title%",
+                "enablement": "isCloud9 || !aws.isWebExtHost",
+                "cloud9": {
+                    "cn": {
+                        "category": "%AWS.title.cn%"
+                    }
+                }
+            },
+            {
+                "command": "aws.downloadSchemaItemCode",
+                "title": "%AWS.command.downloadSchemaItemCode%",
+                "category": "%AWS.title%",
+                "enablement": "isCloud9 || !aws.isWebExtHost",
+                "cloud9": {
+                    "cn": {
+                        "category": "%AWS.title.cn%"
+                    }
+                }
+            },
+            {
+                "command": "aws.viewLogs",
+                "title": "%AWS.command.viewLogs%",
+                "category": "%AWS.title%"
+            },
+            {
+                "command": "aws.help",
+                "title": "%AWS.command.help%",
+                "category": "%AWS.title%",
+                "cloud9": {
+                    "cn": {
+                        "category": "%AWS.title.cn%"
+                    }
+                }
+            },
+            {
+                "command": "aws.github",
+                "title": "%AWS.command.github%",
+                "category": "%AWS.title%",
+                "cloud9": {
+                    "cn": {
+                        "category": "%AWS.title.cn%"
+                    }
+                }
+            },
+            {
+                "command": "aws.quickStart",
+                "title": "%AWS.command.quickStart%",
+                "category": "%AWS.title%",
+                "enablement": "isCloud9",
+                "cloud9": {
+                    "cn": {
+                        "category": "%AWS.title.cn%"
+                    }
+                }
+            },
+            {
+                "command": "aws.cdk.refresh",
+                "title": "%AWS.command.refreshCdkExplorer%",
+                "category": "%AWS.title%",
+                "enablement": "isCloud9 || !aws.isWebExtHost",
+                "icon": {
+                    "dark": "resources/icons/vscode/dark/refresh.svg",
+                    "light": "resources/icons/vscode/light/refresh.svg"
+                },
+                "cloud9": {
+                    "cn": {
+                        "category": "%AWS.title.cn%"
+                    }
+                }
+            },
+            {
+                "command": "aws.cdk.viewDocs",
+                "title": "%AWS.generic.viewDocs%",
+                "category": "%AWS.title%",
+                "enablement": "isCloud9 || !aws.isWebExtHost"
+            },
+            {
+                "command": "aws.stepfunctions.createStateMachineFromTemplate",
+                "title": "%AWS.command.stepFunctions.createStateMachineFromTemplate%",
+                "category": "%AWS.title%",
+                "enablement": "isCloud9 || !aws.isWebExtHost",
+                "cloud9": {
+                    "cn": {
+                        "category": "%AWS.title.cn%"
+                    }
+                }
+            },
+            {
+                "command": "aws.stepfunctions.publishStateMachine",
+                "title": "%AWS.command.stepFunctions.publishStateMachine%",
+                "category": "%AWS.title%",
+                "enablement": "isCloud9 || !aws.isWebExtHost",
+                "cloud9": {
+                    "cn": {
+                        "category": "%AWS.title.cn%"
+                    }
+                }
+            },
+            {
+                "command": "aws.previewStateMachine",
+                "title": "%AWS.command.stepFunctions.previewStateMachine%",
+                "category": "%AWS.title%",
+                "enablement": "isCloud9 || !aws.isWebExtHost",
+                "icon": "$(aws-stepfunctions-preview)",
+                "cloud9": {
+                    "cn": {
+                        "category": "%AWS.title.cn%"
+                    }
+                }
+            },
+            {
+                "command": "aws.cdk.renderStateMachineGraph",
+                "title": "%AWS.command.cdk.previewStateMachine%",
+                "enablement": "isCloud9 || !aws.isWebExtHost",
+                "category": "AWS",
+                "icon": "$(aws-stepfunctions-preview)"
+            },
+            {
+                "command": "aws.aboutToolkit",
+                "title": "%AWS.command.aboutToolkit%",
+                "category": "%AWS.title%"
+            },
+            {
+                "command": "aws.cwl.viewLogStream",
+                "title": "%AWS.command.viewLogStream%",
+                "enablement": "isCloud9 || !aws.isWebExtHost",
+                "category": "%AWS.title%",
+                "cloud9": {
+                    "cn": {
+                        "category": "%AWS.title.cn%"
+                    }
+                }
+            },
+            {
+                "command": "aws.ssmDocument.createLocalDocument",
+                "title": "%AWS.command.ssmDocument.createLocalDocument%",
+                "category": "%AWS.title%",
+                "enablement": "isCloud9 || !aws.isWebExtHost",
+                "cloud9": {
+                    "cn": {
+                        "category": "%AWS.title.cn%"
+                    }
+                }
+            },
+            {
+                "command": "aws.ssmDocument.openLocalDocument",
+                "title": "%AWS.command.ssmDocument.openLocalDocument%",
+                "category": "%AWS.title%",
+                "enablement": "isCloud9 || !aws.isWebExtHost",
+                "icon": "$(cloud-download)",
+                "cloud9": {
+                    "cn": {
+                        "category": "%AWS.title.cn%"
+                    }
+                }
+            },
+            {
+                "command": "aws.ssmDocument.openLocalDocumentJson",
+                "title": "%AWS.command.ssmDocument.openLocalDocumentJson%",
+                "category": "%AWS.title%",
+                "enablement": "isCloud9 || !aws.isWebExtHost",
+                "cloud9": {
+                    "cn": {
+                        "category": "%AWS.title.cn%"
+                    }
+                }
+            },
+            {
+                "command": "aws.ssmDocument.openLocalDocumentYaml",
+                "title": "%AWS.command.ssmDocument.openLocalDocumentYaml%",
+                "category": "%AWS.title%",
+                "enablement": "isCloud9 || !aws.isWebExtHost",
+                "cloud9": {
+                    "cn": {
+                        "category": "%AWS.title.cn%"
+                    }
+                }
+            },
+            {
+                "command": "aws.ssmDocument.deleteDocument",
+                "title": "%AWS.command.ssmDocument.deleteDocument%",
+                "category": "%AWS.title%",
+                "enablement": "isCloud9 || !aws.isWebExtHost",
+                "cloud9": {
+                    "cn": {
+                        "category": "%AWS.title.cn%"
+                    }
+                }
+            },
+            {
+                "command": "aws.ssmDocument.publishDocument",
+                "title": "%AWS.command.ssmDocument.publishDocument%",
+                "category": "%AWS.title%",
+                "enablement": "isCloud9 || !aws.isWebExtHost",
+                "icon": "$(cloud-upload)",
+                "cloud9": {
+                    "cn": {
+                        "category": "%AWS.title.cn%"
+                    }
+                }
+            },
+            {
+                "command": "aws.ssmDocument.updateDocumentVersion",
+                "title": "%AWS.command.ssmDocument.updateDocumentVersion%",
+                "category": "%AWS.title%",
+                "enablement": "isCloud9 || !aws.isWebExtHost",
+                "cloud9": {
+                    "cn": {
+                        "category": "%AWS.title.cn%"
+                    }
+                }
+            },
+            {
+                "command": "aws.copyLogResource",
+                "title": "%AWS.command.copyLogResource%",
+                "category": "%AWS.title%",
+                "enablement": "isCloud9 || !aws.isWebExtHost",
+                "icon": "$(files)",
+                "cloud9": {
+                    "cn": {
+                        "category": "%AWS.title.cn%"
+                    }
+                }
+            },
+            {
+                "command": "aws.cwl.searchLogGroup",
+                "title": "%AWS.command.cloudWatchLogs.searchLogGroup%",
+                "category": "%AWS.title%",
+                "enablement": "isCloud9 || !aws.isWebExtHost",
+                "icon": "$(search-view-icon)",
+                "cloud9": {
+                    "cn": {
+                        "category": "%AWS.title.cn%"
+                    }
+                }
+            },
+            {
+                "command": "aws.saveCurrentLogDataContent",
+                "title": "%AWS.command.saveCurrentLogDataContent%",
+                "category": "%AWS.title%",
+                "enablement": "isCloud9 || !aws.isWebExtHost",
+                "icon": "$(save)",
+                "cloud9": {
+                    "cn": {
+                        "category": "%AWS.title.cn%"
+                    }
+                }
+            },
+            {
+                "command": "aws.cwl.changeFilterPattern",
+                "title": "%AWS.command.cwl.changeFilterPattern%",
+                "category": "%AWS.title%",
+                "enablement": "isCloud9 || !aws.isWebExtHost",
+                "icon": "$(search-view-icon)",
+                "cloud9": {
+                    "cn": {
+                        "category": "%AWS.title.cn%"
+                    }
+                }
+            },
+            {
+                "command": "aws.cwl.changeTimeFilter",
+                "title": "%AWS.command.cwl.changeTimeFilter%",
+                "category": "%AWS.title%",
+                "enablement": "isCloud9 || !aws.isWebExtHost",
+                "icon": "$(calendar)",
+                "cloud9": {
+                    "cn": {
+                        "category": "%AWS.title.cn%"
+                    }
+                }
+            },
+            {
+                "command": "aws.addSamDebugConfig",
+                "title": "%AWS.command.addSamDebugConfig%",
+                "category": "%AWS.title%",
+                "enablement": "isCloud9 || !aws.isWebExtHost",
+                "cloud9": {
+                    "cn": {
+                        "category": "%AWS.title.cn%"
+                    }
+                }
+            },
+            {
+                "command": "aws.toggleSamCodeLenses",
+                "title": "%AWS.command.toggleSamCodeLenses%",
+                "category": "%AWS.title%",
+                "enablement": "isCloud9 || !aws.isWebExtHost",
+                "cloud9": {
+                    "cn": {
+                        "category": "%AWS.title.cn%"
+                    }
+                }
+            },
+            {
+                "command": "aws.ecs.runCommandInContainer",
+                "title": "%AWS.ecs.runCommandInContainer%",
+                "category": "%AWS.title%",
+                "enablement": "viewItem == awsEcsContainerNodeExecEnabled",
+                "cloud9": {
+                    "cn": {
+                        "category": "%AWS.title.cn%"
+                    }
+                }
+            },
+            {
+                "command": "aws.ecs.openTaskInTerminal",
+                "title": "%AWS.ecs.openTaskInTerminal%",
+                "category": "%AWS.title%",
+                "enablement": "viewItem == awsEcsContainerNodeExecEnabled",
+                "cloud9": {
+                    "cn": {
+                        "category": "%AWS.title.cn%"
+                    }
+                }
+            },
+            {
+                "command": "aws.ecs.enableEcsExec",
+                "title": "%AWS.ecs.enableEcsExec%",
+                "category": "%AWS.title%",
+                "enablement": "isCloud9 || !aws.isWebExtHost",
+                "cloud9": {
+                    "cn": {
+                        "category": "%AWS.title.cn%"
+                    }
+                }
+            },
+            {
+                "command": "aws.ecs.viewDocumentation",
+                "title": "%AWS.generic.viewDocs%",
+                "category": "%AWS.title%",
+                "enablement": "isCloud9 || !aws.isWebExtHost",
+                "cloud9": {
+                    "cn": {
+                        "category": "%AWS.title.cn%"
+                    }
+                }
+            },
+            {
+                "command": "aws.resources.copyIdentifier",
+                "title": "%AWS.command.resources.copyIdentifier%",
+                "category": "%AWS.title%",
+                "enablement": "isCloud9 || !aws.isWebExtHost",
+                "cloud9": {
+                    "cn": {
+                        "category": "%AWS.title.cn%"
+                    }
+                }
+            },
+            {
+                "command": "aws.resources.openResourcePreview",
+                "title": "%AWS.generic.preview%",
+                "category": "%AWS.title%",
+                "enablement": "isCloud9 || !aws.isWebExtHost",
+                "icon": "$(open-preview)",
+                "cloud9": {
+                    "cn": {
+                        "category": "%AWS.title.cn%"
+                    }
+                }
+            },
+            {
+                "command": "aws.resources.createResource",
+                "title": "%AWS.generic.create%",
+                "category": "%AWS.title%",
+                "enablement": "isCloud9 || !aws.isWebExtHost",
+                "icon": "$(add)",
+                "cloud9": {
+                    "cn": {
+                        "category": "%AWS.title.cn%"
+                    }
+                }
+            },
+            {
+                "command": "aws.resources.deleteResource",
+                "title": "%AWS.generic.promptDelete%",
+                "category": "%AWS.title%",
+                "enablement": "isCloud9 || !aws.isWebExtHost",
+                "cloud9": {
+                    "cn": {
+                        "category": "%AWS.title.cn%"
+                    }
+                }
+            },
+            {
+                "command": "aws.resources.updateResource",
+                "title": "%AWS.generic.promptUpdate%",
+                "category": "%AWS.title%",
+                "enablement": "isCloud9 || !aws.isWebExtHost",
+                "icon": "$(pencil)",
+                "cloud9": {
+                    "cn": {
+                        "category": "%AWS.title.cn%"
+                    }
+                }
+            },
+            {
+                "command": "aws.resources.updateResourceInline",
+                "title": "%AWS.generic.promptUpdate%",
+                "category": "%AWS.title%",
+                "enablement": "isCloud9 || !aws.isWebExtHost",
+                "icon": "$(pencil)",
+                "cloud9": {
+                    "cn": {
+                        "category": "%AWS.title.cn%"
+                    }
+                }
+            },
+            {
+                "command": "aws.resources.saveResource",
+                "title": "%AWS.generic.save%",
+                "category": "%AWS.title%",
+                "enablement": "isCloud9 || !aws.isWebExtHost",
+                "icon": "$(save)",
+                "cloud9": {
+                    "cn": {
+                        "category": "%AWS.title.cn%"
+                    }
+                }
+            },
+            {
+                "command": "aws.resources.closeResource",
+                "title": "%AWS.generic.close%",
+                "category": "%AWS.title%",
+                "enablement": "isCloud9 || !aws.isWebExtHost",
+                "icon": "$(close)",
+                "cloud9": {
+                    "cn": {
+                        "category": "%AWS.title.cn%"
+                    }
+                }
+            },
+            {
+                "command": "aws.resources.viewDocs",
+                "title": "%AWS.generic.viewDocs%",
+                "category": "%AWS.title%",
+                "enablement": "isCloud9 || !aws.isWebExtHost",
+                "icon": "$(book)",
+                "cloud9": {
+                    "cn": {
+                        "category": "%AWS.title.cn%"
+                    }
+                }
+            },
+            {
+                "command": "aws.resources.configure",
+                "title": "%AWS.command.resources.configure%",
+                "category": "%AWS.title%",
+                "enablement": "isCloud9 || !aws.isWebExtHost",
+                "icon": "$(gear)",
+                "cloud9": {
+                    "cn": {
+                        "category": "%AWS.title.cn%"
+                    }
+                }
+            },
+            {
+                "command": "aws.apprunner.createService",
+                "title": "%AWS.command.apprunner.createService%",
+                "category": "%AWS.title%",
+                "enablement": "isCloud9 || !aws.isWebExtHost",
+                "cloud9": {
+                    "cn": {
+                        "category": "%AWS.title.cn%"
+                    }
+                }
+            },
+            {
+                "command": "aws.ecs.disableEcsExec",
+                "title": "%AWS.ecs.disableEcsExec%",
+                "category": "%AWS.title%",
+                "enablement": "isCloud9 || !aws.isWebExtHost",
+                "cloud9": {
+                    "cn": {
+                        "category": "%AWS.title.cn%"
+                    }
+                }
+            },
+            {
+                "command": "aws.apprunner.createServiceFromEcr",
+                "title": "%AWS.command.apprunner.createServiceFromEcr%",
+                "category": "%AWS.title%",
+                "enablement": "isCloud9 || !aws.isWebExtHost",
+                "cloud9": {
+                    "cn": {
+                        "category": "%AWS.title.cn%"
+                    }
+                }
+            },
+            {
+                "command": "aws.apprunner.pauseService",
+                "title": "%AWS.command.apprunner.pauseService%",
+                "category": "%AWS.title%",
+                "enablement": "isCloud9 || !aws.isWebExtHost",
+                "cloud9": {
+                    "cn": {
+                        "category": "%AWS.title.cn%"
+                    }
+                }
+            },
+            {
+                "command": "aws.apprunner.resumeService",
+                "title": "%AWS.command.apprunner.resumeService%",
+                "category": "AWS",
+                "enablement": "isCloud9 || !aws.isWebExtHost",
+                "cloud9": {
+                    "cn": {
+                        "category": "%AWS.title.cn%"
+                    }
+                }
+            },
+            {
+                "command": "aws.apprunner.copyServiceUrl",
+                "title": "%AWS.command.apprunner.copyServiceUrl%",
+                "category": "%AWS.title%",
+                "enablement": "isCloud9 || !aws.isWebExtHost",
+                "cloud9": {
+                    "cn": {
+                        "category": "%AWS.title.cn%"
+                    }
+                }
+            },
+            {
+                "command": "aws.apprunner.open",
+                "title": "%AWS.command.apprunner.open%",
+                "category": "%AWS.title%",
+                "enablement": "isCloud9 || !aws.isWebExtHost",
+                "cloud9": {
+                    "cn": {
+                        "category": "%AWS.title.cn%"
+                    }
+                }
+            },
+            {
+                "command": "aws.apprunner.deleteService",
+                "title": "%AWS.generic.promptDelete%",
+                "category": "%AWS.title%",
+                "enablement": "isCloud9 || !aws.isWebExtHost",
+                "cloud9": {
+                    "cn": {
+                        "category": "%AWS.title.cn%"
+                    }
+                }
+            },
+            {
+                "command": "aws.apprunner.startDeployment",
+                "title": "%AWS.command.apprunner.startDeployment%",
+                "category": "%AWS.title%",
+                "enablement": "isCloud9 || !aws.isWebExtHost",
+                "cloud9": {
+                    "cn": {
+                        "category": "%AWS.title.cn%"
+                    }
+                }
+            },
+            {
+                "command": "aws.cloudFormation.newTemplate",
+                "title": "%AWS.command.cloudFormation.newTemplate%",
+                "category": "%AWS.title%",
+                "enablement": "isCloud9 || !aws.isWebExtHost",
+                "cloud9": {
+                    "cn": {
+                        "category": "%AWS.title.cn%"
+                    }
+                }
+            },
+            {
+                "command": "aws.sam.newTemplate",
+                "title": "%AWS.command.sam.newTemplate%",
+                "category": "%AWS.title%",
+                "enablement": "isCloud9 || !aws.isWebExtHost",
+                "cloud9": {
+                    "cn": {
+                        "category": "%AWS.title.cn%"
+                    }
+                }
+            },
+            {
+                "command": "aws.samcli.sync",
+                "title": "%AWS.command.samcli.sync%",
+                "category": "%AWS.title%",
+                "enablement": "isCloud9 || !aws.isWebExtHost"
+            },
+            {
+                "command": "aws.codeWhisperer",
+                "title": "%AWS.command.codewhisperer.title%",
+                "category": "%AWS.title%"
+            },
+            {
+                "command": "aws.codeWhisperer.configure",
+                "title": "%AWS.command.codewhisperer.configure%",
+                "category": "%AWS.title%",
+                "icon": "$(gear)",
+                "cloud9": {
+                    "cn": {
+                        "category": "%AWS.title.cn%"
+                    }
+                }
+            },
+            {
+                "command": "aws.codeWhisperer.introduction",
+                "title": "%AWS.command.codewhisperer.introduction%",
+                "category": "%AWS.title%",
+                "icon": "$(question)",
+                "cloud9": {
+                    "cn": {
+                        "category": "%AWS.title.cn%"
+                    }
+                }
+            },
+            {
+                "command": "aws.codewhisperer.signout",
+                "title": "%AWS.command.codewhisperer.signout%",
+                "category": "%AWS.title%",
+                "icon": "$(debug-disconnect)"
+            },
+            {
+                "command": "aws.amazonq.learnMore",
+                "title": "%AWS.amazonq.learnMore%",
+                "category": "%AWS.title%"
+            },
+            {
+                "command": "aws.amazonq.welcome",
+                "title": "%AWS.command.q.welcome%",
+                "category": "%AWS.title%"
+            },
+            {
+                "command": "aws.dev.openMenu",
+                "title": "Open Developer Menu",
+                "category": "AWS (Developer)",
+                "enablement": "aws.isDevMode"
+            },
+            {
+                "command": "aws.dev.viewLogs",
+                "title": "Watch Logs",
+                "category": "AWS (Developer)"
+            },
+            {
+                "command": "aws.openInApplicationComposerDialog",
+                "title": "%AWS.command.applicationComposer.openDialog%",
+                "category": "%AWS.title%",
+                "cloud9": {
+                    "cn": {
+                        "category": "%AWS.title.cn%"
+                    }
+                }
+            },
+            {
+                "command": "aws.openInApplicationComposer",
+                "title": "%AWS.command.applicationComposer.open%",
+                "category": "%AWS.title%",
+                "icon": {
+                    "dark": "resources/icons/aws/applicationcomposer/icon-dark.svg",
+                    "light": "resources/icons/aws/applicationcomposer/icon.svg"
+                },
+                "cloud9": {
+                    "cn": {
+                        "category": "%AWS.title.cn%"
+                    }
+                }
+            },
+            {
+                "command": "aws.amazonq.startTransformationInHub",
+                "title": "Start Transformation",
+                "icon": "$(play)",
+                "enablement": "gumby.isTransformAvailable"
+            },
+            {
+                "command": "aws.amazonq.stopTransformationInHub",
+                "title": "Stop Transformation",
+                "icon": "$(stop)",
+                "enablement": "gumby.isStopButtonAvailable"
+            },
+            {
+                "command": "aws.amazonq.showPlanProgressInHub",
+                "title": "Show Transformation Status",
+                "icon": "$(checklist)"
+            },
+            {
+                "command": "aws.amazonq.showHistoryInHub",
+                "title": "Show Job Status",
+                "icon": "$(history)"
+            },
+            {
+                "command": "aws.amazonq.showTransformationPlanInHub",
+                "title": "Show Transformation Plan",
+                "enablement": "gumby.isPlanAvailable"
+            }
+        ],
+        "jsonValidation": [
+            {
+                "fileMatch": ".aws/templates.json",
+                "url": "./dist/src/templates/templates.json"
+            },
+            {
+                "fileMatch": "*ecs-task-def.json",
+                "url": "https://ecs-intellisense.s3-us-west-2.amazonaws.com/task-definition/schema.json"
+            }
+        ],
+        "languages": [
+            {
+                "id": "asl",
+                "extensions": [
+                    ".asl.json",
+                    ".asl"
+                ],
+                "aliases": [
+                    "Amazon States Language"
+                ]
+            },
+            {
+                "id": "asl-yaml",
+                "aliases": [
+                    "Amazon States Language (YAML)"
+                ],
+                "extensions": [
+                    ".asl.yaml",
+                    ".asl.yml"
+                ]
+            },
+            {
+                "id": "ssm-json",
+                "extensions": [
+                    ".ssm.json"
+                ],
+                "aliases": [
+                    "AWS Systems Manager Document (JSON)"
+                ]
+            },
+            {
+                "id": "ssm-yaml",
+                "extensions": [
+                    ".ssm.yaml",
+                    ".ssm.yml"
+                ],
+                "aliases": [
+                    "AWS Systems Manager Document (YAML)"
+                ]
+            }
+        ],
+        "keybindings": [
+            {
+                "command": "aws.amazonq.explainCode",
+                "win": "win+alt+e",
+                "mac": "cmd+alt+e",
+                "linux": "meta+alt+e",
+                "when": "editorHasSelection"
+            },
+            {
+                "command": "aws.amazonq.refactorCode",
+                "win": "win+alt+u",
+                "mac": "cmd+alt+u",
+                "linux": "meta+alt+u",
+                "when": "editorHasSelection"
+            },
+            {
+                "command": "aws.amazonq.fixCode",
+                "win": "win+alt+y",
+                "mac": "cmd+alt+y",
+                "linux": "meta+alt+y",
+                "when": "editorHasSelection"
+            },
+            {
+                "command": "aws.amazonq.optimizeCode",
+                "win": "win+alt+a",
+                "mac": "cmd+alt+a",
+                "linux": "meta+alt+a",
+                "when": "editorHasSelection"
+            },
+            {
+                "command": "aws.amazonq.sendToPrompt",
+                "key": "win+alt+q",
+                "mac": "cmd+alt+q",
+                "linux": "meta+alt+q"
+            },
+            {
+                "command": "aws.previewStateMachine",
+                "key": "ctrl+shift+v",
+                "mac": "cmd+shift+v",
+                "when": "editorTextFocus && editorLangId == asl || editorTextFocus && editorLangId == asl-yaml"
+            },
+            {
+                "command": "aws.codeWhisperer",
+                "key": "alt+c",
+                "mac": "alt+c",
+                "when": "editorTextFocus && aws.codewhisperer.connected || isCloud9 && editorTextFocus"
+            },
+            {
+                "command": "aws.codeWhisperer.rejectCodeSuggestion",
+                "key": "escape",
+                "mac": "escape",
+                "when": "inlineSuggestionVisible && !editorReadonly && aws.codewhisperer.connected || isCloud9 && suggestWidgetVisible && !editorReadonly"
+            },
+            {
+                "key": "right",
+                "command": "editor.action.inlineSuggest.showNext",
+                "when": "inlineSuggestionVisible && !editorReadonly && aws.codewhisperer.connected"
+            },
+            {
+                "key": "left",
+                "command": "editor.action.inlineSuggest.showPrevious",
+                "when": "inlineSuggestionVisible && !editorReadonly && aws.codewhisperer.connected"
+            }
+        ],
+        "grammars": [
+            {
+                "language": "asl",
+                "scopeName": "source.asl",
+                "path": "./syntaxes/ASL.tmLanguage"
+            },
+            {
+                "language": "asl-yaml",
+                "scopeName": "source.asl.yaml",
+                "path": "./syntaxes/asl-yaml.tmLanguage.json"
+            },
+            {
+                "language": "ssm-json",
+                "scopeName": "source.ssmjson",
+                "path": "./syntaxes/SSMJSON.tmLanguage"
+            },
+            {
+                "language": "ssm-yaml",
+                "scopeName": "source.ssmyaml",
+                "path": "./syntaxes/SSMYAML.tmLanguage"
+            }
+        ],
+        "resourceLabelFormatters": [
+            {
+                "scheme": "aws-cwl",
+                "formatting": {
+                    "label": "${path}",
+                    "separator": "/"
+                }
+            },
+            {
+                "scheme": "s3*",
+                "formatting": {
+                    "label": "[S3] ${path}",
+                    "separator": "/"
+                }
+            }
+        ],
+        "walkthroughs": [],
+        "icons": {
+            "aws-amazonq-q-gradient": {
+                "description": "AWS Contributed Icon",
+                "default": {
+                    "fontPath": "./resources/fonts/aws-toolkit-icons.woff",
+                    "fontCharacter": "\\f1aa"
+                }
+            },
+            "aws-amazonq-q-squid-ink": {
+                "description": "AWS Contributed Icon",
+                "default": {
+                    "fontPath": "./resources/fonts/aws-toolkit-icons.woff",
+                    "fontCharacter": "\\f1ab"
+                }
+            },
+            "aws-amazonq-q-white": {
+                "description": "AWS Contributed Icon",
+                "default": {
+                    "fontPath": "./resources/fonts/aws-toolkit-icons.woff",
+                    "fontCharacter": "\\f1ac"
+                }
+            },
+            "aws-amazonq-transform-landing-page-icon": {
+                "description": "AWS Contributed Icon",
+                "default": {
+                    "fontPath": "./resources/fonts/aws-toolkit-icons.woff",
+                    "fontCharacter": "\\f1ad"
+                }
+            },
+            "aws-applicationcomposer-icon": {
+                "description": "AWS Contributed Icon",
+                "default": {
+                    "fontPath": "./resources/fonts/aws-toolkit-icons.woff",
+                    "fontCharacter": "\\f1ae"
+                }
+            },
+            "aws-applicationcomposer-icon-dark": {
+                "description": "AWS Contributed Icon",
+                "default": {
+                    "fontPath": "./resources/fonts/aws-toolkit-icons.woff",
+                    "fontCharacter": "\\f1af"
+                }
+            },
+            "aws-apprunner-service": {
+                "description": "AWS Contributed Icon",
+                "default": {
+                    "fontPath": "./resources/fonts/aws-toolkit-icons.woff",
+                    "fontCharacter": "\\f1b0"
+                }
+            },
+            "aws-cdk-logo": {
+                "description": "AWS Contributed Icon",
+                "default": {
+                    "fontPath": "./resources/fonts/aws-toolkit-icons.woff",
+                    "fontCharacter": "\\f1b1"
+                }
+            },
+            "aws-cloudformation-stack": {
+                "description": "AWS Contributed Icon",
+                "default": {
+                    "fontPath": "./resources/fonts/aws-toolkit-icons.woff",
+                    "fontCharacter": "\\f1b2"
+                }
+            },
+            "aws-cloudwatch-log-group": {
+                "description": "AWS Contributed Icon",
+                "default": {
+                    "fontPath": "./resources/fonts/aws-toolkit-icons.woff",
+                    "fontCharacter": "\\f1b3"
+                }
+            },
+            "aws-codecatalyst-logo": {
+                "description": "AWS Contributed Icon",
+                "default": {
+                    "fontPath": "./resources/fonts/aws-toolkit-icons.woff",
+                    "fontCharacter": "\\f1b4"
+                }
+            },
+            "aws-codewhisperer-icon-black": {
+                "description": "AWS Contributed Icon",
+                "default": {
+                    "fontPath": "./resources/fonts/aws-toolkit-icons.woff",
+                    "fontCharacter": "\\f1b5"
+                }
+            },
+            "aws-codewhisperer-icon-white": {
+                "description": "AWS Contributed Icon",
+                "default": {
+                    "fontPath": "./resources/fonts/aws-toolkit-icons.woff",
+                    "fontCharacter": "\\f1b6"
+                }
+            },
+            "aws-codewhisperer-learn": {
+                "description": "AWS Contributed Icon",
+                "default": {
+                    "fontPath": "./resources/fonts/aws-toolkit-icons.woff",
+                    "fontCharacter": "\\f1b7"
+                }
+            },
+            "aws-ecr-registry": {
+                "description": "AWS Contributed Icon",
+                "default": {
+                    "fontPath": "./resources/fonts/aws-toolkit-icons.woff",
+                    "fontCharacter": "\\f1b8"
+                }
+            },
+            "aws-ecs-cluster": {
+                "description": "AWS Contributed Icon",
+                "default": {
+                    "fontPath": "./resources/fonts/aws-toolkit-icons.woff",
+                    "fontCharacter": "\\f1b9"
+                }
+            },
+            "aws-ecs-container": {
+                "description": "AWS Contributed Icon",
+                "default": {
+                    "fontPath": "./resources/fonts/aws-toolkit-icons.woff",
+                    "fontCharacter": "\\f1ba"
+                }
+            },
+            "aws-ecs-service": {
+                "description": "AWS Contributed Icon",
+                "default": {
+                    "fontPath": "./resources/fonts/aws-toolkit-icons.woff",
+                    "fontCharacter": "\\f1bb"
+                }
+            },
+            "aws-generic-attach-file": {
+                "description": "AWS Contributed Icon",
+                "default": {
+                    "fontPath": "./resources/fonts/aws-toolkit-icons.woff",
+                    "fontCharacter": "\\f1bc"
+                }
+            },
+            "aws-iot-certificate": {
+                "description": "AWS Contributed Icon",
+                "default": {
+                    "fontPath": "./resources/fonts/aws-toolkit-icons.woff",
+                    "fontCharacter": "\\f1bd"
+                }
+            },
+            "aws-iot-policy": {
+                "description": "AWS Contributed Icon",
+                "default": {
+                    "fontPath": "./resources/fonts/aws-toolkit-icons.woff",
+                    "fontCharacter": "\\f1be"
+                }
+            },
+            "aws-iot-thing": {
+                "description": "AWS Contributed Icon",
+                "default": {
+                    "fontPath": "./resources/fonts/aws-toolkit-icons.woff",
+                    "fontCharacter": "\\f1bf"
+                }
+            },
+            "aws-lambda-function": {
+                "description": "AWS Contributed Icon",
+                "default": {
+                    "fontPath": "./resources/fonts/aws-toolkit-icons.woff",
+                    "fontCharacter": "\\f1c0"
+                }
+            },
+            "aws-mynah-MynahIconBlack": {
+                "description": "AWS Contributed Icon",
+                "default": {
+                    "fontPath": "./resources/fonts/aws-toolkit-icons.woff",
+                    "fontCharacter": "\\f1c1"
+                }
+            },
+            "aws-mynah-MynahIconWhite": {
+                "description": "AWS Contributed Icon",
+                "default": {
+                    "fontPath": "./resources/fonts/aws-toolkit-icons.woff",
+                    "fontCharacter": "\\f1c2"
+                }
+            },
+            "aws-mynah-logo": {
+                "description": "AWS Contributed Icon",
+                "default": {
+                    "fontPath": "./resources/fonts/aws-toolkit-icons.woff",
+                    "fontCharacter": "\\f1c3"
+                }
+            },
+            "aws-redshift-cluster": {
+                "description": "AWS Contributed Icon",
+                "default": {
+                    "fontPath": "./resources/fonts/aws-toolkit-icons.woff",
+                    "fontCharacter": "\\f1c4"
+                }
+            },
+            "aws-redshift-cluster-connected": {
+                "description": "AWS Contributed Icon",
+                "default": {
+                    "fontPath": "./resources/fonts/aws-toolkit-icons.woff",
+                    "fontCharacter": "\\f1c5"
+                }
+            },
+            "aws-redshift-database": {
+                "description": "AWS Contributed Icon",
+                "default": {
+                    "fontPath": "./resources/fonts/aws-toolkit-icons.woff",
+                    "fontCharacter": "\\f1c6"
+                }
+            },
+            "aws-redshift-redshift-cluster-connected": {
+                "description": "AWS Contributed Icon",
+                "default": {
+                    "fontPath": "./resources/fonts/aws-toolkit-icons.woff",
+                    "fontCharacter": "\\f1c7"
+                }
+            },
+            "aws-redshift-schema": {
+                "description": "AWS Contributed Icon",
+                "default": {
+                    "fontPath": "./resources/fonts/aws-toolkit-icons.woff",
+                    "fontCharacter": "\\f1c8"
+                }
+            },
+            "aws-redshift-table": {
+                "description": "AWS Contributed Icon",
+                "default": {
+                    "fontPath": "./resources/fonts/aws-toolkit-icons.woff",
+                    "fontCharacter": "\\f1c9"
+                }
+            },
+            "aws-s3-bucket": {
+                "description": "AWS Contributed Icon",
+                "default": {
+                    "fontPath": "./resources/fonts/aws-toolkit-icons.woff",
+                    "fontCharacter": "\\f1ca"
+                }
+            },
+            "aws-s3-create-bucket": {
+                "description": "AWS Contributed Icon",
+                "default": {
+                    "fontPath": "./resources/fonts/aws-toolkit-icons.woff",
+                    "fontCharacter": "\\f1cb"
+                }
+            },
+            "aws-schemas-registry": {
+                "description": "AWS Contributed Icon",
+                "default": {
+                    "fontPath": "./resources/fonts/aws-toolkit-icons.woff",
+                    "fontCharacter": "\\f1cc"
+                }
+            },
+            "aws-schemas-schema": {
+                "description": "AWS Contributed Icon",
+                "default": {
+                    "fontPath": "./resources/fonts/aws-toolkit-icons.woff",
+                    "fontCharacter": "\\f1cd"
+                }
+            },
+            "aws-stepfunctions-preview": {
+                "description": "AWS Contributed Icon",
+                "default": {
+                    "fontPath": "./resources/fonts/aws-toolkit-icons.woff",
+                    "fontCharacter": "\\f1ce"
+                }
+            }
+        },
+        "notebooks": [
+            {
+                "type": "aws-redshift-sql-notebook",
+                "displayName": "Redshift SQL notebook",
+                "selector": [
+                    {
+                        "filenamePattern": "*.redshiftnb"
+                    }
+                ]
+            }
+        ]
+    },
+    "scripts": {
+        "postinstall": "npm run generateTelemetry && npm run generateConfigurationAttributes",
+        "vscode:prepublish": "npm run clean && npm run buildScripts && webpack --mode production && npm run copyFiles",
+        "clean": "ts-node ../../scripts/clean.ts dist/ LICENSE NOTICE quickStart* README* CHANGELOG.md",
+        "copyFiles": "ts-node ./scripts/build/copyFiles.ts",
+        "buildScripts": "npm run generateClients && npm run generatePackage && npm run generateNonCodeFiles && npm run copyFiles",
+        "browserWatch": "npm run clean && npm run buildScripts && webpack --config webpack.browser.config.js --watch",
+        "browserRun": "npx @vscode/test-web --open-devtools --browserOption=--disable-web-security --waitForDebugger=9222 --extensionDevelopmentPath=. .",
+        "compile": "npm run clean && npm run buildScripts && webpack --mode development && npm run copyFiles",
+        "watch": "npm run clean && npm run buildScripts && tsc -watch -p ./",
+        "testCompile": "npm run buildScripts && tsc -p ./",
+        "test": "npm run testCompile && c8 ts-node ./scripts/test/test.ts",
+        "testE2E": "npm run testCompile && c8 ts-node ./scripts/test/testE2E.ts",
+        "testInteg": "npm run testCompile && c8 ts-node ./scripts/test/testInteg.ts",
+        "format": "prettier --ignore-path ../../.prettierignore --check src scripts",
+        "formatfix": "prettier --ignore-path ../../.prettierignore --write src scripts",
+        "lint": "ts-node ./scripts/lint/testLint.ts && npm run format",
+        "package": "ts-node ./scripts/build/package.ts",
+        "install-plugin": "vsce package -o aws-toolkit-vscode-test.vsix && code --install-extension aws-toolkit-vscode-test.vsix",
+        "generateClients": "npm run build -w @amzn/codewhisperer-streaming && ts-node ./scripts/build/generateServiceClient.ts ",
+        "generatePackage": "ts-node ./scripts/build/generateIcons.ts",
+        "generateTelemetry": "node ../../node_modules/@aws-toolkits/telemetry/lib/generateTelemetry.js --extraInput=src/shared/telemetry/vscodeTelemetry.json --output=src/shared/telemetry/telemetry.gen.ts",
+        "generateNonCodeFiles": "ts-node ./scripts/build/generateNonCodeFiles.ts",
+        "generateConfigurationAttributes": "ts-node ./scripts/build/generateConfigurationAttributes.ts",
+        "createRelease": "ts-node ./scripts/build/createRelease.ts",
+        "serve": "webpack serve --config-name vue-hmr --mode development"
+    },
+    "devDependencies": {
+        "@aws-sdk/types": "^3.13.1",
+        "@aws-toolkits/telemetry": "^1.0.184",
+        "@aws/fully-qualified-names": "^2.1.1",
+        "@cspotcode/source-map-support": "^0.8.1",
+        "@sinonjs/fake-timers": "^10.0.2",
+        "@types/adm-zip": "^0.4.34",
+        "@types/async-lock": "^1.4.0",
+        "@types/bytes": "^3.1.0",
+        "@types/circular-dependency-plugin": "^5.0.8",
+        "@types/cross-spawn": "^6.0.6",
+        "@types/diff": "^5.0.7",
+        "@types/fs-extra": "^9.0.11",
+        "@types/glob": "^8.1.0",
+        "@types/js-yaml": "^4.0.5",
+        "@types/jsdom": "^21.1.6",
+        "@types/lodash": "^4.14.180",
+        "@types/markdown-it": "^13.0.2",
+        "@types/mime-types": "^2.1.4",
+        "@types/mocha": "^10.0.6",
+        "@types/node": "^14.18.63",
+        "@types/node-fetch": "^2.6.8",
+        "@types/prismjs": "^1.26.0",
+        "@types/readline-sync": "^1.4.3",
+        "@types/sanitize-html": "2.3.1",
+        "@types/semver": "^7.5.0",
+        "@types/sinon": "^10.0.5",
+        "@types/sinonjs__fake-timers": "^8.1.2",
+        "@types/tcp-port-used": "^1.0.1",
+        "@types/uuid": "^9.0.1",
+        "@types/webpack-env": "^1.18.1",
+        "@types/whatwg-url": "^11.0.4",
+        "@types/xml2js": "^0.4.11",
+        "@typescript-eslint/eslint-plugin": "^5.59.0",
+        "@typescript-eslint/parser": "^5.59.1",
+        "@vue/compiler-sfc": "^3.3.2",
+        "c8": "^9.0.0",
+        "circular-dependency-plugin": "^5.2.2",
+        "css-loader": "^6.10.0",
+        "diff": "^5.1.0",
+        "esbuild-loader": "2.20.0",
+        "file-loader": "^6.2.0",
+        "jsdom": "^23.0.1",
+        "json-schema-to-typescript": "^13.1.1",
+        "marked": "^11.1.1",
+        "mocha": "^10.1.0",
+        "mocha-junit-reporter": "^2.2.1",
+        "mocha-multi-reporters": "^1.5.1",
+        "readline-sync": "^1.4.9",
+        "sass": "^1.49.8",
+        "sass-loader": "^12.6.0",
+        "sinon": "^14.0.0",
+        "style-loader": "^3.3.1",
+        "umd-compat-loader": "^2.1.2",
+        "vscode-nls-dev": "^4.0.4",
+        "vue-loader": "^17.2.2",
+        "vue-style-loader": "^4.1.3",
+        "webfont": "^11.2.26",
+        "webpack": "^5.83.0",
+        "webpack-cli": "^5.1.4",
+        "webpack-dev-server": "^4.15.1",
+        "typescript": "^5.0.4",
+        "ts-node": "^10.9.1"
+    },
+    "dependencies": {
+        "@amzn/codewhisperer-streaming": "file:../../src.gen/@amzn/codewhisperer-streaming",
+        "@aws-sdk/client-cognito-identity": "3.490.0",
+        "@aws-sdk/client-lambda": "3.385.0",
+        "@aws-sdk/client-sso": "^3.342.0",
+        "@aws-sdk/client-sso-oidc": "^3.181.0",
+        "@aws-sdk/credential-provider-ini": "3.46.0",
+        "@aws-sdk/credential-provider-process": "3.37.0",
+        "@aws-sdk/credential-provider-sso": "^3.345.0",
+        "@aws-sdk/property-provider": "3.46.0",
+        "@aws-sdk/smithy-client": "^3.46.0",
+        "@aws-sdk/util-arn-parser": "^3.46.0",
+        "@aws/mynah-ui": "3.3.3",
+        "@gerhobbelt/gitignore-parser": "^0.2.0-9",
+        "@iarna/toml": "^2.2.5",
+        "@smithy/shared-ini-file-loader": "^2.2.8",
+        "@vscode/debugprotocol": "^1.57.0",
+        "adm-zip": "^0.5.10",
+        "amazon-states-language-service": "^1.11.0",
+        "async-lock": "^1.4.0",
+        "aws-sdk": "^2.1384.0",
+        "aws-ssm-document-language-service": "^1.0.0",
+        "bytes": "^3.1.2",
+        "cross-fetch": "^4.0.0",
+        "cross-spawn": "^7.0.3",
+        "fast-json-patch": "^3.1.1",
+        "fs-extra": "^10.0.1",
+        "glob": "^10.3.10",
+        "got": "^11.8.5",
+        "highlight.js": "^11.9.0",
+        "i18n-ts": "^1.0.5",
+        "immutable": "^4.3.0",
+        "js-yaml": "^4.1.0",
+        "jsonc-parser": "^3.2.0",
+        "lodash": "^4.17.21",
+        "markdown-it": "^13.0.2",
+        "mime-types": "^2.1.32",
+        "node-fetch": "^2.7.0",
+        "portfinder": "^1.0.32",
+        "sanitize-html": "^2.3.3",
+        "semver": "^7.5.4",
+        "strip-ansi": "^5.2.0",
+        "tcp-port-used": "^1.0.1",
+        "uuid": "^9.0.0",
+        "vscode-languageclient": "^6.1.4",
+        "vscode-languageserver": "^6.1.1",
+        "vscode-languageserver-protocol": "^3.15.3",
+        "vscode-languageserver-textdocument": "^1.0.8",
+        "vscode-nls": "^5.2.0",
+        "vue": "^3.3.4",
+        "web-tree-sitter": "^0.20.7",
+        "whatwg-url": "^14.0.0",
+        "winston": "^3.11.0",
+        "winston-transport": "^4.6.0",
+        "xml2js": "^0.6.1",
+        "yaml-cfn": "^0.3.2"
+    },
+    "overrides": {
+        "webfont": {
+            "xml2js": "0.5.0"
+        }
+    },
+    "workspaces": [
+        "src/browser"
+    ]
+}
diff --git a/package.nls.json b/packages/toolkit/package.nls.json
similarity index 100%
rename from package.nls.json
rename to packages/toolkit/package.nls.json
diff --git a/resources/amazonq-logo.svg b/packages/toolkit/resources/amazonq-logo.svg
similarity index 100%
rename from resources/amazonq-logo.svg
rename to packages/toolkit/resources/amazonq-logo.svg
diff --git a/resources/aws-cn-logo.svg b/packages/toolkit/resources/aws-cn-logo.svg
similarity index 100%
rename from resources/aws-cn-logo.svg
rename to packages/toolkit/resources/aws-cn-logo.svg
diff --git a/resources/aws-logo.svg b/packages/toolkit/resources/aws-logo.svg
similarity index 100%
rename from resources/aws-logo.svg
rename to packages/toolkit/resources/aws-logo.svg
diff --git a/resources/codecatalyst_connect b/packages/toolkit/resources/codecatalyst_connect
similarity index 100%
rename from resources/codecatalyst_connect
rename to packages/toolkit/resources/codecatalyst_connect
diff --git a/resources/codecatalyst_connect.ps1 b/packages/toolkit/resources/codecatalyst_connect.ps1
similarity index 100%
rename from resources/codecatalyst_connect.ps1
rename to packages/toolkit/resources/codecatalyst_connect.ps1
diff --git a/resources/css/base-cloud9.css b/packages/toolkit/resources/css/base-cloud9.css
similarity index 100%
rename from resources/css/base-cloud9.css
rename to packages/toolkit/resources/css/base-cloud9.css
diff --git a/resources/css/base.css b/packages/toolkit/resources/css/base.css
similarity index 100%
rename from resources/css/base.css
rename to packages/toolkit/resources/css/base.css
diff --git a/resources/css/executeStateMachine.css b/packages/toolkit/resources/css/executeStateMachine.css
similarity index 100%
rename from resources/css/executeStateMachine.css
rename to packages/toolkit/resources/css/executeStateMachine.css
diff --git a/resources/css/searchSchemas.css b/packages/toolkit/resources/css/searchSchemas.css
similarity index 100%
rename from resources/css/searchSchemas.css
rename to packages/toolkit/resources/css/searchSchemas.css
diff --git a/resources/css/securityIssue.css b/packages/toolkit/resources/css/securityIssue.css
similarity index 100%
rename from resources/css/securityIssue.css
rename to packages/toolkit/resources/css/securityIssue.css
diff --git a/resources/css/stateMachineRender.css b/packages/toolkit/resources/css/stateMachineRender.css
similarity index 100%
rename from resources/css/stateMachineRender.css
rename to packages/toolkit/resources/css/stateMachineRender.css
diff --git a/resources/css/submitFeedback.css b/packages/toolkit/resources/css/submitFeedback.css
similarity index 100%
rename from resources/css/submitFeedback.css
rename to packages/toolkit/resources/css/submitFeedback.css
diff --git a/resources/debugger/py_debug_wrapper.py b/packages/toolkit/resources/debugger/py_debug_wrapper.py
similarity index 100%
rename from resources/debugger/py_debug_wrapper.py
rename to packages/toolkit/resources/debugger/py_debug_wrapper.py
diff --git a/resources/ec2_connect b/packages/toolkit/resources/ec2_connect
similarity index 100%
rename from resources/ec2_connect
rename to packages/toolkit/resources/ec2_connect
diff --git a/resources/endpoints.json b/packages/toolkit/resources/endpoints.json
similarity index 100%
rename from resources/endpoints.json
rename to packages/toolkit/resources/endpoints.json
diff --git a/resources/icons/aws/amazonq/q-gradient.svg b/packages/toolkit/resources/icons/aws/amazonq/q-gradient.svg
similarity index 100%
rename from resources/icons/aws/amazonq/q-gradient.svg
rename to packages/toolkit/resources/icons/aws/amazonq/q-gradient.svg
diff --git a/resources/icons/aws/amazonq/q-squid-ink.svg b/packages/toolkit/resources/icons/aws/amazonq/q-squid-ink.svg
similarity index 100%
rename from resources/icons/aws/amazonq/q-squid-ink.svg
rename to packages/toolkit/resources/icons/aws/amazonq/q-squid-ink.svg
diff --git a/resources/icons/aws/amazonq/q-white.svg b/packages/toolkit/resources/icons/aws/amazonq/q-white.svg
similarity index 100%
rename from resources/icons/aws/amazonq/q-white.svg
rename to packages/toolkit/resources/icons/aws/amazonq/q-white.svg
diff --git a/resources/icons/aws/amazonq/transform-landing-page-icon.svg b/packages/toolkit/resources/icons/aws/amazonq/transform-landing-page-icon.svg
similarity index 100%
rename from resources/icons/aws/amazonq/transform-landing-page-icon.svg
rename to packages/toolkit/resources/icons/aws/amazonq/transform-landing-page-icon.svg
diff --git a/resources/icons/aws/applicationcomposer/icon-dark.svg b/packages/toolkit/resources/icons/aws/applicationcomposer/icon-dark.svg
similarity index 100%
rename from resources/icons/aws/applicationcomposer/icon-dark.svg
rename to packages/toolkit/resources/icons/aws/applicationcomposer/icon-dark.svg
diff --git a/resources/icons/aws/applicationcomposer/icon.svg b/packages/toolkit/resources/icons/aws/applicationcomposer/icon.svg
similarity index 100%
rename from resources/icons/aws/applicationcomposer/icon.svg
rename to packages/toolkit/resources/icons/aws/applicationcomposer/icon.svg
diff --git a/resources/icons/aws/apprunner/service.svg b/packages/toolkit/resources/icons/aws/apprunner/service.svg
similarity index 100%
rename from resources/icons/aws/apprunner/service.svg
rename to packages/toolkit/resources/icons/aws/apprunner/service.svg
diff --git a/resources/icons/aws/cdk/logo.svg b/packages/toolkit/resources/icons/aws/cdk/logo.svg
similarity index 100%
rename from resources/icons/aws/cdk/logo.svg
rename to packages/toolkit/resources/icons/aws/cdk/logo.svg
diff --git a/resources/icons/aws/cloudformation/stack.svg b/packages/toolkit/resources/icons/aws/cloudformation/stack.svg
similarity index 100%
rename from resources/icons/aws/cloudformation/stack.svg
rename to packages/toolkit/resources/icons/aws/cloudformation/stack.svg
diff --git a/resources/icons/aws/cloudwatch/log-group.svg b/packages/toolkit/resources/icons/aws/cloudwatch/log-group.svg
similarity index 100%
rename from resources/icons/aws/cloudwatch/log-group.svg
rename to packages/toolkit/resources/icons/aws/cloudwatch/log-group.svg
diff --git a/resources/icons/aws/codecatalyst/logo.svg b/packages/toolkit/resources/icons/aws/codecatalyst/logo.svg
similarity index 100%
rename from resources/icons/aws/codecatalyst/logo.svg
rename to packages/toolkit/resources/icons/aws/codecatalyst/logo.svg
diff --git a/resources/icons/aws/codewhisperer/icon-black.svg b/packages/toolkit/resources/icons/aws/codewhisperer/icon-black.svg
similarity index 100%
rename from resources/icons/aws/codewhisperer/icon-black.svg
rename to packages/toolkit/resources/icons/aws/codewhisperer/icon-black.svg
diff --git a/resources/icons/aws/codewhisperer/icon-white.svg b/packages/toolkit/resources/icons/aws/codewhisperer/icon-white.svg
similarity index 100%
rename from resources/icons/aws/codewhisperer/icon-white.svg
rename to packages/toolkit/resources/icons/aws/codewhisperer/icon-white.svg
diff --git a/resources/icons/aws/codewhisperer/learn.svg b/packages/toolkit/resources/icons/aws/codewhisperer/learn.svg
similarity index 100%
rename from resources/icons/aws/codewhisperer/learn.svg
rename to packages/toolkit/resources/icons/aws/codewhisperer/learn.svg
diff --git a/resources/icons/aws/ecr/registry.svg b/packages/toolkit/resources/icons/aws/ecr/registry.svg
similarity index 100%
rename from resources/icons/aws/ecr/registry.svg
rename to packages/toolkit/resources/icons/aws/ecr/registry.svg
diff --git a/resources/icons/aws/ecs/cluster.svg b/packages/toolkit/resources/icons/aws/ecs/cluster.svg
similarity index 100%
rename from resources/icons/aws/ecs/cluster.svg
rename to packages/toolkit/resources/icons/aws/ecs/cluster.svg
diff --git a/resources/icons/aws/ecs/container.svg b/packages/toolkit/resources/icons/aws/ecs/container.svg
similarity index 100%
rename from resources/icons/aws/ecs/container.svg
rename to packages/toolkit/resources/icons/aws/ecs/container.svg
diff --git a/resources/icons/aws/ecs/service.svg b/packages/toolkit/resources/icons/aws/ecs/service.svg
similarity index 100%
rename from resources/icons/aws/ecs/service.svg
rename to packages/toolkit/resources/icons/aws/ecs/service.svg
diff --git a/resources/icons/aws/generic/attach-file.svg b/packages/toolkit/resources/icons/aws/generic/attach-file.svg
similarity index 100%
rename from resources/icons/aws/generic/attach-file.svg
rename to packages/toolkit/resources/icons/aws/generic/attach-file.svg
diff --git a/resources/icons/aws/iot/certificate.svg b/packages/toolkit/resources/icons/aws/iot/certificate.svg
similarity index 100%
rename from resources/icons/aws/iot/certificate.svg
rename to packages/toolkit/resources/icons/aws/iot/certificate.svg
diff --git a/resources/icons/aws/iot/policy.svg b/packages/toolkit/resources/icons/aws/iot/policy.svg
similarity index 100%
rename from resources/icons/aws/iot/policy.svg
rename to packages/toolkit/resources/icons/aws/iot/policy.svg
diff --git a/resources/icons/aws/iot/thing.svg b/packages/toolkit/resources/icons/aws/iot/thing.svg
similarity index 100%
rename from resources/icons/aws/iot/thing.svg
rename to packages/toolkit/resources/icons/aws/iot/thing.svg
diff --git a/resources/icons/aws/lambda/function.svg b/packages/toolkit/resources/icons/aws/lambda/function.svg
similarity index 100%
rename from resources/icons/aws/lambda/function.svg
rename to packages/toolkit/resources/icons/aws/lambda/function.svg
diff --git a/resources/icons/aws/mynah/MynahIconBlack.svg b/packages/toolkit/resources/icons/aws/mynah/MynahIconBlack.svg
similarity index 100%
rename from resources/icons/aws/mynah/MynahIconBlack.svg
rename to packages/toolkit/resources/icons/aws/mynah/MynahIconBlack.svg
diff --git a/resources/icons/aws/mynah/MynahIconWhite.svg b/packages/toolkit/resources/icons/aws/mynah/MynahIconWhite.svg
similarity index 100%
rename from resources/icons/aws/mynah/MynahIconWhite.svg
rename to packages/toolkit/resources/icons/aws/mynah/MynahIconWhite.svg
diff --git a/resources/icons/aws/mynah/logo.svg b/packages/toolkit/resources/icons/aws/mynah/logo.svg
similarity index 100%
rename from resources/icons/aws/mynah/logo.svg
rename to packages/toolkit/resources/icons/aws/mynah/logo.svg
diff --git a/resources/icons/aws/redshift/cluster-connected.svg b/packages/toolkit/resources/icons/aws/redshift/cluster-connected.svg
similarity index 100%
rename from resources/icons/aws/redshift/cluster-connected.svg
rename to packages/toolkit/resources/icons/aws/redshift/cluster-connected.svg
diff --git a/resources/icons/aws/redshift/cluster.svg b/packages/toolkit/resources/icons/aws/redshift/cluster.svg
similarity index 100%
rename from resources/icons/aws/redshift/cluster.svg
rename to packages/toolkit/resources/icons/aws/redshift/cluster.svg
diff --git a/resources/icons/aws/redshift/database.svg b/packages/toolkit/resources/icons/aws/redshift/database.svg
similarity index 100%
rename from resources/icons/aws/redshift/database.svg
rename to packages/toolkit/resources/icons/aws/redshift/database.svg
diff --git a/resources/icons/aws/redshift/redshift-cluster-connected.svg b/packages/toolkit/resources/icons/aws/redshift/redshift-cluster-connected.svg
similarity index 100%
rename from resources/icons/aws/redshift/redshift-cluster-connected.svg
rename to packages/toolkit/resources/icons/aws/redshift/redshift-cluster-connected.svg
diff --git a/resources/icons/aws/redshift/schema.svg b/packages/toolkit/resources/icons/aws/redshift/schema.svg
similarity index 100%
rename from resources/icons/aws/redshift/schema.svg
rename to packages/toolkit/resources/icons/aws/redshift/schema.svg
diff --git a/resources/icons/aws/redshift/table.svg b/packages/toolkit/resources/icons/aws/redshift/table.svg
similarity index 100%
rename from resources/icons/aws/redshift/table.svg
rename to packages/toolkit/resources/icons/aws/redshift/table.svg
diff --git a/resources/icons/aws/s3/bucket.svg b/packages/toolkit/resources/icons/aws/s3/bucket.svg
similarity index 100%
rename from resources/icons/aws/s3/bucket.svg
rename to packages/toolkit/resources/icons/aws/s3/bucket.svg
diff --git a/resources/icons/aws/s3/create-bucket.svg b/packages/toolkit/resources/icons/aws/s3/create-bucket.svg
similarity index 100%
rename from resources/icons/aws/s3/create-bucket.svg
rename to packages/toolkit/resources/icons/aws/s3/create-bucket.svg
diff --git a/resources/icons/aws/schemas/registry.svg b/packages/toolkit/resources/icons/aws/schemas/registry.svg
similarity index 100%
rename from resources/icons/aws/schemas/registry.svg
rename to packages/toolkit/resources/icons/aws/schemas/registry.svg
diff --git a/resources/icons/aws/schemas/schema.svg b/packages/toolkit/resources/icons/aws/schemas/schema.svg
similarity index 100%
rename from resources/icons/aws/schemas/schema.svg
rename to packages/toolkit/resources/icons/aws/schemas/schema.svg
diff --git a/resources/icons/aws/stepfunctions/preview.svg b/packages/toolkit/resources/icons/aws/stepfunctions/preview.svg
similarity index 100%
rename from resources/icons/aws/stepfunctions/preview.svg
rename to packages/toolkit/resources/icons/aws/stepfunctions/preview.svg
diff --git a/resources/icons/cloud9/dark/vscode-help.svg b/packages/toolkit/resources/icons/cloud9/dark/vscode-help.svg
similarity index 100%
rename from resources/icons/cloud9/dark/vscode-help.svg
rename to packages/toolkit/resources/icons/cloud9/dark/vscode-help.svg
diff --git a/resources/icons/cloud9/light/vscode-help.svg b/packages/toolkit/resources/icons/cloud9/light/vscode-help.svg
similarity index 100%
rename from resources/icons/cloud9/light/vscode-help.svg
rename to packages/toolkit/resources/icons/cloud9/light/vscode-help.svg
diff --git a/resources/icons/vscode/LICENSE.txt b/packages/toolkit/resources/icons/vscode/LICENSE.txt
similarity index 100%
rename from resources/icons/vscode/LICENSE.txt
rename to packages/toolkit/resources/icons/vscode/LICENSE.txt
diff --git a/resources/icons/vscode/README.md b/packages/toolkit/resources/icons/vscode/README.md
similarity index 100%
rename from resources/icons/vscode/README.md
rename to packages/toolkit/resources/icons/vscode/README.md
diff --git a/resources/icons/vscode/codicons/info.svg b/packages/toolkit/resources/icons/vscode/codicons/info.svg
similarity index 100%
rename from resources/icons/vscode/codicons/info.svg
rename to packages/toolkit/resources/icons/vscode/codicons/info.svg
diff --git a/resources/icons/vscode/codicons/pass.svg b/packages/toolkit/resources/icons/vscode/codicons/pass.svg
similarity index 100%
rename from resources/icons/vscode/codicons/pass.svg
rename to packages/toolkit/resources/icons/vscode/codicons/pass.svg
diff --git a/resources/icons/vscode/codicons/play-circle.svg b/packages/toolkit/resources/icons/vscode/codicons/play-circle.svg
similarity index 100%
rename from resources/icons/vscode/codicons/play-circle.svg
rename to packages/toolkit/resources/icons/vscode/codicons/play-circle.svg
diff --git a/resources/icons/vscode/codicons/stop-circle.svg b/packages/toolkit/resources/icons/vscode/codicons/stop-circle.svg
similarity index 100%
rename from resources/icons/vscode/codicons/stop-circle.svg
rename to packages/toolkit/resources/icons/vscode/codicons/stop-circle.svg
diff --git a/resources/icons/vscode/dark/check-old.svg b/packages/toolkit/resources/icons/vscode/dark/check-old.svg
similarity index 100%
rename from resources/icons/vscode/dark/check-old.svg
rename to packages/toolkit/resources/icons/vscode/dark/check-old.svg
diff --git a/resources/icons/vscode/dark/clear-all.svg b/packages/toolkit/resources/icons/vscode/dark/clear-all.svg
similarity index 100%
rename from resources/icons/vscode/dark/clear-all.svg
rename to packages/toolkit/resources/icons/vscode/dark/clear-all.svg
diff --git a/resources/icons/vscode/dark/help.svg b/packages/toolkit/resources/icons/vscode/dark/help.svg
similarity index 100%
rename from resources/icons/vscode/dark/help.svg
rename to packages/toolkit/resources/icons/vscode/dark/help.svg
diff --git a/resources/icons/vscode/dark/refresh.svg b/packages/toolkit/resources/icons/vscode/dark/refresh.svg
similarity index 100%
rename from resources/icons/vscode/dark/refresh.svg
rename to packages/toolkit/resources/icons/vscode/dark/refresh.svg
diff --git a/resources/icons/vscode/dark/shield.svg b/packages/toolkit/resources/icons/vscode/dark/shield.svg
similarity index 100%
rename from resources/icons/vscode/dark/shield.svg
rename to packages/toolkit/resources/icons/vscode/dark/shield.svg
diff --git a/resources/icons/vscode/light/check-old.svg b/packages/toolkit/resources/icons/vscode/light/check-old.svg
similarity index 100%
rename from resources/icons/vscode/light/check-old.svg
rename to packages/toolkit/resources/icons/vscode/light/check-old.svg
diff --git a/resources/icons/vscode/light/clear-all.svg b/packages/toolkit/resources/icons/vscode/light/clear-all.svg
similarity index 100%
rename from resources/icons/vscode/light/clear-all.svg
rename to packages/toolkit/resources/icons/vscode/light/clear-all.svg
diff --git a/resources/icons/vscode/light/help.svg b/packages/toolkit/resources/icons/vscode/light/help.svg
similarity index 100%
rename from resources/icons/vscode/light/help.svg
rename to packages/toolkit/resources/icons/vscode/light/help.svg
diff --git a/resources/icons/vscode/light/refresh.svg b/packages/toolkit/resources/icons/vscode/light/refresh.svg
similarity index 100%
rename from resources/icons/vscode/light/refresh.svg
rename to packages/toolkit/resources/icons/vscode/light/refresh.svg
diff --git a/resources/icons/vscode/light/shield.svg b/packages/toolkit/resources/icons/vscode/light/shield.svg
similarity index 100%
rename from resources/icons/vscode/light/shield.svg
rename to packages/toolkit/resources/icons/vscode/light/shield.svg
diff --git a/resources/images/severity-critical.svg b/packages/toolkit/resources/images/severity-critical.svg
similarity index 100%
rename from resources/images/severity-critical.svg
rename to packages/toolkit/resources/images/severity-critical.svg
diff --git a/resources/images/severity-high.svg b/packages/toolkit/resources/images/severity-high.svg
similarity index 100%
rename from resources/images/severity-high.svg
rename to packages/toolkit/resources/images/severity-high.svg
diff --git a/resources/images/severity-info.svg b/packages/toolkit/resources/images/severity-info.svg
similarity index 100%
rename from resources/images/severity-info.svg
rename to packages/toolkit/resources/images/severity-info.svg
diff --git a/resources/images/severity-low.svg b/packages/toolkit/resources/images/severity-low.svg
similarity index 100%
rename from resources/images/severity-low.svg
rename to packages/toolkit/resources/images/severity-low.svg
diff --git a/resources/images/severity-medium.svg b/packages/toolkit/resources/images/severity-medium.svg
similarity index 100%
rename from resources/images/severity-medium.svg
rename to packages/toolkit/resources/images/severity-medium.svg
diff --git a/resources/js/graphStateMachine.js b/packages/toolkit/resources/js/graphStateMachine.js
similarity index 100%
rename from resources/js/graphStateMachine.js
rename to packages/toolkit/resources/js/graphStateMachine.js
diff --git a/resources/js/vscode.js b/packages/toolkit/resources/js/vscode.js
similarity index 100%
rename from resources/js/vscode.js
rename to packages/toolkit/resources/js/vscode.js
diff --git a/resources/markdown/WelcomeToCodeWhisperer.md b/packages/toolkit/resources/markdown/WelcomeToCodeWhisperer.md
similarity index 100%
rename from resources/markdown/WelcomeToCodeWhisperer.md
rename to packages/toolkit/resources/markdown/WelcomeToCodeWhisperer.md
diff --git a/resources/markdown/WelcomeToCodeWhispererCloud9.md b/packages/toolkit/resources/markdown/WelcomeToCodeWhispererCloud9.md
similarity index 100%
rename from resources/markdown/WelcomeToCodeWhispererCloud9.md
rename to packages/toolkit/resources/markdown/WelcomeToCodeWhispererCloud9.md
diff --git a/resources/markdown/samReadme.md b/packages/toolkit/resources/markdown/samReadme.md
similarity index 100%
rename from resources/markdown/samReadme.md
rename to packages/toolkit/resources/markdown/samReadme.md
diff --git a/resources/markdown/twosum_vsc.gif b/packages/toolkit/resources/markdown/twosum_vsc.gif
similarity index 100%
rename from resources/markdown/twosum_vsc.gif
rename to packages/toolkit/resources/markdown/twosum_vsc.gif
diff --git a/resources/marketplace/aws-icon-256x256.png b/packages/toolkit/resources/marketplace/aws-icon-256x256.png
similarity index 100%
rename from resources/marketplace/aws-icon-256x256.png
rename to packages/toolkit/resources/marketplace/aws-icon-256x256.png
diff --git a/resources/marketplace/cloud9/Codelens-YAML-template.png b/packages/toolkit/resources/marketplace/cloud9/Codelens-YAML-template.png
similarity index 100%
rename from resources/marketplace/cloud9/Codelens-YAML-template.png
rename to packages/toolkit/resources/marketplace/cloud9/Codelens-YAML-template.png
diff --git a/resources/marketplace/cloud9/Codelens-direct-function.png b/packages/toolkit/resources/marketplace/cloud9/Codelens-direct-function.png
similarity index 100%
rename from resources/marketplace/cloud9/Codelens-direct-function.png
rename to packages/toolkit/resources/marketplace/cloud9/Codelens-direct-function.png
diff --git a/resources/marketplace/cloud9/open-commands-cn.png b/packages/toolkit/resources/marketplace/cloud9/open-commands-cn.png
similarity index 100%
rename from resources/marketplace/cloud9/open-commands-cn.png
rename to packages/toolkit/resources/marketplace/cloud9/open-commands-cn.png
diff --git a/resources/marketplace/cloud9/open-commands-en.png b/packages/toolkit/resources/marketplace/cloud9/open-commands-en.png
similarity index 100%
rename from resources/marketplace/cloud9/open-commands-en.png
rename to packages/toolkit/resources/marketplace/cloud9/open-commands-en.png
diff --git a/resources/marketplace/cloud9/overview-aws-explorer-cn.png b/packages/toolkit/resources/marketplace/cloud9/overview-aws-explorer-cn.png
similarity index 100%
rename from resources/marketplace/cloud9/overview-aws-explorer-cn.png
rename to packages/toolkit/resources/marketplace/cloud9/overview-aws-explorer-cn.png
diff --git a/resources/marketplace/cloud9/overview-aws-explorer-en.png b/packages/toolkit/resources/marketplace/cloud9/overview-aws-explorer-en.png
similarity index 100%
rename from resources/marketplace/cloud9/overview-aws-explorer-en.png
rename to packages/toolkit/resources/marketplace/cloud9/overview-aws-explorer-en.png
diff --git a/resources/marketplace/cloud9/sam-configure-and-run-still-cn.png b/packages/toolkit/resources/marketplace/cloud9/sam-configure-and-run-still-cn.png
similarity index 100%
rename from resources/marketplace/cloud9/sam-configure-and-run-still-cn.png
rename to packages/toolkit/resources/marketplace/cloud9/sam-configure-and-run-still-cn.png
diff --git a/resources/marketplace/cloud9/sam-configure-and-run-still-en.png b/packages/toolkit/resources/marketplace/cloud9/sam-configure-and-run-still-en.png
similarity index 100%
rename from resources/marketplace/cloud9/sam-configure-and-run-still-en.png
rename to packages/toolkit/resources/marketplace/cloud9/sam-configure-and-run-still-en.png
diff --git a/resources/vs-lambda-sample-request-manifest.xml b/packages/toolkit/resources/vs-lambda-sample-request-manifest.xml
similarity index 100%
rename from resources/vs-lambda-sample-request-manifest.xml
rename to packages/toolkit/resources/vs-lambda-sample-request-manifest.xml
diff --git a/resources/walkthrough/images/aws-explorer-no-regions.png b/packages/toolkit/resources/walkthrough/images/aws-explorer-no-regions.png
similarity index 100%
rename from resources/walkthrough/images/aws-explorer-no-regions.png
rename to packages/toolkit/resources/walkthrough/images/aws-explorer-no-regions.png
diff --git a/resources/walkthrough/images/aws-explorer-with-regions.png b/packages/toolkit/resources/walkthrough/images/aws-explorer-with-regions.png
similarity index 100%
rename from resources/walkthrough/images/aws-explorer-with-regions.png
rename to packages/toolkit/resources/walkthrough/images/aws-explorer-with-regions.png
diff --git a/resources/walkthrough/images/aws-toolkit-add-connection.png b/packages/toolkit/resources/walkthrough/images/aws-toolkit-add-connection.png
similarity index 100%
rename from resources/walkthrough/images/aws-toolkit-add-connection.png
rename to packages/toolkit/resources/walkthrough/images/aws-toolkit-add-connection.png
diff --git a/resources/walkthrough/images/aws-toolkit-choose-connection.png b/packages/toolkit/resources/walkthrough/images/aws-toolkit-choose-connection.png
similarity index 100%
rename from resources/walkthrough/images/aws-toolkit-choose-connection.png
rename to packages/toolkit/resources/walkthrough/images/aws-toolkit-choose-connection.png
diff --git a/resources/walkthrough/images/aws-toolkit-commandpalette.png b/packages/toolkit/resources/walkthrough/images/aws-toolkit-commandpalette.png
similarity index 100%
rename from resources/walkthrough/images/aws-toolkit-commandpalette.png
rename to packages/toolkit/resources/walkthrough/images/aws-toolkit-commandpalette.png
diff --git a/resources/walkthrough/images/aws-toolkit-region-added.png b/packages/toolkit/resources/walkthrough/images/aws-toolkit-region-added.png
similarity index 100%
rename from resources/walkthrough/images/aws-toolkit-region-added.png
rename to packages/toolkit/resources/walkthrough/images/aws-toolkit-region-added.png
diff --git a/resources/walkthrough/images/aws-toolkit-region-context-menu.png b/packages/toolkit/resources/walkthrough/images/aws-toolkit-region-context-menu.png
similarity index 100%
rename from resources/walkthrough/images/aws-toolkit-region-context-menu.png
rename to packages/toolkit/resources/walkthrough/images/aws-toolkit-region-context-menu.png
diff --git a/resources/walkthrough/images/aws-toolkit-select-region.png b/packages/toolkit/resources/walkthrough/images/aws-toolkit-select-region.png
similarity index 100%
rename from resources/walkthrough/images/aws-toolkit-select-region.png
rename to packages/toolkit/resources/walkthrough/images/aws-toolkit-select-region.png
diff --git a/resources/walkthrough/images/aws-toolkit-show-regions.png b/packages/toolkit/resources/walkthrough/images/aws-toolkit-show-regions.png
similarity index 100%
rename from resources/walkthrough/images/aws-toolkit-show-regions.png
rename to packages/toolkit/resources/walkthrough/images/aws-toolkit-show-regions.png
diff --git a/resources/walkthrough/setup-connect.md b/packages/toolkit/resources/walkthrough/setup-connect.md
similarity index 100%
rename from resources/walkthrough/setup-connect.md
rename to packages/toolkit/resources/walkthrough/setup-connect.md
diff --git a/resources/walkthrough/setup-region.md b/packages/toolkit/resources/walkthrough/setup-region.md
similarity index 100%
rename from resources/walkthrough/setup-region.md
rename to packages/toolkit/resources/walkthrough/setup-region.md
diff --git a/resources/walkthrough/setup-toolchain.md b/packages/toolkit/resources/walkthrough/setup-toolchain.md
similarity index 100%
rename from resources/walkthrough/setup-toolchain.md
rename to packages/toolkit/resources/walkthrough/setup-toolchain.md
diff --git a/scripts/build/copyFiles.ts b/packages/toolkit/scripts/build/copyFiles.ts
similarity index 69%
rename from scripts/build/copyFiles.ts
rename to packages/toolkit/scripts/build/copyFiles.ts
index ae63caaf7d9..0e2ad8b216e 100644
--- a/scripts/build/copyFiles.ts
+++ b/packages/toolkit/scripts/build/copyFiles.ts
@@ -9,8 +9,8 @@ import * as path from 'path'
 // Moves all dependencies into `dist`
 // There is a single, optional flag `--webpacked` that moves localization files when present
 
-const repoRoot = process.cwd()
-const outRoot = path.join(repoRoot, 'dist')
+const projectRoot = process.cwd()
+const outRoot = path.join(projectRoot, 'dist')
 
 // The target file or directory must exist, otherwise we should fail the whole build.
 interface CopyTask {
@@ -26,6 +26,20 @@ interface CopyTask {
 }
 
 const tasks: CopyTask[] = [
+    ...[
+        'CHANGELOG.md',
+        'LICENSE',
+        'NOTICE',
+        'README.md',
+        'README.quickstart.cloud9.md',
+        'README.quickstart.vscode.md',
+        'quickStartCloud9-cn.html',
+        'quickStartCloud9.html',
+        'quickStartVscode.html',
+    ].map(f => {
+        return { target: path.join('../../', f), destination: path.join(projectRoot, f) }
+    }),
+
     { target: path.join('src', 'templates') },
     { target: path.join('src', 'test', 'shared', 'cloudformation', 'yaml') },
     { target: path.join('src', 'test', 'codewhisperer', 'service', 'resources') },
@@ -33,15 +47,15 @@ const tasks: CopyTask[] = [
 
     // SSM
     {
-        target: path.join('node_modules', 'aws-ssm-document-language-service', 'dist', 'server.js'),
+        target: path.join('../../node_modules', 'aws-ssm-document-language-service', 'dist', 'server.js'),
         destination: path.join('src', 'ssmDocument', 'ssm', 'ssmServer.js'),
     },
     {
-        target: path.join('node_modules', 'aws-ssm-document-language-service', 'dist', 'server.js.LICENSE.txt'),
+        target: path.join('../../node_modules', 'aws-ssm-document-language-service', 'dist', 'server.js.LICENSE.txt'),
         destination: path.join('src', 'ssmDocument', 'ssm', 'ssmServer.js.LICENSE.txt'),
     },
     {
-        target: path.join('node_modules', 'aws-ssm-document-language-service', 'dist', 'server.js.map'),
+        target: path.join('../../node_modules', 'aws-ssm-document-language-service', 'dist', 'server.js.map'),
         destination: path.join('src', 'ssmDocument', 'ssm', 'server.js.map'),
     },
 
@@ -51,17 +65,23 @@ const tasks: CopyTask[] = [
         destination: path.join('libs', 'vscode.js'),
     },
     {
-        target: path.join('node_modules', 'vue', 'dist', 'vue.global.prod.js'),
+        target: path.join('../../node_modules', 'vue', 'dist', 'vue.global.prod.js'),
         destination: path.join('libs', 'vue.min.js'),
     },
 
     // Mynah
     {
-        target: path.join('node_modules', '@aws', 'fully-qualified-names', 'node', 'aws_fully_qualified_names_bg.wasm'),
+        target: path.join(
+            '../../node_modules',
+            '@aws',
+            'fully-qualified-names',
+            'node',
+            'aws_fully_qualified_names_bg.wasm'
+        ),
         destination: path.join('src', 'aws_fully_qualified_names_bg.wasm'),
     },
     {
-        target: path.join('node_modules', 'web-tree-sitter', 'tree-sitter.wasm'),
+        target: path.join('../../node_modules', 'web-tree-sitter', 'tree-sitter.wasm'),
         destination: path.join('src', 'tree-sitter.wasm'),
     },
 ]
@@ -79,7 +99,7 @@ const webpackedTasks: CopyTask[] = [
 ]
 
 async function copy(task: CopyTask): Promise<void> {
-    const src = path.resolve(repoRoot, task.target)
+    const src = path.resolve(projectRoot, task.target)
     const dst = path.resolve(outRoot, task.destination ?? task.target)
 
     try {
diff --git a/scripts/build/generateConfigurationAttributes.ts b/packages/toolkit/scripts/build/generateConfigurationAttributes.ts
similarity index 100%
rename from scripts/build/generateConfigurationAttributes.ts
rename to packages/toolkit/scripts/build/generateConfigurationAttributes.ts
diff --git a/scripts/build/generateIcons.ts b/packages/toolkit/scripts/build/generateIcons.ts
similarity index 94%
rename from scripts/build/generateIcons.ts
rename to packages/toolkit/scripts/build/generateIcons.ts
index 1157c78e12c..0ccdb6ae757 100644
--- a/scripts/build/generateIcons.ts
+++ b/packages/toolkit/scripts/build/generateIcons.ts
@@ -9,13 +9,15 @@ import * as fs from 'fs-extra'
 import packageJson from '../../package.json'
 
 const fontId = 'aws-toolkit-icons'
-const projectDir = process.cwd()
+const projectDir = process.cwd() // root/packages/toolkit
+const rootDir = path.join(projectDir, '../..') // root/
 const iconsDir = path.join(projectDir, 'resources', 'icons')
 const fontsDir = path.join(projectDir, 'resources', 'fonts')
 const stylesheetsDir = path.join(projectDir, 'resources', 'css')
 const iconSources = [
+    // Paths relative to packages/toolkit
     `resources/icons/**/*.svg`,
-    `node_modules/@vscode/codicons/src/icons/**/*.svg`,
+    `../../node_modules/@vscode/codicons/src/icons/**/*.svg`,
     '!**/{cloud9,dark,light}/**',
 ]
 
@@ -157,7 +159,7 @@ async function generate(mappings: Record<string, number | undefined> = {}) {
  * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. 
  * SPDX-License-Identifier: Apache-2.0 
  * 
- * This style sheet was generated using "${path.relative(projectDir, __filename)}". 
+ * This style sheet was generated using "${path.relative(rootDir, __filename)}". 
  */ 
 
 ${result.template}
@@ -199,7 +201,7 @@ class GeneratedFilesManifest {
 }
 
 async function loadCodiconMappings(): Promise<Record<string, number | undefined>> {
-    const codicons = path.join(projectDir, 'node_modules', '@vscode', 'codicons', 'src')
+    const codicons = path.join(rootDir, 'node_modules', '@vscode', 'codicons', 'src')
     const data = JSON.parse(await fs.readFile(path.join(codicons, 'template', 'mapping.json'), 'utf-8'))
     const mappings: Record<string, number | undefined> = {}
     for (const [k, v] of Object.entries(data)) {
diff --git a/scripts/build/generateNonCodeFiles.ts b/packages/toolkit/scripts/build/generateNonCodeFiles.ts
similarity index 95%
rename from scripts/build/generateNonCodeFiles.ts
rename to packages/toolkit/scripts/build/generateNonCodeFiles.ts
index ab4fc74216b..30d285f608e 100644
--- a/scripts/build/generateNonCodeFiles.ts
+++ b/packages/toolkit/scripts/build/generateNonCodeFiles.ts
@@ -9,7 +9,7 @@ import { marked } from 'marked'
 import * as path from 'path'
 
 // doesn't use path utils as this should be formatted for finding images with HTML markup
-const repoRoot = process.cwd()
+const repoRoot = path.join(process.cwd(), '../../') // root/packages/toolkit -> root/
 
 /**
  * replaces relative paths with an `!!EXTENSIONROOT!!` token.
diff --git a/scripts/build/generateServiceClient.ts b/packages/toolkit/scripts/build/generateServiceClient.ts
similarity index 99%
rename from scripts/build/generateServiceClient.ts
rename to packages/toolkit/scripts/build/generateServiceClient.ts
index e264c25e339..724862c06e6 100644
--- a/scripts/build/generateServiceClient.ts
+++ b/packages/toolkit/scripts/build/generateServiceClient.ts
@@ -7,7 +7,7 @@ import * as child_process from 'child_process'
 import * as fs from 'fs-extra'
 import * as path from 'path'
 
-const repoRoot = process.cwd()
+const repoRoot = path.join(process.cwd(), '../../') // root/packages/toolkit -> root/
 /**
  * This script uses the AWS JS SDK to generate service clients where the client definition is contained within
  * this repo. Client definitions are added at the bottom of this script.
diff --git a/scripts/build/package.ts b/packages/toolkit/scripts/build/package.ts
similarity index 96%
rename from scripts/build/package.ts
rename to packages/toolkit/scripts/build/package.ts
index 7d61c85d433..c2e574415c9 100644
--- a/scripts/build/package.ts
+++ b/packages/toolkit/scripts/build/package.ts
@@ -116,6 +116,7 @@ function main() {
             // Create backup files so we can restore the originals later.
             fs.copyFileSync(packageJsonFile, `${packageJsonFile}.bk`)
             fs.copyFileSync(webpackConfigJsFile, `${webpackConfigJsFile}.bk`)
+            fs.copyFileSync('../../CHANGELOG.md', 'CHANGELOG.md')
 
             const packageJson: typeof PackageJson = JSON.parse(fs.readFileSync(packageJsonFile, { encoding: 'utf-8' }))
             const versionSuffix = getVersionSuffix(args.feature, args.debug)
@@ -145,6 +146,9 @@ function main() {
         child_process.execSync(`vsce package`, { stdio: 'inherit' })
         const packageJson = JSON.parse(fs.readFileSync(packageJsonFile, { encoding: 'utf-8' }))
         console.log(`VSIX Version: ${packageJson.version}`)
+
+        const vsixName = `aws-toolkit-vscode-${packageJson.version}.vsix`
+        fs.moveSync(vsixName, `../../${vsixName}`)
     } catch (e) {
         console.log(e)
         throw Error('package.ts: failed')
diff --git a/scripts/lint/testLint.ts b/packages/toolkit/scripts/lint/testLint.ts
similarity index 100%
rename from scripts/lint/testLint.ts
rename to packages/toolkit/scripts/lint/testLint.ts
diff --git a/scripts/test/launchTestUtilities.ts b/packages/toolkit/scripts/test/launchTestUtilities.ts
similarity index 100%
rename from scripts/test/launchTestUtilities.ts
rename to packages/toolkit/scripts/test/launchTestUtilities.ts
diff --git a/scripts/test/test.ts b/packages/toolkit/scripts/test/test.ts
similarity index 100%
rename from scripts/test/test.ts
rename to packages/toolkit/scripts/test/test.ts
diff --git a/scripts/test/testE2E.ts b/packages/toolkit/scripts/test/testE2E.ts
similarity index 100%
rename from scripts/test/testE2E.ts
rename to packages/toolkit/scripts/test/testE2E.ts
diff --git a/scripts/test/testInteg.ts b/packages/toolkit/scripts/test/testInteg.ts
similarity index 100%
rename from scripts/test/testInteg.ts
rename to packages/toolkit/scripts/test/testInteg.ts
diff --git a/src/amazonq/activation.ts b/packages/toolkit/src/amazonq/activation.ts
similarity index 100%
rename from src/amazonq/activation.ts
rename to packages/toolkit/src/amazonq/activation.ts
diff --git a/src/amazonq/apps/initContext.ts b/packages/toolkit/src/amazonq/apps/initContext.ts
similarity index 100%
rename from src/amazonq/apps/initContext.ts
rename to packages/toolkit/src/amazonq/apps/initContext.ts
diff --git a/src/amazonq/auth/controller.ts b/packages/toolkit/src/amazonq/auth/controller.ts
similarity index 100%
rename from src/amazonq/auth/controller.ts
rename to packages/toolkit/src/amazonq/auth/controller.ts
diff --git a/src/amazonq/auth/model.ts b/packages/toolkit/src/amazonq/auth/model.ts
similarity index 100%
rename from src/amazonq/auth/model.ts
rename to packages/toolkit/src/amazonq/auth/model.ts
diff --git a/src/amazonq/commons/controllers/contentController.ts b/packages/toolkit/src/amazonq/commons/controllers/contentController.ts
similarity index 100%
rename from src/amazonq/commons/controllers/contentController.ts
rename to packages/toolkit/src/amazonq/commons/controllers/contentController.ts
diff --git a/src/amazonq/explorer/amazonQChildrenNodes.ts b/packages/toolkit/src/amazonq/explorer/amazonQChildrenNodes.ts
similarity index 100%
rename from src/amazonq/explorer/amazonQChildrenNodes.ts
rename to packages/toolkit/src/amazonq/explorer/amazonQChildrenNodes.ts
diff --git a/src/amazonq/explorer/amazonQNode.ts b/packages/toolkit/src/amazonq/explorer/amazonQNode.ts
similarity index 100%
rename from src/amazonq/explorer/amazonQNode.ts
rename to packages/toolkit/src/amazonq/explorer/amazonQNode.ts
diff --git a/src/amazonq/messages/messageListener.ts b/packages/toolkit/src/amazonq/messages/messageListener.ts
similarity index 100%
rename from src/amazonq/messages/messageListener.ts
rename to packages/toolkit/src/amazonq/messages/messageListener.ts
diff --git a/src/amazonq/messages/messagePublisher.ts b/packages/toolkit/src/amazonq/messages/messagePublisher.ts
similarity index 100%
rename from src/amazonq/messages/messagePublisher.ts
rename to packages/toolkit/src/amazonq/messages/messagePublisher.ts
diff --git a/src/amazonq/onboardingPage/index.ts b/packages/toolkit/src/amazonq/onboardingPage/index.ts
similarity index 100%
rename from src/amazonq/onboardingPage/index.ts
rename to packages/toolkit/src/amazonq/onboardingPage/index.ts
diff --git a/src/amazonq/onboardingPage/model.ts b/packages/toolkit/src/amazonq/onboardingPage/model.ts
similarity index 100%
rename from src/amazonq/onboardingPage/model.ts
rename to packages/toolkit/src/amazonq/onboardingPage/model.ts
diff --git a/src/amazonq/util/viewBadgeHandler.ts b/packages/toolkit/src/amazonq/util/viewBadgeHandler.ts
similarity index 100%
rename from src/amazonq/util/viewBadgeHandler.ts
rename to packages/toolkit/src/amazonq/util/viewBadgeHandler.ts
diff --git a/src/amazonq/webview/assets/assetsHandler.ts b/packages/toolkit/src/amazonq/webview/assets/assetsHandler.ts
similarity index 100%
rename from src/amazonq/webview/assets/assetsHandler.ts
rename to packages/toolkit/src/amazonq/webview/assets/assetsHandler.ts
diff --git a/src/amazonq/webview/generators/webViewContent.ts b/packages/toolkit/src/amazonq/webview/generators/webViewContent.ts
similarity index 100%
rename from src/amazonq/webview/generators/webViewContent.ts
rename to packages/toolkit/src/amazonq/webview/generators/webViewContent.ts
diff --git a/src/amazonq/webview/messages/messageDispatcher.ts b/packages/toolkit/src/amazonq/webview/messages/messageDispatcher.ts
similarity index 100%
rename from src/amazonq/webview/messages/messageDispatcher.ts
rename to packages/toolkit/src/amazonq/webview/messages/messageDispatcher.ts
diff --git a/src/amazonq/webview/ui/apps/amazonqCommonsConnector.ts b/packages/toolkit/src/amazonq/webview/ui/apps/amazonqCommonsConnector.ts
similarity index 100%
rename from src/amazonq/webview/ui/apps/amazonqCommonsConnector.ts
rename to packages/toolkit/src/amazonq/webview/ui/apps/amazonqCommonsConnector.ts
diff --git a/src/amazonq/webview/ui/apps/cwChatConnector.ts b/packages/toolkit/src/amazonq/webview/ui/apps/cwChatConnector.ts
similarity index 100%
rename from src/amazonq/webview/ui/apps/cwChatConnector.ts
rename to packages/toolkit/src/amazonq/webview/ui/apps/cwChatConnector.ts
diff --git a/src/amazonq/webview/ui/apps/featureDevChatConnector.ts b/packages/toolkit/src/amazonq/webview/ui/apps/featureDevChatConnector.ts
similarity index 100%
rename from src/amazonq/webview/ui/apps/featureDevChatConnector.ts
rename to packages/toolkit/src/amazonq/webview/ui/apps/featureDevChatConnector.ts
diff --git a/src/amazonq/webview/ui/commands.ts b/packages/toolkit/src/amazonq/webview/ui/commands.ts
similarity index 100%
rename from src/amazonq/webview/ui/commands.ts
rename to packages/toolkit/src/amazonq/webview/ui/commands.ts
diff --git a/src/amazonq/webview/ui/connector.ts b/packages/toolkit/src/amazonq/webview/ui/connector.ts
similarity index 100%
rename from src/amazonq/webview/ui/connector.ts
rename to packages/toolkit/src/amazonq/webview/ui/connector.ts
diff --git a/src/amazonq/webview/ui/defs.d.ts b/packages/toolkit/src/amazonq/webview/ui/defs.d.ts
similarity index 100%
rename from src/amazonq/webview/ui/defs.d.ts
rename to packages/toolkit/src/amazonq/webview/ui/defs.d.ts
diff --git a/src/amazonq/webview/ui/feedback/constants.ts b/packages/toolkit/src/amazonq/webview/ui/feedback/constants.ts
similarity index 100%
rename from src/amazonq/webview/ui/feedback/constants.ts
rename to packages/toolkit/src/amazonq/webview/ui/feedback/constants.ts
diff --git a/src/amazonq/webview/ui/followUps/constants.ts b/packages/toolkit/src/amazonq/webview/ui/followUps/constants.ts
similarity index 100%
rename from src/amazonq/webview/ui/followUps/constants.ts
rename to packages/toolkit/src/amazonq/webview/ui/followUps/constants.ts
diff --git a/src/amazonq/webview/ui/followUps/generator.ts b/packages/toolkit/src/amazonq/webview/ui/followUps/generator.ts
similarity index 100%
rename from src/amazonq/webview/ui/followUps/generator.ts
rename to packages/toolkit/src/amazonq/webview/ui/followUps/generator.ts
diff --git a/src/amazonq/webview/ui/followUps/handler.ts b/packages/toolkit/src/amazonq/webview/ui/followUps/handler.ts
similarity index 100%
rename from src/amazonq/webview/ui/followUps/handler.ts
rename to packages/toolkit/src/amazonq/webview/ui/followUps/handler.ts
diff --git a/src/amazonq/webview/ui/followUps/model.ts b/packages/toolkit/src/amazonq/webview/ui/followUps/model.ts
similarity index 100%
rename from src/amazonq/webview/ui/followUps/model.ts
rename to packages/toolkit/src/amazonq/webview/ui/followUps/model.ts
diff --git a/src/amazonq/webview/ui/main.ts b/packages/toolkit/src/amazonq/webview/ui/main.ts
similarity index 100%
rename from src/amazonq/webview/ui/main.ts
rename to packages/toolkit/src/amazonq/webview/ui/main.ts
diff --git a/src/amazonq/webview/ui/messages/constants.ts b/packages/toolkit/src/amazonq/webview/ui/messages/constants.ts
similarity index 100%
rename from src/amazonq/webview/ui/messages/constants.ts
rename to packages/toolkit/src/amazonq/webview/ui/messages/constants.ts
diff --git a/src/amazonq/webview/ui/messages/controller.ts b/packages/toolkit/src/amazonq/webview/ui/messages/controller.ts
similarity index 100%
rename from src/amazonq/webview/ui/messages/controller.ts
rename to packages/toolkit/src/amazonq/webview/ui/messages/controller.ts
diff --git a/src/amazonq/webview/ui/messages/handler.ts b/packages/toolkit/src/amazonq/webview/ui/messages/handler.ts
similarity index 100%
rename from src/amazonq/webview/ui/messages/handler.ts
rename to packages/toolkit/src/amazonq/webview/ui/messages/handler.ts
diff --git a/src/amazonq/webview/ui/quickActions/generator.ts b/packages/toolkit/src/amazonq/webview/ui/quickActions/generator.ts
similarity index 100%
rename from src/amazonq/webview/ui/quickActions/generator.ts
rename to packages/toolkit/src/amazonq/webview/ui/quickActions/generator.ts
diff --git a/src/amazonq/webview/ui/quickActions/handler.ts b/packages/toolkit/src/amazonq/webview/ui/quickActions/handler.ts
similarity index 100%
rename from src/amazonq/webview/ui/quickActions/handler.ts
rename to packages/toolkit/src/amazonq/webview/ui/quickActions/handler.ts
diff --git a/src/amazonq/webview/ui/storages/tabsStorage.ts b/packages/toolkit/src/amazonq/webview/ui/storages/tabsStorage.ts
similarity index 100%
rename from src/amazonq/webview/ui/storages/tabsStorage.ts
rename to packages/toolkit/src/amazonq/webview/ui/storages/tabsStorage.ts
diff --git a/src/amazonq/webview/ui/tabs/generator.ts b/packages/toolkit/src/amazonq/webview/ui/tabs/generator.ts
similarity index 100%
rename from src/amazonq/webview/ui/tabs/generator.ts
rename to packages/toolkit/src/amazonq/webview/ui/tabs/generator.ts
diff --git a/src/amazonq/webview/ui/texts/constants.ts b/packages/toolkit/src/amazonq/webview/ui/texts/constants.ts
similarity index 100%
rename from src/amazonq/webview/ui/texts/constants.ts
rename to packages/toolkit/src/amazonq/webview/ui/texts/constants.ts
diff --git a/src/amazonq/webview/webView.ts b/packages/toolkit/src/amazonq/webview/webView.ts
similarity index 100%
rename from src/amazonq/webview/webView.ts
rename to packages/toolkit/src/amazonq/webview/webView.ts
diff --git a/src/amazonqFeatureDev/app.ts b/packages/toolkit/src/amazonqFeatureDev/app.ts
similarity index 100%
rename from src/amazonqFeatureDev/app.ts
rename to packages/toolkit/src/amazonqFeatureDev/app.ts
diff --git a/src/amazonqFeatureDev/client/codewhispererruntime-2022-11-11.json b/packages/toolkit/src/amazonqFeatureDev/client/codewhispererruntime-2022-11-11.json
similarity index 100%
rename from src/amazonqFeatureDev/client/codewhispererruntime-2022-11-11.json
rename to packages/toolkit/src/amazonqFeatureDev/client/codewhispererruntime-2022-11-11.json
diff --git a/src/amazonqFeatureDev/client/featureDev.ts b/packages/toolkit/src/amazonqFeatureDev/client/featureDev.ts
similarity index 100%
rename from src/amazonqFeatureDev/client/featureDev.ts
rename to packages/toolkit/src/amazonqFeatureDev/client/featureDev.ts
diff --git a/src/amazonqFeatureDev/config.ts b/packages/toolkit/src/amazonqFeatureDev/config.ts
similarity index 100%
rename from src/amazonqFeatureDev/config.ts
rename to packages/toolkit/src/amazonqFeatureDev/config.ts
diff --git a/src/amazonqFeatureDev/constants.ts b/packages/toolkit/src/amazonqFeatureDev/constants.ts
similarity index 100%
rename from src/amazonqFeatureDev/constants.ts
rename to packages/toolkit/src/amazonqFeatureDev/constants.ts
diff --git a/src/amazonqFeatureDev/controllers/chat/controller.ts b/packages/toolkit/src/amazonqFeatureDev/controllers/chat/controller.ts
similarity index 100%
rename from src/amazonqFeatureDev/controllers/chat/controller.ts
rename to packages/toolkit/src/amazonqFeatureDev/controllers/chat/controller.ts
diff --git a/src/amazonqFeatureDev/controllers/chat/messenger/messenger.ts b/packages/toolkit/src/amazonqFeatureDev/controllers/chat/messenger/messenger.ts
similarity index 100%
rename from src/amazonqFeatureDev/controllers/chat/messenger/messenger.ts
rename to packages/toolkit/src/amazonqFeatureDev/controllers/chat/messenger/messenger.ts
diff --git a/src/amazonqFeatureDev/errors.ts b/packages/toolkit/src/amazonqFeatureDev/errors.ts
similarity index 100%
rename from src/amazonqFeatureDev/errors.ts
rename to packages/toolkit/src/amazonqFeatureDev/errors.ts
diff --git a/src/amazonqFeatureDev/limits.ts b/packages/toolkit/src/amazonqFeatureDev/limits.ts
similarity index 100%
rename from src/amazonqFeatureDev/limits.ts
rename to packages/toolkit/src/amazonqFeatureDev/limits.ts
diff --git a/src/amazonqFeatureDev/models.ts b/packages/toolkit/src/amazonqFeatureDev/models.ts
similarity index 100%
rename from src/amazonqFeatureDev/models.ts
rename to packages/toolkit/src/amazonqFeatureDev/models.ts
diff --git a/src/amazonqFeatureDev/session/session.ts b/packages/toolkit/src/amazonqFeatureDev/session/session.ts
similarity index 100%
rename from src/amazonqFeatureDev/session/session.ts
rename to packages/toolkit/src/amazonqFeatureDev/session/session.ts
diff --git a/src/amazonqFeatureDev/session/sessionConfigFactory.ts b/packages/toolkit/src/amazonqFeatureDev/session/sessionConfigFactory.ts
similarity index 100%
rename from src/amazonqFeatureDev/session/sessionConfigFactory.ts
rename to packages/toolkit/src/amazonqFeatureDev/session/sessionConfigFactory.ts
diff --git a/src/amazonqFeatureDev/session/sessionState.ts b/packages/toolkit/src/amazonqFeatureDev/session/sessionState.ts
similarity index 100%
rename from src/amazonqFeatureDev/session/sessionState.ts
rename to packages/toolkit/src/amazonqFeatureDev/session/sessionState.ts
diff --git a/src/amazonqFeatureDev/storages/chatSession.ts b/packages/toolkit/src/amazonqFeatureDev/storages/chatSession.ts
similarity index 100%
rename from src/amazonqFeatureDev/storages/chatSession.ts
rename to packages/toolkit/src/amazonqFeatureDev/storages/chatSession.ts
diff --git a/src/amazonqFeatureDev/types.ts b/packages/toolkit/src/amazonqFeatureDev/types.ts
similarity index 100%
rename from src/amazonqFeatureDev/types.ts
rename to packages/toolkit/src/amazonqFeatureDev/types.ts
diff --git a/src/amazonqFeatureDev/userFacingText.ts b/packages/toolkit/src/amazonqFeatureDev/userFacingText.ts
similarity index 100%
rename from src/amazonqFeatureDev/userFacingText.ts
rename to packages/toolkit/src/amazonqFeatureDev/userFacingText.ts
diff --git a/src/amazonqFeatureDev/util/files.ts b/packages/toolkit/src/amazonqFeatureDev/util/files.ts
similarity index 100%
rename from src/amazonqFeatureDev/util/files.ts
rename to packages/toolkit/src/amazonqFeatureDev/util/files.ts
diff --git a/src/amazonqFeatureDev/util/gitignore.ts b/packages/toolkit/src/amazonqFeatureDev/util/gitignore.ts
similarity index 100%
rename from src/amazonqFeatureDev/util/gitignore.ts
rename to packages/toolkit/src/amazonqFeatureDev/util/gitignore.ts
diff --git a/src/amazonqFeatureDev/util/telemetryHelper.ts b/packages/toolkit/src/amazonqFeatureDev/util/telemetryHelper.ts
similarity index 100%
rename from src/amazonqFeatureDev/util/telemetryHelper.ts
rename to packages/toolkit/src/amazonqFeatureDev/util/telemetryHelper.ts
diff --git a/src/amazonqFeatureDev/util/upload.ts b/packages/toolkit/src/amazonqFeatureDev/util/upload.ts
similarity index 100%
rename from src/amazonqFeatureDev/util/upload.ts
rename to packages/toolkit/src/amazonqFeatureDev/util/upload.ts
diff --git a/src/amazonqFeatureDev/views/actions/uiMessageListener.ts b/packages/toolkit/src/amazonqFeatureDev/views/actions/uiMessageListener.ts
similarity index 100%
rename from src/amazonqFeatureDev/views/actions/uiMessageListener.ts
rename to packages/toolkit/src/amazonqFeatureDev/views/actions/uiMessageListener.ts
diff --git a/src/amazonqFeatureDev/views/connector/connector.ts b/packages/toolkit/src/amazonqFeatureDev/views/connector/connector.ts
similarity index 100%
rename from src/amazonqFeatureDev/views/connector/connector.ts
rename to packages/toolkit/src/amazonqFeatureDev/views/connector/connector.ts
diff --git a/src/amazonqGumby/activation.ts b/packages/toolkit/src/amazonqGumby/activation.ts
similarity index 100%
rename from src/amazonqGumby/activation.ts
rename to packages/toolkit/src/amazonqGumby/activation.ts
diff --git a/src/amazonqGumby/entrypoint.ts b/packages/toolkit/src/amazonqGumby/entrypoint.ts
similarity index 100%
rename from src/amazonqGumby/entrypoint.ts
rename to packages/toolkit/src/amazonqGumby/entrypoint.ts
diff --git a/src/amazonqGumby/models/constants.ts b/packages/toolkit/src/amazonqGumby/models/constants.ts
similarity index 100%
rename from src/amazonqGumby/models/constants.ts
rename to packages/toolkit/src/amazonqGumby/models/constants.ts
diff --git a/src/amazonqGumby/models/model.ts b/packages/toolkit/src/amazonqGumby/models/model.ts
similarity index 100%
rename from src/amazonqGumby/models/model.ts
rename to packages/toolkit/src/amazonqGumby/models/model.ts
diff --git a/src/amazonqGumby/telemetry/codeTransformTelemetry.ts b/packages/toolkit/src/amazonqGumby/telemetry/codeTransformTelemetry.ts
similarity index 100%
rename from src/amazonqGumby/telemetry/codeTransformTelemetry.ts
rename to packages/toolkit/src/amazonqGumby/telemetry/codeTransformTelemetry.ts
diff --git a/src/amazonqGumby/telemetry/codeTransformTelemetryState.ts b/packages/toolkit/src/amazonqGumby/telemetry/codeTransformTelemetryState.ts
similarity index 100%
rename from src/amazonqGumby/telemetry/codeTransformTelemetryState.ts
rename to packages/toolkit/src/amazonqGumby/telemetry/codeTransformTelemetryState.ts
diff --git a/src/apigateway/activation.ts b/packages/toolkit/src/apigateway/activation.ts
similarity index 100%
rename from src/apigateway/activation.ts
rename to packages/toolkit/src/apigateway/activation.ts
diff --git a/src/apigateway/commands/copyUrl.ts b/packages/toolkit/src/apigateway/commands/copyUrl.ts
similarity index 100%
rename from src/apigateway/commands/copyUrl.ts
rename to packages/toolkit/src/apigateway/commands/copyUrl.ts
diff --git a/src/apigateway/explorer/apiGatewayNodes.ts b/packages/toolkit/src/apigateway/explorer/apiGatewayNodes.ts
similarity index 100%
rename from src/apigateway/explorer/apiGatewayNodes.ts
rename to packages/toolkit/src/apigateway/explorer/apiGatewayNodes.ts
diff --git a/src/apigateway/explorer/apiNodes.ts b/packages/toolkit/src/apigateway/explorer/apiNodes.ts
similarity index 100%
rename from src/apigateway/explorer/apiNodes.ts
rename to packages/toolkit/src/apigateway/explorer/apiNodes.ts
diff --git a/src/apigateway/vue/index.ts b/packages/toolkit/src/apigateway/vue/index.ts
similarity index 100%
rename from src/apigateway/vue/index.ts
rename to packages/toolkit/src/apigateway/vue/index.ts
diff --git a/src/apigateway/vue/invokeApi.vue b/packages/toolkit/src/apigateway/vue/invokeApi.vue
similarity index 100%
rename from src/apigateway/vue/invokeApi.vue
rename to packages/toolkit/src/apigateway/vue/invokeApi.vue
diff --git a/src/apigateway/vue/invokeRemoteRestApi.ts b/packages/toolkit/src/apigateway/vue/invokeRemoteRestApi.ts
similarity index 100%
rename from src/apigateway/vue/invokeRemoteRestApi.ts
rename to packages/toolkit/src/apigateway/vue/invokeRemoteRestApi.ts
diff --git a/src/applicationcomposer/activation.ts b/packages/toolkit/src/applicationcomposer/activation.ts
similarity index 100%
rename from src/applicationcomposer/activation.ts
rename to packages/toolkit/src/applicationcomposer/activation.ts
diff --git a/src/applicationcomposer/composerWebview.ts b/packages/toolkit/src/applicationcomposer/composerWebview.ts
similarity index 100%
rename from src/applicationcomposer/composerWebview.ts
rename to packages/toolkit/src/applicationcomposer/composerWebview.ts
diff --git a/src/applicationcomposer/handleMessage.ts b/packages/toolkit/src/applicationcomposer/handleMessage.ts
similarity index 100%
rename from src/applicationcomposer/handleMessage.ts
rename to packages/toolkit/src/applicationcomposer/handleMessage.ts
diff --git a/src/applicationcomposer/messageHandlers/addFileWatchMessageHandler.ts b/packages/toolkit/src/applicationcomposer/messageHandlers/addFileWatchMessageHandler.ts
similarity index 100%
rename from src/applicationcomposer/messageHandlers/addFileWatchMessageHandler.ts
rename to packages/toolkit/src/applicationcomposer/messageHandlers/addFileWatchMessageHandler.ts
diff --git a/src/applicationcomposer/messageHandlers/deployMessageHandler.ts b/packages/toolkit/src/applicationcomposer/messageHandlers/deployMessageHandler.ts
similarity index 100%
rename from src/applicationcomposer/messageHandlers/deployMessageHandler.ts
rename to packages/toolkit/src/applicationcomposer/messageHandlers/deployMessageHandler.ts
diff --git a/src/applicationcomposer/messageHandlers/emitTelemetryMessageHandler.ts b/packages/toolkit/src/applicationcomposer/messageHandlers/emitTelemetryMessageHandler.ts
similarity index 100%
rename from src/applicationcomposer/messageHandlers/emitTelemetryMessageHandler.ts
rename to packages/toolkit/src/applicationcomposer/messageHandlers/emitTelemetryMessageHandler.ts
diff --git a/src/applicationcomposer/messageHandlers/generateResourceHandler.ts b/packages/toolkit/src/applicationcomposer/messageHandlers/generateResourceHandler.ts
similarity index 100%
rename from src/applicationcomposer/messageHandlers/generateResourceHandler.ts
rename to packages/toolkit/src/applicationcomposer/messageHandlers/generateResourceHandler.ts
diff --git a/src/applicationcomposer/messageHandlers/initMessageHandler.ts b/packages/toolkit/src/applicationcomposer/messageHandlers/initMessageHandler.ts
similarity index 100%
rename from src/applicationcomposer/messageHandlers/initMessageHandler.ts
rename to packages/toolkit/src/applicationcomposer/messageHandlers/initMessageHandler.ts
diff --git a/src/applicationcomposer/messageHandlers/loadFileMessageHandler.ts b/packages/toolkit/src/applicationcomposer/messageHandlers/loadFileMessageHandler.ts
similarity index 100%
rename from src/applicationcomposer/messageHandlers/loadFileMessageHandler.ts
rename to packages/toolkit/src/applicationcomposer/messageHandlers/loadFileMessageHandler.ts
diff --git a/src/applicationcomposer/messageHandlers/logMessageHandler.ts b/packages/toolkit/src/applicationcomposer/messageHandlers/logMessageHandler.ts
similarity index 100%
rename from src/applicationcomposer/messageHandlers/logMessageHandler.ts
rename to packages/toolkit/src/applicationcomposer/messageHandlers/logMessageHandler.ts
diff --git a/src/applicationcomposer/messageHandlers/notifyUser.ts b/packages/toolkit/src/applicationcomposer/messageHandlers/notifyUser.ts
similarity index 100%
rename from src/applicationcomposer/messageHandlers/notifyUser.ts
rename to packages/toolkit/src/applicationcomposer/messageHandlers/notifyUser.ts
diff --git a/src/applicationcomposer/messageHandlers/openFeedbackMessageHandler.ts b/packages/toolkit/src/applicationcomposer/messageHandlers/openFeedbackMessageHandler.ts
similarity index 100%
rename from src/applicationcomposer/messageHandlers/openFeedbackMessageHandler.ts
rename to packages/toolkit/src/applicationcomposer/messageHandlers/openFeedbackMessageHandler.ts
diff --git a/src/applicationcomposer/messageHandlers/saveFileMessageHandler.ts b/packages/toolkit/src/applicationcomposer/messageHandlers/saveFileMessageHandler.ts
similarity index 100%
rename from src/applicationcomposer/messageHandlers/saveFileMessageHandler.ts
rename to packages/toolkit/src/applicationcomposer/messageHandlers/saveFileMessageHandler.ts
diff --git a/src/applicationcomposer/types.ts b/packages/toolkit/src/applicationcomposer/types.ts
similarity index 100%
rename from src/applicationcomposer/types.ts
rename to packages/toolkit/src/applicationcomposer/types.ts
diff --git a/src/applicationcomposer/webviewManager.ts b/packages/toolkit/src/applicationcomposer/webviewManager.ts
similarity index 100%
rename from src/applicationcomposer/webviewManager.ts
rename to packages/toolkit/src/applicationcomposer/webviewManager.ts
diff --git a/src/apprunner/activation.ts b/packages/toolkit/src/apprunner/activation.ts
similarity index 100%
rename from src/apprunner/activation.ts
rename to packages/toolkit/src/apprunner/activation.ts
diff --git a/src/apprunner/commands/createService.ts b/packages/toolkit/src/apprunner/commands/createService.ts
similarity index 100%
rename from src/apprunner/commands/createService.ts
rename to packages/toolkit/src/apprunner/commands/createService.ts
diff --git a/src/apprunner/commands/createServiceFromEcr.ts b/packages/toolkit/src/apprunner/commands/createServiceFromEcr.ts
similarity index 100%
rename from src/apprunner/commands/createServiceFromEcr.ts
rename to packages/toolkit/src/apprunner/commands/createServiceFromEcr.ts
diff --git a/src/apprunner/commands/deleteService.ts b/packages/toolkit/src/apprunner/commands/deleteService.ts
similarity index 100%
rename from src/apprunner/commands/deleteService.ts
rename to packages/toolkit/src/apprunner/commands/deleteService.ts
diff --git a/src/apprunner/commands/pauseService.ts b/packages/toolkit/src/apprunner/commands/pauseService.ts
similarity index 100%
rename from src/apprunner/commands/pauseService.ts
rename to packages/toolkit/src/apprunner/commands/pauseService.ts
diff --git a/src/apprunner/explorer/apprunnerNode.ts b/packages/toolkit/src/apprunner/explorer/apprunnerNode.ts
similarity index 100%
rename from src/apprunner/explorer/apprunnerNode.ts
rename to packages/toolkit/src/apprunner/explorer/apprunnerNode.ts
diff --git a/src/apprunner/explorer/apprunnerServiceNode.ts b/packages/toolkit/src/apprunner/explorer/apprunnerServiceNode.ts
similarity index 100%
rename from src/apprunner/explorer/apprunnerServiceNode.ts
rename to packages/toolkit/src/apprunner/explorer/apprunnerServiceNode.ts
diff --git a/src/apprunner/wizards/apprunnerCreateServiceWizard.ts b/packages/toolkit/src/apprunner/wizards/apprunnerCreateServiceWizard.ts
similarity index 100%
rename from src/apprunner/wizards/apprunnerCreateServiceWizard.ts
rename to packages/toolkit/src/apprunner/wizards/apprunnerCreateServiceWizard.ts
diff --git a/src/apprunner/wizards/codeRepositoryWizard.ts b/packages/toolkit/src/apprunner/wizards/codeRepositoryWizard.ts
similarity index 100%
rename from src/apprunner/wizards/codeRepositoryWizard.ts
rename to packages/toolkit/src/apprunner/wizards/codeRepositoryWizard.ts
diff --git a/src/apprunner/wizards/deploymentButton.ts b/packages/toolkit/src/apprunner/wizards/deploymentButton.ts
similarity index 100%
rename from src/apprunner/wizards/deploymentButton.ts
rename to packages/toolkit/src/apprunner/wizards/deploymentButton.ts
diff --git a/src/apprunner/wizards/imageRepositoryWizard.ts b/packages/toolkit/src/apprunner/wizards/imageRepositoryWizard.ts
similarity index 100%
rename from src/apprunner/wizards/imageRepositoryWizard.ts
rename to packages/toolkit/src/apprunner/wizards/imageRepositoryWizard.ts
diff --git a/src/auth/activation.ts b/packages/toolkit/src/auth/activation.ts
similarity index 100%
rename from src/auth/activation.ts
rename to packages/toolkit/src/auth/activation.ts
diff --git a/src/auth/auth.ts b/packages/toolkit/src/auth/auth.ts
similarity index 100%
rename from src/auth/auth.ts
rename to packages/toolkit/src/auth/auth.ts
diff --git a/src/auth/connection.ts b/packages/toolkit/src/auth/connection.ts
similarity index 100%
rename from src/auth/connection.ts
rename to packages/toolkit/src/auth/connection.ts
diff --git a/src/auth/credentials/sharedCredentials.ts b/packages/toolkit/src/auth/credentials/sharedCredentials.ts
similarity index 100%
rename from src/auth/credentials/sharedCredentials.ts
rename to packages/toolkit/src/auth/credentials/sharedCredentials.ts
diff --git a/src/auth/credentials/sharedCredentialsFile.ts b/packages/toolkit/src/auth/credentials/sharedCredentialsFile.ts
similarity index 100%
rename from src/auth/credentials/sharedCredentialsFile.ts
rename to packages/toolkit/src/auth/credentials/sharedCredentialsFile.ts
diff --git a/src/auth/credentials/store.ts b/packages/toolkit/src/auth/credentials/store.ts
similarity index 100%
rename from src/auth/credentials/store.ts
rename to packages/toolkit/src/auth/credentials/store.ts
diff --git a/src/auth/credentials/types.ts b/packages/toolkit/src/auth/credentials/types.ts
similarity index 100%
rename from src/auth/credentials/types.ts
rename to packages/toolkit/src/auth/credentials/types.ts
diff --git a/src/auth/credentials/utils.ts b/packages/toolkit/src/auth/credentials/utils.ts
similarity index 100%
rename from src/auth/credentials/utils.ts
rename to packages/toolkit/src/auth/credentials/utils.ts
diff --git a/src/auth/credentials/validation.ts b/packages/toolkit/src/auth/credentials/validation.ts
similarity index 100%
rename from src/auth/credentials/validation.ts
rename to packages/toolkit/src/auth/credentials/validation.ts
diff --git a/src/auth/deprecated/loginManager.ts b/packages/toolkit/src/auth/deprecated/loginManager.ts
similarity index 100%
rename from src/auth/deprecated/loginManager.ts
rename to packages/toolkit/src/auth/deprecated/loginManager.ts
diff --git a/src/auth/providers/credentials.ts b/packages/toolkit/src/auth/providers/credentials.ts
similarity index 100%
rename from src/auth/providers/credentials.ts
rename to packages/toolkit/src/auth/providers/credentials.ts
diff --git a/src/auth/providers/credentialsProviderFactory.ts b/packages/toolkit/src/auth/providers/credentialsProviderFactory.ts
similarity index 100%
rename from src/auth/providers/credentialsProviderFactory.ts
rename to packages/toolkit/src/auth/providers/credentialsProviderFactory.ts
diff --git a/src/auth/providers/credentialsProviderManager.ts b/packages/toolkit/src/auth/providers/credentialsProviderManager.ts
similarity index 100%
rename from src/auth/providers/credentialsProviderManager.ts
rename to packages/toolkit/src/auth/providers/credentialsProviderManager.ts
diff --git a/src/auth/providers/ec2CredentialsProvider.ts b/packages/toolkit/src/auth/providers/ec2CredentialsProvider.ts
similarity index 100%
rename from src/auth/providers/ec2CredentialsProvider.ts
rename to packages/toolkit/src/auth/providers/ec2CredentialsProvider.ts
diff --git a/src/auth/providers/ecsCredentialsProvider.ts b/packages/toolkit/src/auth/providers/ecsCredentialsProvider.ts
similarity index 100%
rename from src/auth/providers/ecsCredentialsProvider.ts
rename to packages/toolkit/src/auth/providers/ecsCredentialsProvider.ts
diff --git a/src/auth/providers/envVarsCredentialsProvider.ts b/packages/toolkit/src/auth/providers/envVarsCredentialsProvider.ts
similarity index 100%
rename from src/auth/providers/envVarsCredentialsProvider.ts
rename to packages/toolkit/src/auth/providers/envVarsCredentialsProvider.ts
diff --git a/src/auth/providers/sharedCredentialsProvider.ts b/packages/toolkit/src/auth/providers/sharedCredentialsProvider.ts
similarity index 100%
rename from src/auth/providers/sharedCredentialsProvider.ts
rename to packages/toolkit/src/auth/providers/sharedCredentialsProvider.ts
diff --git a/src/auth/providers/sharedCredentialsProviderFactory.ts b/packages/toolkit/src/auth/providers/sharedCredentialsProviderFactory.ts
similarity index 100%
rename from src/auth/providers/sharedCredentialsProviderFactory.ts
rename to packages/toolkit/src/auth/providers/sharedCredentialsProviderFactory.ts
diff --git a/src/auth/providers/ssoCredentialsProvider.ts b/packages/toolkit/src/auth/providers/ssoCredentialsProvider.ts
similarity index 100%
rename from src/auth/providers/ssoCredentialsProvider.ts
rename to packages/toolkit/src/auth/providers/ssoCredentialsProvider.ts
diff --git a/src/auth/providers/tempCredentialsProvider.ts b/packages/toolkit/src/auth/providers/tempCredentialsProvider.ts
similarity index 100%
rename from src/auth/providers/tempCredentialsProvider.ts
rename to packages/toolkit/src/auth/providers/tempCredentialsProvider.ts
diff --git a/src/auth/secondaryAuth.ts b/packages/toolkit/src/auth/secondaryAuth.ts
similarity index 100%
rename from src/auth/secondaryAuth.ts
rename to packages/toolkit/src/auth/secondaryAuth.ts
diff --git a/src/auth/sso/cache.ts b/packages/toolkit/src/auth/sso/cache.ts
similarity index 100%
rename from src/auth/sso/cache.ts
rename to packages/toolkit/src/auth/sso/cache.ts
diff --git a/src/auth/sso/clients.ts b/packages/toolkit/src/auth/sso/clients.ts
similarity index 100%
rename from src/auth/sso/clients.ts
rename to packages/toolkit/src/auth/sso/clients.ts
diff --git a/src/auth/sso/model.ts b/packages/toolkit/src/auth/sso/model.ts
similarity index 100%
rename from src/auth/sso/model.ts
rename to packages/toolkit/src/auth/sso/model.ts
diff --git a/src/auth/sso/sdkV2Compat.ts b/packages/toolkit/src/auth/sso/sdkV2Compat.ts
similarity index 100%
rename from src/auth/sso/sdkV2Compat.ts
rename to packages/toolkit/src/auth/sso/sdkV2Compat.ts
diff --git a/src/auth/sso/ssoAccessTokenProvider.ts b/packages/toolkit/src/auth/sso/ssoAccessTokenProvider.ts
similarity index 100%
rename from src/auth/sso/ssoAccessTokenProvider.ts
rename to packages/toolkit/src/auth/sso/ssoAccessTokenProvider.ts
diff --git a/src/auth/sso/validation.ts b/packages/toolkit/src/auth/sso/validation.ts
similarity index 100%
rename from src/auth/sso/validation.ts
rename to packages/toolkit/src/auth/sso/validation.ts
diff --git a/src/auth/ui/statusBarItem.ts b/packages/toolkit/src/auth/ui/statusBarItem.ts
similarity index 100%
rename from src/auth/ui/statusBarItem.ts
rename to packages/toolkit/src/auth/ui/statusBarItem.ts
diff --git a/src/auth/ui/vue/authForms/README.md b/packages/toolkit/src/auth/ui/vue/authForms/README.md
similarity index 100%
rename from src/auth/ui/vue/authForms/README.md
rename to packages/toolkit/src/auth/ui/vue/authForms/README.md
diff --git a/src/auth/ui/vue/authForms/baseAuth.vue b/packages/toolkit/src/auth/ui/vue/authForms/baseAuth.vue
similarity index 100%
rename from src/auth/ui/vue/authForms/baseAuth.vue
rename to packages/toolkit/src/auth/ui/vue/authForms/baseAuth.vue
diff --git a/src/auth/ui/vue/authForms/formTitle.vue b/packages/toolkit/src/auth/ui/vue/authForms/formTitle.vue
similarity index 100%
rename from src/auth/ui/vue/authForms/formTitle.vue
rename to packages/toolkit/src/auth/ui/vue/authForms/formTitle.vue
diff --git a/src/auth/ui/vue/authForms/manageBuilderId.vue b/packages/toolkit/src/auth/ui/vue/authForms/manageBuilderId.vue
similarity index 100%
rename from src/auth/ui/vue/authForms/manageBuilderId.vue
rename to packages/toolkit/src/auth/ui/vue/authForms/manageBuilderId.vue
diff --git a/src/auth/ui/vue/authForms/manageCredentials.vue b/packages/toolkit/src/auth/ui/vue/authForms/manageCredentials.vue
similarity index 100%
rename from src/auth/ui/vue/authForms/manageCredentials.vue
rename to packages/toolkit/src/auth/ui/vue/authForms/manageCredentials.vue
diff --git a/src/auth/ui/vue/authForms/manageExplorer.vue b/packages/toolkit/src/auth/ui/vue/authForms/manageExplorer.vue
similarity index 100%
rename from src/auth/ui/vue/authForms/manageExplorer.vue
rename to packages/toolkit/src/auth/ui/vue/authForms/manageExplorer.vue
diff --git a/src/auth/ui/vue/authForms/manageIdentityCenter.vue b/packages/toolkit/src/auth/ui/vue/authForms/manageIdentityCenter.vue
similarity index 100%
rename from src/auth/ui/vue/authForms/manageIdentityCenter.vue
rename to packages/toolkit/src/auth/ui/vue/authForms/manageIdentityCenter.vue
diff --git a/src/auth/ui/vue/authForms/shared.vue b/packages/toolkit/src/auth/ui/vue/authForms/shared.vue
similarity index 100%
rename from src/auth/ui/vue/authForms/shared.vue
rename to packages/toolkit/src/auth/ui/vue/authForms/shared.vue
diff --git a/src/auth/ui/vue/authForms/sharedAuthForms.css b/packages/toolkit/src/auth/ui/vue/authForms/sharedAuthForms.css
similarity index 100%
rename from src/auth/ui/vue/authForms/sharedAuthForms.css
rename to packages/toolkit/src/auth/ui/vue/authForms/sharedAuthForms.css
diff --git a/src/auth/ui/vue/authForms/types.ts b/packages/toolkit/src/auth/ui/vue/authForms/types.ts
similarity index 100%
rename from src/auth/ui/vue/authForms/types.ts
rename to packages/toolkit/src/auth/ui/vue/authForms/types.ts
diff --git a/src/auth/ui/vue/featurePanel/awsExplorerContent.vue b/packages/toolkit/src/auth/ui/vue/featurePanel/awsExplorerContent.vue
similarity index 100%
rename from src/auth/ui/vue/featurePanel/awsExplorerContent.vue
rename to packages/toolkit/src/auth/ui/vue/featurePanel/awsExplorerContent.vue
diff --git a/src/auth/ui/vue/featurePanel/baseServiceItemContent.css b/packages/toolkit/src/auth/ui/vue/featurePanel/baseServiceItemContent.css
similarity index 100%
rename from src/auth/ui/vue/featurePanel/baseServiceItemContent.css
rename to packages/toolkit/src/auth/ui/vue/featurePanel/baseServiceItemContent.css
diff --git a/src/auth/ui/vue/featurePanel/baseServiceItemContent.vue b/packages/toolkit/src/auth/ui/vue/featurePanel/baseServiceItemContent.vue
similarity index 100%
rename from src/auth/ui/vue/featurePanel/baseServiceItemContent.vue
rename to packages/toolkit/src/auth/ui/vue/featurePanel/baseServiceItemContent.vue
diff --git a/src/auth/ui/vue/featurePanel/codeCatalystContent.vue b/packages/toolkit/src/auth/ui/vue/featurePanel/codeCatalystContent.vue
similarity index 100%
rename from src/auth/ui/vue/featurePanel/codeCatalystContent.vue
rename to packages/toolkit/src/auth/ui/vue/featurePanel/codeCatalystContent.vue
diff --git a/src/auth/ui/vue/featurePanel/codeWhispererContent.vue b/packages/toolkit/src/auth/ui/vue/featurePanel/codeWhispererContent.vue
similarity index 100%
rename from src/auth/ui/vue/featurePanel/codeWhispererContent.vue
rename to packages/toolkit/src/auth/ui/vue/featurePanel/codeWhispererContent.vue
diff --git a/src/auth/ui/vue/featurePanel/shared.vue b/packages/toolkit/src/auth/ui/vue/featurePanel/shared.vue
similarity index 100%
rename from src/auth/ui/vue/featurePanel/shared.vue
rename to packages/toolkit/src/auth/ui/vue/featurePanel/shared.vue
diff --git a/src/auth/ui/vue/index.ts b/packages/toolkit/src/auth/ui/vue/index.ts
similarity index 100%
rename from src/auth/ui/vue/index.ts
rename to packages/toolkit/src/auth/ui/vue/index.ts
diff --git a/src/auth/ui/vue/notifications/baseNotification.vue b/packages/toolkit/src/auth/ui/vue/notifications/baseNotification.vue
similarity index 100%
rename from src/auth/ui/vue/notifications/baseNotification.vue
rename to packages/toolkit/src/auth/ui/vue/notifications/baseNotification.vue
diff --git a/src/auth/ui/vue/notifications/connectedNotification.vue b/packages/toolkit/src/auth/ui/vue/notifications/connectedNotification.vue
similarity index 100%
rename from src/auth/ui/vue/notifications/connectedNotification.vue
rename to packages/toolkit/src/auth/ui/vue/notifications/connectedNotification.vue
diff --git a/src/auth/ui/vue/notifications/credentialsNotification.vue b/packages/toolkit/src/auth/ui/vue/notifications/credentialsNotification.vue
similarity index 100%
rename from src/auth/ui/vue/notifications/credentialsNotification.vue
rename to packages/toolkit/src/auth/ui/vue/notifications/credentialsNotification.vue
diff --git a/src/auth/ui/vue/notifications/notificationContainer.vue b/packages/toolkit/src/auth/ui/vue/notifications/notificationContainer.vue
similarity index 100%
rename from src/auth/ui/vue/notifications/notificationContainer.vue
rename to packages/toolkit/src/auth/ui/vue/notifications/notificationContainer.vue
diff --git a/src/auth/ui/vue/notifications/notifications.vue b/packages/toolkit/src/auth/ui/vue/notifications/notifications.vue
similarity index 100%
rename from src/auth/ui/vue/notifications/notifications.vue
rename to packages/toolkit/src/auth/ui/vue/notifications/notifications.vue
diff --git a/src/auth/ui/vue/root.vue b/packages/toolkit/src/auth/ui/vue/root.vue
similarity index 100%
rename from src/auth/ui/vue/root.vue
rename to packages/toolkit/src/auth/ui/vue/root.vue
diff --git a/src/auth/ui/vue/shared.css b/packages/toolkit/src/auth/ui/vue/shared.css
similarity index 100%
rename from src/auth/ui/vue/shared.css
rename to packages/toolkit/src/auth/ui/vue/shared.css
diff --git a/src/auth/ui/vue/show.ts b/packages/toolkit/src/auth/ui/vue/show.ts
similarity index 100%
rename from src/auth/ui/vue/show.ts
rename to packages/toolkit/src/auth/ui/vue/show.ts
diff --git a/src/auth/ui/vue/telemetry.vue b/packages/toolkit/src/auth/ui/vue/telemetry.vue
similarity index 100%
rename from src/auth/ui/vue/telemetry.vue
rename to packages/toolkit/src/auth/ui/vue/telemetry.vue
diff --git a/src/auth/ui/vue/types.ts b/packages/toolkit/src/auth/ui/vue/types.ts
similarity index 100%
rename from src/auth/ui/vue/types.ts
rename to packages/toolkit/src/auth/ui/vue/types.ts
diff --git a/src/auth/utils.ts b/packages/toolkit/src/auth/utils.ts
similarity index 100%
rename from src/auth/utils.ts
rename to packages/toolkit/src/auth/utils.ts
diff --git a/src/auth/wizards/createProfile.ts b/packages/toolkit/src/auth/wizards/createProfile.ts
similarity index 100%
rename from src/auth/wizards/createProfile.ts
rename to packages/toolkit/src/auth/wizards/createProfile.ts
diff --git a/src/auth/wizards/sso.ts b/packages/toolkit/src/auth/wizards/sso.ts
similarity index 100%
rename from src/auth/wizards/sso.ts
rename to packages/toolkit/src/auth/wizards/sso.ts
diff --git a/src/auth/wizards/templates.ts b/packages/toolkit/src/auth/wizards/templates.ts
similarity index 100%
rename from src/auth/wizards/templates.ts
rename to packages/toolkit/src/auth/wizards/templates.ts
diff --git a/src/awsexplorer/activation.ts b/packages/toolkit/src/awsexplorer/activation.ts
similarity index 100%
rename from src/awsexplorer/activation.ts
rename to packages/toolkit/src/awsexplorer/activation.ts
diff --git a/src/awsexplorer/awsExplorer.ts b/packages/toolkit/src/awsexplorer/awsExplorer.ts
similarity index 100%
rename from src/awsexplorer/awsExplorer.ts
rename to packages/toolkit/src/awsexplorer/awsExplorer.ts
diff --git a/src/awsexplorer/childNodeCache.ts b/packages/toolkit/src/awsexplorer/childNodeCache.ts
similarity index 100%
rename from src/awsexplorer/childNodeCache.ts
rename to packages/toolkit/src/awsexplorer/childNodeCache.ts
diff --git a/src/awsexplorer/childNodeLoader.ts b/packages/toolkit/src/awsexplorer/childNodeLoader.ts
similarity index 100%
rename from src/awsexplorer/childNodeLoader.ts
rename to packages/toolkit/src/awsexplorer/childNodeLoader.ts
diff --git a/src/awsexplorer/commands/copyText.ts b/packages/toolkit/src/awsexplorer/commands/copyText.ts
similarity index 100%
rename from src/awsexplorer/commands/copyText.ts
rename to packages/toolkit/src/awsexplorer/commands/copyText.ts
diff --git a/src/awsexplorer/commands/loadMoreChildren.ts b/packages/toolkit/src/awsexplorer/commands/loadMoreChildren.ts
similarity index 100%
rename from src/awsexplorer/commands/loadMoreChildren.ts
rename to packages/toolkit/src/awsexplorer/commands/loadMoreChildren.ts
diff --git a/src/awsexplorer/defaultRegion.ts b/packages/toolkit/src/awsexplorer/defaultRegion.ts
similarity index 100%
rename from src/awsexplorer/defaultRegion.ts
rename to packages/toolkit/src/awsexplorer/defaultRegion.ts
diff --git a/src/awsexplorer/moreResultsNode.ts b/packages/toolkit/src/awsexplorer/moreResultsNode.ts
similarity index 100%
rename from src/awsexplorer/moreResultsNode.ts
rename to packages/toolkit/src/awsexplorer/moreResultsNode.ts
diff --git a/src/awsexplorer/regionNode.ts b/packages/toolkit/src/awsexplorer/regionNode.ts
similarity index 100%
rename from src/awsexplorer/regionNode.ts
rename to packages/toolkit/src/awsexplorer/regionNode.ts
diff --git a/src/awsexplorer/toolView.ts b/packages/toolkit/src/awsexplorer/toolView.ts
similarity index 100%
rename from src/awsexplorer/toolView.ts
rename to packages/toolkit/src/awsexplorer/toolView.ts
diff --git a/src/browser/README.md b/packages/toolkit/src/browser/README.md
similarity index 100%
rename from src/browser/README.md
rename to packages/toolkit/src/browser/README.md
diff --git a/src/browser/package.json b/packages/toolkit/src/browser/package.json
similarity index 100%
rename from src/browser/package.json
rename to packages/toolkit/src/browser/package.json
diff --git a/src/cdk/explorer/cdkProject.ts b/packages/toolkit/src/cdk/explorer/cdkProject.ts
similarity index 100%
rename from src/cdk/explorer/cdkProject.ts
rename to packages/toolkit/src/cdk/explorer/cdkProject.ts
diff --git a/src/cdk/explorer/detectCdkProjects.ts b/packages/toolkit/src/cdk/explorer/detectCdkProjects.ts
similarity index 100%
rename from src/cdk/explorer/detectCdkProjects.ts
rename to packages/toolkit/src/cdk/explorer/detectCdkProjects.ts
diff --git a/src/cdk/explorer/nodes/appNode.ts b/packages/toolkit/src/cdk/explorer/nodes/appNode.ts
similarity index 100%
rename from src/cdk/explorer/nodes/appNode.ts
rename to packages/toolkit/src/cdk/explorer/nodes/appNode.ts
diff --git a/src/cdk/explorer/nodes/constructNode.ts b/packages/toolkit/src/cdk/explorer/nodes/constructNode.ts
similarity index 100%
rename from src/cdk/explorer/nodes/constructNode.ts
rename to packages/toolkit/src/cdk/explorer/nodes/constructNode.ts
diff --git a/src/cdk/explorer/nodes/propertyNode.ts b/packages/toolkit/src/cdk/explorer/nodes/propertyNode.ts
similarity index 100%
rename from src/cdk/explorer/nodes/propertyNode.ts
rename to packages/toolkit/src/cdk/explorer/nodes/propertyNode.ts
diff --git a/src/cdk/explorer/rootNode.ts b/packages/toolkit/src/cdk/explorer/rootNode.ts
similarity index 100%
rename from src/cdk/explorer/rootNode.ts
rename to packages/toolkit/src/cdk/explorer/rootNode.ts
diff --git a/src/cdk/explorer/tree/treeInspector.ts b/packages/toolkit/src/cdk/explorer/tree/treeInspector.ts
similarity index 100%
rename from src/cdk/explorer/tree/treeInspector.ts
rename to packages/toolkit/src/cdk/explorer/tree/treeInspector.ts
diff --git a/src/cdk/explorer/tree/types.ts b/packages/toolkit/src/cdk/explorer/tree/types.ts
similarity index 100%
rename from src/cdk/explorer/tree/types.ts
rename to packages/toolkit/src/cdk/explorer/tree/types.ts
diff --git a/src/cloudWatchLogs/activation.ts b/packages/toolkit/src/cloudWatchLogs/activation.ts
similarity index 100%
rename from src/cloudWatchLogs/activation.ts
rename to packages/toolkit/src/cloudWatchLogs/activation.ts
diff --git a/src/cloudWatchLogs/changeLogSearch.ts b/packages/toolkit/src/cloudWatchLogs/changeLogSearch.ts
similarity index 100%
rename from src/cloudWatchLogs/changeLogSearch.ts
rename to packages/toolkit/src/cloudWatchLogs/changeLogSearch.ts
diff --git a/src/cloudWatchLogs/cloudWatchLogsUtils.ts b/packages/toolkit/src/cloudWatchLogs/cloudWatchLogsUtils.ts
similarity index 100%
rename from src/cloudWatchLogs/cloudWatchLogsUtils.ts
rename to packages/toolkit/src/cloudWatchLogs/cloudWatchLogsUtils.ts
diff --git a/src/cloudWatchLogs/commands/addLogEvents.ts b/packages/toolkit/src/cloudWatchLogs/commands/addLogEvents.ts
similarity index 100%
rename from src/cloudWatchLogs/commands/addLogEvents.ts
rename to packages/toolkit/src/cloudWatchLogs/commands/addLogEvents.ts
diff --git a/src/cloudWatchLogs/commands/copyLogResource.ts b/packages/toolkit/src/cloudWatchLogs/commands/copyLogResource.ts
similarity index 100%
rename from src/cloudWatchLogs/commands/copyLogResource.ts
rename to packages/toolkit/src/cloudWatchLogs/commands/copyLogResource.ts
diff --git a/src/cloudWatchLogs/commands/saveCurrentLogDataContent.ts b/packages/toolkit/src/cloudWatchLogs/commands/saveCurrentLogDataContent.ts
similarity index 100%
rename from src/cloudWatchLogs/commands/saveCurrentLogDataContent.ts
rename to packages/toolkit/src/cloudWatchLogs/commands/saveCurrentLogDataContent.ts
diff --git a/src/cloudWatchLogs/commands/searchLogGroup.ts b/packages/toolkit/src/cloudWatchLogs/commands/searchLogGroup.ts
similarity index 100%
rename from src/cloudWatchLogs/commands/searchLogGroup.ts
rename to packages/toolkit/src/cloudWatchLogs/commands/searchLogGroup.ts
diff --git a/src/cloudWatchLogs/commands/viewLogStream.ts b/packages/toolkit/src/cloudWatchLogs/commands/viewLogStream.ts
similarity index 100%
rename from src/cloudWatchLogs/commands/viewLogStream.ts
rename to packages/toolkit/src/cloudWatchLogs/commands/viewLogStream.ts
diff --git a/src/cloudWatchLogs/document/logDataCodeLensProvider.ts b/packages/toolkit/src/cloudWatchLogs/document/logDataCodeLensProvider.ts
similarity index 100%
rename from src/cloudWatchLogs/document/logDataCodeLensProvider.ts
rename to packages/toolkit/src/cloudWatchLogs/document/logDataCodeLensProvider.ts
diff --git a/src/cloudWatchLogs/document/logDataDocumentProvider.ts b/packages/toolkit/src/cloudWatchLogs/document/logDataDocumentProvider.ts
similarity index 100%
rename from src/cloudWatchLogs/document/logDataDocumentProvider.ts
rename to packages/toolkit/src/cloudWatchLogs/document/logDataDocumentProvider.ts
diff --git a/src/cloudWatchLogs/document/logStreamsCodeLensProvider.ts b/packages/toolkit/src/cloudWatchLogs/document/logStreamsCodeLensProvider.ts
similarity index 100%
rename from src/cloudWatchLogs/document/logStreamsCodeLensProvider.ts
rename to packages/toolkit/src/cloudWatchLogs/document/logStreamsCodeLensProvider.ts
diff --git a/src/cloudWatchLogs/document/textContent.ts b/packages/toolkit/src/cloudWatchLogs/document/textContent.ts
similarity index 100%
rename from src/cloudWatchLogs/document/textContent.ts
rename to packages/toolkit/src/cloudWatchLogs/document/textContent.ts
diff --git a/src/cloudWatchLogs/explorer/cloudWatchLogsNode.ts b/packages/toolkit/src/cloudWatchLogs/explorer/cloudWatchLogsNode.ts
similarity index 100%
rename from src/cloudWatchLogs/explorer/cloudWatchLogsNode.ts
rename to packages/toolkit/src/cloudWatchLogs/explorer/cloudWatchLogsNode.ts
diff --git a/src/cloudWatchLogs/explorer/logGroupNode.ts b/packages/toolkit/src/cloudWatchLogs/explorer/logGroupNode.ts
similarity index 100%
rename from src/cloudWatchLogs/explorer/logGroupNode.ts
rename to packages/toolkit/src/cloudWatchLogs/explorer/logGroupNode.ts
diff --git a/src/cloudWatchLogs/registry/logDataRegistry.ts b/packages/toolkit/src/cloudWatchLogs/registry/logDataRegistry.ts
similarity index 100%
rename from src/cloudWatchLogs/registry/logDataRegistry.ts
rename to packages/toolkit/src/cloudWatchLogs/registry/logDataRegistry.ts
diff --git a/src/cloudWatchLogs/timeFilterSubmenu.ts b/packages/toolkit/src/cloudWatchLogs/timeFilterSubmenu.ts
similarity index 100%
rename from src/cloudWatchLogs/timeFilterSubmenu.ts
rename to packages/toolkit/src/cloudWatchLogs/timeFilterSubmenu.ts
diff --git a/src/codecatalyst/activation.ts b/packages/toolkit/src/codecatalyst/activation.ts
similarity index 100%
rename from src/codecatalyst/activation.ts
rename to packages/toolkit/src/codecatalyst/activation.ts
diff --git a/src/codecatalyst/auth.ts b/packages/toolkit/src/codecatalyst/auth.ts
similarity index 100%
rename from src/codecatalyst/auth.ts
rename to packages/toolkit/src/codecatalyst/auth.ts
diff --git a/src/codecatalyst/commands.ts b/packages/toolkit/src/codecatalyst/commands.ts
similarity index 100%
rename from src/codecatalyst/commands.ts
rename to packages/toolkit/src/codecatalyst/commands.ts
diff --git a/src/codecatalyst/devEnv.ts b/packages/toolkit/src/codecatalyst/devEnv.ts
similarity index 100%
rename from src/codecatalyst/devEnv.ts
rename to packages/toolkit/src/codecatalyst/devEnv.ts
diff --git a/src/codecatalyst/devfile.ts b/packages/toolkit/src/codecatalyst/devfile.ts
similarity index 100%
rename from src/codecatalyst/devfile.ts
rename to packages/toolkit/src/codecatalyst/devfile.ts
diff --git a/src/codecatalyst/explorer.ts b/packages/toolkit/src/codecatalyst/explorer.ts
similarity index 100%
rename from src/codecatalyst/explorer.ts
rename to packages/toolkit/src/codecatalyst/explorer.ts
diff --git a/src/codecatalyst/model.ts b/packages/toolkit/src/codecatalyst/model.ts
similarity index 100%
rename from src/codecatalyst/model.ts
rename to packages/toolkit/src/codecatalyst/model.ts
diff --git a/src/codecatalyst/reconnect.ts b/packages/toolkit/src/codecatalyst/reconnect.ts
similarity index 100%
rename from src/codecatalyst/reconnect.ts
rename to packages/toolkit/src/codecatalyst/reconnect.ts
diff --git a/src/codecatalyst/repos/remoteSourceProvider.ts b/packages/toolkit/src/codecatalyst/repos/remoteSourceProvider.ts
similarity index 100%
rename from src/codecatalyst/repos/remoteSourceProvider.ts
rename to packages/toolkit/src/codecatalyst/repos/remoteSourceProvider.ts
diff --git a/src/codecatalyst/uriHandlers.ts b/packages/toolkit/src/codecatalyst/uriHandlers.ts
similarity index 100%
rename from src/codecatalyst/uriHandlers.ts
rename to packages/toolkit/src/codecatalyst/uriHandlers.ts
diff --git a/src/codecatalyst/utils.ts b/packages/toolkit/src/codecatalyst/utils.ts
similarity index 100%
rename from src/codecatalyst/utils.ts
rename to packages/toolkit/src/codecatalyst/utils.ts
diff --git a/src/codecatalyst/vue/compute.vue b/packages/toolkit/src/codecatalyst/vue/compute.vue
similarity index 100%
rename from src/codecatalyst/vue/compute.vue
rename to packages/toolkit/src/codecatalyst/vue/compute.vue
diff --git a/src/codecatalyst/vue/configure/backend.ts b/packages/toolkit/src/codecatalyst/vue/configure/backend.ts
similarity index 100%
rename from src/codecatalyst/vue/configure/backend.ts
rename to packages/toolkit/src/codecatalyst/vue/configure/backend.ts
diff --git a/src/codecatalyst/vue/configure/index.ts b/packages/toolkit/src/codecatalyst/vue/configure/index.ts
similarity index 100%
rename from src/codecatalyst/vue/configure/index.ts
rename to packages/toolkit/src/codecatalyst/vue/configure/index.ts
diff --git a/src/codecatalyst/vue/configure/root.vue b/packages/toolkit/src/codecatalyst/vue/configure/root.vue
similarity index 100%
rename from src/codecatalyst/vue/configure/root.vue
rename to packages/toolkit/src/codecatalyst/vue/configure/root.vue
diff --git a/src/codecatalyst/vue/create/backend.ts b/packages/toolkit/src/codecatalyst/vue/create/backend.ts
similarity index 100%
rename from src/codecatalyst/vue/create/backend.ts
rename to packages/toolkit/src/codecatalyst/vue/create/backend.ts
diff --git a/src/codecatalyst/vue/create/index.ts b/packages/toolkit/src/codecatalyst/vue/create/index.ts
similarity index 100%
rename from src/codecatalyst/vue/create/index.ts
rename to packages/toolkit/src/codecatalyst/vue/create/index.ts
diff --git a/src/codecatalyst/vue/create/root.vue b/packages/toolkit/src/codecatalyst/vue/create/root.vue
similarity index 100%
rename from src/codecatalyst/vue/create/root.vue
rename to packages/toolkit/src/codecatalyst/vue/create/root.vue
diff --git a/src/codecatalyst/vue/create/source.vue b/packages/toolkit/src/codecatalyst/vue/create/source.vue
similarity index 100%
rename from src/codecatalyst/vue/create/source.vue
rename to packages/toolkit/src/codecatalyst/vue/create/source.vue
diff --git a/src/codecatalyst/vue/devfile.vue b/packages/toolkit/src/codecatalyst/vue/devfile.vue
similarity index 100%
rename from src/codecatalyst/vue/devfile.vue
rename to packages/toolkit/src/codecatalyst/vue/devfile.vue
diff --git a/src/codecatalyst/vue/summary.vue b/packages/toolkit/src/codecatalyst/vue/summary.vue
similarity index 100%
rename from src/codecatalyst/vue/summary.vue
rename to packages/toolkit/src/codecatalyst/vue/summary.vue
diff --git a/src/codecatalyst/wizards/devenvSettings.ts b/packages/toolkit/src/codecatalyst/wizards/devenvSettings.ts
similarity index 100%
rename from src/codecatalyst/wizards/devenvSettings.ts
rename to packages/toolkit/src/codecatalyst/wizards/devenvSettings.ts
diff --git a/src/codecatalyst/wizards/parameterDescriptions.json b/packages/toolkit/src/codecatalyst/wizards/parameterDescriptions.json
similarity index 100%
rename from src/codecatalyst/wizards/parameterDescriptions.json
rename to packages/toolkit/src/codecatalyst/wizards/parameterDescriptions.json
diff --git a/src/codecatalyst/wizards/selectResource.ts b/packages/toolkit/src/codecatalyst/wizards/selectResource.ts
similarity index 100%
rename from src/codecatalyst/wizards/selectResource.ts
rename to packages/toolkit/src/codecatalyst/wizards/selectResource.ts
diff --git a/src/codewhisperer/activation.ts b/packages/toolkit/src/codewhisperer/activation.ts
similarity index 100%
rename from src/codewhisperer/activation.ts
rename to packages/toolkit/src/codewhisperer/activation.ts
diff --git a/src/codewhisperer/client/agent.ts b/packages/toolkit/src/codewhisperer/client/agent.ts
similarity index 100%
rename from src/codewhisperer/client/agent.ts
rename to packages/toolkit/src/codewhisperer/client/agent.ts
diff --git a/src/codewhisperer/client/codewhisperer.ts b/packages/toolkit/src/codewhisperer/client/codewhisperer.ts
similarity index 100%
rename from src/codewhisperer/client/codewhisperer.ts
rename to packages/toolkit/src/codewhisperer/client/codewhisperer.ts
diff --git a/src/codewhisperer/client/service-2.json b/packages/toolkit/src/codewhisperer/client/service-2.json
similarity index 100%
rename from src/codewhisperer/client/service-2.json
rename to packages/toolkit/src/codewhisperer/client/service-2.json
diff --git a/src/codewhisperer/client/user-service-2.json b/packages/toolkit/src/codewhisperer/client/user-service-2.json
similarity index 100%
rename from src/codewhisperer/client/user-service-2.json
rename to packages/toolkit/src/codewhisperer/client/user-service-2.json
diff --git a/src/codewhisperer/commands/basicCommands.ts b/packages/toolkit/src/codewhisperer/commands/basicCommands.ts
similarity index 100%
rename from src/codewhisperer/commands/basicCommands.ts
rename to packages/toolkit/src/codewhisperer/commands/basicCommands.ts
diff --git a/src/codewhisperer/commands/gettingStartedPageCommands.ts b/packages/toolkit/src/codewhisperer/commands/gettingStartedPageCommands.ts
similarity index 100%
rename from src/codewhisperer/commands/gettingStartedPageCommands.ts
rename to packages/toolkit/src/codewhisperer/commands/gettingStartedPageCommands.ts
diff --git a/src/codewhisperer/commands/invokeRecommendation.ts b/packages/toolkit/src/codewhisperer/commands/invokeRecommendation.ts
similarity index 100%
rename from src/codewhisperer/commands/invokeRecommendation.ts
rename to packages/toolkit/src/codewhisperer/commands/invokeRecommendation.ts
diff --git a/src/codewhisperer/commands/onAcceptance.ts b/packages/toolkit/src/codewhisperer/commands/onAcceptance.ts
similarity index 100%
rename from src/codewhisperer/commands/onAcceptance.ts
rename to packages/toolkit/src/codewhisperer/commands/onAcceptance.ts
diff --git a/src/codewhisperer/commands/onInlineAcceptance.ts b/packages/toolkit/src/codewhisperer/commands/onInlineAcceptance.ts
similarity index 100%
rename from src/codewhisperer/commands/onInlineAcceptance.ts
rename to packages/toolkit/src/codewhisperer/commands/onInlineAcceptance.ts
diff --git a/src/codewhisperer/commands/startSecurityScan.ts b/packages/toolkit/src/codewhisperer/commands/startSecurityScan.ts
similarity index 100%
rename from src/codewhisperer/commands/startSecurityScan.ts
rename to packages/toolkit/src/codewhisperer/commands/startSecurityScan.ts
diff --git a/src/codewhisperer/commands/startTransformByQ.ts b/packages/toolkit/src/codewhisperer/commands/startTransformByQ.ts
similarity index 100%
rename from src/codewhisperer/commands/startTransformByQ.ts
rename to packages/toolkit/src/codewhisperer/commands/startTransformByQ.ts
diff --git a/src/codewhisperer/commands/statusBarCommands.ts b/packages/toolkit/src/codewhisperer/commands/statusBarCommands.ts
similarity index 100%
rename from src/codewhisperer/commands/statusBarCommands.ts
rename to packages/toolkit/src/codewhisperer/commands/statusBarCommands.ts
diff --git a/src/codewhisperer/commands/types.ts b/packages/toolkit/src/codewhisperer/commands/types.ts
similarity index 100%
rename from src/codewhisperer/commands/types.ts
rename to packages/toolkit/src/codewhisperer/commands/types.ts
diff --git a/src/codewhisperer/explorer/codewhispererChildrenNodes.ts b/packages/toolkit/src/codewhisperer/explorer/codewhispererChildrenNodes.ts
similarity index 100%
rename from src/codewhisperer/explorer/codewhispererChildrenNodes.ts
rename to packages/toolkit/src/codewhisperer/explorer/codewhispererChildrenNodes.ts
diff --git a/src/codewhisperer/explorer/codewhispererNode.ts b/packages/toolkit/src/codewhisperer/explorer/codewhispererNode.ts
similarity index 100%
rename from src/codewhisperer/explorer/codewhispererNode.ts
rename to packages/toolkit/src/codewhisperer/explorer/codewhispererNode.ts
diff --git a/src/codewhisperer/models/constants.ts b/packages/toolkit/src/codewhisperer/models/constants.ts
similarity index 100%
rename from src/codewhisperer/models/constants.ts
rename to packages/toolkit/src/codewhisperer/models/constants.ts
diff --git a/src/codewhisperer/models/model.ts b/packages/toolkit/src/codewhisperer/models/model.ts
similarity index 100%
rename from src/codewhisperer/models/model.ts
rename to packages/toolkit/src/codewhisperer/models/model.ts
diff --git a/src/codewhisperer/paginators.json b/packages/toolkit/src/codewhisperer/paginators.json
similarity index 100%
rename from src/codewhisperer/paginators.json
rename to packages/toolkit/src/codewhisperer/paginators.json
diff --git a/src/codewhisperer/service/classifierTrigger.ts b/packages/toolkit/src/codewhisperer/service/classifierTrigger.ts
similarity index 100%
rename from src/codewhisperer/service/classifierTrigger.ts
rename to packages/toolkit/src/codewhisperer/service/classifierTrigger.ts
diff --git a/src/codewhisperer/service/completionProvider.ts b/packages/toolkit/src/codewhisperer/service/completionProvider.ts
similarity index 100%
rename from src/codewhisperer/service/completionProvider.ts
rename to packages/toolkit/src/codewhisperer/service/completionProvider.ts
diff --git a/src/codewhisperer/service/diagnosticsProvider.ts b/packages/toolkit/src/codewhisperer/service/diagnosticsProvider.ts
similarity index 100%
rename from src/codewhisperer/service/diagnosticsProvider.ts
rename to packages/toolkit/src/codewhisperer/service/diagnosticsProvider.ts
diff --git a/src/codewhisperer/service/featureConfigProvider.ts b/packages/toolkit/src/codewhisperer/service/featureConfigProvider.ts
similarity index 100%
rename from src/codewhisperer/service/featureConfigProvider.ts
rename to packages/toolkit/src/codewhisperer/service/featureConfigProvider.ts
diff --git a/src/codewhisperer/service/importAdderProvider.ts b/packages/toolkit/src/codewhisperer/service/importAdderProvider.ts
similarity index 100%
rename from src/codewhisperer/service/importAdderProvider.ts
rename to packages/toolkit/src/codewhisperer/service/importAdderProvider.ts
diff --git a/src/codewhisperer/service/inlineCompletionItemProvider.ts b/packages/toolkit/src/codewhisperer/service/inlineCompletionItemProvider.ts
similarity index 100%
rename from src/codewhisperer/service/inlineCompletionItemProvider.ts
rename to packages/toolkit/src/codewhisperer/service/inlineCompletionItemProvider.ts
diff --git a/src/codewhisperer/service/inlineCompletionService.ts b/packages/toolkit/src/codewhisperer/service/inlineCompletionService.ts
similarity index 100%
rename from src/codewhisperer/service/inlineCompletionService.ts
rename to packages/toolkit/src/codewhisperer/service/inlineCompletionService.ts
diff --git a/src/codewhisperer/service/keyStrokeHandler.ts b/packages/toolkit/src/codewhisperer/service/keyStrokeHandler.ts
similarity index 100%
rename from src/codewhisperer/service/keyStrokeHandler.ts
rename to packages/toolkit/src/codewhisperer/service/keyStrokeHandler.ts
diff --git a/src/codewhisperer/service/recommendationHandler.ts b/packages/toolkit/src/codewhisperer/service/recommendationHandler.ts
similarity index 100%
rename from src/codewhisperer/service/recommendationHandler.ts
rename to packages/toolkit/src/codewhisperer/service/recommendationHandler.ts
diff --git a/src/codewhisperer/service/recommendationService.ts b/packages/toolkit/src/codewhisperer/service/recommendationService.ts
similarity index 100%
rename from src/codewhisperer/service/recommendationService.ts
rename to packages/toolkit/src/codewhisperer/service/recommendationService.ts
diff --git a/src/codewhisperer/service/referenceHoverProvider.ts b/packages/toolkit/src/codewhisperer/service/referenceHoverProvider.ts
similarity index 100%
rename from src/codewhisperer/service/referenceHoverProvider.ts
rename to packages/toolkit/src/codewhisperer/service/referenceHoverProvider.ts
diff --git a/src/codewhisperer/service/referenceInlineProvider.ts b/packages/toolkit/src/codewhisperer/service/referenceInlineProvider.ts
similarity index 100%
rename from src/codewhisperer/service/referenceInlineProvider.ts
rename to packages/toolkit/src/codewhisperer/service/referenceInlineProvider.ts
diff --git a/src/codewhisperer/service/referenceLogViewProvider.ts b/packages/toolkit/src/codewhisperer/service/referenceLogViewProvider.ts
similarity index 100%
rename from src/codewhisperer/service/referenceLogViewProvider.ts
rename to packages/toolkit/src/codewhisperer/service/referenceLogViewProvider.ts
diff --git a/src/codewhisperer/service/securityIssueCodeActionProvider.ts b/packages/toolkit/src/codewhisperer/service/securityIssueCodeActionProvider.ts
similarity index 100%
rename from src/codewhisperer/service/securityIssueCodeActionProvider.ts
rename to packages/toolkit/src/codewhisperer/service/securityIssueCodeActionProvider.ts
diff --git a/src/codewhisperer/service/securityIssueHoverProvider.ts b/packages/toolkit/src/codewhisperer/service/securityIssueHoverProvider.ts
similarity index 100%
rename from src/codewhisperer/service/securityIssueHoverProvider.ts
rename to packages/toolkit/src/codewhisperer/service/securityIssueHoverProvider.ts
diff --git a/src/codewhisperer/service/securityIssueProvider.ts b/packages/toolkit/src/codewhisperer/service/securityIssueProvider.ts
similarity index 100%
rename from src/codewhisperer/service/securityIssueProvider.ts
rename to packages/toolkit/src/codewhisperer/service/securityIssueProvider.ts
diff --git a/src/codewhisperer/service/securityScanHandler.ts b/packages/toolkit/src/codewhisperer/service/securityScanHandler.ts
similarity index 100%
rename from src/codewhisperer/service/securityScanHandler.ts
rename to packages/toolkit/src/codewhisperer/service/securityScanHandler.ts
diff --git a/src/codewhisperer/service/transformByQHandler.ts b/packages/toolkit/src/codewhisperer/service/transformByQHandler.ts
similarity index 100%
rename from src/codewhisperer/service/transformByQHandler.ts
rename to packages/toolkit/src/codewhisperer/service/transformByQHandler.ts
diff --git a/src/codewhisperer/service/transformationHubViewProvider.ts b/packages/toolkit/src/codewhisperer/service/transformationHubViewProvider.ts
similarity index 100%
rename from src/codewhisperer/service/transformationHubViewProvider.ts
rename to packages/toolkit/src/codewhisperer/service/transformationHubViewProvider.ts
diff --git a/src/codewhisperer/service/transformationResultsViewProvider.ts b/packages/toolkit/src/codewhisperer/service/transformationResultsViewProvider.ts
similarity index 100%
rename from src/codewhisperer/service/transformationResultsViewProvider.ts
rename to packages/toolkit/src/codewhisperer/service/transformationResultsViewProvider.ts
diff --git a/src/codewhisperer/tracker/codewhispererCodeCoverageTracker.ts b/packages/toolkit/src/codewhisperer/tracker/codewhispererCodeCoverageTracker.ts
similarity index 100%
rename from src/codewhisperer/tracker/codewhispererCodeCoverageTracker.ts
rename to packages/toolkit/src/codewhisperer/tracker/codewhispererCodeCoverageTracker.ts
diff --git a/src/codewhisperer/tracker/codewhispererTracker.ts b/packages/toolkit/src/codewhisperer/tracker/codewhispererTracker.ts
similarity index 100%
rename from src/codewhisperer/tracker/codewhispererTracker.ts
rename to packages/toolkit/src/codewhisperer/tracker/codewhispererTracker.ts
diff --git a/src/codewhisperer/util/authUtil.ts b/packages/toolkit/src/codewhisperer/util/authUtil.ts
similarity index 100%
rename from src/codewhisperer/util/authUtil.ts
rename to packages/toolkit/src/codewhisperer/util/authUtil.ts
diff --git a/src/codewhisperer/util/closingBracketUtil.ts b/packages/toolkit/src/codewhisperer/util/closingBracketUtil.ts
similarity index 100%
rename from src/codewhisperer/util/closingBracketUtil.ts
rename to packages/toolkit/src/codewhisperer/util/closingBracketUtil.ts
diff --git a/src/codewhisperer/util/codeWhispererApplication.ts b/packages/toolkit/src/codewhisperer/util/codeWhispererApplication.ts
similarity index 100%
rename from src/codewhisperer/util/codeWhispererApplication.ts
rename to packages/toolkit/src/codewhisperer/util/codeWhispererApplication.ts
diff --git a/src/codewhisperer/util/codeWhispererSession.ts b/packages/toolkit/src/codewhisperer/util/codeWhispererSession.ts
similarity index 100%
rename from src/codewhisperer/util/codeWhispererSession.ts
rename to packages/toolkit/src/codewhisperer/util/codeWhispererSession.ts
diff --git a/src/codewhisperer/util/codewhispererSettings.ts b/packages/toolkit/src/codewhisperer/util/codewhispererSettings.ts
similarity index 100%
rename from src/codewhisperer/util/codewhispererSettings.ts
rename to packages/toolkit/src/codewhisperer/util/codewhispererSettings.ts
diff --git a/src/codewhisperer/util/commonUtil.ts b/packages/toolkit/src/codewhisperer/util/commonUtil.ts
similarity index 100%
rename from src/codewhisperer/util/commonUtil.ts
rename to packages/toolkit/src/codewhisperer/util/commonUtil.ts
diff --git a/src/codewhisperer/util/customizationUtil.ts b/packages/toolkit/src/codewhisperer/util/customizationUtil.ts
similarity index 100%
rename from src/codewhisperer/util/customizationUtil.ts
rename to packages/toolkit/src/codewhisperer/util/customizationUtil.ts
diff --git a/src/codewhisperer/util/dependencyGraph/cloudformationDependencyGraph.ts b/packages/toolkit/src/codewhisperer/util/dependencyGraph/cloudformationDependencyGraph.ts
similarity index 100%
rename from src/codewhisperer/util/dependencyGraph/cloudformationDependencyGraph.ts
rename to packages/toolkit/src/codewhisperer/util/dependencyGraph/cloudformationDependencyGraph.ts
diff --git a/src/codewhisperer/util/dependencyGraph/csharpDependencyGraph.ts b/packages/toolkit/src/codewhisperer/util/dependencyGraph/csharpDependencyGraph.ts
similarity index 100%
rename from src/codewhisperer/util/dependencyGraph/csharpDependencyGraph.ts
rename to packages/toolkit/src/codewhisperer/util/dependencyGraph/csharpDependencyGraph.ts
diff --git a/src/codewhisperer/util/dependencyGraph/dependencyGraph.ts b/packages/toolkit/src/codewhisperer/util/dependencyGraph/dependencyGraph.ts
similarity index 100%
rename from src/codewhisperer/util/dependencyGraph/dependencyGraph.ts
rename to packages/toolkit/src/codewhisperer/util/dependencyGraph/dependencyGraph.ts
diff --git a/src/codewhisperer/util/dependencyGraph/dependencyGraphFactory.ts b/packages/toolkit/src/codewhisperer/util/dependencyGraph/dependencyGraphFactory.ts
similarity index 100%
rename from src/codewhisperer/util/dependencyGraph/dependencyGraphFactory.ts
rename to packages/toolkit/src/codewhisperer/util/dependencyGraph/dependencyGraphFactory.ts
diff --git a/src/codewhisperer/util/dependencyGraph/goDependencyGraph.ts b/packages/toolkit/src/codewhisperer/util/dependencyGraph/goDependencyGraph.ts
similarity index 100%
rename from src/codewhisperer/util/dependencyGraph/goDependencyGraph.ts
rename to packages/toolkit/src/codewhisperer/util/dependencyGraph/goDependencyGraph.ts
diff --git a/src/codewhisperer/util/dependencyGraph/javaDependencyGraph.ts b/packages/toolkit/src/codewhisperer/util/dependencyGraph/javaDependencyGraph.ts
similarity index 100%
rename from src/codewhisperer/util/dependencyGraph/javaDependencyGraph.ts
rename to packages/toolkit/src/codewhisperer/util/dependencyGraph/javaDependencyGraph.ts
diff --git a/src/codewhisperer/util/dependencyGraph/javascriptDependencyGraph.ts b/packages/toolkit/src/codewhisperer/util/dependencyGraph/javascriptDependencyGraph.ts
similarity index 100%
rename from src/codewhisperer/util/dependencyGraph/javascriptDependencyGraph.ts
rename to packages/toolkit/src/codewhisperer/util/dependencyGraph/javascriptDependencyGraph.ts
diff --git a/src/codewhisperer/util/dependencyGraph/pythonDependencyGraph.ts b/packages/toolkit/src/codewhisperer/util/dependencyGraph/pythonDependencyGraph.ts
similarity index 100%
rename from src/codewhisperer/util/dependencyGraph/pythonDependencyGraph.ts
rename to packages/toolkit/src/codewhisperer/util/dependencyGraph/pythonDependencyGraph.ts
diff --git a/src/codewhisperer/util/dependencyGraph/rubyDependencyGraph.ts b/packages/toolkit/src/codewhisperer/util/dependencyGraph/rubyDependencyGraph.ts
similarity index 100%
rename from src/codewhisperer/util/dependencyGraph/rubyDependencyGraph.ts
rename to packages/toolkit/src/codewhisperer/util/dependencyGraph/rubyDependencyGraph.ts
diff --git a/src/codewhisperer/util/dependencyGraph/terraformDependencyGraph.ts b/packages/toolkit/src/codewhisperer/util/dependencyGraph/terraformDependencyGraph.ts
similarity index 100%
rename from src/codewhisperer/util/dependencyGraph/terraformDependencyGraph.ts
rename to packages/toolkit/src/codewhisperer/util/dependencyGraph/terraformDependencyGraph.ts
diff --git a/src/codewhisperer/util/editorContext.ts b/packages/toolkit/src/codewhisperer/util/editorContext.ts
similarity index 100%
rename from src/codewhisperer/util/editorContext.ts
rename to packages/toolkit/src/codewhisperer/util/editorContext.ts
diff --git a/src/codewhisperer/util/getStartUrl.ts b/packages/toolkit/src/codewhisperer/util/getStartUrl.ts
similarity index 100%
rename from src/codewhisperer/util/getStartUrl.ts
rename to packages/toolkit/src/codewhisperer/util/getStartUrl.ts
diff --git a/src/codewhisperer/util/globalStateUtil.ts b/packages/toolkit/src/codewhisperer/util/globalStateUtil.ts
similarity index 100%
rename from src/codewhisperer/util/globalStateUtil.ts
rename to packages/toolkit/src/codewhisperer/util/globalStateUtil.ts
diff --git a/src/codewhisperer/util/importAdderUtil.ts b/packages/toolkit/src/codewhisperer/util/importAdderUtil.ts
similarity index 100%
rename from src/codewhisperer/util/importAdderUtil.ts
rename to packages/toolkit/src/codewhisperer/util/importAdderUtil.ts
diff --git a/src/codewhisperer/util/licenseUtil.ts b/packages/toolkit/src/codewhisperer/util/licenseUtil.ts
similarity index 100%
rename from src/codewhisperer/util/licenseUtil.ts
rename to packages/toolkit/src/codewhisperer/util/licenseUtil.ts
diff --git a/src/codewhisperer/util/runtimeLanguageContext.ts b/packages/toolkit/src/codewhisperer/util/runtimeLanguageContext.ts
similarity index 100%
rename from src/codewhisperer/util/runtimeLanguageContext.ts
rename to packages/toolkit/src/codewhisperer/util/runtimeLanguageContext.ts
diff --git a/src/codewhisperer/util/showSsoPrompt.ts b/packages/toolkit/src/codewhisperer/util/showSsoPrompt.ts
similarity index 100%
rename from src/codewhisperer/util/showSsoPrompt.ts
rename to packages/toolkit/src/codewhisperer/util/showSsoPrompt.ts
diff --git a/src/codewhisperer/util/supplementalContext/codeParsingUtil.ts b/packages/toolkit/src/codewhisperer/util/supplementalContext/codeParsingUtil.ts
similarity index 100%
rename from src/codewhisperer/util/supplementalContext/codeParsingUtil.ts
rename to packages/toolkit/src/codewhisperer/util/supplementalContext/codeParsingUtil.ts
diff --git a/src/codewhisperer/util/supplementalContext/crossFileContextUtil.ts b/packages/toolkit/src/codewhisperer/util/supplementalContext/crossFileContextUtil.ts
similarity index 100%
rename from src/codewhisperer/util/supplementalContext/crossFileContextUtil.ts
rename to packages/toolkit/src/codewhisperer/util/supplementalContext/crossFileContextUtil.ts
diff --git a/src/codewhisperer/util/supplementalContext/rankBm25.ts b/packages/toolkit/src/codewhisperer/util/supplementalContext/rankBm25.ts
similarity index 100%
rename from src/codewhisperer/util/supplementalContext/rankBm25.ts
rename to packages/toolkit/src/codewhisperer/util/supplementalContext/rankBm25.ts
diff --git a/src/codewhisperer/util/supplementalContext/supplementalContextUtil.ts b/packages/toolkit/src/codewhisperer/util/supplementalContext/supplementalContextUtil.ts
similarity index 100%
rename from src/codewhisperer/util/supplementalContext/supplementalContextUtil.ts
rename to packages/toolkit/src/codewhisperer/util/supplementalContext/supplementalContextUtil.ts
diff --git a/src/codewhisperer/util/supplementalContext/utgUtils.ts b/packages/toolkit/src/codewhisperer/util/supplementalContext/utgUtils.ts
similarity index 100%
rename from src/codewhisperer/util/supplementalContext/utgUtils.ts
rename to packages/toolkit/src/codewhisperer/util/supplementalContext/utgUtils.ts
diff --git a/src/codewhisperer/util/telemetryHelper.ts b/packages/toolkit/src/codewhisperer/util/telemetryHelper.ts
similarity index 100%
rename from src/codewhisperer/util/telemetryHelper.ts
rename to packages/toolkit/src/codewhisperer/util/telemetryHelper.ts
diff --git a/src/codewhisperer/util/userGroupUtil.ts b/packages/toolkit/src/codewhisperer/util/userGroupUtil.ts
similarity index 100%
rename from src/codewhisperer/util/userGroupUtil.ts
rename to packages/toolkit/src/codewhisperer/util/userGroupUtil.ts
diff --git a/src/codewhisperer/views/css/codewhispererReferenceLog.css b/packages/toolkit/src/codewhisperer/views/css/codewhispererReferenceLog.css
similarity index 100%
rename from src/codewhisperer/views/css/codewhispererReferenceLog.css
rename to packages/toolkit/src/codewhisperer/views/css/codewhispererReferenceLog.css
diff --git a/src/codewhisperer/views/css/securityPanel.css b/packages/toolkit/src/codewhisperer/views/css/securityPanel.css
similarity index 100%
rename from src/codewhisperer/views/css/securityPanel.css
rename to packages/toolkit/src/codewhisperer/views/css/securityPanel.css
diff --git a/src/codewhisperer/views/securityIssue/securityIssueWebview.ts b/packages/toolkit/src/codewhisperer/views/securityIssue/securityIssueWebview.ts
similarity index 100%
rename from src/codewhisperer/views/securityIssue/securityIssueWebview.ts
rename to packages/toolkit/src/codewhisperer/views/securityIssue/securityIssueWebview.ts
diff --git a/src/codewhisperer/views/securityIssue/vue/index.ts b/packages/toolkit/src/codewhisperer/views/securityIssue/vue/index.ts
similarity index 100%
rename from src/codewhisperer/views/securityIssue/vue/index.ts
rename to packages/toolkit/src/codewhisperer/views/securityIssue/vue/index.ts
diff --git a/src/codewhisperer/views/securityIssue/vue/root.vue b/packages/toolkit/src/codewhisperer/views/securityIssue/vue/root.vue
similarity index 100%
rename from src/codewhisperer/views/securityIssue/vue/root.vue
rename to packages/toolkit/src/codewhisperer/views/securityIssue/vue/root.vue
diff --git a/src/codewhisperer/views/securityPanelViewProvider.ts b/packages/toolkit/src/codewhisperer/views/securityPanelViewProvider.ts
similarity index 100%
rename from src/codewhisperer/views/securityPanelViewProvider.ts
rename to packages/toolkit/src/codewhisperer/views/securityPanelViewProvider.ts
diff --git a/src/codewhisperer/vue/backend.ts b/packages/toolkit/src/codewhisperer/vue/backend.ts
similarity index 100%
rename from src/codewhisperer/vue/backend.ts
rename to packages/toolkit/src/codewhisperer/vue/backend.ts
diff --git a/src/codewhisperer/vue/genSuggestionTab.vue b/packages/toolkit/src/codewhisperer/vue/genSuggestionTab.vue
similarity index 100%
rename from src/codewhisperer/vue/genSuggestionTab.vue
rename to packages/toolkit/src/codewhisperer/vue/genSuggestionTab.vue
diff --git a/src/codewhisperer/vue/index.ts b/packages/toolkit/src/codewhisperer/vue/index.ts
similarity index 100%
rename from src/codewhisperer/vue/index.ts
rename to packages/toolkit/src/codewhisperer/vue/index.ts
diff --git a/src/codewhisperer/vue/root.vue b/packages/toolkit/src/codewhisperer/vue/root.vue
similarity index 100%
rename from src/codewhisperer/vue/root.vue
rename to packages/toolkit/src/codewhisperer/vue/root.vue
diff --git a/src/codewhisperer/vue/telemetry.vue b/packages/toolkit/src/codewhisperer/vue/telemetry.vue
similarity index 100%
rename from src/codewhisperer/vue/telemetry.vue
rename to packages/toolkit/src/codewhisperer/vue/telemetry.vue
diff --git a/src/codewhispererChat/app.ts b/packages/toolkit/src/codewhispererChat/app.ts
similarity index 100%
rename from src/codewhispererChat/app.ts
rename to packages/toolkit/src/codewhispererChat/app.ts
diff --git a/src/codewhispererChat/clients/chat/v0/chat.ts b/packages/toolkit/src/codewhispererChat/clients/chat/v0/chat.ts
similarity index 100%
rename from src/codewhispererChat/clients/chat/v0/chat.ts
rename to packages/toolkit/src/codewhispererChat/clients/chat/v0/chat.ts
diff --git a/src/codewhispererChat/clients/chat/v0/model.ts b/packages/toolkit/src/codewhispererChat/clients/chat/v0/model.ts
similarity index 100%
rename from src/codewhispererChat/clients/chat/v0/model.ts
rename to packages/toolkit/src/codewhispererChat/clients/chat/v0/model.ts
diff --git a/src/codewhispererChat/commands/registerCommands.ts b/packages/toolkit/src/codewhispererChat/commands/registerCommands.ts
similarity index 100%
rename from src/codewhispererChat/commands/registerCommands.ts
rename to packages/toolkit/src/codewhispererChat/commands/registerCommands.ts
diff --git a/src/codewhispererChat/controllers/chat/chatRequest/converter.ts b/packages/toolkit/src/codewhispererChat/controllers/chat/chatRequest/converter.ts
similarity index 100%
rename from src/codewhispererChat/controllers/chat/chatRequest/converter.ts
rename to packages/toolkit/src/codewhispererChat/controllers/chat/chatRequest/converter.ts
diff --git a/src/codewhispererChat/controllers/chat/controller.ts b/packages/toolkit/src/codewhispererChat/controllers/chat/controller.ts
similarity index 100%
rename from src/codewhispererChat/controllers/chat/controller.ts
rename to packages/toolkit/src/codewhispererChat/controllers/chat/controller.ts
diff --git a/src/codewhispererChat/controllers/chat/messenger/messenger.ts b/packages/toolkit/src/codewhispererChat/controllers/chat/messenger/messenger.ts
similarity index 100%
rename from src/codewhispererChat/controllers/chat/messenger/messenger.ts
rename to packages/toolkit/src/codewhispererChat/controllers/chat/messenger/messenger.ts
diff --git a/src/codewhispererChat/controllers/chat/messenger/model.ts b/packages/toolkit/src/codewhispererChat/controllers/chat/messenger/model.ts
similarity index 100%
rename from src/codewhispererChat/controllers/chat/messenger/model.ts
rename to packages/toolkit/src/codewhispererChat/controllers/chat/messenger/model.ts
diff --git a/src/codewhispererChat/controllers/chat/model.ts b/packages/toolkit/src/codewhispererChat/controllers/chat/model.ts
similarity index 100%
rename from src/codewhispererChat/controllers/chat/model.ts
rename to packages/toolkit/src/codewhispererChat/controllers/chat/model.ts
diff --git a/src/codewhispererChat/controllers/chat/prompts/promptsGenerator.ts b/packages/toolkit/src/codewhispererChat/controllers/chat/prompts/promptsGenerator.ts
similarity index 100%
rename from src/codewhispererChat/controllers/chat/prompts/promptsGenerator.ts
rename to packages/toolkit/src/codewhispererChat/controllers/chat/prompts/promptsGenerator.ts
diff --git a/src/codewhispererChat/controllers/chat/telemetryHelper.ts b/packages/toolkit/src/codewhispererChat/controllers/chat/telemetryHelper.ts
similarity index 100%
rename from src/codewhispererChat/controllers/chat/telemetryHelper.ts
rename to packages/toolkit/src/codewhispererChat/controllers/chat/telemetryHelper.ts
diff --git a/src/codewhispererChat/controllers/chat/userIntent/userIntentRecognizer.ts b/packages/toolkit/src/codewhispererChat/controllers/chat/userIntent/userIntentRecognizer.ts
similarity index 100%
rename from src/codewhispererChat/controllers/chat/userIntent/userIntentRecognizer.ts
rename to packages/toolkit/src/codewhispererChat/controllers/chat/userIntent/userIntentRecognizer.ts
diff --git a/src/codewhispererChat/editor/context/extractor.ts b/packages/toolkit/src/codewhispererChat/editor/context/extractor.ts
similarity index 100%
rename from src/codewhispererChat/editor/context/extractor.ts
rename to packages/toolkit/src/codewhispererChat/editor/context/extractor.ts
diff --git a/src/codewhispererChat/editor/context/file/fileExtractor.ts b/packages/toolkit/src/codewhispererChat/editor/context/file/fileExtractor.ts
similarity index 100%
rename from src/codewhispererChat/editor/context/file/fileExtractor.ts
rename to packages/toolkit/src/codewhispererChat/editor/context/file/fileExtractor.ts
diff --git a/src/codewhispererChat/editor/context/file/importReader.ts b/packages/toolkit/src/codewhispererChat/editor/context/file/importReader.ts
similarity index 100%
rename from src/codewhispererChat/editor/context/file/importReader.ts
rename to packages/toolkit/src/codewhispererChat/editor/context/file/importReader.ts
diff --git a/src/codewhispererChat/editor/context/file/javaImportReader.ts b/packages/toolkit/src/codewhispererChat/editor/context/file/javaImportReader.ts
similarity index 100%
rename from src/codewhispererChat/editor/context/file/javaImportReader.ts
rename to packages/toolkit/src/codewhispererChat/editor/context/file/javaImportReader.ts
diff --git a/src/codewhispererChat/editor/context/file/languages.ts b/packages/toolkit/src/codewhispererChat/editor/context/file/languages.ts
similarity index 100%
rename from src/codewhispererChat/editor/context/file/languages.ts
rename to packages/toolkit/src/codewhispererChat/editor/context/file/languages.ts
diff --git a/src/codewhispererChat/editor/context/file/model.ts b/packages/toolkit/src/codewhispererChat/editor/context/file/model.ts
similarity index 100%
rename from src/codewhispererChat/editor/context/file/model.ts
rename to packages/toolkit/src/codewhispererChat/editor/context/file/model.ts
diff --git a/src/codewhispererChat/editor/context/focusArea/focusAreaExtractor.ts b/packages/toolkit/src/codewhispererChat/editor/context/focusArea/focusAreaExtractor.ts
similarity index 100%
rename from src/codewhispererChat/editor/context/focusArea/focusAreaExtractor.ts
rename to packages/toolkit/src/codewhispererChat/editor/context/focusArea/focusAreaExtractor.ts
diff --git a/src/codewhispererChat/editor/context/focusArea/model.ts b/packages/toolkit/src/codewhispererChat/editor/context/focusArea/model.ts
similarity index 100%
rename from src/codewhispererChat/editor/context/focusArea/model.ts
rename to packages/toolkit/src/codewhispererChat/editor/context/focusArea/model.ts
diff --git a/src/codewhispererChat/editor/context/model.ts b/packages/toolkit/src/codewhispererChat/editor/context/model.ts
similarity index 100%
rename from src/codewhispererChat/editor/context/model.ts
rename to packages/toolkit/src/codewhispererChat/editor/context/model.ts
diff --git a/src/codewhispererChat/storages/chatSession.ts b/packages/toolkit/src/codewhispererChat/storages/chatSession.ts
similarity index 100%
rename from src/codewhispererChat/storages/chatSession.ts
rename to packages/toolkit/src/codewhispererChat/storages/chatSession.ts
diff --git a/src/codewhispererChat/storages/triggerEvents.ts b/packages/toolkit/src/codewhispererChat/storages/triggerEvents.ts
similarity index 100%
rename from src/codewhispererChat/storages/triggerEvents.ts
rename to packages/toolkit/src/codewhispererChat/storages/triggerEvents.ts
diff --git a/src/codewhispererChat/view/connector/connector.ts b/packages/toolkit/src/codewhispererChat/view/connector/connector.ts
similarity index 100%
rename from src/codewhispererChat/view/connector/connector.ts
rename to packages/toolkit/src/codewhispererChat/view/connector/connector.ts
diff --git a/src/codewhispererChat/view/messages/messageListener.ts b/packages/toolkit/src/codewhispererChat/view/messages/messageListener.ts
similarity index 100%
rename from src/codewhispererChat/view/messages/messageListener.ts
rename to packages/toolkit/src/codewhispererChat/view/messages/messageListener.ts
diff --git a/src/codewhispererChat/view/messages/referenceLogController.ts b/packages/toolkit/src/codewhispererChat/view/messages/referenceLogController.ts
similarity index 100%
rename from src/codewhispererChat/view/messages/referenceLogController.ts
rename to packages/toolkit/src/codewhispererChat/view/messages/referenceLogController.ts
diff --git a/src/common/README.md b/packages/toolkit/src/common/README.md
similarity index 100%
rename from src/common/README.md
rename to packages/toolkit/src/common/README.md
diff --git a/src/common/browserUtils.ts b/packages/toolkit/src/common/browserUtils.ts
similarity index 100%
rename from src/common/browserUtils.ts
rename to packages/toolkit/src/common/browserUtils.ts
diff --git a/src/common/request.ts b/packages/toolkit/src/common/request.ts
similarity index 100%
rename from src/common/request.ts
rename to packages/toolkit/src/common/request.ts
diff --git a/src/dev/activation.ts b/packages/toolkit/src/dev/activation.ts
similarity index 100%
rename from src/dev/activation.ts
rename to packages/toolkit/src/dev/activation.ts
diff --git a/src/dev/beta.ts b/packages/toolkit/src/dev/beta.ts
similarity index 100%
rename from src/dev/beta.ts
rename to packages/toolkit/src/dev/beta.ts
diff --git a/src/dev/codecatalyst.ts b/packages/toolkit/src/dev/codecatalyst.ts
similarity index 100%
rename from src/dev/codecatalyst.ts
rename to packages/toolkit/src/dev/codecatalyst.ts
diff --git a/src/dev/config.ts b/packages/toolkit/src/dev/config.ts
similarity index 100%
rename from src/dev/config.ts
rename to packages/toolkit/src/dev/config.ts
diff --git a/src/dynamicResources/activation.ts b/packages/toolkit/src/dynamicResources/activation.ts
similarity index 100%
rename from src/dynamicResources/activation.ts
rename to packages/toolkit/src/dynamicResources/activation.ts
diff --git a/src/dynamicResources/awsResourceManager.ts b/packages/toolkit/src/dynamicResources/awsResourceManager.ts
similarity index 100%
rename from src/dynamicResources/awsResourceManager.ts
rename to packages/toolkit/src/dynamicResources/awsResourceManager.ts
diff --git a/src/dynamicResources/commands/configure.ts b/packages/toolkit/src/dynamicResources/commands/configure.ts
similarity index 100%
rename from src/dynamicResources/commands/configure.ts
rename to packages/toolkit/src/dynamicResources/commands/configure.ts
diff --git a/src/dynamicResources/commands/copyIdentifier.ts b/packages/toolkit/src/dynamicResources/commands/copyIdentifier.ts
similarity index 100%
rename from src/dynamicResources/commands/copyIdentifier.ts
rename to packages/toolkit/src/dynamicResources/commands/copyIdentifier.ts
diff --git a/src/dynamicResources/commands/deleteResource.ts b/packages/toolkit/src/dynamicResources/commands/deleteResource.ts
similarity index 100%
rename from src/dynamicResources/commands/deleteResource.ts
rename to packages/toolkit/src/dynamicResources/commands/deleteResource.ts
diff --git a/src/dynamicResources/commands/openResource.ts b/packages/toolkit/src/dynamicResources/commands/openResource.ts
similarity index 100%
rename from src/dynamicResources/commands/openResource.ts
rename to packages/toolkit/src/dynamicResources/commands/openResource.ts
diff --git a/src/dynamicResources/commands/saveResource.ts b/packages/toolkit/src/dynamicResources/commands/saveResource.ts
similarity index 100%
rename from src/dynamicResources/commands/saveResource.ts
rename to packages/toolkit/src/dynamicResources/commands/saveResource.ts
diff --git a/src/dynamicResources/explorer/nodes/resourceNode.ts b/packages/toolkit/src/dynamicResources/explorer/nodes/resourceNode.ts
similarity index 100%
rename from src/dynamicResources/explorer/nodes/resourceNode.ts
rename to packages/toolkit/src/dynamicResources/explorer/nodes/resourceNode.ts
diff --git a/src/dynamicResources/explorer/nodes/resourceTypeNode.ts b/packages/toolkit/src/dynamicResources/explorer/nodes/resourceTypeNode.ts
similarity index 100%
rename from src/dynamicResources/explorer/nodes/resourceTypeNode.ts
rename to packages/toolkit/src/dynamicResources/explorer/nodes/resourceTypeNode.ts
diff --git a/src/dynamicResources/explorer/nodes/resourcesNode.ts b/packages/toolkit/src/dynamicResources/explorer/nodes/resourcesNode.ts
similarity index 100%
rename from src/dynamicResources/explorer/nodes/resourcesNode.ts
rename to packages/toolkit/src/dynamicResources/explorer/nodes/resourcesNode.ts
diff --git a/src/dynamicResources/model/resources.ts b/packages/toolkit/src/dynamicResources/model/resources.ts
similarity index 100%
rename from src/dynamicResources/model/resources.ts
rename to packages/toolkit/src/dynamicResources/model/resources.ts
diff --git a/src/dynamicResources/model/supported_resources.json b/packages/toolkit/src/dynamicResources/model/supported_resources.json
similarity index 100%
rename from src/dynamicResources/model/supported_resources.json
rename to packages/toolkit/src/dynamicResources/model/supported_resources.json
diff --git a/src/ec2/activation.ts b/packages/toolkit/src/ec2/activation.ts
similarity index 100%
rename from src/ec2/activation.ts
rename to packages/toolkit/src/ec2/activation.ts
diff --git a/src/ec2/commands.ts b/packages/toolkit/src/ec2/commands.ts
similarity index 100%
rename from src/ec2/commands.ts
rename to packages/toolkit/src/ec2/commands.ts
diff --git a/src/ec2/explorer/ec2InstanceNode.ts b/packages/toolkit/src/ec2/explorer/ec2InstanceNode.ts
similarity index 100%
rename from src/ec2/explorer/ec2InstanceNode.ts
rename to packages/toolkit/src/ec2/explorer/ec2InstanceNode.ts
diff --git a/src/ec2/explorer/ec2ParentNode.ts b/packages/toolkit/src/ec2/explorer/ec2ParentNode.ts
similarity index 100%
rename from src/ec2/explorer/ec2ParentNode.ts
rename to packages/toolkit/src/ec2/explorer/ec2ParentNode.ts
diff --git a/src/ec2/model.ts b/packages/toolkit/src/ec2/model.ts
similarity index 100%
rename from src/ec2/model.ts
rename to packages/toolkit/src/ec2/model.ts
diff --git a/src/ec2/prompter.ts b/packages/toolkit/src/ec2/prompter.ts
similarity index 100%
rename from src/ec2/prompter.ts
rename to packages/toolkit/src/ec2/prompter.ts
diff --git a/src/ec2/sshKeyPair.ts b/packages/toolkit/src/ec2/sshKeyPair.ts
similarity index 100%
rename from src/ec2/sshKeyPair.ts
rename to packages/toolkit/src/ec2/sshKeyPair.ts
diff --git a/src/ec2/utils.ts b/packages/toolkit/src/ec2/utils.ts
similarity index 100%
rename from src/ec2/utils.ts
rename to packages/toolkit/src/ec2/utils.ts
diff --git a/src/ecr/activation.ts b/packages/toolkit/src/ecr/activation.ts
similarity index 100%
rename from src/ecr/activation.ts
rename to packages/toolkit/src/ecr/activation.ts
diff --git a/src/ecr/commands/copyRepositoryUri.ts b/packages/toolkit/src/ecr/commands/copyRepositoryUri.ts
similarity index 100%
rename from src/ecr/commands/copyRepositoryUri.ts
rename to packages/toolkit/src/ecr/commands/copyRepositoryUri.ts
diff --git a/src/ecr/commands/copyTagUri.ts b/packages/toolkit/src/ecr/commands/copyTagUri.ts
similarity index 100%
rename from src/ecr/commands/copyTagUri.ts
rename to packages/toolkit/src/ecr/commands/copyTagUri.ts
diff --git a/src/ecr/commands/createRepository.ts b/packages/toolkit/src/ecr/commands/createRepository.ts
similarity index 100%
rename from src/ecr/commands/createRepository.ts
rename to packages/toolkit/src/ecr/commands/createRepository.ts
diff --git a/src/ecr/commands/deleteRepository.ts b/packages/toolkit/src/ecr/commands/deleteRepository.ts
similarity index 100%
rename from src/ecr/commands/deleteRepository.ts
rename to packages/toolkit/src/ecr/commands/deleteRepository.ts
diff --git a/src/ecr/commands/deleteTag.ts b/packages/toolkit/src/ecr/commands/deleteTag.ts
similarity index 100%
rename from src/ecr/commands/deleteTag.ts
rename to packages/toolkit/src/ecr/commands/deleteTag.ts
diff --git a/src/ecr/explorer/ecrNode.ts b/packages/toolkit/src/ecr/explorer/ecrNode.ts
similarity index 100%
rename from src/ecr/explorer/ecrNode.ts
rename to packages/toolkit/src/ecr/explorer/ecrNode.ts
diff --git a/src/ecr/explorer/ecrRepositoryNode.ts b/packages/toolkit/src/ecr/explorer/ecrRepositoryNode.ts
similarity index 100%
rename from src/ecr/explorer/ecrRepositoryNode.ts
rename to packages/toolkit/src/ecr/explorer/ecrRepositoryNode.ts
diff --git a/src/ecr/explorer/ecrTagNode.ts b/packages/toolkit/src/ecr/explorer/ecrTagNode.ts
similarity index 100%
rename from src/ecr/explorer/ecrTagNode.ts
rename to packages/toolkit/src/ecr/explorer/ecrTagNode.ts
diff --git a/src/ecr/utils.ts b/packages/toolkit/src/ecr/utils.ts
similarity index 100%
rename from src/ecr/utils.ts
rename to packages/toolkit/src/ecr/utils.ts
diff --git a/src/ecs/activation.ts b/packages/toolkit/src/ecs/activation.ts
similarity index 100%
rename from src/ecs/activation.ts
rename to packages/toolkit/src/ecs/activation.ts
diff --git a/src/ecs/commands.ts b/packages/toolkit/src/ecs/commands.ts
similarity index 100%
rename from src/ecs/commands.ts
rename to packages/toolkit/src/ecs/commands.ts
diff --git a/src/ecs/model.ts b/packages/toolkit/src/ecs/model.ts
similarity index 100%
rename from src/ecs/model.ts
rename to packages/toolkit/src/ecs/model.ts
diff --git a/src/ecs/util.ts b/packages/toolkit/src/ecs/util.ts
similarity index 100%
rename from src/ecs/util.ts
rename to packages/toolkit/src/ecs/util.ts
diff --git a/src/ecs/wizards/executeCommand.ts b/packages/toolkit/src/ecs/wizards/executeCommand.ts
similarity index 100%
rename from src/ecs/wizards/executeCommand.ts
rename to packages/toolkit/src/ecs/wizards/executeCommand.ts
diff --git a/src/eventSchemas/activation.ts b/packages/toolkit/src/eventSchemas/activation.ts
similarity index 100%
rename from src/eventSchemas/activation.ts
rename to packages/toolkit/src/eventSchemas/activation.ts
diff --git a/src/eventSchemas/commands/downloadSchemaItemCode.ts b/packages/toolkit/src/eventSchemas/commands/downloadSchemaItemCode.ts
similarity index 100%
rename from src/eventSchemas/commands/downloadSchemaItemCode.ts
rename to packages/toolkit/src/eventSchemas/commands/downloadSchemaItemCode.ts
diff --git a/src/eventSchemas/commands/viewSchemaItem.ts b/packages/toolkit/src/eventSchemas/commands/viewSchemaItem.ts
similarity index 100%
rename from src/eventSchemas/commands/viewSchemaItem.ts
rename to packages/toolkit/src/eventSchemas/commands/viewSchemaItem.ts
diff --git a/src/eventSchemas/explorer/registryItemNode.ts b/packages/toolkit/src/eventSchemas/explorer/registryItemNode.ts
similarity index 100%
rename from src/eventSchemas/explorer/registryItemNode.ts
rename to packages/toolkit/src/eventSchemas/explorer/registryItemNode.ts
diff --git a/src/eventSchemas/explorer/schemaItemNode.ts b/packages/toolkit/src/eventSchemas/explorer/schemaItemNode.ts
similarity index 100%
rename from src/eventSchemas/explorer/schemaItemNode.ts
rename to packages/toolkit/src/eventSchemas/explorer/schemaItemNode.ts
diff --git a/src/eventSchemas/explorer/schemasNode.ts b/packages/toolkit/src/eventSchemas/explorer/schemasNode.ts
similarity index 100%
rename from src/eventSchemas/explorer/schemasNode.ts
rename to packages/toolkit/src/eventSchemas/explorer/schemasNode.ts
diff --git a/src/eventSchemas/models/schemaCodeGenUtils.ts b/packages/toolkit/src/eventSchemas/models/schemaCodeGenUtils.ts
similarity index 100%
rename from src/eventSchemas/models/schemaCodeGenUtils.ts
rename to packages/toolkit/src/eventSchemas/models/schemaCodeGenUtils.ts
diff --git a/src/eventSchemas/models/schemaCodeLangs.ts b/packages/toolkit/src/eventSchemas/models/schemaCodeLangs.ts
similarity index 100%
rename from src/eventSchemas/models/schemaCodeLangs.ts
rename to packages/toolkit/src/eventSchemas/models/schemaCodeLangs.ts
diff --git a/src/eventSchemas/providers/schemasDataProvider.ts b/packages/toolkit/src/eventSchemas/providers/schemasDataProvider.ts
similarity index 100%
rename from src/eventSchemas/providers/schemasDataProvider.ts
rename to packages/toolkit/src/eventSchemas/providers/schemasDataProvider.ts
diff --git a/src/eventSchemas/templates/schemasAppTemplateUtils.ts b/packages/toolkit/src/eventSchemas/templates/schemasAppTemplateUtils.ts
similarity index 100%
rename from src/eventSchemas/templates/schemasAppTemplateUtils.ts
rename to packages/toolkit/src/eventSchemas/templates/schemasAppTemplateUtils.ts
diff --git a/src/eventSchemas/utils.ts b/packages/toolkit/src/eventSchemas/utils.ts
similarity index 100%
rename from src/eventSchemas/utils.ts
rename to packages/toolkit/src/eventSchemas/utils.ts
diff --git a/src/eventSchemas/vue/index.ts b/packages/toolkit/src/eventSchemas/vue/index.ts
similarity index 100%
rename from src/eventSchemas/vue/index.ts
rename to packages/toolkit/src/eventSchemas/vue/index.ts
diff --git a/src/eventSchemas/vue/searchSchemas.ts b/packages/toolkit/src/eventSchemas/vue/searchSchemas.ts
similarity index 100%
rename from src/eventSchemas/vue/searchSchemas.ts
rename to packages/toolkit/src/eventSchemas/vue/searchSchemas.ts
diff --git a/src/eventSchemas/vue/searchSchemas.vue b/packages/toolkit/src/eventSchemas/vue/searchSchemas.vue
similarity index 100%
rename from src/eventSchemas/vue/searchSchemas.vue
rename to packages/toolkit/src/eventSchemas/vue/searchSchemas.vue
diff --git a/src/eventSchemas/wizards/schemaCodeDownloadWizard.ts b/packages/toolkit/src/eventSchemas/wizards/schemaCodeDownloadWizard.ts
similarity index 100%
rename from src/eventSchemas/wizards/schemaCodeDownloadWizard.ts
rename to packages/toolkit/src/eventSchemas/wizards/schemaCodeDownloadWizard.ts
diff --git a/src/extension.ts b/packages/toolkit/src/extension.ts
similarity index 100%
rename from src/extension.ts
rename to packages/toolkit/src/extension.ts
diff --git a/src/extensionShared.ts b/packages/toolkit/src/extensionShared.ts
similarity index 100%
rename from src/extensionShared.ts
rename to packages/toolkit/src/extensionShared.ts
diff --git a/src/extensionWeb.ts b/packages/toolkit/src/extensionWeb.ts
similarity index 100%
rename from src/extensionWeb.ts
rename to packages/toolkit/src/extensionWeb.ts
diff --git a/src/feedback/vue/index.ts b/packages/toolkit/src/feedback/vue/index.ts
similarity index 100%
rename from src/feedback/vue/index.ts
rename to packages/toolkit/src/feedback/vue/index.ts
diff --git a/src/feedback/vue/submitFeedback.ts b/packages/toolkit/src/feedback/vue/submitFeedback.ts
similarity index 100%
rename from src/feedback/vue/submitFeedback.ts
rename to packages/toolkit/src/feedback/vue/submitFeedback.ts
diff --git a/src/feedback/vue/submitFeedback.vue b/packages/toolkit/src/feedback/vue/submitFeedback.vue
similarity index 100%
rename from src/feedback/vue/submitFeedback.vue
rename to packages/toolkit/src/feedback/vue/submitFeedback.vue
diff --git a/src/iot/activation.ts b/packages/toolkit/src/iot/activation.ts
similarity index 100%
rename from src/iot/activation.ts
rename to packages/toolkit/src/iot/activation.ts
diff --git a/src/iot/commands/attachCertificate.ts b/packages/toolkit/src/iot/commands/attachCertificate.ts
similarity index 100%
rename from src/iot/commands/attachCertificate.ts
rename to packages/toolkit/src/iot/commands/attachCertificate.ts
diff --git a/src/iot/commands/attachPolicy.ts b/packages/toolkit/src/iot/commands/attachPolicy.ts
similarity index 100%
rename from src/iot/commands/attachPolicy.ts
rename to packages/toolkit/src/iot/commands/attachPolicy.ts
diff --git a/src/iot/commands/copyEndpoint.ts b/packages/toolkit/src/iot/commands/copyEndpoint.ts
similarity index 100%
rename from src/iot/commands/copyEndpoint.ts
rename to packages/toolkit/src/iot/commands/copyEndpoint.ts
diff --git a/src/iot/commands/createCert.ts b/packages/toolkit/src/iot/commands/createCert.ts
similarity index 100%
rename from src/iot/commands/createCert.ts
rename to packages/toolkit/src/iot/commands/createCert.ts
diff --git a/src/iot/commands/createPolicy.ts b/packages/toolkit/src/iot/commands/createPolicy.ts
similarity index 100%
rename from src/iot/commands/createPolicy.ts
rename to packages/toolkit/src/iot/commands/createPolicy.ts
diff --git a/src/iot/commands/createPolicyVersion.ts b/packages/toolkit/src/iot/commands/createPolicyVersion.ts
similarity index 100%
rename from src/iot/commands/createPolicyVersion.ts
rename to packages/toolkit/src/iot/commands/createPolicyVersion.ts
diff --git a/src/iot/commands/createThing.ts b/packages/toolkit/src/iot/commands/createThing.ts
similarity index 100%
rename from src/iot/commands/createThing.ts
rename to packages/toolkit/src/iot/commands/createThing.ts
diff --git a/src/iot/commands/deleteCert.ts b/packages/toolkit/src/iot/commands/deleteCert.ts
similarity index 100%
rename from src/iot/commands/deleteCert.ts
rename to packages/toolkit/src/iot/commands/deleteCert.ts
diff --git a/src/iot/commands/deletePolicy.ts b/packages/toolkit/src/iot/commands/deletePolicy.ts
similarity index 100%
rename from src/iot/commands/deletePolicy.ts
rename to packages/toolkit/src/iot/commands/deletePolicy.ts
diff --git a/src/iot/commands/deletePolicyVersion.ts b/packages/toolkit/src/iot/commands/deletePolicyVersion.ts
similarity index 100%
rename from src/iot/commands/deletePolicyVersion.ts
rename to packages/toolkit/src/iot/commands/deletePolicyVersion.ts
diff --git a/src/iot/commands/deleteThing.ts b/packages/toolkit/src/iot/commands/deleteThing.ts
similarity index 100%
rename from src/iot/commands/deleteThing.ts
rename to packages/toolkit/src/iot/commands/deleteThing.ts
diff --git a/src/iot/commands/detachCert.ts b/packages/toolkit/src/iot/commands/detachCert.ts
similarity index 100%
rename from src/iot/commands/detachCert.ts
rename to packages/toolkit/src/iot/commands/detachCert.ts
diff --git a/src/iot/commands/detachPolicy.ts b/packages/toolkit/src/iot/commands/detachPolicy.ts
similarity index 100%
rename from src/iot/commands/detachPolicy.ts
rename to packages/toolkit/src/iot/commands/detachPolicy.ts
diff --git a/src/iot/commands/setDefaultPolicy.ts b/packages/toolkit/src/iot/commands/setDefaultPolicy.ts
similarity index 100%
rename from src/iot/commands/setDefaultPolicy.ts
rename to packages/toolkit/src/iot/commands/setDefaultPolicy.ts
diff --git a/src/iot/commands/updateCert.ts b/packages/toolkit/src/iot/commands/updateCert.ts
similarity index 100%
rename from src/iot/commands/updateCert.ts
rename to packages/toolkit/src/iot/commands/updateCert.ts
diff --git a/src/iot/commands/viewPolicyVersion.ts b/packages/toolkit/src/iot/commands/viewPolicyVersion.ts
similarity index 100%
rename from src/iot/commands/viewPolicyVersion.ts
rename to packages/toolkit/src/iot/commands/viewPolicyVersion.ts
diff --git a/src/iot/explorer/iotCertFolderNode.ts b/packages/toolkit/src/iot/explorer/iotCertFolderNode.ts
similarity index 100%
rename from src/iot/explorer/iotCertFolderNode.ts
rename to packages/toolkit/src/iot/explorer/iotCertFolderNode.ts
diff --git a/src/iot/explorer/iotCertificateNode.ts b/packages/toolkit/src/iot/explorer/iotCertificateNode.ts
similarity index 100%
rename from src/iot/explorer/iotCertificateNode.ts
rename to packages/toolkit/src/iot/explorer/iotCertificateNode.ts
diff --git a/src/iot/explorer/iotNodes.ts b/packages/toolkit/src/iot/explorer/iotNodes.ts
similarity index 100%
rename from src/iot/explorer/iotNodes.ts
rename to packages/toolkit/src/iot/explorer/iotNodes.ts
diff --git a/src/iot/explorer/iotPolicyFolderNode.ts b/packages/toolkit/src/iot/explorer/iotPolicyFolderNode.ts
similarity index 100%
rename from src/iot/explorer/iotPolicyFolderNode.ts
rename to packages/toolkit/src/iot/explorer/iotPolicyFolderNode.ts
diff --git a/src/iot/explorer/iotPolicyNode.ts b/packages/toolkit/src/iot/explorer/iotPolicyNode.ts
similarity index 100%
rename from src/iot/explorer/iotPolicyNode.ts
rename to packages/toolkit/src/iot/explorer/iotPolicyNode.ts
diff --git a/src/iot/explorer/iotPolicyVersionNode.ts b/packages/toolkit/src/iot/explorer/iotPolicyVersionNode.ts
similarity index 100%
rename from src/iot/explorer/iotPolicyVersionNode.ts
rename to packages/toolkit/src/iot/explorer/iotPolicyVersionNode.ts
diff --git a/src/iot/explorer/iotThingFolderNode.ts b/packages/toolkit/src/iot/explorer/iotThingFolderNode.ts
similarity index 100%
rename from src/iot/explorer/iotThingFolderNode.ts
rename to packages/toolkit/src/iot/explorer/iotThingFolderNode.ts
diff --git a/src/iot/explorer/iotThingNode.ts b/packages/toolkit/src/iot/explorer/iotThingNode.ts
similarity index 100%
rename from src/iot/explorer/iotThingNode.ts
rename to packages/toolkit/src/iot/explorer/iotThingNode.ts
diff --git a/src/lambda/activation.ts b/packages/toolkit/src/lambda/activation.ts
similarity index 100%
rename from src/lambda/activation.ts
rename to packages/toolkit/src/lambda/activation.ts
diff --git a/src/lambda/commands/copyLambdaUrl.ts b/packages/toolkit/src/lambda/commands/copyLambdaUrl.ts
similarity index 100%
rename from src/lambda/commands/copyLambdaUrl.ts
rename to packages/toolkit/src/lambda/commands/copyLambdaUrl.ts
diff --git a/src/lambda/commands/createNewSamApp.ts b/packages/toolkit/src/lambda/commands/createNewSamApp.ts
similarity index 100%
rename from src/lambda/commands/createNewSamApp.ts
rename to packages/toolkit/src/lambda/commands/createNewSamApp.ts
diff --git a/src/lambda/commands/deleteCloudFormation.ts b/packages/toolkit/src/lambda/commands/deleteCloudFormation.ts
similarity index 100%
rename from src/lambda/commands/deleteCloudFormation.ts
rename to packages/toolkit/src/lambda/commands/deleteCloudFormation.ts
diff --git a/src/lambda/commands/deleteLambda.ts b/packages/toolkit/src/lambda/commands/deleteLambda.ts
similarity index 100%
rename from src/lambda/commands/deleteLambda.ts
rename to packages/toolkit/src/lambda/commands/deleteLambda.ts
diff --git a/src/lambda/commands/deploySamApplication.ts b/packages/toolkit/src/lambda/commands/deploySamApplication.ts
similarity index 100%
rename from src/lambda/commands/deploySamApplication.ts
rename to packages/toolkit/src/lambda/commands/deploySamApplication.ts
diff --git a/src/lambda/commands/downloadLambda.ts b/packages/toolkit/src/lambda/commands/downloadLambda.ts
similarity index 100%
rename from src/lambda/commands/downloadLambda.ts
rename to packages/toolkit/src/lambda/commands/downloadLambda.ts
diff --git a/src/lambda/commands/uploadLambda.ts b/packages/toolkit/src/lambda/commands/uploadLambda.ts
similarity index 100%
rename from src/lambda/commands/uploadLambda.ts
rename to packages/toolkit/src/lambda/commands/uploadLambda.ts
diff --git a/src/lambda/config/configureParameterOverrides.ts b/packages/toolkit/src/lambda/config/configureParameterOverrides.ts
similarity index 100%
rename from src/lambda/config/configureParameterOverrides.ts
rename to packages/toolkit/src/lambda/config/configureParameterOverrides.ts
diff --git a/src/lambda/config/parameterUtils.ts b/packages/toolkit/src/lambda/config/parameterUtils.ts
similarity index 100%
rename from src/lambda/config/parameterUtils.ts
rename to packages/toolkit/src/lambda/config/parameterUtils.ts
diff --git a/src/lambda/config/samParameterCompletionItemProvider.ts b/packages/toolkit/src/lambda/config/samParameterCompletionItemProvider.ts
similarity index 100%
rename from src/lambda/config/samParameterCompletionItemProvider.ts
rename to packages/toolkit/src/lambda/config/samParameterCompletionItemProvider.ts
diff --git a/src/lambda/config/templates.ts b/packages/toolkit/src/lambda/config/templates.ts
similarity index 100%
rename from src/lambda/config/templates.ts
rename to packages/toolkit/src/lambda/config/templates.ts
diff --git a/src/lambda/constants.ts b/packages/toolkit/src/lambda/constants.ts
similarity index 100%
rename from src/lambda/constants.ts
rename to packages/toolkit/src/lambda/constants.ts
diff --git a/src/lambda/explorer/cloudFormationNodes.ts b/packages/toolkit/src/lambda/explorer/cloudFormationNodes.ts
similarity index 100%
rename from src/lambda/explorer/cloudFormationNodes.ts
rename to packages/toolkit/src/lambda/explorer/cloudFormationNodes.ts
diff --git a/src/lambda/explorer/lambdaFunctionNode.ts b/packages/toolkit/src/lambda/explorer/lambdaFunctionNode.ts
similarity index 100%
rename from src/lambda/explorer/lambdaFunctionNode.ts
rename to packages/toolkit/src/lambda/explorer/lambdaFunctionNode.ts
diff --git a/src/lambda/explorer/lambdaNodes.ts b/packages/toolkit/src/lambda/explorer/lambdaNodes.ts
similarity index 100%
rename from src/lambda/explorer/lambdaNodes.ts
rename to packages/toolkit/src/lambda/explorer/lambdaNodes.ts
diff --git a/src/lambda/local/debugConfiguration.ts b/packages/toolkit/src/lambda/local/debugConfiguration.ts
similarity index 100%
rename from src/lambda/local/debugConfiguration.ts
rename to packages/toolkit/src/lambda/local/debugConfiguration.ts
diff --git a/src/lambda/models/samLambdaRuntime.ts b/packages/toolkit/src/lambda/models/samLambdaRuntime.ts
similarity index 100%
rename from src/lambda/models/samLambdaRuntime.ts
rename to packages/toolkit/src/lambda/models/samLambdaRuntime.ts
diff --git a/src/lambda/models/samTemplates.ts b/packages/toolkit/src/lambda/models/samTemplates.ts
similarity index 100%
rename from src/lambda/models/samTemplates.ts
rename to packages/toolkit/src/lambda/models/samTemplates.ts
diff --git a/src/lambda/models/sampleRequest.ts b/packages/toolkit/src/lambda/models/sampleRequest.ts
similarity index 100%
rename from src/lambda/models/sampleRequest.ts
rename to packages/toolkit/src/lambda/models/sampleRequest.ts
diff --git a/src/lambda/utils.ts b/packages/toolkit/src/lambda/utils.ts
similarity index 100%
rename from src/lambda/utils.ts
rename to packages/toolkit/src/lambda/utils.ts
diff --git a/src/lambda/vue/configEditor/index.ts b/packages/toolkit/src/lambda/vue/configEditor/index.ts
similarity index 100%
rename from src/lambda/vue/configEditor/index.ts
rename to packages/toolkit/src/lambda/vue/configEditor/index.ts
diff --git a/src/lambda/vue/configEditor/samInvoke.css b/packages/toolkit/src/lambda/vue/configEditor/samInvoke.css
similarity index 100%
rename from src/lambda/vue/configEditor/samInvoke.css
rename to packages/toolkit/src/lambda/vue/configEditor/samInvoke.css
diff --git a/src/lambda/vue/configEditor/samInvokeBackend.ts b/packages/toolkit/src/lambda/vue/configEditor/samInvokeBackend.ts
similarity index 100%
rename from src/lambda/vue/configEditor/samInvokeBackend.ts
rename to packages/toolkit/src/lambda/vue/configEditor/samInvokeBackend.ts
diff --git a/src/lambda/vue/configEditor/samInvokeComponent.vue b/packages/toolkit/src/lambda/vue/configEditor/samInvokeComponent.vue
similarity index 100%
rename from src/lambda/vue/configEditor/samInvokeComponent.vue
rename to packages/toolkit/src/lambda/vue/configEditor/samInvokeComponent.vue
diff --git a/src/lambda/vue/configEditor/samInvokeFrontend.ts b/packages/toolkit/src/lambda/vue/configEditor/samInvokeFrontend.ts
similarity index 100%
rename from src/lambda/vue/configEditor/samInvokeFrontend.ts
rename to packages/toolkit/src/lambda/vue/configEditor/samInvokeFrontend.ts
diff --git a/src/lambda/vue/remoteInvoke/index.ts b/packages/toolkit/src/lambda/vue/remoteInvoke/index.ts
similarity index 100%
rename from src/lambda/vue/remoteInvoke/index.ts
rename to packages/toolkit/src/lambda/vue/remoteInvoke/index.ts
diff --git a/src/lambda/vue/remoteInvoke/invokeLambda.ts b/packages/toolkit/src/lambda/vue/remoteInvoke/invokeLambda.ts
similarity index 100%
rename from src/lambda/vue/remoteInvoke/invokeLambda.ts
rename to packages/toolkit/src/lambda/vue/remoteInvoke/invokeLambda.ts
diff --git a/src/lambda/vue/remoteInvoke/remoteInvoke.vue b/packages/toolkit/src/lambda/vue/remoteInvoke/remoteInvoke.vue
similarity index 100%
rename from src/lambda/vue/remoteInvoke/remoteInvoke.vue
rename to packages/toolkit/src/lambda/vue/remoteInvoke/remoteInvoke.vue
diff --git a/src/lambda/wizards/samDeployWizard.ts b/packages/toolkit/src/lambda/wizards/samDeployWizard.ts
similarity index 100%
rename from src/lambda/wizards/samDeployWizard.ts
rename to packages/toolkit/src/lambda/wizards/samDeployWizard.ts
diff --git a/src/lambda/wizards/samInitWizard.ts b/packages/toolkit/src/lambda/wizards/samInitWizard.ts
similarity index 100%
rename from src/lambda/wizards/samInitWizard.ts
rename to packages/toolkit/src/lambda/wizards/samInitWizard.ts
diff --git a/src/main.ts b/packages/toolkit/src/main.ts
similarity index 100%
rename from src/main.ts
rename to packages/toolkit/src/main.ts
diff --git a/src/redshift/activation.ts b/packages/toolkit/src/redshift/activation.ts
similarity index 100%
rename from src/redshift/activation.ts
rename to packages/toolkit/src/redshift/activation.ts
diff --git a/src/redshift/explorer/redshiftDatabaseNode.ts b/packages/toolkit/src/redshift/explorer/redshiftDatabaseNode.ts
similarity index 100%
rename from src/redshift/explorer/redshiftDatabaseNode.ts
rename to packages/toolkit/src/redshift/explorer/redshiftDatabaseNode.ts
diff --git a/src/redshift/explorer/redshiftNode.ts b/packages/toolkit/src/redshift/explorer/redshiftNode.ts
similarity index 100%
rename from src/redshift/explorer/redshiftNode.ts
rename to packages/toolkit/src/redshift/explorer/redshiftNode.ts
diff --git a/src/redshift/explorer/redshiftSchemaNode.ts b/packages/toolkit/src/redshift/explorer/redshiftSchemaNode.ts
similarity index 100%
rename from src/redshift/explorer/redshiftSchemaNode.ts
rename to packages/toolkit/src/redshift/explorer/redshiftSchemaNode.ts
diff --git a/src/redshift/explorer/redshiftState.ts b/packages/toolkit/src/redshift/explorer/redshiftState.ts
similarity index 100%
rename from src/redshift/explorer/redshiftState.ts
rename to packages/toolkit/src/redshift/explorer/redshiftState.ts
diff --git a/src/redshift/explorer/redshiftTableNode.ts b/packages/toolkit/src/redshift/explorer/redshiftTableNode.ts
similarity index 100%
rename from src/redshift/explorer/redshiftTableNode.ts
rename to packages/toolkit/src/redshift/explorer/redshiftTableNode.ts
diff --git a/src/redshift/explorer/redshiftWarehouseNode.ts b/packages/toolkit/src/redshift/explorer/redshiftWarehouseNode.ts
similarity index 100%
rename from src/redshift/explorer/redshiftWarehouseNode.ts
rename to packages/toolkit/src/redshift/explorer/redshiftWarehouseNode.ts
diff --git a/src/redshift/messageUtils.ts b/packages/toolkit/src/redshift/messageUtils.ts
similarity index 100%
rename from src/redshift/messageUtils.ts
rename to packages/toolkit/src/redshift/messageUtils.ts
diff --git a/src/redshift/models/models.ts b/packages/toolkit/src/redshift/models/models.ts
similarity index 100%
rename from src/redshift/models/models.ts
rename to packages/toolkit/src/redshift/models/models.ts
diff --git a/src/redshift/notebook/cellStatusBarItemProvider.ts b/packages/toolkit/src/redshift/notebook/cellStatusBarItemProvider.ts
similarity index 100%
rename from src/redshift/notebook/cellStatusBarItemProvider.ts
rename to packages/toolkit/src/redshift/notebook/cellStatusBarItemProvider.ts
diff --git a/src/redshift/notebook/redshiftNotebookController.ts b/packages/toolkit/src/redshift/notebook/redshiftNotebookController.ts
similarity index 100%
rename from src/redshift/notebook/redshiftNotebookController.ts
rename to packages/toolkit/src/redshift/notebook/redshiftNotebookController.ts
diff --git a/src/redshift/notebook/redshiftNotebookSerializer.ts b/packages/toolkit/src/redshift/notebook/redshiftNotebookSerializer.ts
similarity index 100%
rename from src/redshift/notebook/redshiftNotebookSerializer.ts
rename to packages/toolkit/src/redshift/notebook/redshiftNotebookSerializer.ts
diff --git a/src/redshift/wizards/connectionWizard.ts b/packages/toolkit/src/redshift/wizards/connectionWizard.ts
similarity index 100%
rename from src/redshift/wizards/connectionWizard.ts
rename to packages/toolkit/src/redshift/wizards/connectionWizard.ts
diff --git a/src/s3/activation.ts b/packages/toolkit/src/s3/activation.ts
similarity index 100%
rename from src/s3/activation.ts
rename to packages/toolkit/src/s3/activation.ts
diff --git a/src/s3/commands/copyPath.ts b/packages/toolkit/src/s3/commands/copyPath.ts
similarity index 100%
rename from src/s3/commands/copyPath.ts
rename to packages/toolkit/src/s3/commands/copyPath.ts
diff --git a/src/s3/commands/createBucket.ts b/packages/toolkit/src/s3/commands/createBucket.ts
similarity index 100%
rename from src/s3/commands/createBucket.ts
rename to packages/toolkit/src/s3/commands/createBucket.ts
diff --git a/src/s3/commands/createFolder.ts b/packages/toolkit/src/s3/commands/createFolder.ts
similarity index 100%
rename from src/s3/commands/createFolder.ts
rename to packages/toolkit/src/s3/commands/createFolder.ts
diff --git a/src/s3/commands/deleteBucket.ts b/packages/toolkit/src/s3/commands/deleteBucket.ts
similarity index 100%
rename from src/s3/commands/deleteBucket.ts
rename to packages/toolkit/src/s3/commands/deleteBucket.ts
diff --git a/src/s3/commands/deleteFile.ts b/packages/toolkit/src/s3/commands/deleteFile.ts
similarity index 100%
rename from src/s3/commands/deleteFile.ts
rename to packages/toolkit/src/s3/commands/deleteFile.ts
diff --git a/src/s3/commands/downloadFileAs.ts b/packages/toolkit/src/s3/commands/downloadFileAs.ts
similarity index 100%
rename from src/s3/commands/downloadFileAs.ts
rename to packages/toolkit/src/s3/commands/downloadFileAs.ts
diff --git a/src/s3/commands/openFile.ts b/packages/toolkit/src/s3/commands/openFile.ts
similarity index 100%
rename from src/s3/commands/openFile.ts
rename to packages/toolkit/src/s3/commands/openFile.ts
diff --git a/src/s3/commands/presignedURL.ts b/packages/toolkit/src/s3/commands/presignedURL.ts
similarity index 100%
rename from src/s3/commands/presignedURL.ts
rename to packages/toolkit/src/s3/commands/presignedURL.ts
diff --git a/src/s3/commands/uploadFile.ts b/packages/toolkit/src/s3/commands/uploadFile.ts
similarity index 100%
rename from src/s3/commands/uploadFile.ts
rename to packages/toolkit/src/s3/commands/uploadFile.ts
diff --git a/src/s3/commands/uploadFileToParent.ts b/packages/toolkit/src/s3/commands/uploadFileToParent.ts
similarity index 100%
rename from src/s3/commands/uploadFileToParent.ts
rename to packages/toolkit/src/s3/commands/uploadFileToParent.ts
diff --git a/src/s3/explorer/s3BucketNode.ts b/packages/toolkit/src/s3/explorer/s3BucketNode.ts
similarity index 100%
rename from src/s3/explorer/s3BucketNode.ts
rename to packages/toolkit/src/s3/explorer/s3BucketNode.ts
diff --git a/src/s3/explorer/s3FileNode.ts b/packages/toolkit/src/s3/explorer/s3FileNode.ts
similarity index 100%
rename from src/s3/explorer/s3FileNode.ts
rename to packages/toolkit/src/s3/explorer/s3FileNode.ts
diff --git a/src/s3/explorer/s3FolderNode.ts b/packages/toolkit/src/s3/explorer/s3FolderNode.ts
similarity index 100%
rename from src/s3/explorer/s3FolderNode.ts
rename to packages/toolkit/src/s3/explorer/s3FolderNode.ts
diff --git a/src/s3/explorer/s3Nodes.ts b/packages/toolkit/src/s3/explorer/s3Nodes.ts
similarity index 100%
rename from src/s3/explorer/s3Nodes.ts
rename to packages/toolkit/src/s3/explorer/s3Nodes.ts
diff --git a/src/s3/fileViewerManager.ts b/packages/toolkit/src/s3/fileViewerManager.ts
similarity index 100%
rename from src/s3/fileViewerManager.ts
rename to packages/toolkit/src/s3/fileViewerManager.ts
diff --git a/src/s3/progressReporter.ts b/packages/toolkit/src/s3/progressReporter.ts
similarity index 100%
rename from src/s3/progressReporter.ts
rename to packages/toolkit/src/s3/progressReporter.ts
diff --git a/src/s3/util.ts b/packages/toolkit/src/s3/util.ts
similarity index 100%
rename from src/s3/util.ts
rename to packages/toolkit/src/s3/util.ts
diff --git a/src/shared/activationReloadState.ts b/packages/toolkit/src/shared/activationReloadState.ts
similarity index 100%
rename from src/shared/activationReloadState.ts
rename to packages/toolkit/src/shared/activationReloadState.ts
diff --git a/src/shared/awsClientBuilder.ts b/packages/toolkit/src/shared/awsClientBuilder.ts
similarity index 100%
rename from src/shared/awsClientBuilder.ts
rename to packages/toolkit/src/shared/awsClientBuilder.ts
diff --git a/src/shared/awsConsole.ts b/packages/toolkit/src/shared/awsConsole.ts
similarity index 100%
rename from src/shared/awsConsole.ts
rename to packages/toolkit/src/shared/awsConsole.ts
diff --git a/src/shared/awsContext.ts b/packages/toolkit/src/shared/awsContext.ts
similarity index 100%
rename from src/shared/awsContext.ts
rename to packages/toolkit/src/shared/awsContext.ts
diff --git a/src/shared/awsContextCommands.ts b/packages/toolkit/src/shared/awsContextCommands.ts
similarity index 100%
rename from src/shared/awsContextCommands.ts
rename to packages/toolkit/src/shared/awsContextCommands.ts
diff --git a/src/shared/awsFiletypes.ts b/packages/toolkit/src/shared/awsFiletypes.ts
similarity index 100%
rename from src/shared/awsFiletypes.ts
rename to packages/toolkit/src/shared/awsFiletypes.ts
diff --git a/src/shared/clients/apiGatewayClient.ts b/packages/toolkit/src/shared/clients/apiGatewayClient.ts
similarity index 100%
rename from src/shared/clients/apiGatewayClient.ts
rename to packages/toolkit/src/shared/clients/apiGatewayClient.ts
diff --git a/src/shared/clients/apprunnerClient.ts b/packages/toolkit/src/shared/clients/apprunnerClient.ts
similarity index 100%
rename from src/shared/clients/apprunnerClient.ts
rename to packages/toolkit/src/shared/clients/apprunnerClient.ts
diff --git a/src/shared/clients/cloudControlClient.ts b/packages/toolkit/src/shared/clients/cloudControlClient.ts
similarity index 100%
rename from src/shared/clients/cloudControlClient.ts
rename to packages/toolkit/src/shared/clients/cloudControlClient.ts
diff --git a/src/shared/clients/cloudFormationClient.ts b/packages/toolkit/src/shared/clients/cloudFormationClient.ts
similarity index 100%
rename from src/shared/clients/cloudFormationClient.ts
rename to packages/toolkit/src/shared/clients/cloudFormationClient.ts
diff --git a/src/shared/clients/cloudWatchLogsClient.ts b/packages/toolkit/src/shared/clients/cloudWatchLogsClient.ts
similarity index 100%
rename from src/shared/clients/cloudWatchLogsClient.ts
rename to packages/toolkit/src/shared/clients/cloudWatchLogsClient.ts
diff --git a/src/shared/clients/codecatalystClient.ts b/packages/toolkit/src/shared/clients/codecatalystClient.ts
similarity index 100%
rename from src/shared/clients/codecatalystClient.ts
rename to packages/toolkit/src/shared/clients/codecatalystClient.ts
diff --git a/src/shared/clients/devenvClient.ts b/packages/toolkit/src/shared/clients/devenvClient.ts
similarity index 100%
rename from src/shared/clients/devenvClient.ts
rename to packages/toolkit/src/shared/clients/devenvClient.ts
diff --git a/src/shared/clients/ec2Client.ts b/packages/toolkit/src/shared/clients/ec2Client.ts
similarity index 100%
rename from src/shared/clients/ec2Client.ts
rename to packages/toolkit/src/shared/clients/ec2Client.ts
diff --git a/src/shared/clients/ec2MetadataClient.ts b/packages/toolkit/src/shared/clients/ec2MetadataClient.ts
similarity index 100%
rename from src/shared/clients/ec2MetadataClient.ts
rename to packages/toolkit/src/shared/clients/ec2MetadataClient.ts
diff --git a/src/shared/clients/ecrClient.ts b/packages/toolkit/src/shared/clients/ecrClient.ts
similarity index 100%
rename from src/shared/clients/ecrClient.ts
rename to packages/toolkit/src/shared/clients/ecrClient.ts
diff --git a/src/shared/clients/ecsClient.ts b/packages/toolkit/src/shared/clients/ecsClient.ts
similarity index 100%
rename from src/shared/clients/ecsClient.ts
rename to packages/toolkit/src/shared/clients/ecsClient.ts
diff --git a/src/shared/clients/iamClient.ts b/packages/toolkit/src/shared/clients/iamClient.ts
similarity index 100%
rename from src/shared/clients/iamClient.ts
rename to packages/toolkit/src/shared/clients/iamClient.ts
diff --git a/src/shared/clients/iotClient.ts b/packages/toolkit/src/shared/clients/iotClient.ts
similarity index 100%
rename from src/shared/clients/iotClient.ts
rename to packages/toolkit/src/shared/clients/iotClient.ts
diff --git a/src/shared/clients/lambdaClient.ts b/packages/toolkit/src/shared/clients/lambdaClient.ts
similarity index 100%
rename from src/shared/clients/lambdaClient.ts
rename to packages/toolkit/src/shared/clients/lambdaClient.ts
diff --git a/src/shared/clients/redshiftClient.ts b/packages/toolkit/src/shared/clients/redshiftClient.ts
similarity index 100%
rename from src/shared/clients/redshiftClient.ts
rename to packages/toolkit/src/shared/clients/redshiftClient.ts
diff --git a/src/shared/clients/s3Client.ts b/packages/toolkit/src/shared/clients/s3Client.ts
similarity index 100%
rename from src/shared/clients/s3Client.ts
rename to packages/toolkit/src/shared/clients/s3Client.ts
diff --git a/src/shared/clients/schemaClient.ts b/packages/toolkit/src/shared/clients/schemaClient.ts
similarity index 100%
rename from src/shared/clients/schemaClient.ts
rename to packages/toolkit/src/shared/clients/schemaClient.ts
diff --git a/src/shared/clients/secretsManagerClient.ts b/packages/toolkit/src/shared/clients/secretsManagerClient.ts
similarity index 100%
rename from src/shared/clients/secretsManagerClient.ts
rename to packages/toolkit/src/shared/clients/secretsManagerClient.ts
diff --git a/src/shared/clients/ssmClient.ts b/packages/toolkit/src/shared/clients/ssmClient.ts
similarity index 100%
rename from src/shared/clients/ssmClient.ts
rename to packages/toolkit/src/shared/clients/ssmClient.ts
diff --git a/src/shared/clients/ssmDocumentClient.ts b/packages/toolkit/src/shared/clients/ssmDocumentClient.ts
similarity index 100%
rename from src/shared/clients/ssmDocumentClient.ts
rename to packages/toolkit/src/shared/clients/ssmDocumentClient.ts
diff --git a/src/shared/clients/stepFunctionsClient.ts b/packages/toolkit/src/shared/clients/stepFunctionsClient.ts
similarity index 100%
rename from src/shared/clients/stepFunctionsClient.ts
rename to packages/toolkit/src/shared/clients/stepFunctionsClient.ts
diff --git a/src/shared/clients/stsClient.ts b/packages/toolkit/src/shared/clients/stsClient.ts
similarity index 100%
rename from src/shared/clients/stsClient.ts
rename to packages/toolkit/src/shared/clients/stsClient.ts
diff --git a/src/shared/cloudformation/activation.ts b/packages/toolkit/src/shared/cloudformation/activation.ts
similarity index 100%
rename from src/shared/cloudformation/activation.ts
rename to packages/toolkit/src/shared/cloudformation/activation.ts
diff --git a/src/shared/cloudformation/cloudformation.ts b/packages/toolkit/src/shared/cloudformation/cloudformation.ts
similarity index 100%
rename from src/shared/cloudformation/cloudformation.ts
rename to packages/toolkit/src/shared/cloudformation/cloudformation.ts
diff --git a/src/shared/cloudformation/templateSymbolResolver.ts b/packages/toolkit/src/shared/cloudformation/templateSymbolResolver.ts
similarity index 100%
rename from src/shared/cloudformation/templateSymbolResolver.ts
rename to packages/toolkit/src/shared/cloudformation/templateSymbolResolver.ts
diff --git a/src/shared/codelens/codeLensUtils.ts b/packages/toolkit/src/shared/codelens/codeLensUtils.ts
similarity index 100%
rename from src/shared/codelens/codeLensUtils.ts
rename to packages/toolkit/src/shared/codelens/codeLensUtils.ts
diff --git a/src/shared/codelens/csharpCodeLensProvider.ts b/packages/toolkit/src/shared/codelens/csharpCodeLensProvider.ts
similarity index 100%
rename from src/shared/codelens/csharpCodeLensProvider.ts
rename to packages/toolkit/src/shared/codelens/csharpCodeLensProvider.ts
diff --git a/src/shared/codelens/goCodeLensProvider.ts b/packages/toolkit/src/shared/codelens/goCodeLensProvider.ts
similarity index 100%
rename from src/shared/codelens/goCodeLensProvider.ts
rename to packages/toolkit/src/shared/codelens/goCodeLensProvider.ts
diff --git a/src/shared/codelens/javaCodeLensProvider.ts b/packages/toolkit/src/shared/codelens/javaCodeLensProvider.ts
similarity index 100%
rename from src/shared/codelens/javaCodeLensProvider.ts
rename to packages/toolkit/src/shared/codelens/javaCodeLensProvider.ts
diff --git a/src/shared/codelens/pythonCodeLensProvider.ts b/packages/toolkit/src/shared/codelens/pythonCodeLensProvider.ts
similarity index 100%
rename from src/shared/codelens/pythonCodeLensProvider.ts
rename to packages/toolkit/src/shared/codelens/pythonCodeLensProvider.ts
diff --git a/src/shared/codelens/resourceCodeLensProvider.ts b/packages/toolkit/src/shared/codelens/resourceCodeLensProvider.ts
similarity index 100%
rename from src/shared/codelens/resourceCodeLensProvider.ts
rename to packages/toolkit/src/shared/codelens/resourceCodeLensProvider.ts
diff --git a/src/shared/codelens/samTemplateCodeLensProvider.ts b/packages/toolkit/src/shared/codelens/samTemplateCodeLensProvider.ts
similarity index 100%
rename from src/shared/codelens/samTemplateCodeLensProvider.ts
rename to packages/toolkit/src/shared/codelens/samTemplateCodeLensProvider.ts
diff --git a/src/shared/codelens/typescriptCodeLensProvider.ts b/packages/toolkit/src/shared/codelens/typescriptCodeLensProvider.ts
similarity index 100%
rename from src/shared/codelens/typescriptCodeLensProvider.ts
rename to packages/toolkit/src/shared/codelens/typescriptCodeLensProvider.ts
diff --git a/src/shared/constants.ts b/packages/toolkit/src/shared/constants.ts
similarity index 100%
rename from src/shared/constants.ts
rename to packages/toolkit/src/shared/constants.ts
diff --git a/src/shared/credentials/credentialSelectionDataProvider.ts b/packages/toolkit/src/shared/credentials/credentialSelectionDataProvider.ts
similarity index 100%
rename from src/shared/credentials/credentialSelectionDataProvider.ts
rename to packages/toolkit/src/shared/credentials/credentialSelectionDataProvider.ts
diff --git a/src/shared/credentials/credentialSelectionState.ts b/packages/toolkit/src/shared/credentials/credentialSelectionState.ts
similarity index 100%
rename from src/shared/credentials/credentialSelectionState.ts
rename to packages/toolkit/src/shared/credentials/credentialSelectionState.ts
diff --git a/src/shared/credentials/credentialsProfileMru.ts b/packages/toolkit/src/shared/credentials/credentialsProfileMru.ts
similarity index 100%
rename from src/shared/credentials/credentialsProfileMru.ts
rename to packages/toolkit/src/shared/credentials/credentialsProfileMru.ts
diff --git a/src/shared/credentials/defaultCredentialSelectionDataProvider.ts b/packages/toolkit/src/shared/credentials/defaultCredentialSelectionDataProvider.ts
similarity index 100%
rename from src/shared/credentials/defaultCredentialSelectionDataProvider.ts
rename to packages/toolkit/src/shared/credentials/defaultCredentialSelectionDataProvider.ts
diff --git a/src/shared/credentials/userCredentialsUtils.ts b/packages/toolkit/src/shared/credentials/userCredentialsUtils.ts
similarity index 100%
rename from src/shared/credentials/userCredentialsUtils.ts
rename to packages/toolkit/src/shared/credentials/userCredentialsUtils.ts
diff --git a/src/shared/debug/launchConfiguration.ts b/packages/toolkit/src/shared/debug/launchConfiguration.ts
similarity index 100%
rename from src/shared/debug/launchConfiguration.ts
rename to packages/toolkit/src/shared/debug/launchConfiguration.ts
diff --git a/src/shared/environmentVariables.ts b/packages/toolkit/src/shared/environmentVariables.ts
similarity index 100%
rename from src/shared/environmentVariables.ts
rename to packages/toolkit/src/shared/environmentVariables.ts
diff --git a/src/shared/errors.ts b/packages/toolkit/src/shared/errors.ts
similarity index 100%
rename from src/shared/errors.ts
rename to packages/toolkit/src/shared/errors.ts
diff --git a/src/shared/extensionGlobals.ts b/packages/toolkit/src/shared/extensionGlobals.ts
similarity index 100%
rename from src/shared/extensionGlobals.ts
rename to packages/toolkit/src/shared/extensionGlobals.ts
diff --git a/src/shared/extensionStartup.ts b/packages/toolkit/src/shared/extensionStartup.ts
similarity index 100%
rename from src/shared/extensionStartup.ts
rename to packages/toolkit/src/shared/extensionStartup.ts
diff --git a/src/shared/extensionUtilities.ts b/packages/toolkit/src/shared/extensionUtilities.ts
similarity index 100%
rename from src/shared/extensionUtilities.ts
rename to packages/toolkit/src/shared/extensionUtilities.ts
diff --git a/src/shared/extensions.ts b/packages/toolkit/src/shared/extensions.ts
similarity index 100%
rename from src/shared/extensions.ts
rename to packages/toolkit/src/shared/extensions.ts
diff --git a/src/shared/extensions/git.ts b/packages/toolkit/src/shared/extensions/git.ts
similarity index 100%
rename from src/shared/extensions/git.ts
rename to packages/toolkit/src/shared/extensions/git.ts
diff --git a/src/shared/extensions/ssh.ts b/packages/toolkit/src/shared/extensions/ssh.ts
similarity index 100%
rename from src/shared/extensions/ssh.ts
rename to packages/toolkit/src/shared/extensions/ssh.ts
diff --git a/src/shared/extensions/yaml.ts b/packages/toolkit/src/shared/extensions/yaml.ts
similarity index 100%
rename from src/shared/extensions/yaml.ts
rename to packages/toolkit/src/shared/extensions/yaml.ts
diff --git a/src/shared/filesystemUtilities.ts b/packages/toolkit/src/shared/filesystemUtilities.ts
similarity index 100%
rename from src/shared/filesystemUtilities.ts
rename to packages/toolkit/src/shared/filesystemUtilities.ts
diff --git a/src/shared/fs/codelensRootRegistry.ts b/packages/toolkit/src/shared/fs/codelensRootRegistry.ts
similarity index 100%
rename from src/shared/fs/codelensRootRegistry.ts
rename to packages/toolkit/src/shared/fs/codelensRootRegistry.ts
diff --git a/src/shared/fs/devfileRegistry.ts b/packages/toolkit/src/shared/fs/devfileRegistry.ts
similarity index 100%
rename from src/shared/fs/devfileRegistry.ts
rename to packages/toolkit/src/shared/fs/devfileRegistry.ts
diff --git a/src/shared/fs/templateRegistry.ts b/packages/toolkit/src/shared/fs/templateRegistry.ts
similarity index 100%
rename from src/shared/fs/templateRegistry.ts
rename to packages/toolkit/src/shared/fs/templateRegistry.ts
diff --git a/src/shared/fs/watchedFiles.ts b/packages/toolkit/src/shared/fs/watchedFiles.ts
similarity index 100%
rename from src/shared/fs/watchedFiles.ts
rename to packages/toolkit/src/shared/fs/watchedFiles.ts
diff --git a/src/shared/globalState.ts b/packages/toolkit/src/shared/globalState.ts
similarity index 100%
rename from src/shared/globalState.ts
rename to packages/toolkit/src/shared/globalState.ts
diff --git a/src/shared/globalStorage.ts b/packages/toolkit/src/shared/globalStorage.ts
similarity index 100%
rename from src/shared/globalStorage.ts
rename to packages/toolkit/src/shared/globalStorage.ts
diff --git a/src/shared/icons.ts b/packages/toolkit/src/shared/icons.ts
similarity index 100%
rename from src/shared/icons.ts
rename to packages/toolkit/src/shared/icons.ts
diff --git a/src/shared/lambdaHandlerSearch.ts b/packages/toolkit/src/shared/lambdaHandlerSearch.ts
similarity index 100%
rename from src/shared/lambdaHandlerSearch.ts
rename to packages/toolkit/src/shared/lambdaHandlerSearch.ts
diff --git a/src/shared/languageServer/languageModelCache.ts b/packages/toolkit/src/shared/languageServer/languageModelCache.ts
similarity index 100%
rename from src/shared/languageServer/languageModelCache.ts
rename to packages/toolkit/src/shared/languageServer/languageModelCache.ts
diff --git a/src/shared/languageServer/utils/runner.ts b/packages/toolkit/src/shared/languageServer/utils/runner.ts
similarity index 100%
rename from src/shared/languageServer/utils/runner.ts
rename to packages/toolkit/src/shared/languageServer/utils/runner.ts
diff --git a/src/shared/localizedText.ts b/packages/toolkit/src/shared/localizedText.ts
similarity index 100%
rename from src/shared/localizedText.ts
rename to packages/toolkit/src/shared/localizedText.ts
diff --git a/src/shared/logger/activation.ts b/packages/toolkit/src/shared/logger/activation.ts
similarity index 100%
rename from src/shared/logger/activation.ts
rename to packages/toolkit/src/shared/logger/activation.ts
diff --git a/src/shared/logger/commands.ts b/packages/toolkit/src/shared/logger/commands.ts
similarity index 100%
rename from src/shared/logger/commands.ts
rename to packages/toolkit/src/shared/logger/commands.ts
diff --git a/src/shared/logger/consoleLogTransport.ts b/packages/toolkit/src/shared/logger/consoleLogTransport.ts
similarity index 100%
rename from src/shared/logger/consoleLogTransport.ts
rename to packages/toolkit/src/shared/logger/consoleLogTransport.ts
diff --git a/src/shared/logger/index.ts b/packages/toolkit/src/shared/logger/index.ts
similarity index 100%
rename from src/shared/logger/index.ts
rename to packages/toolkit/src/shared/logger/index.ts
diff --git a/src/shared/logger/logger.ts b/packages/toolkit/src/shared/logger/logger.ts
similarity index 100%
rename from src/shared/logger/logger.ts
rename to packages/toolkit/src/shared/logger/logger.ts
diff --git a/src/shared/logger/outputChannel.ts b/packages/toolkit/src/shared/logger/outputChannel.ts
similarity index 100%
rename from src/shared/logger/outputChannel.ts
rename to packages/toolkit/src/shared/logger/outputChannel.ts
diff --git a/src/shared/logger/outputChannelTransport.ts b/packages/toolkit/src/shared/logger/outputChannelTransport.ts
similarity index 100%
rename from src/shared/logger/outputChannelTransport.ts
rename to packages/toolkit/src/shared/logger/outputChannelTransport.ts
diff --git a/src/shared/logger/sharedFileTransport.ts b/packages/toolkit/src/shared/logger/sharedFileTransport.ts
similarity index 100%
rename from src/shared/logger/sharedFileTransport.ts
rename to packages/toolkit/src/shared/logger/sharedFileTransport.ts
diff --git a/src/shared/logger/util.ts b/packages/toolkit/src/shared/logger/util.ts
similarity index 100%
rename from src/shared/logger/util.ts
rename to packages/toolkit/src/shared/logger/util.ts
diff --git a/src/shared/logger/winstonToolkitLogger.ts b/packages/toolkit/src/shared/logger/winstonToolkitLogger.ts
similarity index 100%
rename from src/shared/logger/winstonToolkitLogger.ts
rename to packages/toolkit/src/shared/logger/winstonToolkitLogger.ts
diff --git a/src/shared/multiStepInputFlowController.ts b/packages/toolkit/src/shared/multiStepInputFlowController.ts
similarity index 100%
rename from src/shared/multiStepInputFlowController.ts
rename to packages/toolkit/src/shared/multiStepInputFlowController.ts
diff --git a/src/shared/regions/endpoints.ts b/packages/toolkit/src/shared/regions/endpoints.ts
similarity index 100%
rename from src/shared/regions/endpoints.ts
rename to packages/toolkit/src/shared/regions/endpoints.ts
diff --git a/src/shared/regions/regionProvider.ts b/packages/toolkit/src/shared/regions/regionProvider.ts
similarity index 100%
rename from src/shared/regions/regionProvider.ts
rename to packages/toolkit/src/shared/regions/regionProvider.ts
diff --git a/src/shared/remoteSession.ts b/packages/toolkit/src/shared/remoteSession.ts
similarity index 100%
rename from src/shared/remoteSession.ts
rename to packages/toolkit/src/shared/remoteSession.ts
diff --git a/src/shared/resourcefetcher/compositeResourceFetcher.ts b/packages/toolkit/src/shared/resourcefetcher/compositeResourceFetcher.ts
similarity index 100%
rename from src/shared/resourcefetcher/compositeResourceFetcher.ts
rename to packages/toolkit/src/shared/resourcefetcher/compositeResourceFetcher.ts
diff --git a/src/shared/resourcefetcher/fileResourceFetcher.ts b/packages/toolkit/src/shared/resourcefetcher/fileResourceFetcher.ts
similarity index 100%
rename from src/shared/resourcefetcher/fileResourceFetcher.ts
rename to packages/toolkit/src/shared/resourcefetcher/fileResourceFetcher.ts
diff --git a/src/shared/resourcefetcher/httpResourceFetcher.ts b/packages/toolkit/src/shared/resourcefetcher/httpResourceFetcher.ts
similarity index 100%
rename from src/shared/resourcefetcher/httpResourceFetcher.ts
rename to packages/toolkit/src/shared/resourcefetcher/httpResourceFetcher.ts
diff --git a/src/shared/resourcefetcher/resourcefetcher.ts b/packages/toolkit/src/shared/resourcefetcher/resourcefetcher.ts
similarity index 100%
rename from src/shared/resourcefetcher/resourcefetcher.ts
rename to packages/toolkit/src/shared/resourcefetcher/resourcefetcher.ts
diff --git a/src/shared/sam/activation.ts b/packages/toolkit/src/shared/sam/activation.ts
similarity index 100%
rename from src/shared/sam/activation.ts
rename to packages/toolkit/src/shared/sam/activation.ts
diff --git a/src/shared/sam/cli/samCliBuild.ts b/packages/toolkit/src/shared/sam/cli/samCliBuild.ts
similarity index 100%
rename from src/shared/sam/cli/samCliBuild.ts
rename to packages/toolkit/src/shared/sam/cli/samCliBuild.ts
diff --git a/src/shared/sam/cli/samCliContext.ts b/packages/toolkit/src/shared/sam/cli/samCliContext.ts
similarity index 100%
rename from src/shared/sam/cli/samCliContext.ts
rename to packages/toolkit/src/shared/sam/cli/samCliContext.ts
diff --git a/src/shared/sam/cli/samCliDeploy.ts b/packages/toolkit/src/shared/sam/cli/samCliDeploy.ts
similarity index 100%
rename from src/shared/sam/cli/samCliDeploy.ts
rename to packages/toolkit/src/shared/sam/cli/samCliDeploy.ts
diff --git a/src/shared/sam/cli/samCliDetection.ts b/packages/toolkit/src/shared/sam/cli/samCliDetection.ts
similarity index 100%
rename from src/shared/sam/cli/samCliDetection.ts
rename to packages/toolkit/src/shared/sam/cli/samCliDetection.ts
diff --git a/src/shared/sam/cli/samCliInfo.ts b/packages/toolkit/src/shared/sam/cli/samCliInfo.ts
similarity index 100%
rename from src/shared/sam/cli/samCliInfo.ts
rename to packages/toolkit/src/shared/sam/cli/samCliInfo.ts
diff --git a/src/shared/sam/cli/samCliInit.ts b/packages/toolkit/src/shared/sam/cli/samCliInit.ts
similarity index 100%
rename from src/shared/sam/cli/samCliInit.ts
rename to packages/toolkit/src/shared/sam/cli/samCliInit.ts
diff --git a/src/shared/sam/cli/samCliInvoker.ts b/packages/toolkit/src/shared/sam/cli/samCliInvoker.ts
similarity index 100%
rename from src/shared/sam/cli/samCliInvoker.ts
rename to packages/toolkit/src/shared/sam/cli/samCliInvoker.ts
diff --git a/src/shared/sam/cli/samCliInvokerUtils.ts b/packages/toolkit/src/shared/sam/cli/samCliInvokerUtils.ts
similarity index 100%
rename from src/shared/sam/cli/samCliInvokerUtils.ts
rename to packages/toolkit/src/shared/sam/cli/samCliInvokerUtils.ts
diff --git a/src/shared/sam/cli/samCliLocalInvoke.ts b/packages/toolkit/src/shared/sam/cli/samCliLocalInvoke.ts
similarity index 100%
rename from src/shared/sam/cli/samCliLocalInvoke.ts
rename to packages/toolkit/src/shared/sam/cli/samCliLocalInvoke.ts
diff --git a/src/shared/sam/cli/samCliLocator.ts b/packages/toolkit/src/shared/sam/cli/samCliLocator.ts
similarity index 100%
rename from src/shared/sam/cli/samCliLocator.ts
rename to packages/toolkit/src/shared/sam/cli/samCliLocator.ts
diff --git a/src/shared/sam/cli/samCliPackage.ts b/packages/toolkit/src/shared/sam/cli/samCliPackage.ts
similarity index 100%
rename from src/shared/sam/cli/samCliPackage.ts
rename to packages/toolkit/src/shared/sam/cli/samCliPackage.ts
diff --git a/src/shared/sam/cli/samCliSettings.ts b/packages/toolkit/src/shared/sam/cli/samCliSettings.ts
similarity index 100%
rename from src/shared/sam/cli/samCliSettings.ts
rename to packages/toolkit/src/shared/sam/cli/samCliSettings.ts
diff --git a/src/shared/sam/cli/samCliStartApi.ts b/packages/toolkit/src/shared/sam/cli/samCliStartApi.ts
similarity index 100%
rename from src/shared/sam/cli/samCliStartApi.ts
rename to packages/toolkit/src/shared/sam/cli/samCliStartApi.ts
diff --git a/src/shared/sam/cli/samCliValidationNotification.ts b/packages/toolkit/src/shared/sam/cli/samCliValidationNotification.ts
similarity index 100%
rename from src/shared/sam/cli/samCliValidationNotification.ts
rename to packages/toolkit/src/shared/sam/cli/samCliValidationNotification.ts
diff --git a/src/shared/sam/cli/samCliValidationUtils.ts b/packages/toolkit/src/shared/sam/cli/samCliValidationUtils.ts
similarity index 100%
rename from src/shared/sam/cli/samCliValidationUtils.ts
rename to packages/toolkit/src/shared/sam/cli/samCliValidationUtils.ts
diff --git a/src/shared/sam/cli/samCliValidator.ts b/packages/toolkit/src/shared/sam/cli/samCliValidator.ts
similarity index 100%
rename from src/shared/sam/cli/samCliValidator.ts
rename to packages/toolkit/src/shared/sam/cli/samCliValidator.ts
diff --git a/src/shared/sam/config.ts b/packages/toolkit/src/shared/sam/config.ts
similarity index 100%
rename from src/shared/sam/config.ts
rename to packages/toolkit/src/shared/sam/config.ts
diff --git a/src/shared/sam/debugger/awsSamDebugConfiguration.ts b/packages/toolkit/src/shared/sam/debugger/awsSamDebugConfiguration.ts
similarity index 100%
rename from src/shared/sam/debugger/awsSamDebugConfiguration.ts
rename to packages/toolkit/src/shared/sam/debugger/awsSamDebugConfiguration.ts
diff --git a/src/shared/sam/debugger/awsSamDebugConfigurationValidator.ts b/packages/toolkit/src/shared/sam/debugger/awsSamDebugConfigurationValidator.ts
similarity index 100%
rename from src/shared/sam/debugger/awsSamDebugConfigurationValidator.ts
rename to packages/toolkit/src/shared/sam/debugger/awsSamDebugConfigurationValidator.ts
diff --git a/src/shared/sam/debugger/awsSamDebugger.ts b/packages/toolkit/src/shared/sam/debugger/awsSamDebugger.ts
similarity index 100%
rename from src/shared/sam/debugger/awsSamDebugger.ts
rename to packages/toolkit/src/shared/sam/debugger/awsSamDebugger.ts
diff --git a/src/shared/sam/debugger/commands/addSamDebugConfiguration.ts b/packages/toolkit/src/shared/sam/debugger/commands/addSamDebugConfiguration.ts
similarity index 100%
rename from src/shared/sam/debugger/commands/addSamDebugConfiguration.ts
rename to packages/toolkit/src/shared/sam/debugger/commands/addSamDebugConfiguration.ts
diff --git a/src/shared/sam/debugger/csharpSamDebug.ts b/packages/toolkit/src/shared/sam/debugger/csharpSamDebug.ts
similarity index 100%
rename from src/shared/sam/debugger/csharpSamDebug.ts
rename to packages/toolkit/src/shared/sam/debugger/csharpSamDebug.ts
diff --git a/src/shared/sam/debugger/goSamDebug.ts b/packages/toolkit/src/shared/sam/debugger/goSamDebug.ts
similarity index 100%
rename from src/shared/sam/debugger/goSamDebug.ts
rename to packages/toolkit/src/shared/sam/debugger/goSamDebug.ts
diff --git a/src/shared/sam/debugger/javaSamDebug.ts b/packages/toolkit/src/shared/sam/debugger/javaSamDebug.ts
similarity index 100%
rename from src/shared/sam/debugger/javaSamDebug.ts
rename to packages/toolkit/src/shared/sam/debugger/javaSamDebug.ts
diff --git a/src/shared/sam/debugger/pythonSamDebug.ts b/packages/toolkit/src/shared/sam/debugger/pythonSamDebug.ts
similarity index 100%
rename from src/shared/sam/debugger/pythonSamDebug.ts
rename to packages/toolkit/src/shared/sam/debugger/pythonSamDebug.ts
diff --git a/src/shared/sam/debugger/typescriptSamDebug.ts b/packages/toolkit/src/shared/sam/debugger/typescriptSamDebug.ts
similarity index 100%
rename from src/shared/sam/debugger/typescriptSamDebug.ts
rename to packages/toolkit/src/shared/sam/debugger/typescriptSamDebug.ts
diff --git a/src/shared/sam/localLambdaRunner.ts b/packages/toolkit/src/shared/sam/localLambdaRunner.ts
similarity index 100%
rename from src/shared/sam/localLambdaRunner.ts
rename to packages/toolkit/src/shared/sam/localLambdaRunner.ts
diff --git a/src/shared/sam/sync.ts b/packages/toolkit/src/shared/sam/sync.ts
similarity index 100%
rename from src/shared/sam/sync.ts
rename to packages/toolkit/src/shared/sam/sync.ts
diff --git a/src/shared/schemas.ts b/packages/toolkit/src/shared/schemas.ts
similarity index 100%
rename from src/shared/schemas.ts
rename to packages/toolkit/src/shared/schemas.ts
diff --git a/src/shared/settings.ts b/packages/toolkit/src/shared/settings.ts
similarity index 100%
rename from src/shared/settings.ts
rename to packages/toolkit/src/shared/settings.ts
diff --git a/src/shared/sshConfig.ts b/packages/toolkit/src/shared/sshConfig.ts
similarity index 100%
rename from src/shared/sshConfig.ts
rename to packages/toolkit/src/shared/sshConfig.ts
diff --git a/src/shared/systemUtilities.ts b/packages/toolkit/src/shared/systemUtilities.ts
similarity index 100%
rename from src/shared/systemUtilities.ts
rename to packages/toolkit/src/shared/systemUtilities.ts
diff --git a/src/shared/telemetry/README b/packages/toolkit/src/shared/telemetry/README
similarity index 100%
rename from src/shared/telemetry/README
rename to packages/toolkit/src/shared/telemetry/README
diff --git a/src/shared/telemetry/activation.ts b/packages/toolkit/src/shared/telemetry/activation.ts
similarity index 100%
rename from src/shared/telemetry/activation.ts
rename to packages/toolkit/src/shared/telemetry/activation.ts
diff --git a/src/shared/telemetry/exemptMetrics.ts b/packages/toolkit/src/shared/telemetry/exemptMetrics.ts
similarity index 100%
rename from src/shared/telemetry/exemptMetrics.ts
rename to packages/toolkit/src/shared/telemetry/exemptMetrics.ts
diff --git a/src/shared/telemetry/service-2.json b/packages/toolkit/src/shared/telemetry/service-2.json
similarity index 100%
rename from src/shared/telemetry/service-2.json
rename to packages/toolkit/src/shared/telemetry/service-2.json
diff --git a/src/shared/telemetry/spans.ts b/packages/toolkit/src/shared/telemetry/spans.ts
similarity index 100%
rename from src/shared/telemetry/spans.ts
rename to packages/toolkit/src/shared/telemetry/spans.ts
diff --git a/src/shared/telemetry/telemetry.ts b/packages/toolkit/src/shared/telemetry/telemetry.ts
similarity index 100%
rename from src/shared/telemetry/telemetry.ts
rename to packages/toolkit/src/shared/telemetry/telemetry.ts
diff --git a/src/shared/telemetry/telemetryClient.ts b/packages/toolkit/src/shared/telemetry/telemetryClient.ts
similarity index 100%
rename from src/shared/telemetry/telemetryClient.ts
rename to packages/toolkit/src/shared/telemetry/telemetryClient.ts
diff --git a/src/shared/telemetry/telemetryLogger.ts b/packages/toolkit/src/shared/telemetry/telemetryLogger.ts
similarity index 100%
rename from src/shared/telemetry/telemetryLogger.ts
rename to packages/toolkit/src/shared/telemetry/telemetryLogger.ts
diff --git a/src/shared/telemetry/telemetryPublisher.ts b/packages/toolkit/src/shared/telemetry/telemetryPublisher.ts
similarity index 100%
rename from src/shared/telemetry/telemetryPublisher.ts
rename to packages/toolkit/src/shared/telemetry/telemetryPublisher.ts
diff --git a/src/shared/telemetry/telemetryService.ts b/packages/toolkit/src/shared/telemetry/telemetryService.ts
similarity index 100%
rename from src/shared/telemetry/telemetryService.ts
rename to packages/toolkit/src/shared/telemetry/telemetryService.ts
diff --git a/src/shared/telemetry/util.ts b/packages/toolkit/src/shared/telemetry/util.ts
similarity index 100%
rename from src/shared/telemetry/util.ts
rename to packages/toolkit/src/shared/telemetry/util.ts
diff --git a/src/shared/telemetry/vscodeTelemetry.json b/packages/toolkit/src/shared/telemetry/vscodeTelemetry.json
similarity index 100%
rename from src/shared/telemetry/vscodeTelemetry.json
rename to packages/toolkit/src/shared/telemetry/vscodeTelemetry.json
diff --git a/src/shared/templates/baseTemplates.ts b/packages/toolkit/src/shared/templates/baseTemplates.ts
similarity index 100%
rename from src/shared/templates/baseTemplates.ts
rename to packages/toolkit/src/shared/templates/baseTemplates.ts
diff --git a/src/shared/templates/sam/samTemplateGenerator.ts b/packages/toolkit/src/shared/templates/sam/samTemplateGenerator.ts
similarity index 100%
rename from src/shared/templates/sam/samTemplateGenerator.ts
rename to packages/toolkit/src/shared/templates/sam/samTemplateGenerator.ts
diff --git a/src/shared/treeview/awsTreeProvider.ts b/packages/toolkit/src/shared/treeview/awsTreeProvider.ts
similarity index 100%
rename from src/shared/treeview/awsTreeProvider.ts
rename to packages/toolkit/src/shared/treeview/awsTreeProvider.ts
diff --git a/src/shared/treeview/nodes/awsCommandTreeNode.ts b/packages/toolkit/src/shared/treeview/nodes/awsCommandTreeNode.ts
similarity index 100%
rename from src/shared/treeview/nodes/awsCommandTreeNode.ts
rename to packages/toolkit/src/shared/treeview/nodes/awsCommandTreeNode.ts
diff --git a/src/shared/treeview/nodes/awsResourceNode.ts b/packages/toolkit/src/shared/treeview/nodes/awsResourceNode.ts
similarity index 100%
rename from src/shared/treeview/nodes/awsResourceNode.ts
rename to packages/toolkit/src/shared/treeview/nodes/awsResourceNode.ts
diff --git a/src/shared/treeview/nodes/awsTreeNodeBase.ts b/packages/toolkit/src/shared/treeview/nodes/awsTreeNodeBase.ts
similarity index 100%
rename from src/shared/treeview/nodes/awsTreeNodeBase.ts
rename to packages/toolkit/src/shared/treeview/nodes/awsTreeNodeBase.ts
diff --git a/src/shared/treeview/nodes/loadMoreNode.ts b/packages/toolkit/src/shared/treeview/nodes/loadMoreNode.ts
similarity index 100%
rename from src/shared/treeview/nodes/loadMoreNode.ts
rename to packages/toolkit/src/shared/treeview/nodes/loadMoreNode.ts
diff --git a/src/shared/treeview/nodes/placeholderNode.ts b/packages/toolkit/src/shared/treeview/nodes/placeholderNode.ts
similarity index 100%
rename from src/shared/treeview/nodes/placeholderNode.ts
rename to packages/toolkit/src/shared/treeview/nodes/placeholderNode.ts
diff --git a/src/shared/treeview/resource.ts b/packages/toolkit/src/shared/treeview/resource.ts
similarity index 100%
rename from src/shared/treeview/resource.ts
rename to packages/toolkit/src/shared/treeview/resource.ts
diff --git a/src/shared/treeview/resourceTreeDataProvider.ts b/packages/toolkit/src/shared/treeview/resourceTreeDataProvider.ts
similarity index 100%
rename from src/shared/treeview/resourceTreeDataProvider.ts
rename to packages/toolkit/src/shared/treeview/resourceTreeDataProvider.ts
diff --git a/src/shared/treeview/utils.ts b/packages/toolkit/src/shared/treeview/utils.ts
similarity index 100%
rename from src/shared/treeview/utils.ts
rename to packages/toolkit/src/shared/treeview/utils.ts
diff --git a/src/shared/typescriptLambdaHandlerSearch.ts b/packages/toolkit/src/shared/typescriptLambdaHandlerSearch.ts
similarity index 100%
rename from src/shared/typescriptLambdaHandlerSearch.ts
rename to packages/toolkit/src/shared/typescriptLambdaHandlerSearch.ts
diff --git a/src/shared/ui/buttons.ts b/packages/toolkit/src/shared/ui/buttons.ts
similarity index 100%
rename from src/shared/ui/buttons.ts
rename to packages/toolkit/src/shared/ui/buttons.ts
diff --git a/src/shared/ui/common/exitPrompter.ts b/packages/toolkit/src/shared/ui/common/exitPrompter.ts
similarity index 100%
rename from src/shared/ui/common/exitPrompter.ts
rename to packages/toolkit/src/shared/ui/common/exitPrompter.ts
diff --git a/src/shared/ui/common/location.ts b/packages/toolkit/src/shared/ui/common/location.ts
similarity index 100%
rename from src/shared/ui/common/location.ts
rename to packages/toolkit/src/shared/ui/common/location.ts
diff --git a/src/shared/ui/common/openDialog.ts b/packages/toolkit/src/shared/ui/common/openDialog.ts
similarity index 100%
rename from src/shared/ui/common/openDialog.ts
rename to packages/toolkit/src/shared/ui/common/openDialog.ts
diff --git a/src/shared/ui/common/region.ts b/packages/toolkit/src/shared/ui/common/region.ts
similarity index 100%
rename from src/shared/ui/common/region.ts
rename to packages/toolkit/src/shared/ui/common/region.ts
diff --git a/src/shared/ui/common/regionSubmenu.ts b/packages/toolkit/src/shared/ui/common/regionSubmenu.ts
similarity index 100%
rename from src/shared/ui/common/regionSubmenu.ts
rename to packages/toolkit/src/shared/ui/common/regionSubmenu.ts
diff --git a/src/shared/ui/common/roles.ts b/packages/toolkit/src/shared/ui/common/roles.ts
similarity index 100%
rename from src/shared/ui/common/roles.ts
rename to packages/toolkit/src/shared/ui/common/roles.ts
diff --git a/src/shared/ui/common/skipPrompter.ts b/packages/toolkit/src/shared/ui/common/skipPrompter.ts
similarity index 100%
rename from src/shared/ui/common/skipPrompter.ts
rename to packages/toolkit/src/shared/ui/common/skipPrompter.ts
diff --git a/src/shared/ui/common/variablesPrompter.ts b/packages/toolkit/src/shared/ui/common/variablesPrompter.ts
similarity index 100%
rename from src/shared/ui/common/variablesPrompter.ts
rename to packages/toolkit/src/shared/ui/common/variablesPrompter.ts
diff --git a/src/shared/ui/input.ts b/packages/toolkit/src/shared/ui/input.ts
similarity index 100%
rename from src/shared/ui/input.ts
rename to packages/toolkit/src/shared/ui/input.ts
diff --git a/src/shared/ui/inputPrompter.ts b/packages/toolkit/src/shared/ui/inputPrompter.ts
similarity index 100%
rename from src/shared/ui/inputPrompter.ts
rename to packages/toolkit/src/shared/ui/inputPrompter.ts
diff --git a/src/shared/ui/picker.ts b/packages/toolkit/src/shared/ui/picker.ts
similarity index 100%
rename from src/shared/ui/picker.ts
rename to packages/toolkit/src/shared/ui/picker.ts
diff --git a/src/shared/ui/pickerPrompter.ts b/packages/toolkit/src/shared/ui/pickerPrompter.ts
similarity index 100%
rename from src/shared/ui/pickerPrompter.ts
rename to packages/toolkit/src/shared/ui/pickerPrompter.ts
diff --git a/src/shared/ui/prompter.ts b/packages/toolkit/src/shared/ui/prompter.ts
similarity index 100%
rename from src/shared/ui/prompter.ts
rename to packages/toolkit/src/shared/ui/prompter.ts
diff --git a/src/shared/ui/wizardPrompter.ts b/packages/toolkit/src/shared/ui/wizardPrompter.ts
similarity index 100%
rename from src/shared/ui/wizardPrompter.ts
rename to packages/toolkit/src/shared/ui/wizardPrompter.ts
diff --git a/src/shared/utilities/asyncCollection.ts b/packages/toolkit/src/shared/utilities/asyncCollection.ts
similarity index 100%
rename from src/shared/utilities/asyncCollection.ts
rename to packages/toolkit/src/shared/utilities/asyncCollection.ts
diff --git a/src/shared/utilities/cacheUtils.ts b/packages/toolkit/src/shared/utilities/cacheUtils.ts
similarity index 100%
rename from src/shared/utilities/cacheUtils.ts
rename to packages/toolkit/src/shared/utilities/cacheUtils.ts
diff --git a/src/shared/utilities/childProcess.ts b/packages/toolkit/src/shared/utilities/childProcess.ts
similarity index 100%
rename from src/shared/utilities/childProcess.ts
rename to packages/toolkit/src/shared/utilities/childProcess.ts
diff --git a/src/shared/utilities/classUtils.ts b/packages/toolkit/src/shared/utilities/classUtils.ts
similarity index 100%
rename from src/shared/utilities/classUtils.ts
rename to packages/toolkit/src/shared/utilities/classUtils.ts
diff --git a/src/shared/utilities/cliUtils.ts b/packages/toolkit/src/shared/utilities/cliUtils.ts
similarity index 100%
rename from src/shared/utilities/cliUtils.ts
rename to packages/toolkit/src/shared/utilities/cliUtils.ts
diff --git a/src/shared/utilities/collectionUtils.ts b/packages/toolkit/src/shared/utilities/collectionUtils.ts
similarity index 100%
rename from src/shared/utilities/collectionUtils.ts
rename to packages/toolkit/src/shared/utilities/collectionUtils.ts
diff --git a/src/shared/utilities/debuggerUtils.ts b/packages/toolkit/src/shared/utilities/debuggerUtils.ts
similarity index 100%
rename from src/shared/utilities/debuggerUtils.ts
rename to packages/toolkit/src/shared/utilities/debuggerUtils.ts
diff --git a/src/shared/utilities/download.ts b/packages/toolkit/src/shared/utilities/download.ts
similarity index 100%
rename from src/shared/utilities/download.ts
rename to packages/toolkit/src/shared/utilities/download.ts
diff --git a/src/shared/utilities/editorUtilities.ts b/packages/toolkit/src/shared/utilities/editorUtilities.ts
similarity index 100%
rename from src/shared/utilities/editorUtilities.ts
rename to packages/toolkit/src/shared/utilities/editorUtilities.ts
diff --git a/src/shared/utilities/functionUtils.ts b/packages/toolkit/src/shared/utilities/functionUtils.ts
similarity index 100%
rename from src/shared/utilities/functionUtils.ts
rename to packages/toolkit/src/shared/utilities/functionUtils.ts
diff --git a/src/shared/utilities/mementos.ts b/packages/toolkit/src/shared/utilities/mementos.ts
similarity index 100%
rename from src/shared/utilities/mementos.ts
rename to packages/toolkit/src/shared/utilities/mementos.ts
diff --git a/src/shared/utilities/messages.ts b/packages/toolkit/src/shared/utilities/messages.ts
similarity index 100%
rename from src/shared/utilities/messages.ts
rename to packages/toolkit/src/shared/utilities/messages.ts
diff --git a/src/shared/utilities/pathUtils.ts b/packages/toolkit/src/shared/utilities/pathUtils.ts
similarity index 100%
rename from src/shared/utilities/pathUtils.ts
rename to packages/toolkit/src/shared/utilities/pathUtils.ts
diff --git a/src/shared/utilities/result.ts b/packages/toolkit/src/shared/utilities/result.ts
similarity index 100%
rename from src/shared/utilities/result.ts
rename to packages/toolkit/src/shared/utilities/result.ts
diff --git a/src/shared/utilities/streamUtilities.ts b/packages/toolkit/src/shared/utilities/streamUtilities.ts
similarity index 100%
rename from src/shared/utilities/streamUtilities.ts
rename to packages/toolkit/src/shared/utilities/streamUtilities.ts
diff --git a/src/shared/utilities/symbolUtilities.ts b/packages/toolkit/src/shared/utilities/symbolUtilities.ts
similarity index 100%
rename from src/shared/utilities/symbolUtilities.ts
rename to packages/toolkit/src/shared/utilities/symbolUtilities.ts
diff --git a/src/shared/utilities/textDocumentUtilities.ts b/packages/toolkit/src/shared/utilities/textDocumentUtilities.ts
similarity index 100%
rename from src/shared/utilities/textDocumentUtilities.ts
rename to packages/toolkit/src/shared/utilities/textDocumentUtilities.ts
diff --git a/src/shared/utilities/textUtilities.ts b/packages/toolkit/src/shared/utilities/textUtilities.ts
similarity index 100%
rename from src/shared/utilities/textUtilities.ts
rename to packages/toolkit/src/shared/utilities/textUtilities.ts
diff --git a/src/shared/utilities/timeoutUtils.ts b/packages/toolkit/src/shared/utilities/timeoutUtils.ts
similarity index 100%
rename from src/shared/utilities/timeoutUtils.ts
rename to packages/toolkit/src/shared/utilities/timeoutUtils.ts
diff --git a/src/shared/utilities/tsUtils.ts b/packages/toolkit/src/shared/utilities/tsUtils.ts
similarity index 100%
rename from src/shared/utilities/tsUtils.ts
rename to packages/toolkit/src/shared/utilities/tsUtils.ts
diff --git a/src/shared/utilities/typeConstructors.ts b/packages/toolkit/src/shared/utilities/typeConstructors.ts
similarity index 100%
rename from src/shared/utilities/typeConstructors.ts
rename to packages/toolkit/src/shared/utilities/typeConstructors.ts
diff --git a/src/shared/utilities/uriUtils.ts b/packages/toolkit/src/shared/utilities/uriUtils.ts
similarity index 100%
rename from src/shared/utilities/uriUtils.ts
rename to packages/toolkit/src/shared/utilities/uriUtils.ts
diff --git a/src/shared/utilities/vsCodeUtils.ts b/packages/toolkit/src/shared/utilities/vsCodeUtils.ts
similarity index 100%
rename from src/shared/utilities/vsCodeUtils.ts
rename to packages/toolkit/src/shared/utilities/vsCodeUtils.ts
diff --git a/src/shared/utilities/workspaceUtils.ts b/packages/toolkit/src/shared/utilities/workspaceUtils.ts
similarity index 100%
rename from src/shared/utilities/workspaceUtils.ts
rename to packages/toolkit/src/shared/utilities/workspaceUtils.ts
diff --git a/src/shared/virtualFilesystem.ts b/packages/toolkit/src/shared/virtualFilesystem.ts
similarity index 100%
rename from src/shared/virtualFilesystem.ts
rename to packages/toolkit/src/shared/virtualFilesystem.ts
diff --git a/src/shared/virtualMemoryFile.ts b/packages/toolkit/src/shared/virtualMemoryFile.ts
similarity index 100%
rename from src/shared/virtualMemoryFile.ts
rename to packages/toolkit/src/shared/virtualMemoryFile.ts
diff --git a/src/shared/vscode/commands2.ts b/packages/toolkit/src/shared/vscode/commands2.ts
similarity index 100%
rename from src/shared/vscode/commands2.ts
rename to packages/toolkit/src/shared/vscode/commands2.ts
diff --git a/src/shared/vscode/env.ts b/packages/toolkit/src/shared/vscode/env.ts
similarity index 100%
rename from src/shared/vscode/env.ts
rename to packages/toolkit/src/shared/vscode/env.ts
diff --git a/src/shared/vscode/uriHandler.ts b/packages/toolkit/src/shared/vscode/uriHandler.ts
similarity index 100%
rename from src/shared/vscode/uriHandler.ts
rename to packages/toolkit/src/shared/vscode/uriHandler.ts
diff --git a/src/shared/vscode/window.ts b/packages/toolkit/src/shared/vscode/window.ts
similarity index 100%
rename from src/shared/vscode/window.ts
rename to packages/toolkit/src/shared/vscode/window.ts
diff --git a/src/shared/wizards/multiStepWizard.ts b/packages/toolkit/src/shared/wizards/multiStepWizard.ts
similarity index 100%
rename from src/shared/wizards/multiStepWizard.ts
rename to packages/toolkit/src/shared/wizards/multiStepWizard.ts
diff --git a/src/shared/wizards/stateController.ts b/packages/toolkit/src/shared/wizards/stateController.ts
similarity index 100%
rename from src/shared/wizards/stateController.ts
rename to packages/toolkit/src/shared/wizards/stateController.ts
diff --git a/src/shared/wizards/wizard.ts b/packages/toolkit/src/shared/wizards/wizard.ts
similarity index 100%
rename from src/shared/wizards/wizard.ts
rename to packages/toolkit/src/shared/wizards/wizard.ts
diff --git a/src/shared/wizards/wizardForm.ts b/packages/toolkit/src/shared/wizards/wizardForm.ts
similarity index 100%
rename from src/shared/wizards/wizardForm.ts
rename to packages/toolkit/src/shared/wizards/wizardForm.ts
diff --git a/src/srcShared/README.md b/packages/toolkit/src/srcShared/README.md
similarity index 100%
rename from src/srcShared/README.md
rename to packages/toolkit/src/srcShared/README.md
diff --git a/src/srcShared/fs.ts b/packages/toolkit/src/srcShared/fs.ts
similarity index 100%
rename from src/srcShared/fs.ts
rename to packages/toolkit/src/srcShared/fs.ts
diff --git a/src/ssmDocument/activation.ts b/packages/toolkit/src/ssmDocument/activation.ts
similarity index 100%
rename from src/ssmDocument/activation.ts
rename to packages/toolkit/src/ssmDocument/activation.ts
diff --git a/src/ssmDocument/commands/createDocumentFromTemplate.ts b/packages/toolkit/src/ssmDocument/commands/createDocumentFromTemplate.ts
similarity index 100%
rename from src/ssmDocument/commands/createDocumentFromTemplate.ts
rename to packages/toolkit/src/ssmDocument/commands/createDocumentFromTemplate.ts
diff --git a/src/ssmDocument/commands/deleteDocument.ts b/packages/toolkit/src/ssmDocument/commands/deleteDocument.ts
similarity index 100%
rename from src/ssmDocument/commands/deleteDocument.ts
rename to packages/toolkit/src/ssmDocument/commands/deleteDocument.ts
diff --git a/src/ssmDocument/commands/openDocumentItem.ts b/packages/toolkit/src/ssmDocument/commands/openDocumentItem.ts
similarity index 100%
rename from src/ssmDocument/commands/openDocumentItem.ts
rename to packages/toolkit/src/ssmDocument/commands/openDocumentItem.ts
diff --git a/src/ssmDocument/commands/publishDocument.ts b/packages/toolkit/src/ssmDocument/commands/publishDocument.ts
similarity index 100%
rename from src/ssmDocument/commands/publishDocument.ts
rename to packages/toolkit/src/ssmDocument/commands/publishDocument.ts
diff --git a/src/ssmDocument/commands/updateDocumentVersion.ts b/packages/toolkit/src/ssmDocument/commands/updateDocumentVersion.ts
similarity index 100%
rename from src/ssmDocument/commands/updateDocumentVersion.ts
rename to packages/toolkit/src/ssmDocument/commands/updateDocumentVersion.ts
diff --git a/src/ssmDocument/explorer/documentItemNode.ts b/packages/toolkit/src/ssmDocument/explorer/documentItemNode.ts
similarity index 100%
rename from src/ssmDocument/explorer/documentItemNode.ts
rename to packages/toolkit/src/ssmDocument/explorer/documentItemNode.ts
diff --git a/src/ssmDocument/explorer/documentItemNodeWriteable.ts b/packages/toolkit/src/ssmDocument/explorer/documentItemNodeWriteable.ts
similarity index 100%
rename from src/ssmDocument/explorer/documentItemNodeWriteable.ts
rename to packages/toolkit/src/ssmDocument/explorer/documentItemNodeWriteable.ts
diff --git a/src/ssmDocument/explorer/documentTypeNode.ts b/packages/toolkit/src/ssmDocument/explorer/documentTypeNode.ts
similarity index 100%
rename from src/ssmDocument/explorer/documentTypeNode.ts
rename to packages/toolkit/src/ssmDocument/explorer/documentTypeNode.ts
diff --git a/src/ssmDocument/explorer/registryItemNode.ts b/packages/toolkit/src/ssmDocument/explorer/registryItemNode.ts
similarity index 100%
rename from src/ssmDocument/explorer/registryItemNode.ts
rename to packages/toolkit/src/ssmDocument/explorer/registryItemNode.ts
diff --git a/src/ssmDocument/explorer/ssmDocumentNode.ts b/packages/toolkit/src/ssmDocument/explorer/ssmDocumentNode.ts
similarity index 100%
rename from src/ssmDocument/explorer/ssmDocumentNode.ts
rename to packages/toolkit/src/ssmDocument/explorer/ssmDocumentNode.ts
diff --git a/src/ssmDocument/ssm/ssmClient.ts b/packages/toolkit/src/ssmDocument/ssm/ssmClient.ts
similarity index 100%
rename from src/ssmDocument/ssm/ssmClient.ts
rename to packages/toolkit/src/ssmDocument/ssm/ssmClient.ts
diff --git a/src/ssmDocument/util/util.ts b/packages/toolkit/src/ssmDocument/util/util.ts
similarity index 100%
rename from src/ssmDocument/util/util.ts
rename to packages/toolkit/src/ssmDocument/util/util.ts
diff --git a/src/ssmDocument/util/validateDocumentName.ts b/packages/toolkit/src/ssmDocument/util/validateDocumentName.ts
similarity index 100%
rename from src/ssmDocument/util/validateDocumentName.ts
rename to packages/toolkit/src/ssmDocument/util/validateDocumentName.ts
diff --git a/src/ssmDocument/wizards/publishDocumentWizard.ts b/packages/toolkit/src/ssmDocument/wizards/publishDocumentWizard.ts
similarity index 100%
rename from src/ssmDocument/wizards/publishDocumentWizard.ts
rename to packages/toolkit/src/ssmDocument/wizards/publishDocumentWizard.ts
diff --git a/src/stepFunctions/activation.ts b/packages/toolkit/src/stepFunctions/activation.ts
similarity index 100%
rename from src/stepFunctions/activation.ts
rename to packages/toolkit/src/stepFunctions/activation.ts
diff --git a/src/stepFunctions/asl/aslServer.ts b/packages/toolkit/src/stepFunctions/asl/aslServer.ts
similarity index 100%
rename from src/stepFunctions/asl/aslServer.ts
rename to packages/toolkit/src/stepFunctions/asl/aslServer.ts
diff --git a/src/stepFunctions/asl/client.ts b/packages/toolkit/src/stepFunctions/asl/client.ts
similarity index 100%
rename from src/stepFunctions/asl/client.ts
rename to packages/toolkit/src/stepFunctions/asl/client.ts
diff --git a/src/stepFunctions/commands/createStateMachineFromTemplate.ts b/packages/toolkit/src/stepFunctions/commands/createStateMachineFromTemplate.ts
similarity index 100%
rename from src/stepFunctions/commands/createStateMachineFromTemplate.ts
rename to packages/toolkit/src/stepFunctions/commands/createStateMachineFromTemplate.ts
diff --git a/src/stepFunctions/commands/downloadStateMachineDefinition.ts b/packages/toolkit/src/stepFunctions/commands/downloadStateMachineDefinition.ts
similarity index 100%
rename from src/stepFunctions/commands/downloadStateMachineDefinition.ts
rename to packages/toolkit/src/stepFunctions/commands/downloadStateMachineDefinition.ts
diff --git a/src/stepFunctions/commands/publishStateMachine.ts b/packages/toolkit/src/stepFunctions/commands/publishStateMachine.ts
similarity index 100%
rename from src/stepFunctions/commands/publishStateMachine.ts
rename to packages/toolkit/src/stepFunctions/commands/publishStateMachine.ts
diff --git a/src/stepFunctions/commands/visualizeStateMachine/abstractAslVisualizationManager.ts b/packages/toolkit/src/stepFunctions/commands/visualizeStateMachine/abstractAslVisualizationManager.ts
similarity index 100%
rename from src/stepFunctions/commands/visualizeStateMachine/abstractAslVisualizationManager.ts
rename to packages/toolkit/src/stepFunctions/commands/visualizeStateMachine/abstractAslVisualizationManager.ts
diff --git a/src/stepFunctions/commands/visualizeStateMachine/aslVisualization.ts b/packages/toolkit/src/stepFunctions/commands/visualizeStateMachine/aslVisualization.ts
similarity index 100%
rename from src/stepFunctions/commands/visualizeStateMachine/aslVisualization.ts
rename to packages/toolkit/src/stepFunctions/commands/visualizeStateMachine/aslVisualization.ts
diff --git a/src/stepFunctions/commands/visualizeStateMachine/aslVisualizationCDK.ts b/packages/toolkit/src/stepFunctions/commands/visualizeStateMachine/aslVisualizationCDK.ts
similarity index 100%
rename from src/stepFunctions/commands/visualizeStateMachine/aslVisualizationCDK.ts
rename to packages/toolkit/src/stepFunctions/commands/visualizeStateMachine/aslVisualizationCDK.ts
diff --git a/src/stepFunctions/commands/visualizeStateMachine/aslVisualizationCDKManager.ts b/packages/toolkit/src/stepFunctions/commands/visualizeStateMachine/aslVisualizationCDKManager.ts
similarity index 100%
rename from src/stepFunctions/commands/visualizeStateMachine/aslVisualizationCDKManager.ts
rename to packages/toolkit/src/stepFunctions/commands/visualizeStateMachine/aslVisualizationCDKManager.ts
diff --git a/src/stepFunctions/commands/visualizeStateMachine/aslVisualizationManager.ts b/packages/toolkit/src/stepFunctions/commands/visualizeStateMachine/aslVisualizationManager.ts
similarity index 100%
rename from src/stepFunctions/commands/visualizeStateMachine/aslVisualizationManager.ts
rename to packages/toolkit/src/stepFunctions/commands/visualizeStateMachine/aslVisualizationManager.ts
diff --git a/src/stepFunctions/commands/visualizeStateMachine/getStateMachineDefinitionFromCfnTemplate.ts b/packages/toolkit/src/stepFunctions/commands/visualizeStateMachine/getStateMachineDefinitionFromCfnTemplate.ts
similarity index 100%
rename from src/stepFunctions/commands/visualizeStateMachine/getStateMachineDefinitionFromCfnTemplate.ts
rename to packages/toolkit/src/stepFunctions/commands/visualizeStateMachine/getStateMachineDefinitionFromCfnTemplate.ts
diff --git a/src/stepFunctions/commands/visualizeStateMachine/renderStateMachineGraphCDK.ts b/packages/toolkit/src/stepFunctions/commands/visualizeStateMachine/renderStateMachineGraphCDK.ts
similarity index 100%
rename from src/stepFunctions/commands/visualizeStateMachine/renderStateMachineGraphCDK.ts
rename to packages/toolkit/src/stepFunctions/commands/visualizeStateMachine/renderStateMachineGraphCDK.ts
diff --git a/src/stepFunctions/constants/aslFormats.ts b/packages/toolkit/src/stepFunctions/constants/aslFormats.ts
similarity index 100%
rename from src/stepFunctions/constants/aslFormats.ts
rename to packages/toolkit/src/stepFunctions/constants/aslFormats.ts
diff --git a/src/stepFunctions/explorer/stepFunctionsNodes.ts b/packages/toolkit/src/stepFunctions/explorer/stepFunctionsNodes.ts
similarity index 100%
rename from src/stepFunctions/explorer/stepFunctionsNodes.ts
rename to packages/toolkit/src/stepFunctions/explorer/stepFunctionsNodes.ts
diff --git a/src/stepFunctions/utils.ts b/packages/toolkit/src/stepFunctions/utils.ts
similarity index 100%
rename from src/stepFunctions/utils.ts
rename to packages/toolkit/src/stepFunctions/utils.ts
diff --git a/src/stepFunctions/vue/executeStateMachine/executeStateMachine.ts b/packages/toolkit/src/stepFunctions/vue/executeStateMachine/executeStateMachine.ts
similarity index 100%
rename from src/stepFunctions/vue/executeStateMachine/executeStateMachine.ts
rename to packages/toolkit/src/stepFunctions/vue/executeStateMachine/executeStateMachine.ts
diff --git a/src/stepFunctions/vue/executeStateMachine/executeStateMachine.vue b/packages/toolkit/src/stepFunctions/vue/executeStateMachine/executeStateMachine.vue
similarity index 100%
rename from src/stepFunctions/vue/executeStateMachine/executeStateMachine.vue
rename to packages/toolkit/src/stepFunctions/vue/executeStateMachine/executeStateMachine.vue
diff --git a/src/stepFunctions/vue/executeStateMachine/index.ts b/packages/toolkit/src/stepFunctions/vue/executeStateMachine/index.ts
similarity index 100%
rename from src/stepFunctions/vue/executeStateMachine/index.ts
rename to packages/toolkit/src/stepFunctions/vue/executeStateMachine/index.ts
diff --git a/src/stepFunctions/wizards/createStateMachineWizard.ts b/packages/toolkit/src/stepFunctions/wizards/createStateMachineWizard.ts
similarity index 100%
rename from src/stepFunctions/wizards/createStateMachineWizard.ts
rename to packages/toolkit/src/stepFunctions/wizards/createStateMachineWizard.ts
diff --git a/src/stepFunctions/wizards/previewStateMachineCDKWizard.ts b/packages/toolkit/src/stepFunctions/wizards/previewStateMachineCDKWizard.ts
similarity index 100%
rename from src/stepFunctions/wizards/previewStateMachineCDKWizard.ts
rename to packages/toolkit/src/stepFunctions/wizards/previewStateMachineCDKWizard.ts
diff --git a/src/stepFunctions/wizards/publishStateMachineWizard.ts b/packages/toolkit/src/stepFunctions/wizards/publishStateMachineWizard.ts
similarity index 100%
rename from src/stepFunctions/wizards/publishStateMachineWizard.ts
rename to packages/toolkit/src/stepFunctions/wizards/publishStateMachineWizard.ts
diff --git a/src/templates/templates.json b/packages/toolkit/src/templates/templates.json
similarity index 100%
rename from src/templates/templates.json
rename to packages/toolkit/src/templates/templates.json
diff --git a/src/test/amazonq/apps/initContext.test.ts b/packages/toolkit/src/test/amazonq/apps/initContext.test.ts
similarity index 100%
rename from src/test/amazonq/apps/initContext.test.ts
rename to packages/toolkit/src/test/amazonq/apps/initContext.test.ts
diff --git a/src/test/amazonq/auth/controller.test.ts b/packages/toolkit/src/test/amazonq/auth/controller.test.ts
similarity index 100%
rename from src/test/amazonq/auth/controller.test.ts
rename to packages/toolkit/src/test/amazonq/auth/controller.test.ts
diff --git a/src/test/amazonqFeatureDev/controllers/chat/controller.test.ts b/packages/toolkit/src/test/amazonqFeatureDev/controllers/chat/controller.test.ts
similarity index 100%
rename from src/test/amazonqFeatureDev/controllers/chat/controller.test.ts
rename to packages/toolkit/src/test/amazonqFeatureDev/controllers/chat/controller.test.ts
diff --git a/src/test/amazonqFeatureDev/session/session.test.ts b/packages/toolkit/src/test/amazonqFeatureDev/session/session.test.ts
similarity index 100%
rename from src/test/amazonqFeatureDev/session/session.test.ts
rename to packages/toolkit/src/test/amazonqFeatureDev/session/session.test.ts
diff --git a/src/test/amazonqFeatureDev/session/sessionState.test.ts b/packages/toolkit/src/test/amazonqFeatureDev/session/sessionState.test.ts
similarity index 100%
rename from src/test/amazonqFeatureDev/session/sessionState.test.ts
rename to packages/toolkit/src/test/amazonqFeatureDev/session/sessionState.test.ts
diff --git a/src/test/amazonqFeatureDev/util/files.test.ts b/packages/toolkit/src/test/amazonqFeatureDev/util/files.test.ts
similarity index 100%
rename from src/test/amazonqFeatureDev/util/files.test.ts
rename to packages/toolkit/src/test/amazonqFeatureDev/util/files.test.ts
diff --git a/src/test/amazonqFeatureDev/utils.ts b/packages/toolkit/src/test/amazonqFeatureDev/utils.ts
similarity index 100%
rename from src/test/amazonqFeatureDev/utils.ts
rename to packages/toolkit/src/test/amazonqFeatureDev/utils.ts
diff --git a/src/test/amazonqGumby/entrypoint.test.ts b/packages/toolkit/src/test/amazonqGumby/entrypoint.test.ts
similarity index 100%
rename from src/test/amazonqGumby/entrypoint.test.ts
rename to packages/toolkit/src/test/amazonqGumby/entrypoint.test.ts
diff --git a/src/test/apigateway/commands/copyUrl.test.ts b/packages/toolkit/src/test/apigateway/commands/copyUrl.test.ts
similarity index 100%
rename from src/test/apigateway/commands/copyUrl.test.ts
rename to packages/toolkit/src/test/apigateway/commands/copyUrl.test.ts
diff --git a/src/test/apigateway/commands/invokeRemoteRestApi.test.ts b/packages/toolkit/src/test/apigateway/commands/invokeRemoteRestApi.test.ts
similarity index 100%
rename from src/test/apigateway/commands/invokeRemoteRestApi.test.ts
rename to packages/toolkit/src/test/apigateway/commands/invokeRemoteRestApi.test.ts
diff --git a/src/test/apigateway/explorer/apiGatewayNodes.test.ts b/packages/toolkit/src/test/apigateway/explorer/apiGatewayNodes.test.ts
similarity index 100%
rename from src/test/apigateway/explorer/apiGatewayNodes.test.ts
rename to packages/toolkit/src/test/apigateway/explorer/apiGatewayNodes.test.ts
diff --git a/src/test/apprunner/explorer/apprunnerNode.test.ts b/packages/toolkit/src/test/apprunner/explorer/apprunnerNode.test.ts
similarity index 100%
rename from src/test/apprunner/explorer/apprunnerNode.test.ts
rename to packages/toolkit/src/test/apprunner/explorer/apprunnerNode.test.ts
diff --git a/src/test/apprunner/explorer/apprunnerServiceNode.test.ts b/packages/toolkit/src/test/apprunner/explorer/apprunnerServiceNode.test.ts
similarity index 100%
rename from src/test/apprunner/explorer/apprunnerServiceNode.test.ts
rename to packages/toolkit/src/test/apprunner/explorer/apprunnerServiceNode.test.ts
diff --git a/src/test/apprunner/wizards/codeRepositoryWizard.test.ts b/packages/toolkit/src/test/apprunner/wizards/codeRepositoryWizard.test.ts
similarity index 100%
rename from src/test/apprunner/wizards/codeRepositoryWizard.test.ts
rename to packages/toolkit/src/test/apprunner/wizards/codeRepositoryWizard.test.ts
diff --git a/src/test/apprunner/wizards/createServiceWizard.test.ts b/packages/toolkit/src/test/apprunner/wizards/createServiceWizard.test.ts
similarity index 100%
rename from src/test/apprunner/wizards/createServiceWizard.test.ts
rename to packages/toolkit/src/test/apprunner/wizards/createServiceWizard.test.ts
diff --git a/src/test/apprunner/wizards/imageRepositoryWizard.test.ts b/packages/toolkit/src/test/apprunner/wizards/imageRepositoryWizard.test.ts
similarity index 100%
rename from src/test/apprunner/wizards/imageRepositoryWizard.test.ts
rename to packages/toolkit/src/test/apprunner/wizards/imageRepositoryWizard.test.ts
diff --git a/src/test/awsExplorer/awsExplorer.test.ts b/packages/toolkit/src/test/awsExplorer/awsExplorer.test.ts
similarity index 100%
rename from src/test/awsExplorer/awsExplorer.test.ts
rename to packages/toolkit/src/test/awsExplorer/awsExplorer.test.ts
diff --git a/src/test/awsExplorer/childNodeCache.test.ts b/packages/toolkit/src/test/awsExplorer/childNodeCache.test.ts
similarity index 100%
rename from src/test/awsExplorer/childNodeCache.test.ts
rename to packages/toolkit/src/test/awsExplorer/childNodeCache.test.ts
diff --git a/src/test/awsExplorer/childNodeLoader.test.ts b/packages/toolkit/src/test/awsExplorer/childNodeLoader.test.ts
similarity index 100%
rename from src/test/awsExplorer/childNodeLoader.test.ts
rename to packages/toolkit/src/test/awsExplorer/childNodeLoader.test.ts
diff --git a/src/test/awsExplorer/commands/copyText.test.ts b/packages/toolkit/src/test/awsExplorer/commands/copyText.test.ts
similarity index 100%
rename from src/test/awsExplorer/commands/copyText.test.ts
rename to packages/toolkit/src/test/awsExplorer/commands/copyText.test.ts
diff --git a/src/test/awsExplorer/commands/loadMoreChildren.test.ts b/packages/toolkit/src/test/awsExplorer/commands/loadMoreChildren.test.ts
similarity index 100%
rename from src/test/awsExplorer/commands/loadMoreChildren.test.ts
rename to packages/toolkit/src/test/awsExplorer/commands/loadMoreChildren.test.ts
diff --git a/src/test/awsExplorer/regionNode.test.ts b/packages/toolkit/src/test/awsExplorer/regionNode.test.ts
similarity index 100%
rename from src/test/awsExplorer/regionNode.test.ts
rename to packages/toolkit/src/test/awsExplorer/regionNode.test.ts
diff --git a/src/test/browser.test.ts b/packages/toolkit/src/test/browser.test.ts
similarity index 100%
rename from src/test/browser.test.ts
rename to packages/toolkit/src/test/browser.test.ts
diff --git a/src/test/cdk/detectCdkProjects.test.ts b/packages/toolkit/src/test/cdk/detectCdkProjects.test.ts
similarity index 100%
rename from src/test/cdk/detectCdkProjects.test.ts
rename to packages/toolkit/src/test/cdk/detectCdkProjects.test.ts
diff --git a/src/test/cdk/explorer/appNode.test.ts b/packages/toolkit/src/test/cdk/explorer/appNode.test.ts
similarity index 100%
rename from src/test/cdk/explorer/appNode.test.ts
rename to packages/toolkit/src/test/cdk/explorer/appNode.test.ts
diff --git a/src/test/cdk/explorer/awsCdkExplorer.test.ts b/packages/toolkit/src/test/cdk/explorer/awsCdkExplorer.test.ts
similarity index 100%
rename from src/test/cdk/explorer/awsCdkExplorer.test.ts
rename to packages/toolkit/src/test/cdk/explorer/awsCdkExplorer.test.ts
diff --git a/src/test/cdk/explorer/constructNode.test.ts b/packages/toolkit/src/test/cdk/explorer/constructNode.test.ts
similarity index 100%
rename from src/test/cdk/explorer/constructNode.test.ts
rename to packages/toolkit/src/test/cdk/explorer/constructNode.test.ts
diff --git a/src/test/cdk/explorer/propertyNode.test.ts b/packages/toolkit/src/test/cdk/explorer/propertyNode.test.ts
similarity index 100%
rename from src/test/cdk/explorer/propertyNode.test.ts
rename to packages/toolkit/src/test/cdk/explorer/propertyNode.test.ts
diff --git a/src/test/cdk/tree/resources/templateJsonTester.template.json b/packages/toolkit/src/test/cdk/tree/resources/templateJsonTester.template.json
similarity index 100%
rename from src/test/cdk/tree/resources/templateJsonTester.template.json
rename to packages/toolkit/src/test/cdk/tree/resources/templateJsonTester.template.json
diff --git a/src/test/cdk/tree/treeInspector.test.ts b/packages/toolkit/src/test/cdk/tree/treeInspector.test.ts
similarity index 100%
rename from src/test/cdk/tree/treeInspector.test.ts
rename to packages/toolkit/src/test/cdk/tree/treeInspector.test.ts
diff --git a/src/test/cdk/treeTestUtils.ts b/packages/toolkit/src/test/cdk/treeTestUtils.ts
similarity index 100%
rename from src/test/cdk/treeTestUtils.ts
rename to packages/toolkit/src/test/cdk/treeTestUtils.ts
diff --git a/src/test/cloudWatchLogs/commands/addLogEvents.test.ts b/packages/toolkit/src/test/cloudWatchLogs/commands/addLogEvents.test.ts
similarity index 100%
rename from src/test/cloudWatchLogs/commands/addLogEvents.test.ts
rename to packages/toolkit/src/test/cloudWatchLogs/commands/addLogEvents.test.ts
diff --git a/src/test/cloudWatchLogs/commands/copyLogResource.test.ts b/packages/toolkit/src/test/cloudWatchLogs/commands/copyLogResource.test.ts
similarity index 100%
rename from src/test/cloudWatchLogs/commands/copyLogResource.test.ts
rename to packages/toolkit/src/test/cloudWatchLogs/commands/copyLogResource.test.ts
diff --git a/src/test/cloudWatchLogs/commands/saveCurrentLogDataContent.test.ts b/packages/toolkit/src/test/cloudWatchLogs/commands/saveCurrentLogDataContent.test.ts
similarity index 100%
rename from src/test/cloudWatchLogs/commands/saveCurrentLogDataContent.test.ts
rename to packages/toolkit/src/test/cloudWatchLogs/commands/saveCurrentLogDataContent.test.ts
diff --git a/src/test/cloudWatchLogs/commands/searchLogGroup.test.ts b/packages/toolkit/src/test/cloudWatchLogs/commands/searchLogGroup.test.ts
similarity index 100%
rename from src/test/cloudWatchLogs/commands/searchLogGroup.test.ts
rename to packages/toolkit/src/test/cloudWatchLogs/commands/searchLogGroup.test.ts
diff --git a/src/test/cloudWatchLogs/commands/viewLogStream.test.ts b/packages/toolkit/src/test/cloudWatchLogs/commands/viewLogStream.test.ts
similarity index 100%
rename from src/test/cloudWatchLogs/commands/viewLogStream.test.ts
rename to packages/toolkit/src/test/cloudWatchLogs/commands/viewLogStream.test.ts
diff --git a/src/test/cloudWatchLogs/document/logDataDocumentProvider.test.ts b/packages/toolkit/src/test/cloudWatchLogs/document/logDataDocumentProvider.test.ts
similarity index 100%
rename from src/test/cloudWatchLogs/document/logDataDocumentProvider.test.ts
rename to packages/toolkit/src/test/cloudWatchLogs/document/logDataDocumentProvider.test.ts
diff --git a/src/test/cloudWatchLogs/document/logStreamsCodeLensProvider.test.ts b/packages/toolkit/src/test/cloudWatchLogs/document/logStreamsCodeLensProvider.test.ts
similarity index 100%
rename from src/test/cloudWatchLogs/document/logStreamsCodeLensProvider.test.ts
rename to packages/toolkit/src/test/cloudWatchLogs/document/logStreamsCodeLensProvider.test.ts
diff --git a/src/test/cloudWatchLogs/document/textContent.test.ts b/packages/toolkit/src/test/cloudWatchLogs/document/textContent.test.ts
similarity index 100%
rename from src/test/cloudWatchLogs/document/textContent.test.ts
rename to packages/toolkit/src/test/cloudWatchLogs/document/textContent.test.ts
diff --git a/src/test/cloudWatchLogs/explorer/cloudWatchLogsNode.test.ts b/packages/toolkit/src/test/cloudWatchLogs/explorer/cloudWatchLogsNode.test.ts
similarity index 100%
rename from src/test/cloudWatchLogs/explorer/cloudWatchLogsNode.test.ts
rename to packages/toolkit/src/test/cloudWatchLogs/explorer/cloudWatchLogsNode.test.ts
diff --git a/src/test/cloudWatchLogs/explorer/logGroupNode.test.ts b/packages/toolkit/src/test/cloudWatchLogs/explorer/logGroupNode.test.ts
similarity index 100%
rename from src/test/cloudWatchLogs/explorer/logGroupNode.test.ts
rename to packages/toolkit/src/test/cloudWatchLogs/explorer/logGroupNode.test.ts
diff --git a/src/test/cloudWatchLogs/registry/logDataRegistry.test.ts b/packages/toolkit/src/test/cloudWatchLogs/registry/logDataRegistry.test.ts
similarity index 100%
rename from src/test/cloudWatchLogs/registry/logDataRegistry.test.ts
rename to packages/toolkit/src/test/cloudWatchLogs/registry/logDataRegistry.test.ts
diff --git a/src/test/cloudWatchLogs/utils.test.ts b/packages/toolkit/src/test/cloudWatchLogs/utils.test.ts
similarity index 100%
rename from src/test/cloudWatchLogs/utils.test.ts
rename to packages/toolkit/src/test/cloudWatchLogs/utils.test.ts
diff --git a/src/test/codecatalyst/auth.test.ts b/packages/toolkit/src/test/codecatalyst/auth.test.ts
similarity index 100%
rename from src/test/codecatalyst/auth.test.ts
rename to packages/toolkit/src/test/codecatalyst/auth.test.ts
diff --git a/src/test/codecatalyst/codecatalystClient.test.ts b/packages/toolkit/src/test/codecatalyst/codecatalystClient.test.ts
similarity index 100%
rename from src/test/codecatalyst/codecatalystClient.test.ts
rename to packages/toolkit/src/test/codecatalyst/codecatalystClient.test.ts
diff --git a/src/test/codecatalyst/devfileLocation.test.ts b/packages/toolkit/src/test/codecatalyst/devfileLocation.test.ts
similarity index 100%
rename from src/test/codecatalyst/devfileLocation.test.ts
rename to packages/toolkit/src/test/codecatalyst/devfileLocation.test.ts
diff --git a/src/test/codecatalyst/uriHandlers.test.ts b/packages/toolkit/src/test/codecatalyst/uriHandlers.test.ts
similarity index 100%
rename from src/test/codecatalyst/uriHandlers.test.ts
rename to packages/toolkit/src/test/codecatalyst/uriHandlers.test.ts
diff --git a/src/test/codecatalyst/wizards/selectResource.test.ts b/packages/toolkit/src/test/codecatalyst/wizards/selectResource.test.ts
similarity index 100%
rename from src/test/codecatalyst/wizards/selectResource.test.ts
rename to packages/toolkit/src/test/codecatalyst/wizards/selectResource.test.ts
diff --git a/src/test/codewhisperer/commands/basicCommands.test.ts b/packages/toolkit/src/test/codewhisperer/commands/basicCommands.test.ts
similarity index 100%
rename from src/test/codewhisperer/commands/basicCommands.test.ts
rename to packages/toolkit/src/test/codewhisperer/commands/basicCommands.test.ts
diff --git a/src/test/codewhisperer/commands/invokeRecommendation.test.ts b/packages/toolkit/src/test/codewhisperer/commands/invokeRecommendation.test.ts
similarity index 100%
rename from src/test/codewhisperer/commands/invokeRecommendation.test.ts
rename to packages/toolkit/src/test/codewhisperer/commands/invokeRecommendation.test.ts
diff --git a/src/test/codewhisperer/commands/onAcceptance.test.ts b/packages/toolkit/src/test/codewhisperer/commands/onAcceptance.test.ts
similarity index 100%
rename from src/test/codewhisperer/commands/onAcceptance.test.ts
rename to packages/toolkit/src/test/codewhisperer/commands/onAcceptance.test.ts
diff --git a/src/test/codewhisperer/commands/onInlineAcceptance.test.ts b/packages/toolkit/src/test/codewhisperer/commands/onInlineAcceptance.test.ts
similarity index 100%
rename from src/test/codewhisperer/commands/onInlineAcceptance.test.ts
rename to packages/toolkit/src/test/codewhisperer/commands/onInlineAcceptance.test.ts
diff --git a/src/test/codewhisperer/commands/startSecurityScan.test.ts b/packages/toolkit/src/test/codewhisperer/commands/startSecurityScan.test.ts
similarity index 100%
rename from src/test/codewhisperer/commands/startSecurityScan.test.ts
rename to packages/toolkit/src/test/codewhisperer/commands/startSecurityScan.test.ts
diff --git a/src/test/codewhisperer/commands/transformByQ.test.ts b/packages/toolkit/src/test/codewhisperer/commands/transformByQ.test.ts
similarity index 100%
rename from src/test/codewhisperer/commands/transformByQ.test.ts
rename to packages/toolkit/src/test/codewhisperer/commands/transformByQ.test.ts
diff --git a/src/test/codewhisperer/explorer/codewhispererChildrenNodes.test.ts b/packages/toolkit/src/test/codewhisperer/explorer/codewhispererChildrenNodes.test.ts
similarity index 100%
rename from src/test/codewhisperer/explorer/codewhispererChildrenNodes.test.ts
rename to packages/toolkit/src/test/codewhisperer/explorer/codewhispererChildrenNodes.test.ts
diff --git a/src/test/codewhisperer/explorer/codewhispererNode.test.ts b/packages/toolkit/src/test/codewhisperer/explorer/codewhispererNode.test.ts
similarity index 100%
rename from src/test/codewhisperer/explorer/codewhispererNode.test.ts
rename to packages/toolkit/src/test/codewhisperer/explorer/codewhispererNode.test.ts
diff --git a/src/test/codewhisperer/service/codewhisperer.test.ts b/packages/toolkit/src/test/codewhisperer/service/codewhisperer.test.ts
similarity index 100%
rename from src/test/codewhisperer/service/codewhisperer.test.ts
rename to packages/toolkit/src/test/codewhisperer/service/codewhisperer.test.ts
diff --git a/src/test/codewhisperer/service/completionProvider.test.ts b/packages/toolkit/src/test/codewhisperer/service/completionProvider.test.ts
similarity index 100%
rename from src/test/codewhisperer/service/completionProvider.test.ts
rename to packages/toolkit/src/test/codewhisperer/service/completionProvider.test.ts
diff --git a/src/test/codewhisperer/service/featureConfigProvider.test.ts b/packages/toolkit/src/test/codewhisperer/service/featureConfigProvider.test.ts
similarity index 100%
rename from src/test/codewhisperer/service/featureConfigProvider.test.ts
rename to packages/toolkit/src/test/codewhisperer/service/featureConfigProvider.test.ts
diff --git a/src/test/codewhisperer/service/inlineCompletionService.test.ts b/packages/toolkit/src/test/codewhisperer/service/inlineCompletionService.test.ts
similarity index 100%
rename from src/test/codewhisperer/service/inlineCompletionService.test.ts
rename to packages/toolkit/src/test/codewhisperer/service/inlineCompletionService.test.ts
diff --git a/src/test/codewhisperer/service/keyStrokeHandler.test.ts b/packages/toolkit/src/test/codewhisperer/service/keyStrokeHandler.test.ts
similarity index 100%
rename from src/test/codewhisperer/service/keyStrokeHandler.test.ts
rename to packages/toolkit/src/test/codewhisperer/service/keyStrokeHandler.test.ts
diff --git a/src/test/codewhisperer/service/recommendationHandler.test.ts b/packages/toolkit/src/test/codewhisperer/service/recommendationHandler.test.ts
similarity index 100%
rename from src/test/codewhisperer/service/recommendationHandler.test.ts
rename to packages/toolkit/src/test/codewhisperer/service/recommendationHandler.test.ts
diff --git a/src/test/codewhisperer/service/referenceHoverProvider.test.ts b/packages/toolkit/src/test/codewhisperer/service/referenceHoverProvider.test.ts
similarity index 100%
rename from src/test/codewhisperer/service/referenceHoverProvider.test.ts
rename to packages/toolkit/src/test/codewhisperer/service/referenceHoverProvider.test.ts
diff --git a/src/test/codewhisperer/service/referenceInlineProvider.test.ts b/packages/toolkit/src/test/codewhisperer/service/referenceInlineProvider.test.ts
similarity index 100%
rename from src/test/codewhisperer/service/referenceInlineProvider.test.ts
rename to packages/toolkit/src/test/codewhisperer/service/referenceInlineProvider.test.ts
diff --git a/src/test/codewhisperer/service/referenceLogViewProvider.test.ts b/packages/toolkit/src/test/codewhisperer/service/referenceLogViewProvider.test.ts
similarity index 100%
rename from src/test/codewhisperer/service/referenceLogViewProvider.test.ts
rename to packages/toolkit/src/test/codewhisperer/service/referenceLogViewProvider.test.ts
diff --git a/src/test/codewhisperer/service/resources/addedFile.diff b/packages/toolkit/src/test/codewhisperer/service/resources/addedFile.diff
similarity index 100%
rename from src/test/codewhisperer/service/resources/addedFile.diff
rename to packages/toolkit/src/test/codewhisperer/service/resources/addedFile.diff
diff --git a/src/test/codewhisperer/service/resources/modifiedFile.diff b/packages/toolkit/src/test/codewhisperer/service/resources/modifiedFile.diff
similarity index 100%
rename from src/test/codewhisperer/service/resources/modifiedFile.diff
rename to packages/toolkit/src/test/codewhisperer/service/resources/modifiedFile.diff
diff --git a/src/test/codewhisperer/service/securityIssueCodeActionProvider.test.ts b/packages/toolkit/src/test/codewhisperer/service/securityIssueCodeActionProvider.test.ts
similarity index 100%
rename from src/test/codewhisperer/service/securityIssueCodeActionProvider.test.ts
rename to packages/toolkit/src/test/codewhisperer/service/securityIssueCodeActionProvider.test.ts
diff --git a/src/test/codewhisperer/service/securityIssueHoverProvider.test.ts b/packages/toolkit/src/test/codewhisperer/service/securityIssueHoverProvider.test.ts
similarity index 100%
rename from src/test/codewhisperer/service/securityIssueHoverProvider.test.ts
rename to packages/toolkit/src/test/codewhisperer/service/securityIssueHoverProvider.test.ts
diff --git a/src/test/codewhisperer/service/securityIssueProvider.test.ts b/packages/toolkit/src/test/codewhisperer/service/securityIssueProvider.test.ts
similarity index 100%
rename from src/test/codewhisperer/service/securityIssueProvider.test.ts
rename to packages/toolkit/src/test/codewhisperer/service/securityIssueProvider.test.ts
diff --git a/src/test/codewhisperer/service/telemetry.test.ts b/packages/toolkit/src/test/codewhisperer/service/telemetry.test.ts
similarity index 100%
rename from src/test/codewhisperer/service/telemetry.test.ts
rename to packages/toolkit/src/test/codewhisperer/service/telemetry.test.ts
diff --git a/src/test/codewhisperer/service/transformationResultsHandler.test.ts b/packages/toolkit/src/test/codewhisperer/service/transformationResultsHandler.test.ts
similarity index 100%
rename from src/test/codewhisperer/service/transformationResultsHandler.test.ts
rename to packages/toolkit/src/test/codewhisperer/service/transformationResultsHandler.test.ts
diff --git a/src/test/codewhisperer/testUtil.ts b/packages/toolkit/src/test/codewhisperer/testUtil.ts
similarity index 100%
rename from src/test/codewhisperer/testUtil.ts
rename to packages/toolkit/src/test/codewhisperer/testUtil.ts
diff --git a/src/test/codewhisperer/tracker/codewhispererCodeCoverageTracker.test.ts b/packages/toolkit/src/test/codewhisperer/tracker/codewhispererCodeCoverageTracker.test.ts
similarity index 100%
rename from src/test/codewhisperer/tracker/codewhispererCodeCoverageTracker.test.ts
rename to packages/toolkit/src/test/codewhisperer/tracker/codewhispererCodeCoverageTracker.test.ts
diff --git a/src/test/codewhisperer/tracker/codewhispererTracker.test.ts b/packages/toolkit/src/test/codewhisperer/tracker/codewhispererTracker.test.ts
similarity index 100%
rename from src/test/codewhisperer/tracker/codewhispererTracker.test.ts
rename to packages/toolkit/src/test/codewhisperer/tracker/codewhispererTracker.test.ts
diff --git a/src/test/codewhisperer/util/authUtil.test.ts b/packages/toolkit/src/test/codewhisperer/util/authUtil.test.ts
similarity index 100%
rename from src/test/codewhisperer/util/authUtil.test.ts
rename to packages/toolkit/src/test/codewhisperer/util/authUtil.test.ts
diff --git a/src/test/codewhisperer/util/bm25.test.ts b/packages/toolkit/src/test/codewhisperer/util/bm25.test.ts
similarity index 100%
rename from src/test/codewhisperer/util/bm25.test.ts
rename to packages/toolkit/src/test/codewhisperer/util/bm25.test.ts
diff --git a/src/test/codewhisperer/util/closingBracketUtil.test.ts b/packages/toolkit/src/test/codewhisperer/util/closingBracketUtil.test.ts
similarity index 100%
rename from src/test/codewhisperer/util/closingBracketUtil.test.ts
rename to packages/toolkit/src/test/codewhisperer/util/closingBracketUtil.test.ts
diff --git a/src/test/codewhisperer/util/codeParsingUtil.test.ts b/packages/toolkit/src/test/codewhisperer/util/codeParsingUtil.test.ts
similarity index 100%
rename from src/test/codewhisperer/util/codeParsingUtil.test.ts
rename to packages/toolkit/src/test/codewhisperer/util/codeParsingUtil.test.ts
diff --git a/src/test/codewhisperer/util/commonUtil.test.ts b/packages/toolkit/src/test/codewhisperer/util/commonUtil.test.ts
similarity index 100%
rename from src/test/codewhisperer/util/commonUtil.test.ts
rename to packages/toolkit/src/test/codewhisperer/util/commonUtil.test.ts
diff --git a/src/test/codewhisperer/util/crossFileContextUtil.test.ts b/packages/toolkit/src/test/codewhisperer/util/crossFileContextUtil.test.ts
similarity index 100%
rename from src/test/codewhisperer/util/crossFileContextUtil.test.ts
rename to packages/toolkit/src/test/codewhisperer/util/crossFileContextUtil.test.ts
diff --git a/src/test/codewhisperer/util/dependencyGraph/cloudformationDependencyGraph.test.ts b/packages/toolkit/src/test/codewhisperer/util/dependencyGraph/cloudformationDependencyGraph.test.ts
similarity index 100%
rename from src/test/codewhisperer/util/dependencyGraph/cloudformationDependencyGraph.test.ts
rename to packages/toolkit/src/test/codewhisperer/util/dependencyGraph/cloudformationDependencyGraph.test.ts
diff --git a/src/test/codewhisperer/util/dependencyGraph/csharpDependencyGraph.test.ts b/packages/toolkit/src/test/codewhisperer/util/dependencyGraph/csharpDependencyGraph.test.ts
similarity index 100%
rename from src/test/codewhisperer/util/dependencyGraph/csharpDependencyGraph.test.ts
rename to packages/toolkit/src/test/codewhisperer/util/dependencyGraph/csharpDependencyGraph.test.ts
diff --git a/src/test/codewhisperer/util/dependencyGraph/dependencyGraphFactory.test.ts b/packages/toolkit/src/test/codewhisperer/util/dependencyGraph/dependencyGraphFactory.test.ts
similarity index 100%
rename from src/test/codewhisperer/util/dependencyGraph/dependencyGraphFactory.test.ts
rename to packages/toolkit/src/test/codewhisperer/util/dependencyGraph/dependencyGraphFactory.test.ts
diff --git a/src/test/codewhisperer/util/dependencyGraph/goDependencyGraph.test.ts b/packages/toolkit/src/test/codewhisperer/util/dependencyGraph/goDependencyGraph.test.ts
similarity index 100%
rename from src/test/codewhisperer/util/dependencyGraph/goDependencyGraph.test.ts
rename to packages/toolkit/src/test/codewhisperer/util/dependencyGraph/goDependencyGraph.test.ts
diff --git a/src/test/codewhisperer/util/dependencyGraph/javaDependencyGraph.test.ts b/packages/toolkit/src/test/codewhisperer/util/dependencyGraph/javaDependencyGraph.test.ts
similarity index 100%
rename from src/test/codewhisperer/util/dependencyGraph/javaDependencyGraph.test.ts
rename to packages/toolkit/src/test/codewhisperer/util/dependencyGraph/javaDependencyGraph.test.ts
diff --git a/src/test/codewhisperer/util/dependencyGraph/javascriptDependencyGraph.test.ts b/packages/toolkit/src/test/codewhisperer/util/dependencyGraph/javascriptDependencyGraph.test.ts
similarity index 100%
rename from src/test/codewhisperer/util/dependencyGraph/javascriptDependencyGraph.test.ts
rename to packages/toolkit/src/test/codewhisperer/util/dependencyGraph/javascriptDependencyGraph.test.ts
diff --git a/src/test/codewhisperer/util/dependencyGraph/pythonDependencyGraph.test.ts b/packages/toolkit/src/test/codewhisperer/util/dependencyGraph/pythonDependencyGraph.test.ts
similarity index 100%
rename from src/test/codewhisperer/util/dependencyGraph/pythonDependencyGraph.test.ts
rename to packages/toolkit/src/test/codewhisperer/util/dependencyGraph/pythonDependencyGraph.test.ts
diff --git a/src/test/codewhisperer/util/dependencyGraph/rubyDependencyGraph.test.ts b/packages/toolkit/src/test/codewhisperer/util/dependencyGraph/rubyDependencyGraph.test.ts
similarity index 100%
rename from src/test/codewhisperer/util/dependencyGraph/rubyDependencyGraph.test.ts
rename to packages/toolkit/src/test/codewhisperer/util/dependencyGraph/rubyDependencyGraph.test.ts
diff --git a/src/test/codewhisperer/util/dependencyGraph/terraformDependencyGraph.test.ts b/packages/toolkit/src/test/codewhisperer/util/dependencyGraph/terraformDependencyGraph.test.ts
similarity index 100%
rename from src/test/codewhisperer/util/dependencyGraph/terraformDependencyGraph.test.ts
rename to packages/toolkit/src/test/codewhisperer/util/dependencyGraph/terraformDependencyGraph.test.ts
diff --git a/src/test/codewhisperer/util/editorContext.test.ts b/packages/toolkit/src/test/codewhisperer/util/editorContext.test.ts
similarity index 100%
rename from src/test/codewhisperer/util/editorContext.test.ts
rename to packages/toolkit/src/test/codewhisperer/util/editorContext.test.ts
diff --git a/src/test/codewhisperer/util/globalStateUtil.test.ts b/packages/toolkit/src/test/codewhisperer/util/globalStateUtil.test.ts
similarity index 100%
rename from src/test/codewhisperer/util/globalStateUtil.test.ts
rename to packages/toolkit/src/test/codewhisperer/util/globalStateUtil.test.ts
diff --git a/src/test/codewhisperer/util/importAdderUtil.test.ts b/packages/toolkit/src/test/codewhisperer/util/importAdderUtil.test.ts
similarity index 100%
rename from src/test/codewhisperer/util/importAdderUtil.test.ts
rename to packages/toolkit/src/test/codewhisperer/util/importAdderUtil.test.ts
diff --git a/src/test/codewhisperer/util/licenseUtil.test.ts b/packages/toolkit/src/test/codewhisperer/util/licenseUtil.test.ts
similarity index 100%
rename from src/test/codewhisperer/util/licenseUtil.test.ts
rename to packages/toolkit/src/test/codewhisperer/util/licenseUtil.test.ts
diff --git a/src/test/codewhisperer/util/runtimeLanguageContext.test.ts b/packages/toolkit/src/test/codewhisperer/util/runtimeLanguageContext.test.ts
similarity index 100%
rename from src/test/codewhisperer/util/runtimeLanguageContext.test.ts
rename to packages/toolkit/src/test/codewhisperer/util/runtimeLanguageContext.test.ts
diff --git a/src/test/codewhisperer/util/showSsoPrompt.test.ts b/packages/toolkit/src/test/codewhisperer/util/showSsoPrompt.test.ts
similarity index 100%
rename from src/test/codewhisperer/util/showSsoPrompt.test.ts
rename to packages/toolkit/src/test/codewhisperer/util/showSsoPrompt.test.ts
diff --git a/src/test/codewhisperer/util/telemetryHelper.test.ts b/packages/toolkit/src/test/codewhisperer/util/telemetryHelper.test.ts
similarity index 100%
rename from src/test/codewhisperer/util/telemetryHelper.test.ts
rename to packages/toolkit/src/test/codewhisperer/util/telemetryHelper.test.ts
diff --git a/src/test/codewhisperer/util/userGroupUtil.test.ts b/packages/toolkit/src/test/codewhisperer/util/userGroupUtil.test.ts
similarity index 100%
rename from src/test/codewhisperer/util/userGroupUtil.test.ts
rename to packages/toolkit/src/test/codewhisperer/util/userGroupUtil.test.ts
diff --git a/src/test/codewhisperer/util/utgUtils.test.ts b/packages/toolkit/src/test/codewhisperer/util/utgUtils.test.ts
similarity index 100%
rename from src/test/codewhisperer/util/utgUtils.test.ts
rename to packages/toolkit/src/test/codewhisperer/util/utgUtils.test.ts
diff --git a/src/test/codewhisperer/views/securityPanelViewProvider.test.ts b/packages/toolkit/src/test/codewhisperer/views/securityPanelViewProvider.test.ts
similarity index 100%
rename from src/test/codewhisperer/views/securityPanelViewProvider.test.ts
rename to packages/toolkit/src/test/codewhisperer/views/securityPanelViewProvider.test.ts
diff --git a/src/test/codewhispererChat/editor/context/focusArea/focusAreaExtractor.test.ts b/packages/toolkit/src/test/codewhispererChat/editor/context/focusArea/focusAreaExtractor.test.ts
similarity index 100%
rename from src/test/codewhispererChat/editor/context/focusArea/focusAreaExtractor.test.ts
rename to packages/toolkit/src/test/codewhispererChat/editor/context/focusArea/focusAreaExtractor.test.ts
diff --git a/src/test/common/request.test.ts b/packages/toolkit/src/test/common/request.test.ts
similarity index 100%
rename from src/test/common/request.test.ts
rename to packages/toolkit/src/test/common/request.test.ts
diff --git a/src/test/credentials/auth.test.ts b/packages/toolkit/src/test/credentials/auth.test.ts
similarity index 100%
rename from src/test/credentials/auth.test.ts
rename to packages/toolkit/src/test/credentials/auth.test.ts
diff --git a/src/test/credentials/provider/credentialsProviderFactory.test.ts b/packages/toolkit/src/test/credentials/provider/credentialsProviderFactory.test.ts
similarity index 100%
rename from src/test/credentials/provider/credentialsProviderFactory.test.ts
rename to packages/toolkit/src/test/credentials/provider/credentialsProviderFactory.test.ts
diff --git a/src/test/credentials/provider/credentialsProviderId.test.ts b/packages/toolkit/src/test/credentials/provider/credentialsProviderId.test.ts
similarity index 100%
rename from src/test/credentials/provider/credentialsProviderId.test.ts
rename to packages/toolkit/src/test/credentials/provider/credentialsProviderId.test.ts
diff --git a/src/test/credentials/provider/credentialsProviderManager.test.ts b/packages/toolkit/src/test/credentials/provider/credentialsProviderManager.test.ts
similarity index 100%
rename from src/test/credentials/provider/credentialsProviderManager.test.ts
rename to packages/toolkit/src/test/credentials/provider/credentialsProviderManager.test.ts
diff --git a/src/test/credentials/provider/ec2CredentialsProvider.test.ts b/packages/toolkit/src/test/credentials/provider/ec2CredentialsProvider.test.ts
similarity index 100%
rename from src/test/credentials/provider/ec2CredentialsProvider.test.ts
rename to packages/toolkit/src/test/credentials/provider/ec2CredentialsProvider.test.ts
diff --git a/src/test/credentials/provider/ecsCredentialsProvider.test.ts b/packages/toolkit/src/test/credentials/provider/ecsCredentialsProvider.test.ts
similarity index 100%
rename from src/test/credentials/provider/ecsCredentialsProvider.test.ts
rename to packages/toolkit/src/test/credentials/provider/ecsCredentialsProvider.test.ts
diff --git a/src/test/credentials/provider/envVarsCredentialsProvider.test.ts b/packages/toolkit/src/test/credentials/provider/envVarsCredentialsProvider.test.ts
similarity index 100%
rename from src/test/credentials/provider/envVarsCredentialsProvider.test.ts
rename to packages/toolkit/src/test/credentials/provider/envVarsCredentialsProvider.test.ts
diff --git a/src/test/credentials/provider/sharedCredentialsProvider.test.ts b/packages/toolkit/src/test/credentials/provider/sharedCredentialsProvider.test.ts
similarity index 100%
rename from src/test/credentials/provider/sharedCredentialsProvider.test.ts
rename to packages/toolkit/src/test/credentials/provider/sharedCredentialsProvider.test.ts
diff --git a/src/test/credentials/provider/sharedCredentialsProviderFactory.test.ts b/packages/toolkit/src/test/credentials/provider/sharedCredentialsProviderFactory.test.ts
similarity index 100%
rename from src/test/credentials/provider/sharedCredentialsProviderFactory.test.ts
rename to packages/toolkit/src/test/credentials/provider/sharedCredentialsProviderFactory.test.ts
diff --git a/src/test/credentials/secondaryAuth.test.ts b/packages/toolkit/src/test/credentials/secondaryAuth.test.ts
similarity index 100%
rename from src/test/credentials/secondaryAuth.test.ts
rename to packages/toolkit/src/test/credentials/secondaryAuth.test.ts
diff --git a/src/test/credentials/sharedCredentials.test.ts b/packages/toolkit/src/test/credentials/sharedCredentials.test.ts
similarity index 100%
rename from src/test/credentials/sharedCredentials.test.ts
rename to packages/toolkit/src/test/credentials/sharedCredentials.test.ts
diff --git a/src/test/credentials/sso/cache.test.ts b/packages/toolkit/src/test/credentials/sso/cache.test.ts
similarity index 100%
rename from src/test/credentials/sso/cache.test.ts
rename to packages/toolkit/src/test/credentials/sso/cache.test.ts
diff --git a/src/test/credentials/sso/model.test.ts b/packages/toolkit/src/test/credentials/sso/model.test.ts
similarity index 100%
rename from src/test/credentials/sso/model.test.ts
rename to packages/toolkit/src/test/credentials/sso/model.test.ts
diff --git a/src/test/credentials/sso/ssoAccessTokenProvider.test.ts b/packages/toolkit/src/test/credentials/sso/ssoAccessTokenProvider.test.ts
similarity index 100%
rename from src/test/credentials/sso/ssoAccessTokenProvider.test.ts
rename to packages/toolkit/src/test/credentials/sso/ssoAccessTokenProvider.test.ts
diff --git a/src/test/credentials/testUtil.ts b/packages/toolkit/src/test/credentials/testUtil.ts
similarity index 100%
rename from src/test/credentials/testUtil.ts
rename to packages/toolkit/src/test/credentials/testUtil.ts
diff --git a/src/test/credentials/ui/vue/show.test.ts b/packages/toolkit/src/test/credentials/ui/vue/show.test.ts
similarity index 99%
rename from src/test/credentials/ui/vue/show.test.ts
rename to packages/toolkit/src/test/credentials/ui/vue/show.test.ts
index ca4758c1129..1d98469f9b7 100644
--- a/src/test/credentials/ui/vue/show.test.ts
+++ b/packages/toolkit/src/test/credentials/ui/vue/show.test.ts
@@ -170,8 +170,8 @@ describe('emitWebviewClosed()', function () {
 
 describe('Add Connection webview', function () {
     it('has all images used by the webview', async function () {
-        // We are in the root of the built, `dist`, but we want the root of the actual project
-        const projectRoot = Uri.joinPath(Uri.file(getProjectDir()), '..', '..')
+        // We are in the root of the built, `dist`, but we want the root of the repo
+        const projectRoot = Uri.joinPath(Uri.file(getProjectDir()), '../../../..')
         const marketplaceImagesRoot = Uri.joinPath(projectRoot, 'docs/marketplace/vscode')
 
         assert(await fsCommon.existsFile(Uri.joinPath(marketplaceImagesRoot, 'CC_dev_env.gif')))
diff --git a/src/test/credentials/utils.test.ts b/packages/toolkit/src/test/credentials/utils.test.ts
similarity index 100%
rename from src/test/credentials/utils.test.ts
rename to packages/toolkit/src/test/credentials/utils.test.ts
diff --git a/src/test/credentials/wizards/createProfile.test.ts b/packages/toolkit/src/test/credentials/wizards/createProfile.test.ts
similarity index 100%
rename from src/test/credentials/wizards/createProfile.test.ts
rename to packages/toolkit/src/test/credentials/wizards/createProfile.test.ts
diff --git a/src/test/credentials/wizards/sso.test.ts b/packages/toolkit/src/test/credentials/wizards/sso.test.ts
similarity index 100%
rename from src/test/credentials/wizards/sso.test.ts
rename to packages/toolkit/src/test/credentials/wizards/sso.test.ts
diff --git a/src/test/dynamicResources/awsResourceManager.test.ts b/packages/toolkit/src/test/dynamicResources/awsResourceManager.test.ts
similarity index 100%
rename from src/test/dynamicResources/awsResourceManager.test.ts
rename to packages/toolkit/src/test/dynamicResources/awsResourceManager.test.ts
diff --git a/src/test/dynamicResources/commands/configure.test.ts b/packages/toolkit/src/test/dynamicResources/commands/configure.test.ts
similarity index 100%
rename from src/test/dynamicResources/commands/configure.test.ts
rename to packages/toolkit/src/test/dynamicResources/commands/configure.test.ts
diff --git a/src/test/dynamicResources/commands/copyIdentifier.test.ts b/packages/toolkit/src/test/dynamicResources/commands/copyIdentifier.test.ts
similarity index 100%
rename from src/test/dynamicResources/commands/copyIdentifier.test.ts
rename to packages/toolkit/src/test/dynamicResources/commands/copyIdentifier.test.ts
diff --git a/src/test/dynamicResources/commands/deleteResource.test.ts b/packages/toolkit/src/test/dynamicResources/commands/deleteResource.test.ts
similarity index 100%
rename from src/test/dynamicResources/commands/deleteResource.test.ts
rename to packages/toolkit/src/test/dynamicResources/commands/deleteResource.test.ts
diff --git a/src/test/dynamicResources/commands/openResource.test.ts b/packages/toolkit/src/test/dynamicResources/commands/openResource.test.ts
similarity index 100%
rename from src/test/dynamicResources/commands/openResource.test.ts
rename to packages/toolkit/src/test/dynamicResources/commands/openResource.test.ts
diff --git a/src/test/dynamicResources/commands/saveResource.test.ts b/packages/toolkit/src/test/dynamicResources/commands/saveResource.test.ts
similarity index 100%
rename from src/test/dynamicResources/commands/saveResource.test.ts
rename to packages/toolkit/src/test/dynamicResources/commands/saveResource.test.ts
diff --git a/src/test/dynamicResources/explorer/moreResourcesNode.test.ts b/packages/toolkit/src/test/dynamicResources/explorer/moreResourcesNode.test.ts
similarity index 100%
rename from src/test/dynamicResources/explorer/moreResourcesNode.test.ts
rename to packages/toolkit/src/test/dynamicResources/explorer/moreResourcesNode.test.ts
diff --git a/src/test/dynamicResources/explorer/resourceNode.test.ts b/packages/toolkit/src/test/dynamicResources/explorer/resourceNode.test.ts
similarity index 100%
rename from src/test/dynamicResources/explorer/resourceNode.test.ts
rename to packages/toolkit/src/test/dynamicResources/explorer/resourceNode.test.ts
diff --git a/src/test/dynamicResources/explorer/resourceTypeNode.test.ts b/packages/toolkit/src/test/dynamicResources/explorer/resourceTypeNode.test.ts
similarity index 100%
rename from src/test/dynamicResources/explorer/resourceTypeNode.test.ts
rename to packages/toolkit/src/test/dynamicResources/explorer/resourceTypeNode.test.ts
diff --git a/src/test/dynamicResources/model/resources.test.ts b/packages/toolkit/src/test/dynamicResources/model/resources.test.ts
similarity index 100%
rename from src/test/dynamicResources/model/resources.test.ts
rename to packages/toolkit/src/test/dynamicResources/model/resources.test.ts
diff --git a/src/test/ec2/explorer/ec2InstanceNode.test.ts b/packages/toolkit/src/test/ec2/explorer/ec2InstanceNode.test.ts
similarity index 100%
rename from src/test/ec2/explorer/ec2InstanceNode.test.ts
rename to packages/toolkit/src/test/ec2/explorer/ec2InstanceNode.test.ts
diff --git a/src/test/ec2/explorer/ec2ParentNode.test.ts b/packages/toolkit/src/test/ec2/explorer/ec2ParentNode.test.ts
similarity index 100%
rename from src/test/ec2/explorer/ec2ParentNode.test.ts
rename to packages/toolkit/src/test/ec2/explorer/ec2ParentNode.test.ts
diff --git a/src/test/ec2/model.test.ts b/packages/toolkit/src/test/ec2/model.test.ts
similarity index 100%
rename from src/test/ec2/model.test.ts
rename to packages/toolkit/src/test/ec2/model.test.ts
diff --git a/src/test/ec2/prompter.test.ts b/packages/toolkit/src/test/ec2/prompter.test.ts
similarity index 100%
rename from src/test/ec2/prompter.test.ts
rename to packages/toolkit/src/test/ec2/prompter.test.ts
diff --git a/src/test/ec2/sshKeyPair.test.ts b/packages/toolkit/src/test/ec2/sshKeyPair.test.ts
similarity index 100%
rename from src/test/ec2/sshKeyPair.test.ts
rename to packages/toolkit/src/test/ec2/sshKeyPair.test.ts
diff --git a/src/test/ecr/commands/copyRepositoryUri.test.ts b/packages/toolkit/src/test/ecr/commands/copyRepositoryUri.test.ts
similarity index 100%
rename from src/test/ecr/commands/copyRepositoryUri.test.ts
rename to packages/toolkit/src/test/ecr/commands/copyRepositoryUri.test.ts
diff --git a/src/test/ecr/commands/copyTagUri.test.ts b/packages/toolkit/src/test/ecr/commands/copyTagUri.test.ts
similarity index 100%
rename from src/test/ecr/commands/copyTagUri.test.ts
rename to packages/toolkit/src/test/ecr/commands/copyTagUri.test.ts
diff --git a/src/test/ecr/commands/createRepository.test.ts b/packages/toolkit/src/test/ecr/commands/createRepository.test.ts
similarity index 100%
rename from src/test/ecr/commands/createRepository.test.ts
rename to packages/toolkit/src/test/ecr/commands/createRepository.test.ts
diff --git a/src/test/ecr/commands/deleteRepository.test.ts b/packages/toolkit/src/test/ecr/commands/deleteRepository.test.ts
similarity index 100%
rename from src/test/ecr/commands/deleteRepository.test.ts
rename to packages/toolkit/src/test/ecr/commands/deleteRepository.test.ts
diff --git a/src/test/ecr/commands/deleteTag.test.ts b/packages/toolkit/src/test/ecr/commands/deleteTag.test.ts
similarity index 100%
rename from src/test/ecr/commands/deleteTag.test.ts
rename to packages/toolkit/src/test/ecr/commands/deleteTag.test.ts
diff --git a/src/test/ecr/explorer/EcrNode.test.ts b/packages/toolkit/src/test/ecr/explorer/EcrNode.test.ts
similarity index 100%
rename from src/test/ecr/explorer/EcrNode.test.ts
rename to packages/toolkit/src/test/ecr/explorer/EcrNode.test.ts
diff --git a/src/test/ecr/utils.test.ts b/packages/toolkit/src/test/ecr/utils.test.ts
similarity index 100%
rename from src/test/ecr/utils.test.ts
rename to packages/toolkit/src/test/ecr/utils.test.ts
diff --git a/src/test/ecs/commands.test.ts b/packages/toolkit/src/test/ecs/commands.test.ts
similarity index 100%
rename from src/test/ecs/commands.test.ts
rename to packages/toolkit/src/test/ecs/commands.test.ts
diff --git a/src/test/ecs/model.test.ts b/packages/toolkit/src/test/ecs/model.test.ts
similarity index 100%
rename from src/test/ecs/model.test.ts
rename to packages/toolkit/src/test/ecs/model.test.ts
diff --git a/src/test/ecs/util.test.ts b/packages/toolkit/src/test/ecs/util.test.ts
similarity index 100%
rename from src/test/ecs/util.test.ts
rename to packages/toolkit/src/test/ecs/util.test.ts
diff --git a/src/test/ecs/wizards/executeCommand.test.ts b/packages/toolkit/src/test/ecs/wizards/executeCommand.test.ts
similarity index 100%
rename from src/test/ecs/wizards/executeCommand.test.ts
rename to packages/toolkit/src/test/ecs/wizards/executeCommand.test.ts
diff --git a/src/test/eventSchemas/commands/downloadSchemaItemCode.test.ts b/packages/toolkit/src/test/eventSchemas/commands/downloadSchemaItemCode.test.ts
similarity index 100%
rename from src/test/eventSchemas/commands/downloadSchemaItemCode.test.ts
rename to packages/toolkit/src/test/eventSchemas/commands/downloadSchemaItemCode.test.ts
diff --git a/src/test/eventSchemas/commands/searchSchemas.test.ts b/packages/toolkit/src/test/eventSchemas/commands/searchSchemas.test.ts
similarity index 100%
rename from src/test/eventSchemas/commands/searchSchemas.test.ts
rename to packages/toolkit/src/test/eventSchemas/commands/searchSchemas.test.ts
diff --git a/src/test/eventSchemas/commands/viewSchemaItem.test.ts b/packages/toolkit/src/test/eventSchemas/commands/viewSchemaItem.test.ts
similarity index 100%
rename from src/test/eventSchemas/commands/viewSchemaItem.test.ts
rename to packages/toolkit/src/test/eventSchemas/commands/viewSchemaItem.test.ts
diff --git a/src/test/eventSchemas/explorer/registryItemNode.test.ts b/packages/toolkit/src/test/eventSchemas/explorer/registryItemNode.test.ts
similarity index 100%
rename from src/test/eventSchemas/explorer/registryItemNode.test.ts
rename to packages/toolkit/src/test/eventSchemas/explorer/registryItemNode.test.ts
diff --git a/src/test/eventSchemas/model/schemaCodeGenUtils.test.ts b/packages/toolkit/src/test/eventSchemas/model/schemaCodeGenUtils.test.ts
similarity index 100%
rename from src/test/eventSchemas/model/schemaCodeGenUtils.test.ts
rename to packages/toolkit/src/test/eventSchemas/model/schemaCodeGenUtils.test.ts
diff --git a/src/test/eventSchemas/model/schemaCodeLangs.test.ts b/packages/toolkit/src/test/eventSchemas/model/schemaCodeLangs.test.ts
similarity index 100%
rename from src/test/eventSchemas/model/schemaCodeLangs.test.ts
rename to packages/toolkit/src/test/eventSchemas/model/schemaCodeLangs.test.ts
diff --git a/src/test/eventSchemas/providers/schemasDataProvider.test.ts b/packages/toolkit/src/test/eventSchemas/providers/schemasDataProvider.test.ts
similarity index 100%
rename from src/test/eventSchemas/providers/schemasDataProvider.test.ts
rename to packages/toolkit/src/test/eventSchemas/providers/schemasDataProvider.test.ts
diff --git a/src/test/eventSchemas/templates/schemasAppTemplateUtils.test.ts b/packages/toolkit/src/test/eventSchemas/templates/schemasAppTemplateUtils.test.ts
similarity index 100%
rename from src/test/eventSchemas/templates/schemasAppTemplateUtils.test.ts
rename to packages/toolkit/src/test/eventSchemas/templates/schemasAppTemplateUtils.test.ts
diff --git a/src/test/eventSchemas/templates/schemasExamples.ts b/packages/toolkit/src/test/eventSchemas/templates/schemasExamples.ts
similarity index 100%
rename from src/test/eventSchemas/templates/schemasExamples.ts
rename to packages/toolkit/src/test/eventSchemas/templates/schemasExamples.ts
diff --git a/src/test/eventSchemas/wizards/schemaCodeDownloadWizard.test.ts b/packages/toolkit/src/test/eventSchemas/wizards/schemaCodeDownloadWizard.test.ts
similarity index 100%
rename from src/test/eventSchemas/wizards/schemaCodeDownloadWizard.test.ts
rename to packages/toolkit/src/test/eventSchemas/wizards/schemaCodeDownloadWizard.test.ts
diff --git a/src/test/fake/fakeDocument.ts b/packages/toolkit/src/test/fake/fakeDocument.ts
similarity index 100%
rename from src/test/fake/fakeDocument.ts
rename to packages/toolkit/src/test/fake/fakeDocument.ts
diff --git a/src/test/fake/fakeTelemetryService.ts b/packages/toolkit/src/test/fake/fakeTelemetryService.ts
similarity index 100%
rename from src/test/fake/fakeTelemetryService.ts
rename to packages/toolkit/src/test/fake/fakeTelemetryService.ts
diff --git a/src/test/fakeExtensionContext.ts b/packages/toolkit/src/test/fakeExtensionContext.ts
similarity index 100%
rename from src/test/fakeExtensionContext.ts
rename to packages/toolkit/src/test/fakeExtensionContext.ts
diff --git a/src/test/feedback/commands/submitFeedbackListener.test.ts b/packages/toolkit/src/test/feedback/commands/submitFeedbackListener.test.ts
similarity index 100%
rename from src/test/feedback/commands/submitFeedbackListener.test.ts
rename to packages/toolkit/src/test/feedback/commands/submitFeedbackListener.test.ts
diff --git a/src/test/globalSetup.test.ts b/packages/toolkit/src/test/globalSetup.test.ts
similarity index 98%
rename from src/test/globalSetup.test.ts
rename to packages/toolkit/src/test/globalSetup.test.ts
index 510d59caa6f..9bcb32db4a1 100644
--- a/src/test/globalSetup.test.ts
+++ b/packages/toolkit/src/test/globalSetup.test.ts
@@ -26,7 +26,7 @@ import { getTestWindow, resetTestWindow } from './shared/vscode/window'
 import { mapTestErrors, normalizeError, setRunnableTimeout } from './setupUtil'
 import { TelemetryDebounceInfo } from '../shared/vscode/commands2'
 
-const testReportDir = join(__dirname, '../../../.test-reports')
+const testReportDir = join(__dirname, '../../../../../.test-reports') // Root project, not subproject
 const testLogOutput = join(testReportDir, 'testLog.log')
 const globalSandbox = sinon.createSandbox()
 const maxTestDuration = 30_000
diff --git a/src/test/index.ts b/packages/toolkit/src/test/index.ts
similarity index 100%
rename from src/test/index.ts
rename to packages/toolkit/src/test/index.ts
diff --git a/src/test/iot/commands/attachCertificate.test.ts b/packages/toolkit/src/test/iot/commands/attachCertificate.test.ts
similarity index 100%
rename from src/test/iot/commands/attachCertificate.test.ts
rename to packages/toolkit/src/test/iot/commands/attachCertificate.test.ts
diff --git a/src/test/iot/commands/copyEndpoint.test.ts b/packages/toolkit/src/test/iot/commands/copyEndpoint.test.ts
similarity index 100%
rename from src/test/iot/commands/copyEndpoint.test.ts
rename to packages/toolkit/src/test/iot/commands/copyEndpoint.test.ts
diff --git a/src/test/iot/commands/createCert.test.ts b/packages/toolkit/src/test/iot/commands/createCert.test.ts
similarity index 100%
rename from src/test/iot/commands/createCert.test.ts
rename to packages/toolkit/src/test/iot/commands/createCert.test.ts
diff --git a/src/test/iot/commands/createPolicy.test.ts b/packages/toolkit/src/test/iot/commands/createPolicy.test.ts
similarity index 100%
rename from src/test/iot/commands/createPolicy.test.ts
rename to packages/toolkit/src/test/iot/commands/createPolicy.test.ts
diff --git a/src/test/iot/commands/createPolicyVersion.test.ts b/packages/toolkit/src/test/iot/commands/createPolicyVersion.test.ts
similarity index 100%
rename from src/test/iot/commands/createPolicyVersion.test.ts
rename to packages/toolkit/src/test/iot/commands/createPolicyVersion.test.ts
diff --git a/src/test/iot/commands/createThing.test.ts b/packages/toolkit/src/test/iot/commands/createThing.test.ts
similarity index 100%
rename from src/test/iot/commands/createThing.test.ts
rename to packages/toolkit/src/test/iot/commands/createThing.test.ts
diff --git a/src/test/iot/commands/deleteCert.test.ts b/packages/toolkit/src/test/iot/commands/deleteCert.test.ts
similarity index 100%
rename from src/test/iot/commands/deleteCert.test.ts
rename to packages/toolkit/src/test/iot/commands/deleteCert.test.ts
diff --git a/src/test/iot/commands/deletePolicy.test.ts b/packages/toolkit/src/test/iot/commands/deletePolicy.test.ts
similarity index 100%
rename from src/test/iot/commands/deletePolicy.test.ts
rename to packages/toolkit/src/test/iot/commands/deletePolicy.test.ts
diff --git a/src/test/iot/commands/deletePolicyVersion.test.ts b/packages/toolkit/src/test/iot/commands/deletePolicyVersion.test.ts
similarity index 100%
rename from src/test/iot/commands/deletePolicyVersion.test.ts
rename to packages/toolkit/src/test/iot/commands/deletePolicyVersion.test.ts
diff --git a/src/test/iot/commands/deleteThing.test.ts b/packages/toolkit/src/test/iot/commands/deleteThing.test.ts
similarity index 100%
rename from src/test/iot/commands/deleteThing.test.ts
rename to packages/toolkit/src/test/iot/commands/deleteThing.test.ts
diff --git a/src/test/iot/commands/detachCert.test.ts b/packages/toolkit/src/test/iot/commands/detachCert.test.ts
similarity index 100%
rename from src/test/iot/commands/detachCert.test.ts
rename to packages/toolkit/src/test/iot/commands/detachCert.test.ts
diff --git a/src/test/iot/commands/detachPolicy.test.ts b/packages/toolkit/src/test/iot/commands/detachPolicy.test.ts
similarity index 100%
rename from src/test/iot/commands/detachPolicy.test.ts
rename to packages/toolkit/src/test/iot/commands/detachPolicy.test.ts
diff --git a/src/test/iot/commands/setDefaultPolicy.test.ts b/packages/toolkit/src/test/iot/commands/setDefaultPolicy.test.ts
similarity index 100%
rename from src/test/iot/commands/setDefaultPolicy.test.ts
rename to packages/toolkit/src/test/iot/commands/setDefaultPolicy.test.ts
diff --git a/src/test/iot/commands/updateCert.test.ts b/packages/toolkit/src/test/iot/commands/updateCert.test.ts
similarity index 100%
rename from src/test/iot/commands/updateCert.test.ts
rename to packages/toolkit/src/test/iot/commands/updateCert.test.ts
diff --git a/src/test/iot/commands/viewPolicyVersion.test.ts b/packages/toolkit/src/test/iot/commands/viewPolicyVersion.test.ts
similarity index 100%
rename from src/test/iot/commands/viewPolicyVersion.test.ts
rename to packages/toolkit/src/test/iot/commands/viewPolicyVersion.test.ts
diff --git a/src/test/iot/explorer/iotCertFolderNode.test.ts b/packages/toolkit/src/test/iot/explorer/iotCertFolderNode.test.ts
similarity index 100%
rename from src/test/iot/explorer/iotCertFolderNode.test.ts
rename to packages/toolkit/src/test/iot/explorer/iotCertFolderNode.test.ts
diff --git a/src/test/iot/explorer/iotCertificateNode.test.ts b/packages/toolkit/src/test/iot/explorer/iotCertificateNode.test.ts
similarity index 100%
rename from src/test/iot/explorer/iotCertificateNode.test.ts
rename to packages/toolkit/src/test/iot/explorer/iotCertificateNode.test.ts
diff --git a/src/test/iot/explorer/iotNodes.test.ts b/packages/toolkit/src/test/iot/explorer/iotNodes.test.ts
similarity index 100%
rename from src/test/iot/explorer/iotNodes.test.ts
rename to packages/toolkit/src/test/iot/explorer/iotNodes.test.ts
diff --git a/src/test/iot/explorer/iotPolicyFolderNode.test.ts b/packages/toolkit/src/test/iot/explorer/iotPolicyFolderNode.test.ts
similarity index 100%
rename from src/test/iot/explorer/iotPolicyFolderNode.test.ts
rename to packages/toolkit/src/test/iot/explorer/iotPolicyFolderNode.test.ts
diff --git a/src/test/iot/explorer/iotPolicyNode.test.ts b/packages/toolkit/src/test/iot/explorer/iotPolicyNode.test.ts
similarity index 100%
rename from src/test/iot/explorer/iotPolicyNode.test.ts
rename to packages/toolkit/src/test/iot/explorer/iotPolicyNode.test.ts
diff --git a/src/test/iot/explorer/iotPolicyVersionNode.test.ts b/packages/toolkit/src/test/iot/explorer/iotPolicyVersionNode.test.ts
similarity index 100%
rename from src/test/iot/explorer/iotPolicyVersionNode.test.ts
rename to packages/toolkit/src/test/iot/explorer/iotPolicyVersionNode.test.ts
diff --git a/src/test/iot/explorer/iotThingFolderNode.test.ts b/packages/toolkit/src/test/iot/explorer/iotThingFolderNode.test.ts
similarity index 100%
rename from src/test/iot/explorer/iotThingFolderNode.test.ts
rename to packages/toolkit/src/test/iot/explorer/iotThingFolderNode.test.ts
diff --git a/src/test/iot/explorer/iotThingNode.test.ts b/packages/toolkit/src/test/iot/explorer/iotThingNode.test.ts
similarity index 100%
rename from src/test/iot/explorer/iotThingNode.test.ts
rename to packages/toolkit/src/test/iot/explorer/iotThingNode.test.ts
diff --git a/src/test/lambda/commands/copyLambdaUrl.test.ts b/packages/toolkit/src/test/lambda/commands/copyLambdaUrl.test.ts
similarity index 100%
rename from src/test/lambda/commands/copyLambdaUrl.test.ts
rename to packages/toolkit/src/test/lambda/commands/copyLambdaUrl.test.ts
diff --git a/src/test/lambda/commands/createNewSamApp.test.ts b/packages/toolkit/src/test/lambda/commands/createNewSamApp.test.ts
similarity index 100%
rename from src/test/lambda/commands/createNewSamApp.test.ts
rename to packages/toolkit/src/test/lambda/commands/createNewSamApp.test.ts
diff --git a/src/test/lambda/commands/deleteLambda.test.ts b/packages/toolkit/src/test/lambda/commands/deleteLambda.test.ts
similarity index 100%
rename from src/test/lambda/commands/deleteLambda.test.ts
rename to packages/toolkit/src/test/lambda/commands/deleteLambda.test.ts
diff --git a/src/test/lambda/commands/deploySamApplication.test.ts b/packages/toolkit/src/test/lambda/commands/deploySamApplication.test.ts
similarity index 100%
rename from src/test/lambda/commands/deploySamApplication.test.ts
rename to packages/toolkit/src/test/lambda/commands/deploySamApplication.test.ts
diff --git a/src/test/lambda/commands/downloadLambda.test.ts b/packages/toolkit/src/test/lambda/commands/downloadLambda.test.ts
similarity index 100%
rename from src/test/lambda/commands/downloadLambda.test.ts
rename to packages/toolkit/src/test/lambda/commands/downloadLambda.test.ts
diff --git a/src/test/lambda/commands/uploadLambda.test.ts b/packages/toolkit/src/test/lambda/commands/uploadLambda.test.ts
similarity index 100%
rename from src/test/lambda/commands/uploadLambda.test.ts
rename to packages/toolkit/src/test/lambda/commands/uploadLambda.test.ts
diff --git a/src/test/lambda/config/samParameterCompletionItemProvider.test.ts b/packages/toolkit/src/test/lambda/config/samParameterCompletionItemProvider.test.ts
similarity index 100%
rename from src/test/lambda/config/samParameterCompletionItemProvider.test.ts
rename to packages/toolkit/src/test/lambda/config/samParameterCompletionItemProvider.test.ts
diff --git a/src/test/lambda/config/templates.test.ts b/packages/toolkit/src/test/lambda/config/templates.test.ts
similarity index 100%
rename from src/test/lambda/config/templates.test.ts
rename to packages/toolkit/src/test/lambda/config/templates.test.ts
diff --git a/src/test/lambda/explorer/cloudFormationNodes.test.ts b/packages/toolkit/src/test/lambda/explorer/cloudFormationNodes.test.ts
similarity index 100%
rename from src/test/lambda/explorer/cloudFormationNodes.test.ts
rename to packages/toolkit/src/test/lambda/explorer/cloudFormationNodes.test.ts
diff --git a/src/test/lambda/explorer/lambdaFunctionNode.test.ts b/packages/toolkit/src/test/lambda/explorer/lambdaFunctionNode.test.ts
similarity index 100%
rename from src/test/lambda/explorer/lambdaFunctionNode.test.ts
rename to packages/toolkit/src/test/lambda/explorer/lambdaFunctionNode.test.ts
diff --git a/src/test/lambda/explorer/lambdaNodes.test.ts b/packages/toolkit/src/test/lambda/explorer/lambdaNodes.test.ts
similarity index 100%
rename from src/test/lambda/explorer/lambdaNodes.test.ts
rename to packages/toolkit/src/test/lambda/explorer/lambdaNodes.test.ts
diff --git a/src/test/lambda/local/debugConfiguration.test.ts b/packages/toolkit/src/test/lambda/local/debugConfiguration.test.ts
similarity index 100%
rename from src/test/lambda/local/debugConfiguration.test.ts
rename to packages/toolkit/src/test/lambda/local/debugConfiguration.test.ts
diff --git a/src/test/lambda/local/util.ts b/packages/toolkit/src/test/lambda/local/util.ts
similarity index 100%
rename from src/test/lambda/local/util.ts
rename to packages/toolkit/src/test/lambda/local/util.ts
diff --git a/src/test/lambda/models/samLambdaRuntime.test.ts b/packages/toolkit/src/test/lambda/models/samLambdaRuntime.test.ts
similarity index 100%
rename from src/test/lambda/models/samLambdaRuntime.test.ts
rename to packages/toolkit/src/test/lambda/models/samLambdaRuntime.test.ts
diff --git a/src/test/lambda/models/samTemplates.test.ts b/packages/toolkit/src/test/lambda/models/samTemplates.test.ts
similarity index 100%
rename from src/test/lambda/models/samTemplates.test.ts
rename to packages/toolkit/src/test/lambda/models/samTemplates.test.ts
diff --git a/src/test/lambda/utilities/parameterUtils.test.ts b/packages/toolkit/src/test/lambda/utilities/parameterUtils.test.ts
similarity index 100%
rename from src/test/lambda/utilities/parameterUtils.test.ts
rename to packages/toolkit/src/test/lambda/utilities/parameterUtils.test.ts
diff --git a/src/test/lambda/utils.test.ts b/packages/toolkit/src/test/lambda/utils.test.ts
similarity index 100%
rename from src/test/lambda/utils.test.ts
rename to packages/toolkit/src/test/lambda/utils.test.ts
diff --git a/src/test/lambda/vue/samInvoke.test.ts b/packages/toolkit/src/test/lambda/vue/samInvoke.test.ts
similarity index 100%
rename from src/test/lambda/vue/samInvoke.test.ts
rename to packages/toolkit/src/test/lambda/vue/samInvoke.test.ts
diff --git a/src/test/lambda/wizards/samDeployWizard.test.ts b/packages/toolkit/src/test/lambda/wizards/samDeployWizard.test.ts
similarity index 100%
rename from src/test/lambda/wizards/samDeployWizard.test.ts
rename to packages/toolkit/src/test/lambda/wizards/samDeployWizard.test.ts
diff --git a/src/test/lambda/wizards/samInitWizard.test.ts b/packages/toolkit/src/test/lambda/wizards/samInitWizard.test.ts
similarity index 100%
rename from src/test/lambda/wizards/samInitWizard.test.ts
rename to packages/toolkit/src/test/lambda/wizards/samInitWizard.test.ts
diff --git a/src/test/lambda/wizards/stateController.test.ts b/packages/toolkit/src/test/lambda/wizards/stateController.test.ts
similarity index 100%
rename from src/test/lambda/wizards/stateController.test.ts
rename to packages/toolkit/src/test/lambda/wizards/stateController.test.ts
diff --git a/src/test/lambda/wizards/uploadLambdaWizard.test.ts b/packages/toolkit/src/test/lambda/wizards/uploadLambdaWizard.test.ts
similarity index 100%
rename from src/test/lambda/wizards/uploadLambdaWizard.test.ts
rename to packages/toolkit/src/test/lambda/wizards/uploadLambdaWizard.test.ts
diff --git a/src/test/mockOutputChannel.ts b/packages/toolkit/src/test/mockOutputChannel.ts
similarity index 100%
rename from src/test/mockOutputChannel.ts
rename to packages/toolkit/src/test/mockOutputChannel.ts
diff --git a/src/test/redshift/explorer/redshiftDatabaseNode.test.ts b/packages/toolkit/src/test/redshift/explorer/redshiftDatabaseNode.test.ts
similarity index 100%
rename from src/test/redshift/explorer/redshiftDatabaseNode.test.ts
rename to packages/toolkit/src/test/redshift/explorer/redshiftDatabaseNode.test.ts
diff --git a/src/test/redshift/explorer/redshiftNode.test.ts b/packages/toolkit/src/test/redshift/explorer/redshiftNode.test.ts
similarity index 100%
rename from src/test/redshift/explorer/redshiftNode.test.ts
rename to packages/toolkit/src/test/redshift/explorer/redshiftNode.test.ts
diff --git a/src/test/redshift/explorer/redshiftSchemaNode.test.ts b/packages/toolkit/src/test/redshift/explorer/redshiftSchemaNode.test.ts
similarity index 100%
rename from src/test/redshift/explorer/redshiftSchemaNode.test.ts
rename to packages/toolkit/src/test/redshift/explorer/redshiftSchemaNode.test.ts
diff --git a/src/test/redshift/explorer/redshiftWarehouseNode.test.ts b/packages/toolkit/src/test/redshift/explorer/redshiftWarehouseNode.test.ts
similarity index 100%
rename from src/test/redshift/explorer/redshiftWarehouseNode.test.ts
rename to packages/toolkit/src/test/redshift/explorer/redshiftWarehouseNode.test.ts
diff --git a/src/test/redshift/notebook/cellStatusBarItemProvider.test.ts b/packages/toolkit/src/test/redshift/notebook/cellStatusBarItemProvider.test.ts
similarity index 100%
rename from src/test/redshift/notebook/cellStatusBarItemProvider.test.ts
rename to packages/toolkit/src/test/redshift/notebook/cellStatusBarItemProvider.test.ts
diff --git a/src/test/redshift/notebook/redshiftNotebookController.test.ts b/packages/toolkit/src/test/redshift/notebook/redshiftNotebookController.test.ts
similarity index 100%
rename from src/test/redshift/notebook/redshiftNotebookController.test.ts
rename to packages/toolkit/src/test/redshift/notebook/redshiftNotebookController.test.ts
diff --git a/src/test/redshift/notebook/redshiftNotebookSerializer.test.ts b/packages/toolkit/src/test/redshift/notebook/redshiftNotebookSerializer.test.ts
similarity index 100%
rename from src/test/redshift/notebook/redshiftNotebookSerializer.test.ts
rename to packages/toolkit/src/test/redshift/notebook/redshiftNotebookSerializer.test.ts
diff --git a/src/test/redshift/wizards/connectionWizard.test.ts b/packages/toolkit/src/test/redshift/wizards/connectionWizard.test.ts
similarity index 100%
rename from src/test/redshift/wizards/connectionWizard.test.ts
rename to packages/toolkit/src/test/redshift/wizards/connectionWizard.test.ts
diff --git a/src/test/s3/commands/copyPath.test.ts b/packages/toolkit/src/test/s3/commands/copyPath.test.ts
similarity index 100%
rename from src/test/s3/commands/copyPath.test.ts
rename to packages/toolkit/src/test/s3/commands/copyPath.test.ts
diff --git a/src/test/s3/commands/createBucket.test.ts b/packages/toolkit/src/test/s3/commands/createBucket.test.ts
similarity index 100%
rename from src/test/s3/commands/createBucket.test.ts
rename to packages/toolkit/src/test/s3/commands/createBucket.test.ts
diff --git a/src/test/s3/commands/createFolder.test.ts b/packages/toolkit/src/test/s3/commands/createFolder.test.ts
similarity index 100%
rename from src/test/s3/commands/createFolder.test.ts
rename to packages/toolkit/src/test/s3/commands/createFolder.test.ts
diff --git a/src/test/s3/commands/deleteBucket.test.ts b/packages/toolkit/src/test/s3/commands/deleteBucket.test.ts
similarity index 100%
rename from src/test/s3/commands/deleteBucket.test.ts
rename to packages/toolkit/src/test/s3/commands/deleteBucket.test.ts
diff --git a/src/test/s3/commands/deleteFile.test.ts b/packages/toolkit/src/test/s3/commands/deleteFile.test.ts
similarity index 100%
rename from src/test/s3/commands/deleteFile.test.ts
rename to packages/toolkit/src/test/s3/commands/deleteFile.test.ts
diff --git a/src/test/s3/commands/downloadFileAs.test.ts b/packages/toolkit/src/test/s3/commands/downloadFileAs.test.ts
similarity index 100%
rename from src/test/s3/commands/downloadFileAs.test.ts
rename to packages/toolkit/src/test/s3/commands/downloadFileAs.test.ts
diff --git a/src/test/s3/commands/presignedURL.test.ts b/packages/toolkit/src/test/s3/commands/presignedURL.test.ts
similarity index 100%
rename from src/test/s3/commands/presignedURL.test.ts
rename to packages/toolkit/src/test/s3/commands/presignedURL.test.ts
diff --git a/src/test/s3/commands/uploadFile.test.ts b/packages/toolkit/src/test/s3/commands/uploadFile.test.ts
similarity index 100%
rename from src/test/s3/commands/uploadFile.test.ts
rename to packages/toolkit/src/test/s3/commands/uploadFile.test.ts
diff --git a/src/test/s3/explorer/s3BucketNode.test.ts b/packages/toolkit/src/test/s3/explorer/s3BucketNode.test.ts
similarity index 100%
rename from src/test/s3/explorer/s3BucketNode.test.ts
rename to packages/toolkit/src/test/s3/explorer/s3BucketNode.test.ts
diff --git a/src/test/s3/explorer/s3FileNode.test.ts b/packages/toolkit/src/test/s3/explorer/s3FileNode.test.ts
similarity index 100%
rename from src/test/s3/explorer/s3FileNode.test.ts
rename to packages/toolkit/src/test/s3/explorer/s3FileNode.test.ts
diff --git a/src/test/s3/explorer/s3FolderNode.test.ts b/packages/toolkit/src/test/s3/explorer/s3FolderNode.test.ts
similarity index 100%
rename from src/test/s3/explorer/s3FolderNode.test.ts
rename to packages/toolkit/src/test/s3/explorer/s3FolderNode.test.ts
diff --git a/src/test/s3/explorer/s3Nodes.test.ts b/packages/toolkit/src/test/s3/explorer/s3Nodes.test.ts
similarity index 100%
rename from src/test/s3/explorer/s3Nodes.test.ts
rename to packages/toolkit/src/test/s3/explorer/s3Nodes.test.ts
diff --git a/src/test/s3/util/fileViewerManager.test.ts b/packages/toolkit/src/test/s3/util/fileViewerManager.test.ts
similarity index 100%
rename from src/test/s3/util/fileViewerManager.test.ts
rename to packages/toolkit/src/test/s3/util/fileViewerManager.test.ts
diff --git a/src/test/s3/util/progressReporter.test.ts b/packages/toolkit/src/test/s3/util/progressReporter.test.ts
similarity index 100%
rename from src/test/s3/util/progressReporter.test.ts
rename to packages/toolkit/src/test/s3/util/progressReporter.test.ts
diff --git a/src/test/s3/util/util.test.ts b/packages/toolkit/src/test/s3/util/util.test.ts
similarity index 100%
rename from src/test/s3/util/util.test.ts
rename to packages/toolkit/src/test/s3/util/util.test.ts
diff --git a/src/test/s3/util/validateBucketName.test.ts b/packages/toolkit/src/test/s3/util/validateBucketName.test.ts
similarity index 100%
rename from src/test/s3/util/validateBucketName.test.ts
rename to packages/toolkit/src/test/s3/util/validateBucketName.test.ts
diff --git a/src/test/samples/javascript/sampleClasses.js b/packages/toolkit/src/test/samples/javascript/sampleClasses.js
similarity index 100%
rename from src/test/samples/javascript/sampleClasses.js
rename to packages/toolkit/src/test/samples/javascript/sampleClasses.js
diff --git a/src/test/samples/javascript/sampleFunctions.js b/packages/toolkit/src/test/samples/javascript/sampleFunctions.js
similarity index 100%
rename from src/test/samples/javascript/sampleFunctions.js
rename to packages/toolkit/src/test/samples/javascript/sampleFunctions.js
diff --git a/src/test/samples/typescript/sampleClasses.ts b/packages/toolkit/src/test/samples/typescript/sampleClasses.ts
similarity index 100%
rename from src/test/samples/typescript/sampleClasses.ts
rename to packages/toolkit/src/test/samples/typescript/sampleClasses.ts
diff --git a/src/test/samples/typescript/sampleFunctions.ts b/packages/toolkit/src/test/samples/typescript/sampleFunctions.ts
similarity index 100%
rename from src/test/samples/typescript/sampleFunctions.ts
rename to packages/toolkit/src/test/samples/typescript/sampleFunctions.ts
diff --git a/src/test/samples/typescript/sampleInterfaces.ts b/packages/toolkit/src/test/samples/typescript/sampleInterfaces.ts
similarity index 100%
rename from src/test/samples/typescript/sampleInterfaces.ts
rename to packages/toolkit/src/test/samples/typescript/sampleInterfaces.ts
diff --git a/src/test/setupUtil.ts b/packages/toolkit/src/test/setupUtil.ts
similarity index 100%
rename from src/test/setupUtil.ts
rename to packages/toolkit/src/test/setupUtil.ts
diff --git a/src/test/shared/activationReloadState.test.ts b/packages/toolkit/src/test/shared/activationReloadState.test.ts
similarity index 100%
rename from src/test/shared/activationReloadState.test.ts
rename to packages/toolkit/src/test/shared/activationReloadState.test.ts
diff --git a/src/test/shared/awsFiletypes.test.ts b/packages/toolkit/src/test/shared/awsFiletypes.test.ts
similarity index 100%
rename from src/test/shared/awsFiletypes.test.ts
rename to packages/toolkit/src/test/shared/awsFiletypes.test.ts
diff --git a/src/test/shared/clients/defaultIamClient.test.ts b/packages/toolkit/src/test/shared/clients/defaultIamClient.test.ts
similarity index 100%
rename from src/test/shared/clients/defaultIamClient.test.ts
rename to packages/toolkit/src/test/shared/clients/defaultIamClient.test.ts
diff --git a/src/test/shared/clients/defaultIotClient.test.ts b/packages/toolkit/src/test/shared/clients/defaultIotClient.test.ts
similarity index 100%
rename from src/test/shared/clients/defaultIotClient.test.ts
rename to packages/toolkit/src/test/shared/clients/defaultIotClient.test.ts
diff --git a/src/test/shared/clients/defaultRedshiftClient.test.ts b/packages/toolkit/src/test/shared/clients/defaultRedshiftClient.test.ts
similarity index 100%
rename from src/test/shared/clients/defaultRedshiftClient.test.ts
rename to packages/toolkit/src/test/shared/clients/defaultRedshiftClient.test.ts
diff --git a/src/test/shared/clients/defaultS3Client.test.ts b/packages/toolkit/src/test/shared/clients/defaultS3Client.test.ts
similarity index 100%
rename from src/test/shared/clients/defaultS3Client.test.ts
rename to packages/toolkit/src/test/shared/clients/defaultS3Client.test.ts
diff --git a/src/test/shared/clients/devenvClient.test.ts b/packages/toolkit/src/test/shared/clients/devenvClient.test.ts
similarity index 100%
rename from src/test/shared/clients/devenvClient.test.ts
rename to packages/toolkit/src/test/shared/clients/devenvClient.test.ts
diff --git a/src/test/shared/clients/ec2Client.test.ts b/packages/toolkit/src/test/shared/clients/ec2Client.test.ts
similarity index 100%
rename from src/test/shared/clients/ec2Client.test.ts
rename to packages/toolkit/src/test/shared/clients/ec2Client.test.ts
diff --git a/src/test/shared/clients/fakeFileStreams.ts b/packages/toolkit/src/test/shared/clients/fakeFileStreams.ts
similarity index 100%
rename from src/test/shared/clients/fakeFileStreams.ts
rename to packages/toolkit/src/test/shared/clients/fakeFileStreams.ts
diff --git a/src/test/shared/clients/iamClient.test.ts b/packages/toolkit/src/test/shared/clients/iamClient.test.ts
similarity index 100%
rename from src/test/shared/clients/iamClient.test.ts
rename to packages/toolkit/src/test/shared/clients/iamClient.test.ts
diff --git a/src/test/shared/cloudformation/cloudformation.test.ts b/packages/toolkit/src/test/shared/cloudformation/cloudformation.test.ts
similarity index 100%
rename from src/test/shared/cloudformation/cloudformation.test.ts
rename to packages/toolkit/src/test/shared/cloudformation/cloudformation.test.ts
diff --git a/src/test/shared/cloudformation/cloudformationTestUtils.ts b/packages/toolkit/src/test/shared/cloudformation/cloudformationTestUtils.ts
similarity index 100%
rename from src/test/shared/cloudformation/cloudformationTestUtils.ts
rename to packages/toolkit/src/test/shared/cloudformation/cloudformationTestUtils.ts
diff --git a/src/test/shared/cloudformation/templateSymbolResolver.test.ts b/packages/toolkit/src/test/shared/cloudformation/templateSymbolResolver.test.ts
similarity index 100%
rename from src/test/shared/cloudformation/templateSymbolResolver.test.ts
rename to packages/toolkit/src/test/shared/cloudformation/templateSymbolResolver.test.ts
diff --git a/src/test/shared/cloudformation/yaml/template_api_endpoint_configuration.yaml b/packages/toolkit/src/test/shared/cloudformation/yaml/template_api_endpoint_configuration.yaml
similarity index 100%
rename from src/test/shared/cloudformation/yaml/template_api_endpoint_configuration.yaml
rename to packages/toolkit/src/test/shared/cloudformation/yaml/template_api_endpoint_configuration.yaml
diff --git a/src/test/shared/cloudformation/yaml/template_api_request_model.yaml b/packages/toolkit/src/test/shared/cloudformation/yaml/template_api_request_model.yaml
similarity index 100%
rename from src/test/shared/cloudformation/yaml/template_api_request_model.yaml
rename to packages/toolkit/src/test/shared/cloudformation/yaml/template_api_request_model.yaml
diff --git a/src/test/shared/cloudformation/yaml/template_no_lambdas.yaml b/packages/toolkit/src/test/shared/cloudformation/yaml/template_no_lambdas.yaml
similarity index 100%
rename from src/test/shared/cloudformation/yaml/template_no_lambdas.yaml
rename to packages/toolkit/src/test/shared/cloudformation/yaml/template_no_lambdas.yaml
diff --git a/src/test/shared/cloudformation/yaml/template_python3.9.yaml b/packages/toolkit/src/test/shared/cloudformation/yaml/template_python3.9.yaml
similarity index 100%
rename from src/test/shared/cloudformation/yaml/template_python3.9.yaml
rename to packages/toolkit/src/test/shared/cloudformation/yaml/template_python3.9.yaml
diff --git a/src/test/shared/cloudformation/yaml/template_python_mixed.yaml b/packages/toolkit/src/test/shared/cloudformation/yaml/template_python_mixed.yaml
similarity index 100%
rename from src/test/shared/cloudformation/yaml/template_python_mixed.yaml
rename to packages/toolkit/src/test/shared/cloudformation/yaml/template_python_mixed.yaml
diff --git a/src/test/shared/codelens/codeLensUtils.test.ts b/packages/toolkit/src/test/shared/codelens/codeLensUtils.test.ts
similarity index 100%
rename from src/test/shared/codelens/codeLensUtils.test.ts
rename to packages/toolkit/src/test/shared/codelens/codeLensUtils.test.ts
diff --git a/src/test/shared/codelens/csharpCodeLensProvider.test.ts b/packages/toolkit/src/test/shared/codelens/csharpCodeLensProvider.test.ts
similarity index 100%
rename from src/test/shared/codelens/csharpCodeLensProvider.test.ts
rename to packages/toolkit/src/test/shared/codelens/csharpCodeLensProvider.test.ts
diff --git a/src/test/shared/codelens/goCodeLensProvider.test.ts b/packages/toolkit/src/test/shared/codelens/goCodeLensProvider.test.ts
similarity index 100%
rename from src/test/shared/codelens/goCodeLensProvider.test.ts
rename to packages/toolkit/src/test/shared/codelens/goCodeLensProvider.test.ts
diff --git a/src/test/shared/codelens/javaCodeLensProvider.test.ts b/packages/toolkit/src/test/shared/codelens/javaCodeLensProvider.test.ts
similarity index 100%
rename from src/test/shared/codelens/javaCodeLensProvider.test.ts
rename to packages/toolkit/src/test/shared/codelens/javaCodeLensProvider.test.ts
diff --git a/src/test/shared/codelens/localLambdaRunner.test.ts b/packages/toolkit/src/test/shared/codelens/localLambdaRunner.test.ts
similarity index 100%
rename from src/test/shared/codelens/localLambdaRunner.test.ts
rename to packages/toolkit/src/test/shared/codelens/localLambdaRunner.test.ts
diff --git a/src/test/shared/codelens/pythonCodeLensProvider.test.ts b/packages/toolkit/src/test/shared/codelens/pythonCodeLensProvider.test.ts
similarity index 100%
rename from src/test/shared/codelens/pythonCodeLensProvider.test.ts
rename to packages/toolkit/src/test/shared/codelens/pythonCodeLensProvider.test.ts
diff --git a/src/test/shared/codelens/sampleDotNetSamProgram.ts b/packages/toolkit/src/test/shared/codelens/sampleDotNetSamProgram.ts
similarity index 100%
rename from src/test/shared/codelens/sampleDotNetSamProgram.ts
rename to packages/toolkit/src/test/shared/codelens/sampleDotNetSamProgram.ts
diff --git a/src/test/shared/codelens/sampleJavaSamProgram.ts b/packages/toolkit/src/test/shared/codelens/sampleJavaSamProgram.ts
similarity index 100%
rename from src/test/shared/codelens/sampleJavaSamProgram.ts
rename to packages/toolkit/src/test/shared/codelens/sampleJavaSamProgram.ts
diff --git a/src/test/shared/credentials/credentialsProfileMru.test.ts b/packages/toolkit/src/test/shared/credentials/credentialsProfileMru.test.ts
similarity index 100%
rename from src/test/shared/credentials/credentialsProfileMru.test.ts
rename to packages/toolkit/src/test/shared/credentials/credentialsProfileMru.test.ts
diff --git a/src/test/shared/credentials/credentialsStore.test.ts b/packages/toolkit/src/test/shared/credentials/credentialsStore.test.ts
similarity index 100%
rename from src/test/shared/credentials/credentialsStore.test.ts
rename to packages/toolkit/src/test/shared/credentials/credentialsStore.test.ts
diff --git a/src/test/shared/credentials/defaultCredentialSelectionDataProvider.test.ts b/packages/toolkit/src/test/shared/credentials/defaultCredentialSelectionDataProvider.test.ts
similarity index 100%
rename from src/test/shared/credentials/defaultCredentialSelectionDataProvider.test.ts
rename to packages/toolkit/src/test/shared/credentials/defaultCredentialSelectionDataProvider.test.ts
diff --git a/src/test/shared/credentials/loginManager.test.ts b/packages/toolkit/src/test/shared/credentials/loginManager.test.ts
similarity index 100%
rename from src/test/shared/credentials/loginManager.test.ts
rename to packages/toolkit/src/test/shared/credentials/loginManager.test.ts
diff --git a/src/test/shared/credentials/userCredentialsUtils.test.ts b/packages/toolkit/src/test/shared/credentials/userCredentialsUtils.test.ts
similarity index 100%
rename from src/test/shared/credentials/userCredentialsUtils.test.ts
rename to packages/toolkit/src/test/shared/credentials/userCredentialsUtils.test.ts
diff --git a/src/test/shared/debug/launchConfiguration.test.ts b/packages/toolkit/src/test/shared/debug/launchConfiguration.test.ts
similarity index 100%
rename from src/test/shared/debug/launchConfiguration.test.ts
rename to packages/toolkit/src/test/shared/debug/launchConfiguration.test.ts
diff --git a/src/test/shared/defaultAwsClientBuilder.test.ts b/packages/toolkit/src/test/shared/defaultAwsClientBuilder.test.ts
similarity index 100%
rename from src/test/shared/defaultAwsClientBuilder.test.ts
rename to packages/toolkit/src/test/shared/defaultAwsClientBuilder.test.ts
diff --git a/src/test/shared/defaultAwsContext.test.ts b/packages/toolkit/src/test/shared/defaultAwsContext.test.ts
similarity index 100%
rename from src/test/shared/defaultAwsContext.test.ts
rename to packages/toolkit/src/test/shared/defaultAwsContext.test.ts
diff --git a/src/test/shared/errors.test.ts b/packages/toolkit/src/test/shared/errors.test.ts
similarity index 100%
rename from src/test/shared/errors.test.ts
rename to packages/toolkit/src/test/shared/errors.test.ts
diff --git a/src/test/shared/extensionUtilities.test.ts b/packages/toolkit/src/test/shared/extensionUtilities.test.ts
similarity index 100%
rename from src/test/shared/extensionUtilities.test.ts
rename to packages/toolkit/src/test/shared/extensionUtilities.test.ts
diff --git a/src/test/shared/extensions/ssh.test.ts b/packages/toolkit/src/test/shared/extensions/ssh.test.ts
similarity index 100%
rename from src/test/shared/extensions/ssh.test.ts
rename to packages/toolkit/src/test/shared/extensions/ssh.test.ts
diff --git a/src/test/shared/filesystemUtilities.test.ts b/packages/toolkit/src/test/shared/filesystemUtilities.test.ts
similarity index 100%
rename from src/test/shared/filesystemUtilities.test.ts
rename to packages/toolkit/src/test/shared/filesystemUtilities.test.ts
diff --git a/src/test/shared/fs/templateRegistry.test.ts b/packages/toolkit/src/test/shared/fs/templateRegistry.test.ts
similarity index 100%
rename from src/test/shared/fs/templateRegistry.test.ts
rename to packages/toolkit/src/test/shared/fs/templateRegistry.test.ts
diff --git a/src/test/shared/icons.test.ts b/packages/toolkit/src/test/shared/icons.test.ts
similarity index 100%
rename from src/test/shared/icons.test.ts
rename to packages/toolkit/src/test/shared/icons.test.ts
diff --git a/src/test/shared/logger/activation.test.ts b/packages/toolkit/src/test/shared/logger/activation.test.ts
similarity index 100%
rename from src/test/shared/logger/activation.test.ts
rename to packages/toolkit/src/test/shared/logger/activation.test.ts
diff --git a/src/test/shared/logger/consoleLogLogger.test.ts b/packages/toolkit/src/test/shared/logger/consoleLogLogger.test.ts
similarity index 100%
rename from src/test/shared/logger/consoleLogLogger.test.ts
rename to packages/toolkit/src/test/shared/logger/consoleLogLogger.test.ts
diff --git a/src/test/shared/logger/outputChannelLogger.test.ts b/packages/toolkit/src/test/shared/logger/outputChannelLogger.test.ts
similarity index 100%
rename from src/test/shared/logger/outputChannelLogger.test.ts
rename to packages/toolkit/src/test/shared/logger/outputChannelLogger.test.ts
diff --git a/src/test/shared/logger/sharedFileTransport.test.ts b/packages/toolkit/src/test/shared/logger/sharedFileTransport.test.ts
similarity index 100%
rename from src/test/shared/logger/sharedFileTransport.test.ts
rename to packages/toolkit/src/test/shared/logger/sharedFileTransport.test.ts
diff --git a/src/test/shared/logger/util.test.ts b/packages/toolkit/src/test/shared/logger/util.test.ts
similarity index 100%
rename from src/test/shared/logger/util.test.ts
rename to packages/toolkit/src/test/shared/logger/util.test.ts
diff --git a/src/test/shared/logger/winstonToolkitLogger.test.ts b/packages/toolkit/src/test/shared/logger/winstonToolkitLogger.test.ts
similarity index 100%
rename from src/test/shared/logger/winstonToolkitLogger.test.ts
rename to packages/toolkit/src/test/shared/logger/winstonToolkitLogger.test.ts
diff --git a/src/test/shared/regions/endpoints.test.ts b/packages/toolkit/src/test/shared/regions/endpoints.test.ts
similarity index 100%
rename from src/test/shared/regions/endpoints.test.ts
rename to packages/toolkit/src/test/shared/regions/endpoints.test.ts
diff --git a/src/test/shared/regions/regionProvider.test.ts b/packages/toolkit/src/test/shared/regions/regionProvider.test.ts
similarity index 100%
rename from src/test/shared/regions/regionProvider.test.ts
rename to packages/toolkit/src/test/shared/regions/regionProvider.test.ts
diff --git a/src/test/shared/regions/testUtil.ts b/packages/toolkit/src/test/shared/regions/testUtil.ts
similarity index 100%
rename from src/test/shared/regions/testUtil.ts
rename to packages/toolkit/src/test/shared/regions/testUtil.ts
diff --git a/src/test/shared/resourceFetcher/compositeResourceFetcher.test.ts b/packages/toolkit/src/test/shared/resourceFetcher/compositeResourceFetcher.test.ts
similarity index 100%
rename from src/test/shared/resourceFetcher/compositeResourceFetcher.test.ts
rename to packages/toolkit/src/test/shared/resourceFetcher/compositeResourceFetcher.test.ts
diff --git a/src/test/shared/resourceFetcher/fileResourceFetcher.test.ts b/packages/toolkit/src/test/shared/resourceFetcher/fileResourceFetcher.test.ts
similarity index 100%
rename from src/test/shared/resourceFetcher/fileResourceFetcher.test.ts
rename to packages/toolkit/src/test/shared/resourceFetcher/fileResourceFetcher.test.ts
diff --git a/src/test/shared/resourceFetcher/httpResourceFetcher.test.ts b/packages/toolkit/src/test/shared/resourceFetcher/httpResourceFetcher.test.ts
similarity index 100%
rename from src/test/shared/resourceFetcher/httpResourceFetcher.test.ts
rename to packages/toolkit/src/test/shared/resourceFetcher/httpResourceFetcher.test.ts
diff --git a/src/test/shared/sam/cli/samCliBuild.test.ts b/packages/toolkit/src/test/shared/sam/cli/samCliBuild.test.ts
similarity index 100%
rename from src/test/shared/sam/cli/samCliBuild.test.ts
rename to packages/toolkit/src/test/shared/sam/cli/samCliBuild.test.ts
diff --git a/src/test/shared/sam/cli/samCliConfiguration.test.ts b/packages/toolkit/src/test/shared/sam/cli/samCliConfiguration.test.ts
similarity index 100%
rename from src/test/shared/sam/cli/samCliConfiguration.test.ts
rename to packages/toolkit/src/test/shared/sam/cli/samCliConfiguration.test.ts
diff --git a/src/test/shared/sam/cli/samCliDeploy.test.ts b/packages/toolkit/src/test/shared/sam/cli/samCliDeploy.test.ts
similarity index 100%
rename from src/test/shared/sam/cli/samCliDeploy.test.ts
rename to packages/toolkit/src/test/shared/sam/cli/samCliDeploy.test.ts
diff --git a/src/test/shared/sam/cli/samCliInfo.test.ts b/packages/toolkit/src/test/shared/sam/cli/samCliInfo.test.ts
similarity index 100%
rename from src/test/shared/sam/cli/samCliInfo.test.ts
rename to packages/toolkit/src/test/shared/sam/cli/samCliInfo.test.ts
diff --git a/src/test/shared/sam/cli/samCliInit.test.ts b/packages/toolkit/src/test/shared/sam/cli/samCliInit.test.ts
similarity index 100%
rename from src/test/shared/sam/cli/samCliInit.test.ts
rename to packages/toolkit/src/test/shared/sam/cli/samCliInit.test.ts
diff --git a/src/test/shared/sam/cli/samCliInvokerUtils.test.ts b/packages/toolkit/src/test/shared/sam/cli/samCliInvokerUtils.test.ts
similarity index 100%
rename from src/test/shared/sam/cli/samCliInvokerUtils.test.ts
rename to packages/toolkit/src/test/shared/sam/cli/samCliInvokerUtils.test.ts
diff --git a/src/test/shared/sam/cli/samCliLocalInvoke.test.ts b/packages/toolkit/src/test/shared/sam/cli/samCliLocalInvoke.test.ts
similarity index 100%
rename from src/test/shared/sam/cli/samCliLocalInvoke.test.ts
rename to packages/toolkit/src/test/shared/sam/cli/samCliLocalInvoke.test.ts
diff --git a/src/test/shared/sam/cli/samCliPackage.test.ts b/packages/toolkit/src/test/shared/sam/cli/samCliPackage.test.ts
similarity index 100%
rename from src/test/shared/sam/cli/samCliPackage.test.ts
rename to packages/toolkit/src/test/shared/sam/cli/samCliPackage.test.ts
diff --git a/src/test/shared/sam/cli/samCliStartApi.test.ts b/packages/toolkit/src/test/shared/sam/cli/samCliStartApi.test.ts
similarity index 100%
rename from src/test/shared/sam/cli/samCliStartApi.test.ts
rename to packages/toolkit/src/test/shared/sam/cli/samCliStartApi.test.ts
diff --git a/src/test/shared/sam/cli/samCliTestUtils.ts b/packages/toolkit/src/test/shared/sam/cli/samCliTestUtils.ts
similarity index 100%
rename from src/test/shared/sam/cli/samCliTestUtils.ts
rename to packages/toolkit/src/test/shared/sam/cli/samCliTestUtils.ts
diff --git a/src/test/shared/sam/cli/samCliValidationNotification.test.ts b/packages/toolkit/src/test/shared/sam/cli/samCliValidationNotification.test.ts
similarity index 100%
rename from src/test/shared/sam/cli/samCliValidationNotification.test.ts
rename to packages/toolkit/src/test/shared/sam/cli/samCliValidationNotification.test.ts
diff --git a/src/test/shared/sam/cli/samCliValidator.test.ts b/packages/toolkit/src/test/shared/sam/cli/samCliValidator.test.ts
similarity index 100%
rename from src/test/shared/sam/cli/samCliValidator.test.ts
rename to packages/toolkit/src/test/shared/sam/cli/samCliValidator.test.ts
diff --git a/src/test/shared/sam/cli/testSamCliProcessInvoker.ts b/packages/toolkit/src/test/shared/sam/cli/testSamCliProcessInvoker.ts
similarity index 100%
rename from src/test/shared/sam/cli/testSamCliProcessInvoker.ts
rename to packages/toolkit/src/test/shared/sam/cli/testSamCliProcessInvoker.ts
diff --git a/src/test/shared/sam/debugger/awsSamDebugConfigurationValidator.test.ts b/packages/toolkit/src/test/shared/sam/debugger/awsSamDebugConfigurationValidator.test.ts
similarity index 100%
rename from src/test/shared/sam/debugger/awsSamDebugConfigurationValidator.test.ts
rename to packages/toolkit/src/test/shared/sam/debugger/awsSamDebugConfigurationValidator.test.ts
diff --git a/src/test/shared/sam/debugger/samDebugConfigProvider.test.ts b/packages/toolkit/src/test/shared/sam/debugger/samDebugConfigProvider.test.ts
similarity index 100%
rename from src/test/shared/sam/debugger/samDebugConfigProvider.test.ts
rename to packages/toolkit/src/test/shared/sam/debugger/samDebugConfigProvider.test.ts
diff --git a/src/test/shared/sam/sync.test.ts b/packages/toolkit/src/test/shared/sam/sync.test.ts
similarity index 100%
rename from src/test/shared/sam/sync.test.ts
rename to packages/toolkit/src/test/shared/sam/sync.test.ts
diff --git a/src/test/shared/schema/testUtils.ts b/packages/toolkit/src/test/shared/schema/testUtils.ts
similarity index 100%
rename from src/test/shared/schema/testUtils.ts
rename to packages/toolkit/src/test/shared/schema/testUtils.ts
diff --git a/src/test/shared/schemas.test.ts b/packages/toolkit/src/test/shared/schemas.test.ts
similarity index 100%
rename from src/test/shared/schemas.test.ts
rename to packages/toolkit/src/test/shared/schemas.test.ts
diff --git a/src/test/shared/settingsConfiguration.test.ts b/packages/toolkit/src/test/shared/settingsConfiguration.test.ts
similarity index 100%
rename from src/test/shared/settingsConfiguration.test.ts
rename to packages/toolkit/src/test/shared/settingsConfiguration.test.ts
diff --git a/src/test/shared/sshConfig.test.ts b/packages/toolkit/src/test/shared/sshConfig.test.ts
similarity index 100%
rename from src/test/shared/sshConfig.test.ts
rename to packages/toolkit/src/test/shared/sshConfig.test.ts
diff --git a/src/test/shared/systemUtilities.test.ts b/packages/toolkit/src/test/shared/systemUtilities.test.ts
similarity index 100%
rename from src/test/shared/systemUtilities.test.ts
rename to packages/toolkit/src/test/shared/systemUtilities.test.ts
diff --git a/src/test/shared/telemetry/activation.test.ts b/packages/toolkit/src/test/shared/telemetry/activation.test.ts
similarity index 100%
rename from src/test/shared/telemetry/activation.test.ts
rename to packages/toolkit/src/test/shared/telemetry/activation.test.ts
diff --git a/src/test/shared/telemetry/spans.test.ts b/packages/toolkit/src/test/shared/telemetry/spans.test.ts
similarity index 100%
rename from src/test/shared/telemetry/spans.test.ts
rename to packages/toolkit/src/test/shared/telemetry/spans.test.ts
diff --git a/src/test/shared/telemetry/telemetryCache.test.ts b/packages/toolkit/src/test/shared/telemetry/telemetryCache.test.ts
similarity index 100%
rename from src/test/shared/telemetry/telemetryCache.test.ts
rename to packages/toolkit/src/test/shared/telemetry/telemetryCache.test.ts
diff --git a/src/test/shared/telemetry/telemetryPublisher.test.ts b/packages/toolkit/src/test/shared/telemetry/telemetryPublisher.test.ts
similarity index 100%
rename from src/test/shared/telemetry/telemetryPublisher.test.ts
rename to packages/toolkit/src/test/shared/telemetry/telemetryPublisher.test.ts
diff --git a/src/test/shared/telemetry/telemetryService.test.ts b/packages/toolkit/src/test/shared/telemetry/telemetryService.test.ts
similarity index 100%
rename from src/test/shared/telemetry/telemetryService.test.ts
rename to packages/toolkit/src/test/shared/telemetry/telemetryService.test.ts
diff --git a/src/test/shared/telemetry/util.test.ts b/packages/toolkit/src/test/shared/telemetry/util.test.ts
similarity index 100%
rename from src/test/shared/telemetry/util.test.ts
rename to packages/toolkit/src/test/shared/telemetry/util.test.ts
diff --git a/src/test/shared/treeview/nodes/testAWSTreeNode.ts b/packages/toolkit/src/test/shared/treeview/nodes/testAWSTreeNode.ts
similarity index 100%
rename from src/test/shared/treeview/nodes/testAWSTreeNode.ts
rename to packages/toolkit/src/test/shared/treeview/nodes/testAWSTreeNode.ts
diff --git a/src/test/shared/treeview/resource.test.ts b/packages/toolkit/src/test/shared/treeview/resource.test.ts
similarity index 100%
rename from src/test/shared/treeview/resource.test.ts
rename to packages/toolkit/src/test/shared/treeview/resource.test.ts
diff --git a/src/test/shared/treeview/resourceTreeDataProvider.test.ts b/packages/toolkit/src/test/shared/treeview/resourceTreeDataProvider.test.ts
similarity index 100%
rename from src/test/shared/treeview/resourceTreeDataProvider.test.ts
rename to packages/toolkit/src/test/shared/treeview/resourceTreeDataProvider.test.ts
diff --git a/src/test/shared/treeview/testUtil.ts b/packages/toolkit/src/test/shared/treeview/testUtil.ts
similarity index 100%
rename from src/test/shared/treeview/testUtil.ts
rename to packages/toolkit/src/test/shared/treeview/testUtil.ts
diff --git a/src/test/shared/treeview/treeNodeUtilities.test.ts b/packages/toolkit/src/test/shared/treeview/treeNodeUtilities.test.ts
similarity index 100%
rename from src/test/shared/treeview/treeNodeUtilities.test.ts
rename to packages/toolkit/src/test/shared/treeview/treeNodeUtilities.test.ts
diff --git a/src/test/shared/ui/buttons.test.ts b/packages/toolkit/src/test/shared/ui/buttons.test.ts
similarity index 100%
rename from src/test/shared/ui/buttons.test.ts
rename to packages/toolkit/src/test/shared/ui/buttons.test.ts
diff --git a/src/test/shared/ui/inputPrompter.test.ts b/packages/toolkit/src/test/shared/ui/inputPrompter.test.ts
similarity index 100%
rename from src/test/shared/ui/inputPrompter.test.ts
rename to packages/toolkit/src/test/shared/ui/inputPrompter.test.ts
diff --git a/src/test/shared/ui/pickerPrompter.test.ts b/packages/toolkit/src/test/shared/ui/pickerPrompter.test.ts
similarity index 100%
rename from src/test/shared/ui/pickerPrompter.test.ts
rename to packages/toolkit/src/test/shared/ui/pickerPrompter.test.ts
diff --git a/src/test/shared/ui/prompter.test.ts b/packages/toolkit/src/test/shared/ui/prompter.test.ts
similarity index 100%
rename from src/test/shared/ui/prompter.test.ts
rename to packages/toolkit/src/test/shared/ui/prompter.test.ts
diff --git a/src/test/shared/ui/prompters/regionPrompter.test.ts b/packages/toolkit/src/test/shared/ui/prompters/regionPrompter.test.ts
similarity index 100%
rename from src/test/shared/ui/prompters/regionPrompter.test.ts
rename to packages/toolkit/src/test/shared/ui/prompters/regionPrompter.test.ts
diff --git a/src/test/shared/ui/prompters/regionSubmenu.test.ts b/packages/toolkit/src/test/shared/ui/prompters/regionSubmenu.test.ts
similarity index 100%
rename from src/test/shared/ui/prompters/regionSubmenu.test.ts
rename to packages/toolkit/src/test/shared/ui/prompters/regionSubmenu.test.ts
diff --git a/src/test/shared/ui/prompters/roles.test.ts b/packages/toolkit/src/test/shared/ui/prompters/roles.test.ts
similarity index 100%
rename from src/test/shared/ui/prompters/roles.test.ts
rename to packages/toolkit/src/test/shared/ui/prompters/roles.test.ts
diff --git a/src/test/shared/ui/testUtils.ts b/packages/toolkit/src/test/shared/ui/testUtils.ts
similarity index 100%
rename from src/test/shared/ui/testUtils.ts
rename to packages/toolkit/src/test/shared/ui/testUtils.ts
diff --git a/src/test/shared/utilities/asyncCollection.test.ts b/packages/toolkit/src/test/shared/utilities/asyncCollection.test.ts
similarity index 100%
rename from src/test/shared/utilities/asyncCollection.test.ts
rename to packages/toolkit/src/test/shared/utilities/asyncCollection.test.ts
diff --git a/src/test/shared/utilities/childProcess.test.ts b/packages/toolkit/src/test/shared/utilities/childProcess.test.ts
similarity index 100%
rename from src/test/shared/utilities/childProcess.test.ts
rename to packages/toolkit/src/test/shared/utilities/childProcess.test.ts
diff --git a/src/test/shared/utilities/cliUtils.test.ts b/packages/toolkit/src/test/shared/utilities/cliUtils.test.ts
similarity index 100%
rename from src/test/shared/utilities/cliUtils.test.ts
rename to packages/toolkit/src/test/shared/utilities/cliUtils.test.ts
diff --git a/src/test/shared/utilities/collectionUtils.test.ts b/packages/toolkit/src/test/shared/utilities/collectionUtils.test.ts
similarity index 100%
rename from src/test/shared/utilities/collectionUtils.test.ts
rename to packages/toolkit/src/test/shared/utilities/collectionUtils.test.ts
diff --git a/src/test/shared/utilities/editorUtilities.test.ts b/packages/toolkit/src/test/shared/utilities/editorUtilities.test.ts
similarity index 100%
rename from src/test/shared/utilities/editorUtilities.test.ts
rename to packages/toolkit/src/test/shared/utilities/editorUtilities.test.ts
diff --git a/src/test/shared/utilities/functionUtils.test.ts b/packages/toolkit/src/test/shared/utilities/functionUtils.test.ts
similarity index 100%
rename from src/test/shared/utilities/functionUtils.test.ts
rename to packages/toolkit/src/test/shared/utilities/functionUtils.test.ts
diff --git a/src/test/shared/utilities/messages.test.ts b/packages/toolkit/src/test/shared/utilities/messages.test.ts
similarity index 100%
rename from src/test/shared/utilities/messages.test.ts
rename to packages/toolkit/src/test/shared/utilities/messages.test.ts
diff --git a/src/test/shared/utilities/pathUtils.test.ts b/packages/toolkit/src/test/shared/utilities/pathUtils.test.ts
similarity index 100%
rename from src/test/shared/utilities/pathUtils.test.ts
rename to packages/toolkit/src/test/shared/utilities/pathUtils.test.ts
diff --git a/src/test/shared/utilities/symbolUtilities.test.ts b/packages/toolkit/src/test/shared/utilities/symbolUtilities.test.ts
similarity index 100%
rename from src/test/shared/utilities/symbolUtilities.test.ts
rename to packages/toolkit/src/test/shared/utilities/symbolUtilities.test.ts
diff --git a/src/test/shared/utilities/textUtilities.test.ts b/packages/toolkit/src/test/shared/utilities/textUtilities.test.ts
similarity index 100%
rename from src/test/shared/utilities/textUtilities.test.ts
rename to packages/toolkit/src/test/shared/utilities/textUtilities.test.ts
diff --git a/src/test/shared/utilities/timeoutUtils.test.ts b/packages/toolkit/src/test/shared/utilities/timeoutUtils.test.ts
similarity index 100%
rename from src/test/shared/utilities/timeoutUtils.test.ts
rename to packages/toolkit/src/test/shared/utilities/timeoutUtils.test.ts
diff --git a/src/test/shared/utilities/typeConstructors.test.ts b/packages/toolkit/src/test/shared/utilities/typeConstructors.test.ts
similarity index 100%
rename from src/test/shared/utilities/typeConstructors.test.ts
rename to packages/toolkit/src/test/shared/utilities/typeConstructors.test.ts
diff --git a/src/test/shared/utilities/uriUtils.test.ts b/packages/toolkit/src/test/shared/utilities/uriUtils.test.ts
similarity index 100%
rename from src/test/shared/utilities/uriUtils.test.ts
rename to packages/toolkit/src/test/shared/utilities/uriUtils.test.ts
diff --git a/src/test/shared/utilities/vscodeUtils.test.ts b/packages/toolkit/src/test/shared/utilities/vscodeUtils.test.ts
similarity index 100%
rename from src/test/shared/utilities/vscodeUtils.test.ts
rename to packages/toolkit/src/test/shared/utilities/vscodeUtils.test.ts
diff --git a/src/test/shared/vscode/commands.test.ts b/packages/toolkit/src/test/shared/vscode/commands.test.ts
similarity index 100%
rename from src/test/shared/vscode/commands.test.ts
rename to packages/toolkit/src/test/shared/vscode/commands.test.ts
diff --git a/src/test/shared/vscode/env.test.ts b/packages/toolkit/src/test/shared/vscode/env.test.ts
similarity index 100%
rename from src/test/shared/vscode/env.test.ts
rename to packages/toolkit/src/test/shared/vscode/env.test.ts
diff --git a/src/test/shared/vscode/fakeEnv.ts b/packages/toolkit/src/test/shared/vscode/fakeEnv.ts
similarity index 100%
rename from src/test/shared/vscode/fakeEnv.ts
rename to packages/toolkit/src/test/shared/vscode/fakeEnv.ts
diff --git a/src/test/shared/vscode/message.ts b/packages/toolkit/src/test/shared/vscode/message.ts
similarity index 100%
rename from src/test/shared/vscode/message.ts
rename to packages/toolkit/src/test/shared/vscode/message.ts
diff --git a/src/test/shared/vscode/quickInput.ts b/packages/toolkit/src/test/shared/vscode/quickInput.ts
similarity index 100%
rename from src/test/shared/vscode/quickInput.ts
rename to packages/toolkit/src/test/shared/vscode/quickInput.ts
diff --git a/src/test/shared/vscode/runCommand.test.ts b/packages/toolkit/src/test/shared/vscode/runCommand.test.ts
similarity index 100%
rename from src/test/shared/vscode/runCommand.test.ts
rename to packages/toolkit/src/test/shared/vscode/runCommand.test.ts
diff --git a/src/test/shared/vscode/statusbar.ts b/packages/toolkit/src/test/shared/vscode/statusbar.ts
similarity index 100%
rename from src/test/shared/vscode/statusbar.ts
rename to packages/toolkit/src/test/shared/vscode/statusbar.ts
diff --git a/src/test/shared/vscode/testUtils.ts b/packages/toolkit/src/test/shared/vscode/testUtils.ts
similarity index 100%
rename from src/test/shared/vscode/testUtils.ts
rename to packages/toolkit/src/test/shared/vscode/testUtils.ts
diff --git a/src/test/shared/vscode/uriHandler.test.ts b/packages/toolkit/src/test/shared/vscode/uriHandler.test.ts
similarity index 100%
rename from src/test/shared/vscode/uriHandler.test.ts
rename to packages/toolkit/src/test/shared/vscode/uriHandler.test.ts
diff --git a/src/test/shared/vscode/window.ts b/packages/toolkit/src/test/shared/vscode/window.ts
similarity index 100%
rename from src/test/shared/vscode/window.ts
rename to packages/toolkit/src/test/shared/vscode/window.ts
diff --git a/src/test/shared/wizards/multiStepWizard.test.ts b/packages/toolkit/src/test/shared/wizards/multiStepWizard.test.ts
similarity index 100%
rename from src/test/shared/wizards/multiStepWizard.test.ts
rename to packages/toolkit/src/test/shared/wizards/multiStepWizard.test.ts
diff --git a/src/test/shared/wizards/wizard.test.ts b/packages/toolkit/src/test/shared/wizards/wizard.test.ts
similarity index 100%
rename from src/test/shared/wizards/wizard.test.ts
rename to packages/toolkit/src/test/shared/wizards/wizard.test.ts
diff --git a/src/test/shared/wizards/wizardForm.test.ts b/packages/toolkit/src/test/shared/wizards/wizardForm.test.ts
similarity index 100%
rename from src/test/shared/wizards/wizardForm.test.ts
rename to packages/toolkit/src/test/shared/wizards/wizardForm.test.ts
diff --git a/src/test/shared/wizards/wizardTestUtils.ts b/packages/toolkit/src/test/shared/wizards/wizardTestUtils.ts
similarity index 100%
rename from src/test/shared/wizards/wizardTestUtils.ts
rename to packages/toolkit/src/test/shared/wizards/wizardTestUtils.ts
diff --git a/src/test/srcShared/fs.test.ts b/packages/toolkit/src/test/srcShared/fs.test.ts
similarity index 100%
rename from src/test/srcShared/fs.test.ts
rename to packages/toolkit/src/test/srcShared/fs.test.ts
diff --git a/src/test/ssmDocument/commands/createDocumentFromTemplate.test.ts b/packages/toolkit/src/test/ssmDocument/commands/createDocumentFromTemplate.test.ts
similarity index 100%
rename from src/test/ssmDocument/commands/createDocumentFromTemplate.test.ts
rename to packages/toolkit/src/test/ssmDocument/commands/createDocumentFromTemplate.test.ts
diff --git a/src/test/ssmDocument/commands/deleteDocument.test.ts b/packages/toolkit/src/test/ssmDocument/commands/deleteDocument.test.ts
similarity index 100%
rename from src/test/ssmDocument/commands/deleteDocument.test.ts
rename to packages/toolkit/src/test/ssmDocument/commands/deleteDocument.test.ts
diff --git a/src/test/ssmDocument/commands/openDocumentItem.test.ts b/packages/toolkit/src/test/ssmDocument/commands/openDocumentItem.test.ts
similarity index 100%
rename from src/test/ssmDocument/commands/openDocumentItem.test.ts
rename to packages/toolkit/src/test/ssmDocument/commands/openDocumentItem.test.ts
diff --git a/src/test/ssmDocument/commands/publishDocument.test.ts b/packages/toolkit/src/test/ssmDocument/commands/publishDocument.test.ts
similarity index 100%
rename from src/test/ssmDocument/commands/publishDocument.test.ts
rename to packages/toolkit/src/test/ssmDocument/commands/publishDocument.test.ts
diff --git a/src/test/ssmDocument/commands/updateDocumentVersion.test.ts b/packages/toolkit/src/test/ssmDocument/commands/updateDocumentVersion.test.ts
similarity index 100%
rename from src/test/ssmDocument/commands/updateDocumentVersion.test.ts
rename to packages/toolkit/src/test/ssmDocument/commands/updateDocumentVersion.test.ts
diff --git a/src/test/ssmDocument/explorer/documentItemNode.test.ts b/packages/toolkit/src/test/ssmDocument/explorer/documentItemNode.test.ts
similarity index 100%
rename from src/test/ssmDocument/explorer/documentItemNode.test.ts
rename to packages/toolkit/src/test/ssmDocument/explorer/documentItemNode.test.ts
diff --git a/src/test/ssmDocument/explorer/documentTypeNode.test.ts b/packages/toolkit/src/test/ssmDocument/explorer/documentTypeNode.test.ts
similarity index 100%
rename from src/test/ssmDocument/explorer/documentTypeNode.test.ts
rename to packages/toolkit/src/test/ssmDocument/explorer/documentTypeNode.test.ts
diff --git a/src/test/ssmDocument/explorer/registryItemNode.test.ts b/packages/toolkit/src/test/ssmDocument/explorer/registryItemNode.test.ts
similarity index 100%
rename from src/test/ssmDocument/explorer/registryItemNode.test.ts
rename to packages/toolkit/src/test/ssmDocument/explorer/registryItemNode.test.ts
diff --git a/src/test/ssmDocument/explorer/ssmDocumentNode.test.ts b/packages/toolkit/src/test/ssmDocument/explorer/ssmDocumentNode.test.ts
similarity index 100%
rename from src/test/ssmDocument/explorer/ssmDocumentNode.test.ts
rename to packages/toolkit/src/test/ssmDocument/explorer/ssmDocumentNode.test.ts
diff --git a/src/test/ssmDocument/util/validateDocumentName.test.ts b/packages/toolkit/src/test/ssmDocument/util/validateDocumentName.test.ts
similarity index 100%
rename from src/test/ssmDocument/util/validateDocumentName.test.ts
rename to packages/toolkit/src/test/ssmDocument/util/validateDocumentName.test.ts
diff --git a/src/test/ssmDocument/wizards/publishDocumentWizard.test.ts b/packages/toolkit/src/test/ssmDocument/wizards/publishDocumentWizard.test.ts
similarity index 100%
rename from src/test/ssmDocument/wizards/publishDocumentWizard.test.ts
rename to packages/toolkit/src/test/ssmDocument/wizards/publishDocumentWizard.test.ts
diff --git a/src/test/stepFunctions/commands/getStateMachineDefinitionFromCfnTemplate.test.ts b/packages/toolkit/src/test/stepFunctions/commands/getStateMachineDefinitionFromCfnTemplate.test.ts
similarity index 100%
rename from src/test/stepFunctions/commands/getStateMachineDefinitionFromCfnTemplate.test.ts
rename to packages/toolkit/src/test/stepFunctions/commands/getStateMachineDefinitionFromCfnTemplate.test.ts
diff --git a/src/test/stepFunctions/commands/resources/templateJsonTester.template.json b/packages/toolkit/src/test/stepFunctions/commands/resources/templateJsonTester.template.json
similarity index 100%
rename from src/test/stepFunctions/commands/resources/templateJsonTester.template.json
rename to packages/toolkit/src/test/stepFunctions/commands/resources/templateJsonTester.template.json
diff --git a/src/test/stepFunctions/commands/visualizeStateMachine.test.ts b/packages/toolkit/src/test/stepFunctions/commands/visualizeStateMachine.test.ts
similarity index 100%
rename from src/test/stepFunctions/commands/visualizeStateMachine.test.ts
rename to packages/toolkit/src/test/stepFunctions/commands/visualizeStateMachine.test.ts
diff --git a/src/test/stepFunctions/explorer/stepFunctionNodes.test.ts b/packages/toolkit/src/test/stepFunctions/explorer/stepFunctionNodes.test.ts
similarity index 100%
rename from src/test/stepFunctions/explorer/stepFunctionNodes.test.ts
rename to packages/toolkit/src/test/stepFunctions/explorer/stepFunctionNodes.test.ts
diff --git a/src/test/stepFunctions/utils.test.ts b/packages/toolkit/src/test/stepFunctions/utils.test.ts
similarity index 100%
rename from src/test/stepFunctions/utils.test.ts
rename to packages/toolkit/src/test/stepFunctions/utils.test.ts
diff --git a/src/test/stepFunctions/wizards/createStateMachineWizard.test.ts b/packages/toolkit/src/test/stepFunctions/wizards/createStateMachineWizard.test.ts
similarity index 100%
rename from src/test/stepFunctions/wizards/createStateMachineWizard.test.ts
rename to packages/toolkit/src/test/stepFunctions/wizards/createStateMachineWizard.test.ts
diff --git a/src/test/stepFunctions/wizards/previewStateMachineCDKWizard.test.ts b/packages/toolkit/src/test/stepFunctions/wizards/previewStateMachineCDKWizard.test.ts
similarity index 100%
rename from src/test/stepFunctions/wizards/previewStateMachineCDKWizard.test.ts
rename to packages/toolkit/src/test/stepFunctions/wizards/previewStateMachineCDKWizard.test.ts
diff --git a/src/test/stepFunctions/wizards/publishStateMachineWizard.test.ts b/packages/toolkit/src/test/stepFunctions/wizards/publishStateMachineWizard.test.ts
similarity index 100%
rename from src/test/stepFunctions/wizards/publishStateMachineWizard.test.ts
rename to packages/toolkit/src/test/stepFunctions/wizards/publishStateMachineWizard.test.ts
diff --git a/src/test/techdebt.test.ts b/packages/toolkit/src/test/techdebt.test.ts
similarity index 100%
rename from src/test/techdebt.test.ts
rename to packages/toolkit/src/test/techdebt.test.ts
diff --git a/src/test/templates/sam/samTemplateGenerator.test.ts b/packages/toolkit/src/test/templates/sam/samTemplateGenerator.test.ts
similarity index 100%
rename from src/test/templates/sam/samTemplateGenerator.test.ts
rename to packages/toolkit/src/test/templates/sam/samTemplateGenerator.test.ts
diff --git a/src/test/testLogger.ts b/packages/toolkit/src/test/testLogger.ts
similarity index 100%
rename from src/test/testLogger.ts
rename to packages/toolkit/src/test/testLogger.ts
diff --git a/src/test/testRunner.ts b/packages/toolkit/src/test/testRunner.ts
similarity index 98%
rename from src/test/testRunner.ts
rename to packages/toolkit/src/test/testRunner.ts
index 5616811591c..c11abfb49d2 100644
--- a/src/test/testRunner.ts
+++ b/packages/toolkit/src/test/testRunner.ts
@@ -42,7 +42,7 @@ export async function runTests(testFolder: string, initTests: string[] = [], tes
     }
 
     const root = getRoot()
-    const outputFile = path.resolve(root, '.test-reports', 'report.xml')
+    const outputFile = path.resolve(root, '../../', '.test-reports', 'report.xml')
     const colorOutput = !process.env['AWS_TOOLKIT_TEST_NO_COLOR']
 
     // Create the mocha test
diff --git a/src/test/testUtil.ts b/packages/toolkit/src/test/testUtil.ts
similarity index 100%
rename from src/test/testUtil.ts
rename to packages/toolkit/src/test/testUtil.ts
diff --git a/src/test/typescriptLambdaHandlerSearch.test.ts b/packages/toolkit/src/test/typescriptLambdaHandlerSearch.test.ts
similarity index 100%
rename from src/test/typescriptLambdaHandlerSearch.test.ts
rename to packages/toolkit/src/test/typescriptLambdaHandlerSearch.test.ts
diff --git a/src/test/utilities/explorerNodeAssertions.ts b/packages/toolkit/src/test/utilities/explorerNodeAssertions.ts
similarity index 100%
rename from src/test/utilities/explorerNodeAssertions.ts
rename to packages/toolkit/src/test/utilities/explorerNodeAssertions.ts
diff --git a/src/test/utilities/fakeAwsContext.ts b/packages/toolkit/src/test/utilities/fakeAwsContext.ts
similarity index 100%
rename from src/test/utilities/fakeAwsContext.ts
rename to packages/toolkit/src/test/utilities/fakeAwsContext.ts
diff --git a/src/test/utilities/stubber.ts b/packages/toolkit/src/test/utilities/stubber.ts
similarity index 100%
rename from src/test/utilities/stubber.ts
rename to packages/toolkit/src/test/utilities/stubber.ts
diff --git a/src/test/utilities/testSettingsConfiguration.ts b/packages/toolkit/src/test/utilities/testSettingsConfiguration.ts
similarity index 100%
rename from src/test/utilities/testSettingsConfiguration.ts
rename to packages/toolkit/src/test/utilities/testSettingsConfiguration.ts
diff --git a/src/test/webview/server.test.ts b/packages/toolkit/src/test/webview/server.test.ts
similarity index 100%
rename from src/test/webview/server.test.ts
rename to packages/toolkit/src/test/webview/server.test.ts
diff --git a/src/testBrowser/shared/systemUtilities.test.ts b/packages/toolkit/src/testBrowser/shared/systemUtilities.test.ts
similarity index 100%
rename from src/testBrowser/shared/systemUtilities.test.ts
rename to packages/toolkit/src/testBrowser/shared/systemUtilities.test.ts
diff --git a/src/testBrowser/testRunner.ts b/packages/toolkit/src/testBrowser/testRunner.ts
similarity index 100%
rename from src/testBrowser/testRunner.ts
rename to packages/toolkit/src/testBrowser/testRunner.ts
diff --git a/src/testBrowser/utils.test.ts b/packages/toolkit/src/testBrowser/utils.test.ts
similarity index 100%
rename from src/testBrowser/utils.test.ts
rename to packages/toolkit/src/testBrowser/utils.test.ts
diff --git a/src/testE2E/amazonq/featureDev.test.ts b/packages/toolkit/src/testE2E/amazonq/featureDev.test.ts
similarity index 100%
rename from src/testE2E/amazonq/featureDev.test.ts
rename to packages/toolkit/src/testE2E/amazonq/featureDev.test.ts
diff --git a/src/testE2E/amazonq/framework/framework.ts b/packages/toolkit/src/testE2E/amazonq/framework/framework.ts
similarity index 100%
rename from src/testE2E/amazonq/framework/framework.ts
rename to packages/toolkit/src/testE2E/amazonq/framework/framework.ts
diff --git a/src/testE2E/amazonq/framework/jsdomInjector.ts b/packages/toolkit/src/testE2E/amazonq/framework/jsdomInjector.ts
similarity index 100%
rename from src/testE2E/amazonq/framework/jsdomInjector.ts
rename to packages/toolkit/src/testE2E/amazonq/framework/jsdomInjector.ts
diff --git a/src/testE2E/amazonq/framework/messenger.ts b/packages/toolkit/src/testE2E/amazonq/framework/messenger.ts
similarity index 100%
rename from src/testE2E/amazonq/framework/messenger.ts
rename to packages/toolkit/src/testE2E/amazonq/framework/messenger.ts
diff --git a/src/testE2E/amazonq/framework/text.ts b/packages/toolkit/src/testE2E/amazonq/framework/text.ts
similarity index 100%
rename from src/testE2E/amazonq/framework/text.ts
rename to packages/toolkit/src/testE2E/amazonq/framework/text.ts
diff --git a/src/testE2E/amazonqGumby/transformByQ.test.ts b/packages/toolkit/src/testE2E/amazonqGumby/transformByQ.test.ts
similarity index 100%
rename from src/testE2E/amazonqGumby/transformByQ.test.ts
rename to packages/toolkit/src/testE2E/amazonqGumby/transformByQ.test.ts
diff --git a/src/testE2E/codecatalyst/client.test.ts b/packages/toolkit/src/testE2E/codecatalyst/client.test.ts
similarity index 100%
rename from src/testE2E/codecatalyst/client.test.ts
rename to packages/toolkit/src/testE2E/codecatalyst/client.test.ts
diff --git a/src/testE2E/codewhisperer/referenceTracker.test.ts b/packages/toolkit/src/testE2E/codewhisperer/referenceTracker.test.ts
similarity index 100%
rename from src/testE2E/codewhisperer/referenceTracker.test.ts
rename to packages/toolkit/src/testE2E/codewhisperer/referenceTracker.test.ts
diff --git a/src/testE2E/codewhisperer/securityScan.test.ts b/packages/toolkit/src/testE2E/codewhisperer/securityScan.test.ts
similarity index 100%
rename from src/testE2E/codewhisperer/securityScan.test.ts
rename to packages/toolkit/src/testE2E/codewhisperer/securityScan.test.ts
diff --git a/src/testE2E/codewhisperer/serviceInvocations.test.ts b/packages/toolkit/src/testE2E/codewhisperer/serviceInvocations.test.ts
similarity index 100%
rename from src/testE2E/codewhisperer/serviceInvocations.test.ts
rename to packages/toolkit/src/testE2E/codewhisperer/serviceInvocations.test.ts
diff --git a/src/testE2E/index.ts b/packages/toolkit/src/testE2E/index.ts
similarity index 100%
rename from src/testE2E/index.ts
rename to packages/toolkit/src/testE2E/index.ts
diff --git a/src/testE2E/util/amazonQUtil.ts b/packages/toolkit/src/testE2E/util/amazonQUtil.ts
similarity index 100%
rename from src/testE2E/util/amazonQUtil.ts
rename to packages/toolkit/src/testE2E/util/amazonQUtil.ts
diff --git a/src/testE2E/util/codewhispererUtil.ts b/packages/toolkit/src/testE2E/util/codewhispererUtil.ts
similarity index 100%
rename from src/testE2E/util/codewhispererUtil.ts
rename to packages/toolkit/src/testE2E/util/codewhispererUtil.ts
diff --git a/src/testFixtures/workspaceFolder/.vscode/launch.json b/packages/toolkit/src/testFixtures/workspaceFolder/.vscode/launch.json
similarity index 100%
rename from src/testFixtures/workspaceFolder/.vscode/launch.json
rename to packages/toolkit/src/testFixtures/workspaceFolder/.vscode/launch.json
diff --git a/src/testFixtures/workspaceFolder/.vscode/settings.json b/packages/toolkit/src/testFixtures/workspaceFolder/.vscode/settings.json
similarity index 100%
rename from src/testFixtures/workspaceFolder/.vscode/settings.json
rename to packages/toolkit/src/testFixtures/workspaceFolder/.vscode/settings.json
diff --git a/src/testFixtures/workspaceFolder/cloudformation-plain-sam-app/src/app.json b/packages/toolkit/src/testFixtures/workspaceFolder/cloudformation-plain-sam-app/src/app.json
similarity index 100%
rename from src/testFixtures/workspaceFolder/cloudformation-plain-sam-app/src/app.json
rename to packages/toolkit/src/testFixtures/workspaceFolder/cloudformation-plain-sam-app/src/app.json
diff --git a/src/testFixtures/workspaceFolder/cloudformation-plain-sam-app/src/app.yaml b/packages/toolkit/src/testFixtures/workspaceFolder/cloudformation-plain-sam-app/src/app.yaml
similarity index 100%
rename from src/testFixtures/workspaceFolder/cloudformation-plain-sam-app/src/app.yaml
rename to packages/toolkit/src/testFixtures/workspaceFolder/cloudformation-plain-sam-app/src/app.yaml
diff --git a/src/testFixtures/workspaceFolder/cloudformation-plain-sam-app/src/appYml.yml b/packages/toolkit/src/testFixtures/workspaceFolder/cloudformation-plain-sam-app/src/appYml.yml
similarity index 100%
rename from src/testFixtures/workspaceFolder/cloudformation-plain-sam-app/src/appYml.yml
rename to packages/toolkit/src/testFixtures/workspaceFolder/cloudformation-plain-sam-app/src/appYml.yml
diff --git a/src/testFixtures/workspaceFolder/cloudformation-plain-sam-app/template.yaml b/packages/toolkit/src/testFixtures/workspaceFolder/cloudformation-plain-sam-app/template.yaml
similarity index 100%
rename from src/testFixtures/workspaceFolder/cloudformation-plain-sam-app/template.yaml
rename to packages/toolkit/src/testFixtures/workspaceFolder/cloudformation-plain-sam-app/template.yaml
diff --git a/src/testFixtures/workspaceFolder/csharp6-image/src/HelloWorld/Dockerfile b/packages/toolkit/src/testFixtures/workspaceFolder/csharp6-image/src/HelloWorld/Dockerfile
similarity index 100%
rename from src/testFixtures/workspaceFolder/csharp6-image/src/HelloWorld/Dockerfile
rename to packages/toolkit/src/testFixtures/workspaceFolder/csharp6-image/src/HelloWorld/Dockerfile
diff --git a/src/testFixtures/workspaceFolder/csharp6-image/src/HelloWorld/Function.cs b/packages/toolkit/src/testFixtures/workspaceFolder/csharp6-image/src/HelloWorld/Function.cs
similarity index 100%
rename from src/testFixtures/workspaceFolder/csharp6-image/src/HelloWorld/Function.cs
rename to packages/toolkit/src/testFixtures/workspaceFolder/csharp6-image/src/HelloWorld/Function.cs
diff --git a/src/testFixtures/workspaceFolder/csharp6-image/src/HelloWorld/HelloWorld.csproj b/packages/toolkit/src/testFixtures/workspaceFolder/csharp6-image/src/HelloWorld/HelloWorld.csproj
similarity index 100%
rename from src/testFixtures/workspaceFolder/csharp6-image/src/HelloWorld/HelloWorld.csproj
rename to packages/toolkit/src/testFixtures/workspaceFolder/csharp6-image/src/HelloWorld/HelloWorld.csproj
diff --git a/src/testFixtures/workspaceFolder/csharp6-image/template.yaml b/packages/toolkit/src/testFixtures/workspaceFolder/csharp6-image/template.yaml
similarity index 100%
rename from src/testFixtures/workspaceFolder/csharp6-image/template.yaml
rename to packages/toolkit/src/testFixtures/workspaceFolder/csharp6-image/template.yaml
diff --git a/src/testFixtures/workspaceFolder/csharp6-zip/src/HelloWorld/Function.cs b/packages/toolkit/src/testFixtures/workspaceFolder/csharp6-zip/src/HelloWorld/Function.cs
similarity index 100%
rename from src/testFixtures/workspaceFolder/csharp6-zip/src/HelloWorld/Function.cs
rename to packages/toolkit/src/testFixtures/workspaceFolder/csharp6-zip/src/HelloWorld/Function.cs
diff --git a/src/testFixtures/workspaceFolder/csharp6-zip/src/HelloWorld/HelloWorld.csproj b/packages/toolkit/src/testFixtures/workspaceFolder/csharp6-zip/src/HelloWorld/HelloWorld.csproj
similarity index 100%
rename from src/testFixtures/workspaceFolder/csharp6-zip/src/HelloWorld/HelloWorld.csproj
rename to packages/toolkit/src/testFixtures/workspaceFolder/csharp6-zip/src/HelloWorld/HelloWorld.csproj
diff --git a/src/testFixtures/workspaceFolder/csharp6-zip/template.yaml b/packages/toolkit/src/testFixtures/workspaceFolder/csharp6-zip/template.yaml
similarity index 100%
rename from src/testFixtures/workspaceFolder/csharp6-zip/template.yaml
rename to packages/toolkit/src/testFixtures/workspaceFolder/csharp6-zip/template.yaml
diff --git a/src/testFixtures/workspaceFolder/deeper-projects/js-plain-sam-app/src/app.js b/packages/toolkit/src/testFixtures/workspaceFolder/deeper-projects/js-plain-sam-app/src/app.js
similarity index 100%
rename from src/testFixtures/workspaceFolder/deeper-projects/js-plain-sam-app/src/app.js
rename to packages/toolkit/src/testFixtures/workspaceFolder/deeper-projects/js-plain-sam-app/src/app.js
diff --git a/src/testFixtures/workspaceFolder/deeper-projects/js-plain-sam-app/src/package.json b/packages/toolkit/src/testFixtures/workspaceFolder/deeper-projects/js-plain-sam-app/src/package.json
similarity index 100%
rename from src/testFixtures/workspaceFolder/deeper-projects/js-plain-sam-app/src/package.json
rename to packages/toolkit/src/testFixtures/workspaceFolder/deeper-projects/js-plain-sam-app/src/package.json
diff --git a/src/testFixtures/workspaceFolder/deeper-projects/js-plain-sam-app/template.yaml b/packages/toolkit/src/testFixtures/workspaceFolder/deeper-projects/js-plain-sam-app/template.yaml
similarity index 100%
rename from src/testFixtures/workspaceFolder/deeper-projects/js-plain-sam-app/template.yaml
rename to packages/toolkit/src/testFixtures/workspaceFolder/deeper-projects/js-plain-sam-app/template.yaml
diff --git a/src/testFixtures/workspaceFolder/go1-image-sam-app/hello-world/Dockerfile b/packages/toolkit/src/testFixtures/workspaceFolder/go1-image-sam-app/hello-world/Dockerfile
similarity index 100%
rename from src/testFixtures/workspaceFolder/go1-image-sam-app/hello-world/Dockerfile
rename to packages/toolkit/src/testFixtures/workspaceFolder/go1-image-sam-app/hello-world/Dockerfile
diff --git a/src/testFixtures/workspaceFolder/go1-image-sam-app/hello-world/go.mod b/packages/toolkit/src/testFixtures/workspaceFolder/go1-image-sam-app/hello-world/go.mod
similarity index 100%
rename from src/testFixtures/workspaceFolder/go1-image-sam-app/hello-world/go.mod
rename to packages/toolkit/src/testFixtures/workspaceFolder/go1-image-sam-app/hello-world/go.mod
diff --git a/src/testFixtures/workspaceFolder/go1-image-sam-app/hello-world/main.go b/packages/toolkit/src/testFixtures/workspaceFolder/go1-image-sam-app/hello-world/main.go
similarity index 100%
rename from src/testFixtures/workspaceFolder/go1-image-sam-app/hello-world/main.go
rename to packages/toolkit/src/testFixtures/workspaceFolder/go1-image-sam-app/hello-world/main.go
diff --git a/src/testFixtures/workspaceFolder/go1-image-sam-app/hello-world/main_test.go b/packages/toolkit/src/testFixtures/workspaceFolder/go1-image-sam-app/hello-world/main_test.go
similarity index 100%
rename from src/testFixtures/workspaceFolder/go1-image-sam-app/hello-world/main_test.go
rename to packages/toolkit/src/testFixtures/workspaceFolder/go1-image-sam-app/hello-world/main_test.go
diff --git a/src/testFixtures/workspaceFolder/go1-image-sam-app/template.yaml b/packages/toolkit/src/testFixtures/workspaceFolder/go1-image-sam-app/template.yaml
similarity index 100%
rename from src/testFixtures/workspaceFolder/go1-image-sam-app/template.yaml
rename to packages/toolkit/src/testFixtures/workspaceFolder/go1-image-sam-app/template.yaml
diff --git a/src/testFixtures/workspaceFolder/go1-plain-sam-app/Makefile b/packages/toolkit/src/testFixtures/workspaceFolder/go1-plain-sam-app/Makefile
similarity index 100%
rename from src/testFixtures/workspaceFolder/go1-plain-sam-app/Makefile
rename to packages/toolkit/src/testFixtures/workspaceFolder/go1-plain-sam-app/Makefile
diff --git a/src/testFixtures/workspaceFolder/go1-plain-sam-app/hello-world/go.mod b/packages/toolkit/src/testFixtures/workspaceFolder/go1-plain-sam-app/hello-world/go.mod
similarity index 100%
rename from src/testFixtures/workspaceFolder/go1-plain-sam-app/hello-world/go.mod
rename to packages/toolkit/src/testFixtures/workspaceFolder/go1-plain-sam-app/hello-world/go.mod
diff --git a/src/testFixtures/workspaceFolder/go1-plain-sam-app/hello-world/main.go b/packages/toolkit/src/testFixtures/workspaceFolder/go1-plain-sam-app/hello-world/main.go
similarity index 100%
rename from src/testFixtures/workspaceFolder/go1-plain-sam-app/hello-world/main.go
rename to packages/toolkit/src/testFixtures/workspaceFolder/go1-plain-sam-app/hello-world/main.go
diff --git a/src/testFixtures/workspaceFolder/go1-plain-sam-app/hello-world/main_test.go b/packages/toolkit/src/testFixtures/workspaceFolder/go1-plain-sam-app/hello-world/main_test.go
similarity index 100%
rename from src/testFixtures/workspaceFolder/go1-plain-sam-app/hello-world/main_test.go
rename to packages/toolkit/src/testFixtures/workspaceFolder/go1-plain-sam-app/hello-world/main_test.go
diff --git a/src/testFixtures/workspaceFolder/go1-plain-sam-app/template.yaml b/packages/toolkit/src/testFixtures/workspaceFolder/go1-plain-sam-app/template.yaml
similarity index 100%
rename from src/testFixtures/workspaceFolder/go1-plain-sam-app/template.yaml
rename to packages/toolkit/src/testFixtures/workspaceFolder/go1-plain-sam-app/template.yaml
diff --git a/src/testFixtures/workspaceFolder/go1-zip/go.mod b/packages/toolkit/src/testFixtures/workspaceFolder/go1-zip/go.mod
similarity index 100%
rename from src/testFixtures/workspaceFolder/go1-zip/go.mod
rename to packages/toolkit/src/testFixtures/workspaceFolder/go1-zip/go.mod
diff --git a/src/testFixtures/workspaceFolder/go1-zip/help.go b/packages/toolkit/src/testFixtures/workspaceFolder/go1-zip/help.go
similarity index 100%
rename from src/testFixtures/workspaceFolder/go1-zip/help.go
rename to packages/toolkit/src/testFixtures/workspaceFolder/go1-zip/help.go
diff --git a/src/testFixtures/workspaceFolder/go1-zip/main.go b/packages/toolkit/src/testFixtures/workspaceFolder/go1-zip/main.go
similarity index 100%
rename from src/testFixtures/workspaceFolder/go1-zip/main.go
rename to packages/toolkit/src/testFixtures/workspaceFolder/go1-zip/main.go
diff --git a/src/testFixtures/workspaceFolder/go1-zip/util/number.go b/packages/toolkit/src/testFixtures/workspaceFolder/go1-zip/util/number.go
similarity index 100%
rename from src/testFixtures/workspaceFolder/go1-zip/util/number.go
rename to packages/toolkit/src/testFixtures/workspaceFolder/go1-zip/util/number.go
diff --git a/src/testFixtures/workspaceFolder/java11-plain-maven-sam-app/HelloWorldFunction/pom.xml b/packages/toolkit/src/testFixtures/workspaceFolder/java11-plain-maven-sam-app/HelloWorldFunction/pom.xml
similarity index 100%
rename from src/testFixtures/workspaceFolder/java11-plain-maven-sam-app/HelloWorldFunction/pom.xml
rename to packages/toolkit/src/testFixtures/workspaceFolder/java11-plain-maven-sam-app/HelloWorldFunction/pom.xml
diff --git a/src/testFixtures/workspaceFolder/java11-plain-maven-sam-app/HelloWorldFunction/src/main/java/helloworld/App.java b/packages/toolkit/src/testFixtures/workspaceFolder/java11-plain-maven-sam-app/HelloWorldFunction/src/main/java/helloworld/App.java
similarity index 100%
rename from src/testFixtures/workspaceFolder/java11-plain-maven-sam-app/HelloWorldFunction/src/main/java/helloworld/App.java
rename to packages/toolkit/src/testFixtures/workspaceFolder/java11-plain-maven-sam-app/HelloWorldFunction/src/main/java/helloworld/App.java
diff --git a/src/testFixtures/workspaceFolder/java11-plain-maven-sam-app/HelloWorldFunction/src/test/java/helloworld/AppTest.java b/packages/toolkit/src/testFixtures/workspaceFolder/java11-plain-maven-sam-app/HelloWorldFunction/src/test/java/helloworld/AppTest.java
similarity index 100%
rename from src/testFixtures/workspaceFolder/java11-plain-maven-sam-app/HelloWorldFunction/src/test/java/helloworld/AppTest.java
rename to packages/toolkit/src/testFixtures/workspaceFolder/java11-plain-maven-sam-app/HelloWorldFunction/src/test/java/helloworld/AppTest.java
diff --git a/src/testFixtures/workspaceFolder/java11-plain-maven-sam-app/template.yaml b/packages/toolkit/src/testFixtures/workspaceFolder/java11-plain-maven-sam-app/template.yaml
similarity index 100%
rename from src/testFixtures/workspaceFolder/java11-plain-maven-sam-app/template.yaml
rename to packages/toolkit/src/testFixtures/workspaceFolder/java11-plain-maven-sam-app/template.yaml
diff --git a/src/testFixtures/workspaceFolder/java17-gradle/HelloWorldFunction/build.gradle b/packages/toolkit/src/testFixtures/workspaceFolder/java17-gradle/HelloWorldFunction/build.gradle
similarity index 100%
rename from src/testFixtures/workspaceFolder/java17-gradle/HelloWorldFunction/build.gradle
rename to packages/toolkit/src/testFixtures/workspaceFolder/java17-gradle/HelloWorldFunction/build.gradle
diff --git a/src/testFixtures/workspaceFolder/java17-gradle/HelloWorldFunction/gradle/wrapper/gradle-wrapper.properties b/packages/toolkit/src/testFixtures/workspaceFolder/java17-gradle/HelloWorldFunction/gradle/wrapper/gradle-wrapper.properties
similarity index 100%
rename from src/testFixtures/workspaceFolder/java17-gradle/HelloWorldFunction/gradle/wrapper/gradle-wrapper.properties
rename to packages/toolkit/src/testFixtures/workspaceFolder/java17-gradle/HelloWorldFunction/gradle/wrapper/gradle-wrapper.properties
diff --git a/src/testFixtures/workspaceFolder/java17-gradle/HelloWorldFunction/gradlew b/packages/toolkit/src/testFixtures/workspaceFolder/java17-gradle/HelloWorldFunction/gradlew
similarity index 100%
rename from src/testFixtures/workspaceFolder/java17-gradle/HelloWorldFunction/gradlew
rename to packages/toolkit/src/testFixtures/workspaceFolder/java17-gradle/HelloWorldFunction/gradlew
diff --git a/src/testFixtures/workspaceFolder/java17-gradle/HelloWorldFunction/gradlew.bat b/packages/toolkit/src/testFixtures/workspaceFolder/java17-gradle/HelloWorldFunction/gradlew.bat
similarity index 100%
rename from src/testFixtures/workspaceFolder/java17-gradle/HelloWorldFunction/gradlew.bat
rename to packages/toolkit/src/testFixtures/workspaceFolder/java17-gradle/HelloWorldFunction/gradlew.bat
diff --git a/src/testFixtures/workspaceFolder/java17-gradle/HelloWorldFunction/src/main/java/helloworld/App.java b/packages/toolkit/src/testFixtures/workspaceFolder/java17-gradle/HelloWorldFunction/src/main/java/helloworld/App.java
similarity index 100%
rename from src/testFixtures/workspaceFolder/java17-gradle/HelloWorldFunction/src/main/java/helloworld/App.java
rename to packages/toolkit/src/testFixtures/workspaceFolder/java17-gradle/HelloWorldFunction/src/main/java/helloworld/App.java
diff --git a/src/testFixtures/workspaceFolder/java17-gradle/HelloWorldFunction/src/test/java/helloworld/AppTest.java b/packages/toolkit/src/testFixtures/workspaceFolder/java17-gradle/HelloWorldFunction/src/test/java/helloworld/AppTest.java
similarity index 100%
rename from src/testFixtures/workspaceFolder/java17-gradle/HelloWorldFunction/src/test/java/helloworld/AppTest.java
rename to packages/toolkit/src/testFixtures/workspaceFolder/java17-gradle/HelloWorldFunction/src/test/java/helloworld/AppTest.java
diff --git a/src/testFixtures/workspaceFolder/java17-gradle/events/event.json b/packages/toolkit/src/testFixtures/workspaceFolder/java17-gradle/events/event.json
similarity index 100%
rename from src/testFixtures/workspaceFolder/java17-gradle/events/event.json
rename to packages/toolkit/src/testFixtures/workspaceFolder/java17-gradle/events/event.json
diff --git a/src/testFixtures/workspaceFolder/java17-gradle/template.yaml b/packages/toolkit/src/testFixtures/workspaceFolder/java17-gradle/template.yaml
similarity index 100%
rename from src/testFixtures/workspaceFolder/java17-gradle/template.yaml
rename to packages/toolkit/src/testFixtures/workspaceFolder/java17-gradle/template.yaml
diff --git a/src/testFixtures/workspaceFolder/java17-image/HelloWorldFunction/Dockerfile b/packages/toolkit/src/testFixtures/workspaceFolder/java17-image/HelloWorldFunction/Dockerfile
similarity index 100%
rename from src/testFixtures/workspaceFolder/java17-image/HelloWorldFunction/Dockerfile
rename to packages/toolkit/src/testFixtures/workspaceFolder/java17-image/HelloWorldFunction/Dockerfile
diff --git a/src/testFixtures/workspaceFolder/java17-image/HelloWorldFunction/build.gradle b/packages/toolkit/src/testFixtures/workspaceFolder/java17-image/HelloWorldFunction/build.gradle
similarity index 100%
rename from src/testFixtures/workspaceFolder/java17-image/HelloWorldFunction/build.gradle
rename to packages/toolkit/src/testFixtures/workspaceFolder/java17-image/HelloWorldFunction/build.gradle
diff --git a/src/testFixtures/workspaceFolder/java17-image/HelloWorldFunction/gradle/lambda-build-init.gradle b/packages/toolkit/src/testFixtures/workspaceFolder/java17-image/HelloWorldFunction/gradle/lambda-build-init.gradle
similarity index 100%
rename from src/testFixtures/workspaceFolder/java17-image/HelloWorldFunction/gradle/lambda-build-init.gradle
rename to packages/toolkit/src/testFixtures/workspaceFolder/java17-image/HelloWorldFunction/gradle/lambda-build-init.gradle
diff --git a/src/testFixtures/workspaceFolder/java17-image/HelloWorldFunction/gradle/wrapper/gradle-wrapper.properties b/packages/toolkit/src/testFixtures/workspaceFolder/java17-image/HelloWorldFunction/gradle/wrapper/gradle-wrapper.properties
similarity index 100%
rename from src/testFixtures/workspaceFolder/java17-image/HelloWorldFunction/gradle/wrapper/gradle-wrapper.properties
rename to packages/toolkit/src/testFixtures/workspaceFolder/java17-image/HelloWorldFunction/gradle/wrapper/gradle-wrapper.properties
diff --git a/src/testFixtures/workspaceFolder/java17-image/HelloWorldFunction/gradlew b/packages/toolkit/src/testFixtures/workspaceFolder/java17-image/HelloWorldFunction/gradlew
similarity index 100%
rename from src/testFixtures/workspaceFolder/java17-image/HelloWorldFunction/gradlew
rename to packages/toolkit/src/testFixtures/workspaceFolder/java17-image/HelloWorldFunction/gradlew
diff --git a/src/testFixtures/workspaceFolder/java17-image/HelloWorldFunction/src/main/java/helloworld/App.java b/packages/toolkit/src/testFixtures/workspaceFolder/java17-image/HelloWorldFunction/src/main/java/helloworld/App.java
similarity index 100%
rename from src/testFixtures/workspaceFolder/java17-image/HelloWorldFunction/src/main/java/helloworld/App.java
rename to packages/toolkit/src/testFixtures/workspaceFolder/java17-image/HelloWorldFunction/src/main/java/helloworld/App.java
diff --git a/src/testFixtures/workspaceFolder/java17-image/HelloWorldFunction/src/test/java/helloworld/AppTest.java b/packages/toolkit/src/testFixtures/workspaceFolder/java17-image/HelloWorldFunction/src/test/java/helloworld/AppTest.java
similarity index 100%
rename from src/testFixtures/workspaceFolder/java17-image/HelloWorldFunction/src/test/java/helloworld/AppTest.java
rename to packages/toolkit/src/testFixtures/workspaceFolder/java17-image/HelloWorldFunction/src/test/java/helloworld/AppTest.java
diff --git a/src/testFixtures/workspaceFolder/java17-image/events/event.json b/packages/toolkit/src/testFixtures/workspaceFolder/java17-image/events/event.json
similarity index 100%
rename from src/testFixtures/workspaceFolder/java17-image/events/event.json
rename to packages/toolkit/src/testFixtures/workspaceFolder/java17-image/events/event.json
diff --git a/src/testFixtures/workspaceFolder/java17-image/template.yaml b/packages/toolkit/src/testFixtures/workspaceFolder/java17-image/template.yaml
similarity index 100%
rename from src/testFixtures/workspaceFolder/java17-image/template.yaml
rename to packages/toolkit/src/testFixtures/workspaceFolder/java17-image/template.yaml
diff --git a/src/testFixtures/workspaceFolder/java17-maven/HelloWorldFunction/pom.xml b/packages/toolkit/src/testFixtures/workspaceFolder/java17-maven/HelloWorldFunction/pom.xml
similarity index 100%
rename from src/testFixtures/workspaceFolder/java17-maven/HelloWorldFunction/pom.xml
rename to packages/toolkit/src/testFixtures/workspaceFolder/java17-maven/HelloWorldFunction/pom.xml
diff --git a/src/testFixtures/workspaceFolder/java17-maven/HelloWorldFunction/src/main/java/helloworld/App.java b/packages/toolkit/src/testFixtures/workspaceFolder/java17-maven/HelloWorldFunction/src/main/java/helloworld/App.java
similarity index 100%
rename from src/testFixtures/workspaceFolder/java17-maven/HelloWorldFunction/src/main/java/helloworld/App.java
rename to packages/toolkit/src/testFixtures/workspaceFolder/java17-maven/HelloWorldFunction/src/main/java/helloworld/App.java
diff --git a/src/testFixtures/workspaceFolder/java17-maven/HelloWorldFunction/src/test/java/helloworld/AppTest.java b/packages/toolkit/src/testFixtures/workspaceFolder/java17-maven/HelloWorldFunction/src/test/java/helloworld/AppTest.java
similarity index 100%
rename from src/testFixtures/workspaceFolder/java17-maven/HelloWorldFunction/src/test/java/helloworld/AppTest.java
rename to packages/toolkit/src/testFixtures/workspaceFolder/java17-maven/HelloWorldFunction/src/test/java/helloworld/AppTest.java
diff --git a/src/testFixtures/workspaceFolder/java17-maven/events/event.json b/packages/toolkit/src/testFixtures/workspaceFolder/java17-maven/events/event.json
similarity index 100%
rename from src/testFixtures/workspaceFolder/java17-maven/events/event.json
rename to packages/toolkit/src/testFixtures/workspaceFolder/java17-maven/events/event.json
diff --git a/src/testFixtures/workspaceFolder/java17-maven/template.yaml b/packages/toolkit/src/testFixtures/workspaceFolder/java17-maven/template.yaml
similarity index 100%
rename from src/testFixtures/workspaceFolder/java17-maven/template.yaml
rename to packages/toolkit/src/testFixtures/workspaceFolder/java17-maven/template.yaml
diff --git a/src/testFixtures/workspaceFolder/js-image-sam-app/hello-world/.npmignore b/packages/toolkit/src/testFixtures/workspaceFolder/js-image-sam-app/hello-world/.npmignore
similarity index 100%
rename from src/testFixtures/workspaceFolder/js-image-sam-app/hello-world/.npmignore
rename to packages/toolkit/src/testFixtures/workspaceFolder/js-image-sam-app/hello-world/.npmignore
diff --git a/src/testFixtures/workspaceFolder/js-image-sam-app/hello-world/Dockerfile b/packages/toolkit/src/testFixtures/workspaceFolder/js-image-sam-app/hello-world/Dockerfile
similarity index 100%
rename from src/testFixtures/workspaceFolder/js-image-sam-app/hello-world/Dockerfile
rename to packages/toolkit/src/testFixtures/workspaceFolder/js-image-sam-app/hello-world/Dockerfile
diff --git a/src/testFixtures/workspaceFolder/js-image-sam-app/hello-world/app.js b/packages/toolkit/src/testFixtures/workspaceFolder/js-image-sam-app/hello-world/app.js
similarity index 100%
rename from src/testFixtures/workspaceFolder/js-image-sam-app/hello-world/app.js
rename to packages/toolkit/src/testFixtures/workspaceFolder/js-image-sam-app/hello-world/app.js
diff --git a/src/testFixtures/workspaceFolder/js-image-sam-app/hello-world/package.json b/packages/toolkit/src/testFixtures/workspaceFolder/js-image-sam-app/hello-world/package.json
similarity index 100%
rename from src/testFixtures/workspaceFolder/js-image-sam-app/hello-world/package.json
rename to packages/toolkit/src/testFixtures/workspaceFolder/js-image-sam-app/hello-world/package.json
diff --git a/src/testFixtures/workspaceFolder/js-image-sam-app/template.yaml b/packages/toolkit/src/testFixtures/workspaceFolder/js-image-sam-app/template.yaml
similarity index 100%
rename from src/testFixtures/workspaceFolder/js-image-sam-app/template.yaml
rename to packages/toolkit/src/testFixtures/workspaceFolder/js-image-sam-app/template.yaml
diff --git a/src/testFixtures/workspaceFolder/js-manifest-in-root/package.json b/packages/toolkit/src/testFixtures/workspaceFolder/js-manifest-in-root/package.json
similarity index 100%
rename from src/testFixtures/workspaceFolder/js-manifest-in-root/package.json
rename to packages/toolkit/src/testFixtures/workspaceFolder/js-manifest-in-root/package.json
diff --git a/src/testFixtures/workspaceFolder/js-manifest-in-root/src/subfolder/app.js b/packages/toolkit/src/testFixtures/workspaceFolder/js-manifest-in-root/src/subfolder/app.js
similarity index 100%
rename from src/testFixtures/workspaceFolder/js-manifest-in-root/src/subfolder/app.js
rename to packages/toolkit/src/testFixtures/workspaceFolder/js-manifest-in-root/src/subfolder/app.js
diff --git a/src/testFixtures/workspaceFolder/js-manifest-in-root/template.yaml b/packages/toolkit/src/testFixtures/workspaceFolder/js-manifest-in-root/template.yaml
similarity index 100%
rename from src/testFixtures/workspaceFolder/js-manifest-in-root/template.yaml
rename to packages/toolkit/src/testFixtures/workspaceFolder/js-manifest-in-root/template.yaml
diff --git a/src/testFixtures/workspaceFolder/js-manifest-in-subfolder/src/package.json b/packages/toolkit/src/testFixtures/workspaceFolder/js-manifest-in-subfolder/src/package.json
similarity index 100%
rename from src/testFixtures/workspaceFolder/js-manifest-in-subfolder/src/package.json
rename to packages/toolkit/src/testFixtures/workspaceFolder/js-manifest-in-subfolder/src/package.json
diff --git a/src/testFixtures/workspaceFolder/js-manifest-in-subfolder/src/subfolder/app.js b/packages/toolkit/src/testFixtures/workspaceFolder/js-manifest-in-subfolder/src/subfolder/app.js
similarity index 100%
rename from src/testFixtures/workspaceFolder/js-manifest-in-subfolder/src/subfolder/app.js
rename to packages/toolkit/src/testFixtures/workspaceFolder/js-manifest-in-subfolder/src/subfolder/app.js
diff --git a/src/testFixtures/workspaceFolder/js-manifest-in-subfolder/template.yaml b/packages/toolkit/src/testFixtures/workspaceFolder/js-manifest-in-subfolder/template.yaml
similarity index 100%
rename from src/testFixtures/workspaceFolder/js-manifest-in-subfolder/template.yaml
rename to packages/toolkit/src/testFixtures/workspaceFolder/js-manifest-in-subfolder/template.yaml
diff --git a/src/testFixtures/workspaceFolder/js-plain-sam-app/src/app.js b/packages/toolkit/src/testFixtures/workspaceFolder/js-plain-sam-app/src/app.js
similarity index 100%
rename from src/testFixtures/workspaceFolder/js-plain-sam-app/src/app.js
rename to packages/toolkit/src/testFixtures/workspaceFolder/js-plain-sam-app/src/app.js
diff --git a/src/testFixtures/workspaceFolder/js-plain-sam-app/src/package.json b/packages/toolkit/src/testFixtures/workspaceFolder/js-plain-sam-app/src/package.json
similarity index 100%
rename from src/testFixtures/workspaceFolder/js-plain-sam-app/src/package.json
rename to packages/toolkit/src/testFixtures/workspaceFolder/js-plain-sam-app/src/package.json
diff --git a/src/testFixtures/workspaceFolder/js-plain-sam-app/template.yaml b/packages/toolkit/src/testFixtures/workspaceFolder/js-plain-sam-app/template.yaml
similarity index 100%
rename from src/testFixtures/workspaceFolder/js-plain-sam-app/template.yaml
rename to packages/toolkit/src/testFixtures/workspaceFolder/js-plain-sam-app/template.yaml
diff --git a/src/testFixtures/workspaceFolder/python3.7-image-sam-app/hello_world/Dockerfile b/packages/toolkit/src/testFixtures/workspaceFolder/python3.7-image-sam-app/hello_world/Dockerfile
similarity index 100%
rename from src/testFixtures/workspaceFolder/python3.7-image-sam-app/hello_world/Dockerfile
rename to packages/toolkit/src/testFixtures/workspaceFolder/python3.7-image-sam-app/hello_world/Dockerfile
diff --git a/src/testFixtures/workspaceFolder/python3.7-image-sam-app/hello_world/__init__.py b/packages/toolkit/src/testFixtures/workspaceFolder/python3.7-image-sam-app/hello_world/__init__.py
similarity index 100%
rename from src/testFixtures/workspaceFolder/python3.7-image-sam-app/hello_world/__init__.py
rename to packages/toolkit/src/testFixtures/workspaceFolder/python3.7-image-sam-app/hello_world/__init__.py
diff --git a/src/testFixtures/workspaceFolder/python3.7-image-sam-app/hello_world/app.py b/packages/toolkit/src/testFixtures/workspaceFolder/python3.7-image-sam-app/hello_world/app.py
similarity index 100%
rename from src/testFixtures/workspaceFolder/python3.7-image-sam-app/hello_world/app.py
rename to packages/toolkit/src/testFixtures/workspaceFolder/python3.7-image-sam-app/hello_world/app.py
diff --git a/src/testFixtures/workspaceFolder/python3.7-image-sam-app/hello_world/requirements.txt b/packages/toolkit/src/testFixtures/workspaceFolder/python3.7-image-sam-app/hello_world/requirements.txt
similarity index 100%
rename from src/testFixtures/workspaceFolder/python3.7-image-sam-app/hello_world/requirements.txt
rename to packages/toolkit/src/testFixtures/workspaceFolder/python3.7-image-sam-app/hello_world/requirements.txt
diff --git a/src/testFixtures/workspaceFolder/python3.7-image-sam-app/template.yaml b/packages/toolkit/src/testFixtures/workspaceFolder/python3.7-image-sam-app/template.yaml
similarity index 100%
rename from src/testFixtures/workspaceFolder/python3.7-image-sam-app/template.yaml
rename to packages/toolkit/src/testFixtures/workspaceFolder/python3.7-image-sam-app/template.yaml
diff --git a/src/testFixtures/workspaceFolder/python3.7-plain-sam-app/events/event.json b/packages/toolkit/src/testFixtures/workspaceFolder/python3.7-plain-sam-app/events/event.json
similarity index 100%
rename from src/testFixtures/workspaceFolder/python3.7-plain-sam-app/events/event.json
rename to packages/toolkit/src/testFixtures/workspaceFolder/python3.7-plain-sam-app/events/event.json
diff --git a/src/testFixtures/workspaceFolder/python3.7-plain-sam-app/hello_world/__init__.py b/packages/toolkit/src/testFixtures/workspaceFolder/python3.7-plain-sam-app/hello_world/__init__.py
similarity index 100%
rename from src/testFixtures/workspaceFolder/python3.7-plain-sam-app/hello_world/__init__.py
rename to packages/toolkit/src/testFixtures/workspaceFolder/python3.7-plain-sam-app/hello_world/__init__.py
diff --git a/src/testFixtures/workspaceFolder/python3.7-plain-sam-app/hello_world/app.py b/packages/toolkit/src/testFixtures/workspaceFolder/python3.7-plain-sam-app/hello_world/app.py
similarity index 100%
rename from src/testFixtures/workspaceFolder/python3.7-plain-sam-app/hello_world/app.py
rename to packages/toolkit/src/testFixtures/workspaceFolder/python3.7-plain-sam-app/hello_world/app.py
diff --git a/src/testFixtures/workspaceFolder/python3.7-plain-sam-app/hello_world/requirements.txt b/packages/toolkit/src/testFixtures/workspaceFolder/python3.7-plain-sam-app/hello_world/requirements.txt
similarity index 100%
rename from src/testFixtures/workspaceFolder/python3.7-plain-sam-app/hello_world/requirements.txt
rename to packages/toolkit/src/testFixtures/workspaceFolder/python3.7-plain-sam-app/hello_world/requirements.txt
diff --git a/src/testFixtures/workspaceFolder/python3.7-plain-sam-app/template.yaml b/packages/toolkit/src/testFixtures/workspaceFolder/python3.7-plain-sam-app/template.yaml
similarity index 100%
rename from src/testFixtures/workspaceFolder/python3.7-plain-sam-app/template.yaml
rename to packages/toolkit/src/testFixtures/workspaceFolder/python3.7-plain-sam-app/template.yaml
diff --git a/src/testFixtures/workspaceFolder/python3.7-plain-sam-app/tests/unit/__init__.py b/packages/toolkit/src/testFixtures/workspaceFolder/python3.7-plain-sam-app/tests/unit/__init__.py
similarity index 100%
rename from src/testFixtures/workspaceFolder/python3.7-plain-sam-app/tests/unit/__init__.py
rename to packages/toolkit/src/testFixtures/workspaceFolder/python3.7-plain-sam-app/tests/unit/__init__.py
diff --git a/src/testFixtures/workspaceFolder/python3.7-plain-sam-app/tests/unit/test_handler.py b/packages/toolkit/src/testFixtures/workspaceFolder/python3.7-plain-sam-app/tests/unit/test_handler.py
similarity index 100%
rename from src/testFixtures/workspaceFolder/python3.7-plain-sam-app/tests/unit/test_handler.py
rename to packages/toolkit/src/testFixtures/workspaceFolder/python3.7-plain-sam-app/tests/unit/test_handler.py
diff --git a/src/testFixtures/workspaceFolder/ruby-plain-sam-app/src/app.rb b/packages/toolkit/src/testFixtures/workspaceFolder/ruby-plain-sam-app/src/app.rb
similarity index 100%
rename from src/testFixtures/workspaceFolder/ruby-plain-sam-app/src/app.rb
rename to packages/toolkit/src/testFixtures/workspaceFolder/ruby-plain-sam-app/src/app.rb
diff --git a/src/testFixtures/workspaceFolder/ruby-plain-sam-app/template.yaml b/packages/toolkit/src/testFixtures/workspaceFolder/ruby-plain-sam-app/template.yaml
similarity index 100%
rename from src/testFixtures/workspaceFolder/ruby-plain-sam-app/template.yaml
rename to packages/toolkit/src/testFixtures/workspaceFolder/ruby-plain-sam-app/template.yaml
diff --git a/src/testFixtures/workspaceFolder/terraform-plain-sam-app/src/app.hcl b/packages/toolkit/src/testFixtures/workspaceFolder/terraform-plain-sam-app/src/app.hcl
similarity index 100%
rename from src/testFixtures/workspaceFolder/terraform-plain-sam-app/src/app.hcl
rename to packages/toolkit/src/testFixtures/workspaceFolder/terraform-plain-sam-app/src/app.hcl
diff --git a/src/testFixtures/workspaceFolder/terraform-plain-sam-app/src/app.tf b/packages/toolkit/src/testFixtures/workspaceFolder/terraform-plain-sam-app/src/app.tf
similarity index 100%
rename from src/testFixtures/workspaceFolder/terraform-plain-sam-app/src/app.tf
rename to packages/toolkit/src/testFixtures/workspaceFolder/terraform-plain-sam-app/src/app.tf
diff --git a/src/testFixtures/workspaceFolder/terraform-plain-sam-app/template.yaml b/packages/toolkit/src/testFixtures/workspaceFolder/terraform-plain-sam-app/template.yaml
similarity index 100%
rename from src/testFixtures/workspaceFolder/terraform-plain-sam-app/template.yaml
rename to packages/toolkit/src/testFixtures/workspaceFolder/terraform-plain-sam-app/template.yaml
diff --git a/src/testFixtures/workspaceFolder/ts-plain-sam-app/package.json b/packages/toolkit/src/testFixtures/workspaceFolder/ts-plain-sam-app/package.json
similarity index 100%
rename from src/testFixtures/workspaceFolder/ts-plain-sam-app/package.json
rename to packages/toolkit/src/testFixtures/workspaceFolder/ts-plain-sam-app/package.json
diff --git a/src/testFixtures/workspaceFolder/ts-plain-sam-app/src/app.ts b/packages/toolkit/src/testFixtures/workspaceFolder/ts-plain-sam-app/src/app.ts
similarity index 100%
rename from src/testFixtures/workspaceFolder/ts-plain-sam-app/src/app.ts
rename to packages/toolkit/src/testFixtures/workspaceFolder/ts-plain-sam-app/src/app.ts
diff --git a/src/testFixtures/workspaceFolder/ts-plain-sam-app/template.yaml b/packages/toolkit/src/testFixtures/workspaceFolder/ts-plain-sam-app/template.yaml
similarity index 100%
rename from src/testFixtures/workspaceFolder/ts-plain-sam-app/template.yaml
rename to packages/toolkit/src/testFixtures/workspaceFolder/ts-plain-sam-app/template.yaml
diff --git a/src/testFixtures/workspaceFolder/ts-plain-sam-app/tsconfig.json b/packages/toolkit/src/testFixtures/workspaceFolder/ts-plain-sam-app/tsconfig.json
similarity index 100%
rename from src/testFixtures/workspaceFolder/ts-plain-sam-app/tsconfig.json
rename to packages/toolkit/src/testFixtures/workspaceFolder/ts-plain-sam-app/tsconfig.json
diff --git a/src/testInteg/cloudformation/templateRegistry.test.ts b/packages/toolkit/src/testInteg/cloudformation/templateRegistry.test.ts
similarity index 100%
rename from src/testInteg/cloudformation/templateRegistry.test.ts
rename to packages/toolkit/src/testInteg/cloudformation/templateRegistry.test.ts
diff --git a/src/testInteg/codecatalyst/devEnv.test.ts b/packages/toolkit/src/testInteg/codecatalyst/devEnv.test.ts
similarity index 100%
rename from src/testInteg/codecatalyst/devEnv.test.ts
rename to packages/toolkit/src/testInteg/codecatalyst/devEnv.test.ts
diff --git a/src/testInteg/codelens.js.test.ts b/packages/toolkit/src/testInteg/codelens.js.test.ts
similarity index 100%
rename from src/testInteg/codelens.js.test.ts
rename to packages/toolkit/src/testInteg/codelens.js.test.ts
diff --git a/src/testInteg/common/request.ts b/packages/toolkit/src/testInteg/common/request.ts
similarity index 100%
rename from src/testInteg/common/request.ts
rename to packages/toolkit/src/testInteg/common/request.ts
diff --git a/src/testInteg/globalSetup.test.ts b/packages/toolkit/src/testInteg/globalSetup.test.ts
similarity index 100%
rename from src/testInteg/globalSetup.test.ts
rename to packages/toolkit/src/testInteg/globalSetup.test.ts
diff --git a/src/testInteg/index.ts b/packages/toolkit/src/testInteg/index.ts
similarity index 100%
rename from src/testInteg/index.ts
rename to packages/toolkit/src/testInteg/index.ts
diff --git a/src/testInteg/integrationTestsUtilities.ts b/packages/toolkit/src/testInteg/integrationTestsUtilities.ts
similarity index 100%
rename from src/testInteg/integrationTestsUtilities.ts
rename to packages/toolkit/src/testInteg/integrationTestsUtilities.ts
diff --git a/src/testInteg/sam.test.ts b/packages/toolkit/src/testInteg/sam.test.ts
similarity index 100%
rename from src/testInteg/sam.test.ts
rename to packages/toolkit/src/testInteg/sam.test.ts
diff --git a/src/testInteg/schema/schema.test.ts b/packages/toolkit/src/testInteg/schema/schema.test.ts
similarity index 100%
rename from src/testInteg/schema/schema.test.ts
rename to packages/toolkit/src/testInteg/schema/schema.test.ts
diff --git a/src/testInteg/shared/codelens/samTemplateCodeLensProvider.test.ts b/packages/toolkit/src/testInteg/shared/codelens/samTemplateCodeLensProvider.test.ts
similarity index 100%
rename from src/testInteg/shared/codelens/samTemplateCodeLensProvider.test.ts
rename to packages/toolkit/src/testInteg/shared/codelens/samTemplateCodeLensProvider.test.ts
diff --git a/src/testInteg/shared/extensions/git.test.ts b/packages/toolkit/src/testInteg/shared/extensions/git.test.ts
similarity index 100%
rename from src/testInteg/shared/extensions/git.test.ts
rename to packages/toolkit/src/testInteg/shared/extensions/git.test.ts
diff --git a/src/testInteg/shared/utilities/workspaceUtils.test.ts b/packages/toolkit/src/testInteg/shared/utilities/workspaceUtils.test.ts
similarity index 100%
rename from src/testInteg/shared/utilities/workspaceUtils.test.ts
rename to packages/toolkit/src/testInteg/shared/utilities/workspaceUtils.test.ts
diff --git a/src/testInteg/stepFunctions/visualizeStateMachine.test.ts b/packages/toolkit/src/testInteg/stepFunctions/visualizeStateMachine.test.ts
similarity index 100%
rename from src/testInteg/stepFunctions/visualizeStateMachine.test.ts
rename to packages/toolkit/src/testInteg/stepFunctions/visualizeStateMachine.test.ts
diff --git a/src/testLint/README.md b/packages/toolkit/src/testLint/README.md
similarity index 100%
rename from src/testLint/README.md
rename to packages/toolkit/src/testLint/README.md
diff --git a/packages/toolkit/src/testLint/eslint.test.ts b/packages/toolkit/src/testLint/eslint.test.ts
new file mode 100644
index 00000000000..ce4b8f0a37f
--- /dev/null
+++ b/packages/toolkit/src/testLint/eslint.test.ts
@@ -0,0 +1,30 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import assert from 'assert'
+import { runCmd } from './testUtils'
+
+describe('eslint', function () {
+    this.timeout(180_000)
+
+    it('passes eslint', function () {
+        const result = runCmd(
+            [
+                '../../node_modules/.bin/eslint',
+                '-c',
+                '../../.eslintrc.js',
+                '--ignore-path',
+                '../../.eslintignore',
+                '--ext',
+                '.ts',
+                '.',
+            ],
+            {
+                throws: false,
+            }
+        )
+        assert.strictEqual(result.status, 0, result.stdout.toString())
+    })
+})
diff --git a/src/testLint/gitSecrets.test.ts b/packages/toolkit/src/testLint/gitSecrets.test.ts
similarity index 100%
rename from src/testLint/gitSecrets.test.ts
rename to packages/toolkit/src/testLint/gitSecrets.test.ts
diff --git a/src/testLint/testUtils.ts b/packages/toolkit/src/testLint/testUtils.ts
similarity index 100%
rename from src/testLint/testUtils.ts
rename to packages/toolkit/src/testLint/testUtils.ts
diff --git a/src/webviews/client.ts b/packages/toolkit/src/webviews/client.ts
similarity index 100%
rename from src/webviews/client.ts
rename to packages/toolkit/src/webviews/client.ts
diff --git a/src/webviews/components/settingsPanel.vue b/packages/toolkit/src/webviews/components/settingsPanel.vue
similarity index 100%
rename from src/webviews/components/settingsPanel.vue
rename to packages/toolkit/src/webviews/components/settingsPanel.vue
diff --git a/src/webviews/components/validatedInput.vue b/packages/toolkit/src/webviews/components/validatedInput.vue
similarity index 100%
rename from src/webviews/components/validatedInput.vue
rename to packages/toolkit/src/webviews/components/validatedInput.vue
diff --git a/src/webviews/main.ts b/packages/toolkit/src/webviews/main.ts
similarity index 100%
rename from src/webviews/main.ts
rename to packages/toolkit/src/webviews/main.ts
diff --git a/src/webviews/mixins/saveData.ts b/packages/toolkit/src/webviews/mixins/saveData.ts
similarity index 100%
rename from src/webviews/mixins/saveData.ts
rename to packages/toolkit/src/webviews/mixins/saveData.ts
diff --git a/src/webviews/server.ts b/packages/toolkit/src/webviews/server.ts
similarity index 100%
rename from src/webviews/server.ts
rename to packages/toolkit/src/webviews/server.ts
diff --git a/src/webviews/types.ts b/packages/toolkit/src/webviews/types.ts
similarity index 100%
rename from src/webviews/types.ts
rename to packages/toolkit/src/webviews/types.ts
diff --git a/src/webviews/util.ts b/packages/toolkit/src/webviews/util.ts
similarity index 100%
rename from src/webviews/util.ts
rename to packages/toolkit/src/webviews/util.ts
diff --git a/syntaxes/ASL.tmLanguage b/packages/toolkit/syntaxes/ASL.tmLanguage
similarity index 100%
rename from syntaxes/ASL.tmLanguage
rename to packages/toolkit/syntaxes/ASL.tmLanguage
diff --git a/syntaxes/SSMJSON.tmLanguage b/packages/toolkit/syntaxes/SSMJSON.tmLanguage
similarity index 100%
rename from syntaxes/SSMJSON.tmLanguage
rename to packages/toolkit/syntaxes/SSMJSON.tmLanguage
diff --git a/syntaxes/SSMYAML.tmLanguage b/packages/toolkit/syntaxes/SSMYAML.tmLanguage
similarity index 100%
rename from syntaxes/SSMYAML.tmLanguage
rename to packages/toolkit/syntaxes/SSMYAML.tmLanguage
diff --git a/syntaxes/asl-yaml.tmLanguage.json b/packages/toolkit/syntaxes/asl-yaml.tmLanguage.json
similarity index 100%
rename from syntaxes/asl-yaml.tmLanguage.json
rename to packages/toolkit/syntaxes/asl-yaml.tmLanguage.json
diff --git a/templates/CatchFailure.asl.json b/packages/toolkit/templates/CatchFailure.asl.json
similarity index 100%
rename from templates/CatchFailure.asl.json
rename to packages/toolkit/templates/CatchFailure.asl.json
diff --git a/templates/ChoiceState.asl.json b/packages/toolkit/templates/ChoiceState.asl.json
similarity index 100%
rename from templates/ChoiceState.asl.json
rename to packages/toolkit/templates/ChoiceState.asl.json
diff --git a/templates/HelloWorld.asl.json b/packages/toolkit/templates/HelloWorld.asl.json
similarity index 100%
rename from templates/HelloWorld.asl.json
rename to packages/toolkit/templates/HelloWorld.asl.json
diff --git a/templates/HelloWorldPowershell.ssm.yaml b/packages/toolkit/templates/HelloWorldPowershell.ssm.yaml
similarity index 100%
rename from templates/HelloWorldPowershell.ssm.yaml
rename to packages/toolkit/templates/HelloWorldPowershell.ssm.yaml
diff --git a/templates/HelloWorldPython.ssm.yaml b/packages/toolkit/templates/HelloWorldPython.ssm.yaml
similarity index 100%
rename from templates/HelloWorldPython.ssm.yaml
rename to packages/toolkit/templates/HelloWorldPython.ssm.yaml
diff --git a/templates/MapState.asl.json b/packages/toolkit/templates/MapState.asl.json
similarity index 100%
rename from templates/MapState.asl.json
rename to packages/toolkit/templates/MapState.asl.json
diff --git a/templates/Parallel.asl.json b/packages/toolkit/templates/Parallel.asl.json
similarity index 100%
rename from templates/Parallel.asl.json
rename to packages/toolkit/templates/Parallel.asl.json
diff --git a/templates/RetryFailure.asl.json b/packages/toolkit/templates/RetryFailure.asl.json
similarity index 100%
rename from templates/RetryFailure.asl.json
rename to packages/toolkit/templates/RetryFailure.asl.json
diff --git a/templates/WaitState.asl.json b/packages/toolkit/templates/WaitState.asl.json
similarity index 100%
rename from templates/WaitState.asl.json
rename to packages/toolkit/templates/WaitState.asl.json
diff --git a/packages/toolkit/tsconfig.json b/packages/toolkit/tsconfig.json
new file mode 100644
index 00000000000..d5b53761c57
--- /dev/null
+++ b/packages/toolkit/tsconfig.json
@@ -0,0 +1,26 @@
+{
+    "compilerOptions": {
+        "baseUrl": ".",
+        "paths": {
+            "*": ["types/*"],
+            "@sinonjs/fake-timers": ["node_modules/@types/sinonjs__fake-timers"]
+        },
+        "incremental": true,
+        "module": "commonjs",
+        "target": "es2021",
+        "outDir": "dist",
+        "sourceMap": true,
+        "moduleResolution": "node",
+        "rootDir": ".",
+        "resolveJsonModule": true,
+        "strict": true,
+        "noUnusedLocals": true,
+        "noImplicitOverride": true,
+        "lib": ["dom", "es2021"],
+        "skipLibCheck": true,
+        "forceConsistentCasingInFileNames": true,
+        "jsx": "preserve",
+        "esModuleInterop": true
+    },
+    "exclude": ["node_modules", ".vscode-test", "src/testFixtures", "dist"]
+}
diff --git a/types/cloudformation-schema-js-yaml.d.ts b/packages/toolkit/types/cloudformation-schema-js-yaml.d.ts
similarity index 100%
rename from types/cloudformation-schema-js-yaml.d.ts
rename to packages/toolkit/types/cloudformation-schema-js-yaml.d.ts
diff --git a/types/git.d.ts b/packages/toolkit/types/git.d.ts
similarity index 100%
rename from types/git.d.ts
rename to packages/toolkit/types/git.d.ts
diff --git a/types/gitignore-parser.d.ts b/packages/toolkit/types/gitignore-parser.d.ts
similarity index 62%
rename from types/gitignore-parser.d.ts
rename to packages/toolkit/types/gitignore-parser.d.ts
index f98608d9811..de23302bd2f 100644
--- a/types/gitignore-parser.d.ts
+++ b/packages/toolkit/types/gitignore-parser.d.ts
@@ -1,3 +1,8 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
 declare module '@gerhobbelt/gitignore-parser' {
     export interface GitIgnoreAcceptor {
         accepts(filePath: string)
diff --git a/types/jsonSchemaService.d.ts b/packages/toolkit/types/jsonSchemaService.d.ts
similarity index 100%
rename from types/jsonSchemaService.d.ts
rename to packages/toolkit/types/jsonSchemaService.d.ts
diff --git a/types/vue-types.d.ts b/packages/toolkit/types/vue-types.d.ts
similarity index 100%
rename from types/vue-types.d.ts
rename to packages/toolkit/types/vue-types.d.ts
diff --git a/webpack.base.config.js b/packages/toolkit/webpack.base.config.js
similarity index 100%
rename from webpack.base.config.js
rename to packages/toolkit/webpack.base.config.js
diff --git a/webpack.browser.config.js b/packages/toolkit/webpack.browser.config.js
similarity index 100%
rename from webpack.browser.config.js
rename to packages/toolkit/webpack.browser.config.js
diff --git a/webpack.config.js b/packages/toolkit/webpack.config.js
similarity index 100%
rename from webpack.config.js
rename to packages/toolkit/webpack.config.js
diff --git a/webpack.vue.config.js b/packages/toolkit/webpack.vue.config.js
similarity index 100%
rename from webpack.vue.config.js
rename to packages/toolkit/webpack.vue.config.js
diff --git a/plugins/eslint-plugin-aws-toolkits/package.json b/plugins/eslint-plugin-aws-toolkits/package.json
index c0ac41916a9..b10e57b1c38 100644
--- a/plugins/eslint-plugin-aws-toolkits/package.json
+++ b/plugins/eslint-plugin-aws-toolkits/package.json
@@ -5,12 +5,11 @@
     "main": "dist/index.js",
     "scripts": {
         "build": "tsc",
-        "test": "npm run build && mocha dist/test --recursive"
+        "test": "npm run build && mocha dist/test --recursive",
+        "clean": "ts-node ../../scripts/clean.ts dist"
     },
     "devDependencies": {
-        "eslint": "^8.26.0",
-        "mocha": "^10.1.0",
-        "typescript": "^5.0.4"
+        "mocha": "^10.1.0"
     },
     "engines": {
         "npm": "^10.1.0"
diff --git a/scripts/clean.ts b/scripts/clean.ts
index ce90d1e704b..4076e6d6480 100644
--- a/scripts/clean.ts
+++ b/scripts/clean.ts
@@ -24,15 +24,19 @@ const unlink = util.promisify(fs.unlink)
 // to be run before `npm install`.
 async function rdelete(p: string) {
     const stats = await stat(p)
-    if (stats.isFile()) {
+    if (!stats.isFile() && !stats.isDirectory()) {
+        throw new Error(`Could not delete '${p}' because it is neither a file nor directory`)
+    }
+
+    try {
         await unlink(p)
-    } else if (stats.isDirectory()) {
+    } catch {
+        // Unlink should only fail if it is a non-empty directory that is NOT a symbolic link.
+        // stats.isSymoblicLink() does not seem to detect symbolic links to folders?
         const promises = (await readdir(p)).map(child => rdelete(path.join(p, child)))
 
         await Promise.all(promises)
         await rmdir(p)
-    } else {
-        throw new Error(`Could not delete '${p}' because it is neither a file nor directory`)
     }
 }
 
diff --git a/scripts/build/createRelease.ts b/scripts/createRelease.ts
similarity index 97%
rename from scripts/build/createRelease.ts
rename to scripts/createRelease.ts
index 4533b54ff5e..881a1924c19 100644
--- a/scripts/build/createRelease.ts
+++ b/scripts/createRelease.ts
@@ -10,7 +10,7 @@
 import * as child_process from 'child_process'
 import * as fs from 'fs-extra'
 import * as path from 'path'
-import { version } from '../../package.json'
+import { version } from '../packages/toolkit/package.json'
 
 const cwd = process.cwd()
 const changesDirectory = path.join(cwd, '.changes')
diff --git a/scripts/build/prepare.ts b/scripts/prepare.ts
similarity index 100%
rename from scripts/build/prepare.ts
rename to scripts/prepare.ts
diff --git a/src.gen/@amzn/codewhisperer-streaming/tsconfig.json b/src.gen/@amzn/codewhisperer-streaming/tsconfig.json
index 344909de212..781aec632e5 100644
--- a/src.gen/@amzn/codewhisperer-streaming/tsconfig.json
+++ b/src.gen/@amzn/codewhisperer-streaming/tsconfig.json
@@ -7,7 +7,8 @@
     "removeComments": true,
     "resolveJsonModule": true,
     "rootDir": "src",
-    "useUnknownInCatchVariables": false
+    "useUnknownInCatchVariables": false,
+    "composite": true
   },
-  "exclude": ["test/"]
+  "exclude": ["test/", "dist-*", "node_modules"]
 }
diff --git a/src/testLint/eslint.test.ts b/src/testLint/eslint.test.ts
deleted file mode 100644
index 027edeb8430..00000000000
--- a/src/testLint/eslint.test.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-/*!
- * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import assert from 'assert'
-import { runCmd } from './testUtils'
-
-describe('eslint', function () {
-    this.timeout(180_000)
-
-    it('passes eslint', function () {
-        const result = runCmd(['./node_modules/.bin/eslint', '-c', '.eslintrc.js', '--ext', '.ts', '.'], {
-            throws: false,
-        })
-        assert.strictEqual(result.status, 0, result.stdout.toString())
-    })
-})
diff --git a/tsconfig.json b/tsconfig.json
index 4fda37b4752..ff7aeb66afe 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -1,14 +1,7 @@
 {
     "compilerOptions": {
-        "baseUrl": ".",
-        "paths": {
-            "*": ["types/*"],
-            "@sinonjs/fake-timers": ["node_modules/@types/sinonjs__fake-timers"]
-        },
-        "incremental": true,
         "module": "commonjs",
         "target": "es2021",
-        "outDir": "dist",
         "sourceMap": true,
         "moduleResolution": "node",
         "rootDir": ".",
@@ -17,10 +10,20 @@
         "noUnusedLocals": true,
         "noImplicitOverride": true,
         "lib": ["dom", "es2021"],
-        "skipLibCheck": true,
         "forceConsistentCasingInFileNames": true,
         "jsx": "preserve",
-        "esModuleInterop": true
+        "esModuleInterop": true,
+        "composite": true,
+        "declaration": true,
+        "declarationMap": true,
+        "incremental": true,
+        "noEmitOnError": true,
+        "skipLibCheck": true
     },
-    "exclude": ["node_modules", ".vscode-test", "src/testFixtures", "dist", "src.gen"]
+    "files": [],
+    "references": [
+        {
+            "path": "./packages/toolkit"
+        }
+    ]
 }