diff --git a/.projenrc.ts b/.projenrc.ts
index d4a5a907d..9e3ef921d 100644
--- a/.projenrc.ts
+++ b/.projenrc.ts
@@ -908,7 +908,7 @@ const toolkitLib = configureProject(
       private: true,
     }),
     parent: repo,
-    name: '@aws-cdk/toolkit',
+    name: '@aws-cdk/toolkit-lib',
     description: 'AWS CDK Programmatic Toolkit Library',
     srcdir: 'lib',
     deps: [
diff --git a/aws-cdk-cli.code-workspace b/aws-cdk-cli.code-workspace
index 4fd4f941c..15ad8a738 100644
--- a/aws-cdk-cli.code-workspace
+++ b/aws-cdk-cli.code-workspace
@@ -27,7 +27,7 @@
       "path": "packages/@aws-cdk/node-bundle"
     },
     {
-      "path": "packages/@aws-cdk/toolkit"
+      "path": "packages/@aws-cdk/toolkit-lib"
     },
     {
       "path": "packages/@aws-cdk/user-input-gen"
diff --git a/package.json b/package.json
index 4da092471..edd9d3e9a 100644
--- a/package.json
+++ b/package.json
@@ -54,7 +54,7 @@
       "packages/cdk-assets",
       "packages/aws-cdk",
       "packages/@aws-cdk/cli-lib-alpha",
-      "packages/@aws-cdk/toolkit",
+      "packages/@aws-cdk/toolkit-lib",
       "packages/@aws-cdk/cdk-cli-wrapper",
       "packages/cdk"
     ],
@@ -77,7 +77,7 @@
       "<rootDir>/packages/cdk-assets",
       "<rootDir>/packages/aws-cdk",
       "<rootDir>/packages/@aws-cdk/cli-lib-alpha",
-      "<rootDir>/packages/@aws-cdk/toolkit",
+      "<rootDir>/packages/@aws-cdk/toolkit-lib",
       "<rootDir>/packages/@aws-cdk/cdk-cli-wrapper",
       "<rootDir>/packages/cdk"
     ]
diff --git a/packages/@aws-cdk/toolkit/.eslintrc.js b/packages/@aws-cdk/toolkit-lib/.eslintrc.js
similarity index 100%
rename from packages/@aws-cdk/toolkit/.eslintrc.js
rename to packages/@aws-cdk/toolkit-lib/.eslintrc.js
diff --git a/packages/@aws-cdk/toolkit/.eslintrc.json b/packages/@aws-cdk/toolkit-lib/.eslintrc.json
similarity index 100%
rename from packages/@aws-cdk/toolkit/.eslintrc.json
rename to packages/@aws-cdk/toolkit-lib/.eslintrc.json
diff --git a/packages/@aws-cdk/toolkit/.gitattributes b/packages/@aws-cdk/toolkit-lib/.gitattributes
similarity index 100%
rename from packages/@aws-cdk/toolkit/.gitattributes
rename to packages/@aws-cdk/toolkit-lib/.gitattributes
diff --git a/packages/@aws-cdk/toolkit/.gitignore b/packages/@aws-cdk/toolkit-lib/.gitignore
similarity index 100%
rename from packages/@aws-cdk/toolkit/.gitignore
rename to packages/@aws-cdk/toolkit-lib/.gitignore
diff --git a/packages/@aws-cdk/toolkit/.npmignore b/packages/@aws-cdk/toolkit-lib/.npmignore
similarity index 100%
rename from packages/@aws-cdk/toolkit/.npmignore
rename to packages/@aws-cdk/toolkit-lib/.npmignore
diff --git a/packages/@aws-cdk/toolkit/.prettierignore b/packages/@aws-cdk/toolkit-lib/.prettierignore
similarity index 100%
rename from packages/@aws-cdk/toolkit/.prettierignore
rename to packages/@aws-cdk/toolkit-lib/.prettierignore
diff --git a/packages/@aws-cdk/toolkit/.prettierrc.json b/packages/@aws-cdk/toolkit-lib/.prettierrc.json
similarity index 100%
rename from packages/@aws-cdk/toolkit/.prettierrc.json
rename to packages/@aws-cdk/toolkit-lib/.prettierrc.json
diff --git a/packages/@aws-cdk/toolkit/.projen/deps.json b/packages/@aws-cdk/toolkit-lib/.projen/deps.json
similarity index 100%
rename from packages/@aws-cdk/toolkit/.projen/deps.json
rename to packages/@aws-cdk/toolkit-lib/.projen/deps.json
diff --git a/packages/@aws-cdk/toolkit/.projen/files.json b/packages/@aws-cdk/toolkit-lib/.projen/files.json
similarity index 100%
rename from packages/@aws-cdk/toolkit/.projen/files.json
rename to packages/@aws-cdk/toolkit-lib/.projen/files.json
diff --git a/packages/@aws-cdk/toolkit/.projen/tasks.json b/packages/@aws-cdk/toolkit-lib/.projen/tasks.json
similarity index 96%
rename from packages/@aws-cdk/toolkit/.projen/tasks.json
rename to packages/@aws-cdk/toolkit-lib/.projen/tasks.json
index 847ab9468..fe4b09f6c 100644
--- a/packages/@aws-cdk/toolkit/.projen/tasks.json
+++ b/packages/@aws-cdk/toolkit-lib/.projen/tasks.json
@@ -85,7 +85,7 @@
       "name": "gather-versions",
       "steps": [
         {
-          "exec": "node -e \"require(path.join(path.dirname(require.resolve('cdklabs-projen-project-types')), 'yarn', 'gather-versions.exec.js'))\" @aws-cdk/toolkit MAJOR --deps @aws-cdk/cloud-assembly-schema @aws-cdk/cloudformation-diff @aws-cdk/cdk-build-tools cdk-assets aws-cdk",
+          "exec": "node -e \"require(path.join(path.dirname(require.resolve('cdklabs-projen-project-types')), 'yarn', 'gather-versions.exec.js'))\" @aws-cdk/toolkit-lib MAJOR --deps @aws-cdk/cloud-assembly-schema @aws-cdk/cloudformation-diff @aws-cdk/cdk-build-tools cdk-assets aws-cdk",
           "receiveArgs": true
         }
       ]
diff --git a/packages/@aws-cdk/toolkit/LICENSE b/packages/@aws-cdk/toolkit-lib/LICENSE
similarity index 100%
rename from packages/@aws-cdk/toolkit/LICENSE
rename to packages/@aws-cdk/toolkit-lib/LICENSE
diff --git a/packages/@aws-cdk/toolkit/NOTICE b/packages/@aws-cdk/toolkit-lib/NOTICE
similarity index 100%
rename from packages/@aws-cdk/toolkit/NOTICE
rename to packages/@aws-cdk/toolkit-lib/NOTICE
diff --git a/packages/@aws-cdk/toolkit-lib/README.md b/packages/@aws-cdk/toolkit-lib/README.md
new file mode 100644
index 000000000..59e62cc5a
--- /dev/null
+++ b/packages/@aws-cdk/toolkit-lib/README.md
@@ -0,0 +1,17 @@
+# AWS CDK Toolkit Library
+<!--BEGIN STABILITY BANNER-->
+
+---
+
+![@aws-cdk/toolkit-lib: Developer Preview](https://img.shields.io/badge/@aws--cdk/toolkit--lib-developer_preview-important.svg?style=for-the-badge)
+
+> The APIs in this module are experimental and under active development.
+> They are subject to non-backward compatible changes or removal in future versions.
+> The package follows the [Semantic Versioning](https://semver.org/) model for [major version zero](https://semver.org/#spec-item-4).
+> Accordingly, breaking changes will be introduced in minor versions and announced in the release notes.
+> This means that while you may use them, you may need to update
+> your source code when upgrading to a newer version of this package.
+
+---
+
+<!--END STABILITY BANNER-->
diff --git a/packages/@aws-cdk/toolkit/build-tools/bundle.mjs b/packages/@aws-cdk/toolkit-lib/build-tools/bundle.mjs
similarity index 100%
rename from packages/@aws-cdk/toolkit/build-tools/bundle.mjs
rename to packages/@aws-cdk/toolkit-lib/build-tools/bundle.mjs
diff --git a/packages/@aws-cdk/toolkit/build-tools/package.sh b/packages/@aws-cdk/toolkit-lib/build-tools/package.sh
similarity index 100%
rename from packages/@aws-cdk/toolkit/build-tools/package.sh
rename to packages/@aws-cdk/toolkit-lib/build-tools/package.sh
diff --git a/packages/@aws-cdk/toolkit/jest.config.json b/packages/@aws-cdk/toolkit-lib/jest.config.json
similarity index 100%
rename from packages/@aws-cdk/toolkit/jest.config.json
rename to packages/@aws-cdk/toolkit-lib/jest.config.json
diff --git a/packages/@aws-cdk/toolkit/lib/actions/deploy/index.ts b/packages/@aws-cdk/toolkit-lib/lib/actions/deploy/index.ts
similarity index 100%
rename from packages/@aws-cdk/toolkit/lib/actions/deploy/index.ts
rename to packages/@aws-cdk/toolkit-lib/lib/actions/deploy/index.ts
diff --git a/packages/@aws-cdk/toolkit/lib/actions/deploy/private/helpers.ts b/packages/@aws-cdk/toolkit-lib/lib/actions/deploy/private/helpers.ts
similarity index 100%
rename from packages/@aws-cdk/toolkit/lib/actions/deploy/private/helpers.ts
rename to packages/@aws-cdk/toolkit-lib/lib/actions/deploy/private/helpers.ts
diff --git a/packages/@aws-cdk/toolkit/lib/actions/deploy/private/index.ts b/packages/@aws-cdk/toolkit-lib/lib/actions/deploy/private/index.ts
similarity index 100%
rename from packages/@aws-cdk/toolkit/lib/actions/deploy/private/index.ts
rename to packages/@aws-cdk/toolkit-lib/lib/actions/deploy/private/index.ts
diff --git a/packages/@aws-cdk/toolkit/lib/actions/destroy/index.ts b/packages/@aws-cdk/toolkit-lib/lib/actions/destroy/index.ts
similarity index 100%
rename from packages/@aws-cdk/toolkit/lib/actions/destroy/index.ts
rename to packages/@aws-cdk/toolkit-lib/lib/actions/destroy/index.ts
diff --git a/packages/@aws-cdk/toolkit/lib/actions/diff/index.ts b/packages/@aws-cdk/toolkit-lib/lib/actions/diff/index.ts
similarity index 100%
rename from packages/@aws-cdk/toolkit/lib/actions/diff/index.ts
rename to packages/@aws-cdk/toolkit-lib/lib/actions/diff/index.ts
diff --git a/packages/@aws-cdk/toolkit/lib/actions/diff/private/helpers.ts b/packages/@aws-cdk/toolkit-lib/lib/actions/diff/private/helpers.ts
similarity index 100%
rename from packages/@aws-cdk/toolkit/lib/actions/diff/private/helpers.ts
rename to packages/@aws-cdk/toolkit-lib/lib/actions/diff/private/helpers.ts
diff --git a/packages/@aws-cdk/toolkit/lib/actions/diff/private/index.ts b/packages/@aws-cdk/toolkit-lib/lib/actions/diff/private/index.ts
similarity index 100%
rename from packages/@aws-cdk/toolkit/lib/actions/diff/private/index.ts
rename to packages/@aws-cdk/toolkit-lib/lib/actions/diff/private/index.ts
diff --git a/packages/@aws-cdk/toolkit/lib/actions/import/index.ts b/packages/@aws-cdk/toolkit-lib/lib/actions/import/index.ts
similarity index 100%
rename from packages/@aws-cdk/toolkit/lib/actions/import/index.ts
rename to packages/@aws-cdk/toolkit-lib/lib/actions/import/index.ts
diff --git a/packages/@aws-cdk/toolkit/lib/actions/index.ts b/packages/@aws-cdk/toolkit-lib/lib/actions/index.ts
similarity index 100%
rename from packages/@aws-cdk/toolkit/lib/actions/index.ts
rename to packages/@aws-cdk/toolkit-lib/lib/actions/index.ts
diff --git a/packages/@aws-cdk/toolkit/lib/actions/list/index.ts b/packages/@aws-cdk/toolkit-lib/lib/actions/list/index.ts
similarity index 100%
rename from packages/@aws-cdk/toolkit/lib/actions/list/index.ts
rename to packages/@aws-cdk/toolkit-lib/lib/actions/list/index.ts
diff --git a/packages/@aws-cdk/toolkit/lib/actions/rollback/index.ts b/packages/@aws-cdk/toolkit-lib/lib/actions/rollback/index.ts
similarity index 100%
rename from packages/@aws-cdk/toolkit/lib/actions/rollback/index.ts
rename to packages/@aws-cdk/toolkit-lib/lib/actions/rollback/index.ts
diff --git a/packages/@aws-cdk/toolkit/lib/actions/synth/index.ts b/packages/@aws-cdk/toolkit-lib/lib/actions/synth/index.ts
similarity index 100%
rename from packages/@aws-cdk/toolkit/lib/actions/synth/index.ts
rename to packages/@aws-cdk/toolkit-lib/lib/actions/synth/index.ts
diff --git a/packages/@aws-cdk/toolkit/lib/actions/watch/index.ts b/packages/@aws-cdk/toolkit-lib/lib/actions/watch/index.ts
similarity index 100%
rename from packages/@aws-cdk/toolkit/lib/actions/watch/index.ts
rename to packages/@aws-cdk/toolkit-lib/lib/actions/watch/index.ts
diff --git a/packages/@aws-cdk/toolkit/lib/api/aws-auth/index.ts b/packages/@aws-cdk/toolkit-lib/lib/api/aws-auth/index.ts
similarity index 100%
rename from packages/@aws-cdk/toolkit/lib/api/aws-auth/index.ts
rename to packages/@aws-cdk/toolkit-lib/lib/api/aws-auth/index.ts
diff --git a/packages/@aws-cdk/toolkit/lib/api/aws-auth/types.ts b/packages/@aws-cdk/toolkit-lib/lib/api/aws-auth/types.ts
similarity index 100%
rename from packages/@aws-cdk/toolkit/lib/api/aws-auth/types.ts
rename to packages/@aws-cdk/toolkit-lib/lib/api/aws-auth/types.ts
diff --git a/packages/@aws-cdk/toolkit/lib/api/aws-cdk.ts b/packages/@aws-cdk/toolkit-lib/lib/api/aws-cdk.ts
similarity index 100%
rename from packages/@aws-cdk/toolkit/lib/api/aws-cdk.ts
rename to packages/@aws-cdk/toolkit-lib/lib/api/aws-cdk.ts
diff --git a/packages/@aws-cdk/toolkit/lib/api/cloud-assembly/cached-source.ts b/packages/@aws-cdk/toolkit-lib/lib/api/cloud-assembly/cached-source.ts
similarity index 100%
rename from packages/@aws-cdk/toolkit/lib/api/cloud-assembly/cached-source.ts
rename to packages/@aws-cdk/toolkit-lib/lib/api/cloud-assembly/cached-source.ts
diff --git a/packages/@aws-cdk/toolkit/lib/api/cloud-assembly/identity-source.ts b/packages/@aws-cdk/toolkit-lib/lib/api/cloud-assembly/identity-source.ts
similarity index 100%
rename from packages/@aws-cdk/toolkit/lib/api/cloud-assembly/identity-source.ts
rename to packages/@aws-cdk/toolkit-lib/lib/api/cloud-assembly/identity-source.ts
diff --git a/packages/@aws-cdk/toolkit/lib/api/cloud-assembly/index.ts b/packages/@aws-cdk/toolkit-lib/lib/api/cloud-assembly/index.ts
similarity index 100%
rename from packages/@aws-cdk/toolkit/lib/api/cloud-assembly/index.ts
rename to packages/@aws-cdk/toolkit-lib/lib/api/cloud-assembly/index.ts
diff --git a/packages/@aws-cdk/toolkit/lib/api/cloud-assembly/private/context-aware-source.ts b/packages/@aws-cdk/toolkit-lib/lib/api/cloud-assembly/private/context-aware-source.ts
similarity index 100%
rename from packages/@aws-cdk/toolkit/lib/api/cloud-assembly/private/context-aware-source.ts
rename to packages/@aws-cdk/toolkit-lib/lib/api/cloud-assembly/private/context-aware-source.ts
diff --git a/packages/@aws-cdk/toolkit/lib/api/cloud-assembly/private/exec.ts b/packages/@aws-cdk/toolkit-lib/lib/api/cloud-assembly/private/exec.ts
similarity index 100%
rename from packages/@aws-cdk/toolkit/lib/api/cloud-assembly/private/exec.ts
rename to packages/@aws-cdk/toolkit-lib/lib/api/cloud-assembly/private/exec.ts
diff --git a/packages/@aws-cdk/toolkit/lib/api/cloud-assembly/private/index.ts b/packages/@aws-cdk/toolkit-lib/lib/api/cloud-assembly/private/index.ts
similarity index 100%
rename from packages/@aws-cdk/toolkit/lib/api/cloud-assembly/private/index.ts
rename to packages/@aws-cdk/toolkit-lib/lib/api/cloud-assembly/private/index.ts
diff --git a/packages/@aws-cdk/toolkit/lib/api/cloud-assembly/private/prepare-source.ts b/packages/@aws-cdk/toolkit-lib/lib/api/cloud-assembly/private/prepare-source.ts
similarity index 100%
rename from packages/@aws-cdk/toolkit/lib/api/cloud-assembly/private/prepare-source.ts
rename to packages/@aws-cdk/toolkit-lib/lib/api/cloud-assembly/private/prepare-source.ts
diff --git a/packages/@aws-cdk/toolkit/lib/api/cloud-assembly/private/source-builder.ts b/packages/@aws-cdk/toolkit-lib/lib/api/cloud-assembly/private/source-builder.ts
similarity index 100%
rename from packages/@aws-cdk/toolkit/lib/api/cloud-assembly/private/source-builder.ts
rename to packages/@aws-cdk/toolkit-lib/lib/api/cloud-assembly/private/source-builder.ts
diff --git a/packages/@aws-cdk/toolkit/lib/api/cloud-assembly/private/stack-selectors.ts b/packages/@aws-cdk/toolkit-lib/lib/api/cloud-assembly/private/stack-selectors.ts
similarity index 100%
rename from packages/@aws-cdk/toolkit/lib/api/cloud-assembly/private/stack-selectors.ts
rename to packages/@aws-cdk/toolkit-lib/lib/api/cloud-assembly/private/stack-selectors.ts
diff --git a/packages/@aws-cdk/toolkit/lib/api/cloud-assembly/source-builder.ts b/packages/@aws-cdk/toolkit-lib/lib/api/cloud-assembly/source-builder.ts
similarity index 100%
rename from packages/@aws-cdk/toolkit/lib/api/cloud-assembly/source-builder.ts
rename to packages/@aws-cdk/toolkit-lib/lib/api/cloud-assembly/source-builder.ts
diff --git a/packages/@aws-cdk/toolkit/lib/api/cloud-assembly/stack-assembly.ts b/packages/@aws-cdk/toolkit-lib/lib/api/cloud-assembly/stack-assembly.ts
similarity index 100%
rename from packages/@aws-cdk/toolkit/lib/api/cloud-assembly/stack-assembly.ts
rename to packages/@aws-cdk/toolkit-lib/lib/api/cloud-assembly/stack-assembly.ts
diff --git a/packages/@aws-cdk/toolkit/lib/api/cloud-assembly/stack-selector.ts b/packages/@aws-cdk/toolkit-lib/lib/api/cloud-assembly/stack-selector.ts
similarity index 100%
rename from packages/@aws-cdk/toolkit/lib/api/cloud-assembly/stack-selector.ts
rename to packages/@aws-cdk/toolkit-lib/lib/api/cloud-assembly/stack-selector.ts
diff --git a/packages/@aws-cdk/toolkit/lib/api/cloud-assembly/types.ts b/packages/@aws-cdk/toolkit-lib/lib/api/cloud-assembly/types.ts
similarity index 100%
rename from packages/@aws-cdk/toolkit/lib/api/cloud-assembly/types.ts
rename to packages/@aws-cdk/toolkit-lib/lib/api/cloud-assembly/types.ts
diff --git a/packages/@aws-cdk/toolkit/lib/api/errors.ts b/packages/@aws-cdk/toolkit-lib/lib/api/errors.ts
similarity index 100%
rename from packages/@aws-cdk/toolkit/lib/api/errors.ts
rename to packages/@aws-cdk/toolkit-lib/lib/api/errors.ts
diff --git a/packages/@aws-cdk/toolkit/lib/api/io/index.ts b/packages/@aws-cdk/toolkit-lib/lib/api/io/index.ts
similarity index 100%
rename from packages/@aws-cdk/toolkit/lib/api/io/index.ts
rename to packages/@aws-cdk/toolkit-lib/lib/api/io/index.ts
diff --git a/packages/@aws-cdk/toolkit/lib/api/io/io-host.ts b/packages/@aws-cdk/toolkit-lib/lib/api/io/io-host.ts
similarity index 100%
rename from packages/@aws-cdk/toolkit/lib/api/io/io-host.ts
rename to packages/@aws-cdk/toolkit-lib/lib/api/io/io-host.ts
diff --git a/packages/@aws-cdk/toolkit/lib/api/io/io-message.ts b/packages/@aws-cdk/toolkit-lib/lib/api/io/io-message.ts
similarity index 100%
rename from packages/@aws-cdk/toolkit/lib/api/io/io-message.ts
rename to packages/@aws-cdk/toolkit-lib/lib/api/io/io-message.ts
diff --git a/packages/@aws-cdk/toolkit/lib/api/io/private/codes.ts b/packages/@aws-cdk/toolkit-lib/lib/api/io/private/codes.ts
similarity index 100%
rename from packages/@aws-cdk/toolkit/lib/api/io/private/codes.ts
rename to packages/@aws-cdk/toolkit-lib/lib/api/io/private/codes.ts
diff --git a/packages/@aws-cdk/toolkit/lib/api/io/private/index.ts b/packages/@aws-cdk/toolkit-lib/lib/api/io/private/index.ts
similarity index 100%
rename from packages/@aws-cdk/toolkit/lib/api/io/private/index.ts
rename to packages/@aws-cdk/toolkit-lib/lib/api/io/private/index.ts
diff --git a/packages/@aws-cdk/toolkit/lib/api/io/private/logger.ts b/packages/@aws-cdk/toolkit-lib/lib/api/io/private/logger.ts
similarity index 100%
rename from packages/@aws-cdk/toolkit/lib/api/io/private/logger.ts
rename to packages/@aws-cdk/toolkit-lib/lib/api/io/private/logger.ts
diff --git a/packages/@aws-cdk/toolkit/lib/api/io/private/messages.ts b/packages/@aws-cdk/toolkit-lib/lib/api/io/private/messages.ts
similarity index 100%
rename from packages/@aws-cdk/toolkit/lib/api/io/private/messages.ts
rename to packages/@aws-cdk/toolkit-lib/lib/api/io/private/messages.ts
diff --git a/packages/@aws-cdk/toolkit/lib/api/io/private/timer.ts b/packages/@aws-cdk/toolkit-lib/lib/api/io/private/timer.ts
similarity index 100%
rename from packages/@aws-cdk/toolkit/lib/api/io/private/timer.ts
rename to packages/@aws-cdk/toolkit-lib/lib/api/io/private/timer.ts
diff --git a/packages/@aws-cdk/toolkit/lib/api/io/private/types.ts b/packages/@aws-cdk/toolkit-lib/lib/api/io/private/types.ts
similarity index 100%
rename from packages/@aws-cdk/toolkit/lib/api/io/private/types.ts
rename to packages/@aws-cdk/toolkit-lib/lib/api/io/private/types.ts
diff --git a/packages/@aws-cdk/toolkit/lib/index.ts b/packages/@aws-cdk/toolkit-lib/lib/index.ts
similarity index 100%
rename from packages/@aws-cdk/toolkit/lib/index.ts
rename to packages/@aws-cdk/toolkit-lib/lib/index.ts
diff --git a/packages/@aws-cdk/toolkit/lib/toolkit/index.ts b/packages/@aws-cdk/toolkit-lib/lib/toolkit/index.ts
similarity index 100%
rename from packages/@aws-cdk/toolkit/lib/toolkit/index.ts
rename to packages/@aws-cdk/toolkit-lib/lib/toolkit/index.ts
diff --git a/packages/@aws-cdk/toolkit/lib/toolkit/private/index.ts b/packages/@aws-cdk/toolkit-lib/lib/toolkit/private/index.ts
similarity index 100%
rename from packages/@aws-cdk/toolkit/lib/toolkit/private/index.ts
rename to packages/@aws-cdk/toolkit-lib/lib/toolkit/private/index.ts
diff --git a/packages/@aws-cdk/toolkit/lib/toolkit/toolkit.ts b/packages/@aws-cdk/toolkit-lib/lib/toolkit/toolkit.ts
similarity index 100%
rename from packages/@aws-cdk/toolkit/lib/toolkit/toolkit.ts
rename to packages/@aws-cdk/toolkit-lib/lib/toolkit/toolkit.ts
diff --git a/packages/@aws-cdk/toolkit/package.json b/packages/@aws-cdk/toolkit-lib/package.json
similarity index 98%
rename from packages/@aws-cdk/toolkit/package.json
rename to packages/@aws-cdk/toolkit-lib/package.json
index ca899453b..11436aa57 100644
--- a/packages/@aws-cdk/toolkit/package.json
+++ b/packages/@aws-cdk/toolkit-lib/package.json
@@ -1,10 +1,10 @@
 {
-  "name": "@aws-cdk/toolkit",
+  "name": "@aws-cdk/toolkit-lib",
   "description": "AWS CDK Programmatic Toolkit Library",
   "repository": {
     "type": "git",
     "url": "https://github.com/aws/aws-cdk-cli",
-    "directory": "packages/@aws-cdk/toolkit"
+    "directory": "packages/@aws-cdk/toolkit-lib"
   },
   "scripts": {
     "build": "npx projen build",
diff --git a/packages/@aws-cdk/toolkit/test/_fixtures/console-output/app.js b/packages/@aws-cdk/toolkit-lib/test/_fixtures/console-output/app.js
similarity index 100%
rename from packages/@aws-cdk/toolkit/test/_fixtures/console-output/app.js
rename to packages/@aws-cdk/toolkit-lib/test/_fixtures/console-output/app.js
diff --git a/packages/@aws-cdk/toolkit/test/_fixtures/external-context/app.js b/packages/@aws-cdk/toolkit-lib/test/_fixtures/external-context/app.js
similarity index 100%
rename from packages/@aws-cdk/toolkit/test/_fixtures/external-context/app.js
rename to packages/@aws-cdk/toolkit-lib/test/_fixtures/external-context/app.js
diff --git a/packages/@aws-cdk/toolkit/test/_fixtures/external-context/index.d.ts b/packages/@aws-cdk/toolkit-lib/test/_fixtures/external-context/index.d.ts
similarity index 100%
rename from packages/@aws-cdk/toolkit/test/_fixtures/external-context/index.d.ts
rename to packages/@aws-cdk/toolkit-lib/test/_fixtures/external-context/index.d.ts
diff --git a/packages/@aws-cdk/toolkit/test/_fixtures/external-context/index.d.ts.map b/packages/@aws-cdk/toolkit-lib/test/_fixtures/external-context/index.d.ts.map
similarity index 100%
rename from packages/@aws-cdk/toolkit/test/_fixtures/external-context/index.d.ts.map
rename to packages/@aws-cdk/toolkit-lib/test/_fixtures/external-context/index.d.ts.map
diff --git a/packages/@aws-cdk/toolkit/test/_fixtures/external-context/index.js b/packages/@aws-cdk/toolkit-lib/test/_fixtures/external-context/index.js
similarity index 100%
rename from packages/@aws-cdk/toolkit/test/_fixtures/external-context/index.js
rename to packages/@aws-cdk/toolkit-lib/test/_fixtures/external-context/index.js
diff --git a/packages/@aws-cdk/toolkit/test/_fixtures/external-context/index.ts b/packages/@aws-cdk/toolkit-lib/test/_fixtures/external-context/index.ts
similarity index 100%
rename from packages/@aws-cdk/toolkit/test/_fixtures/external-context/index.ts
rename to packages/@aws-cdk/toolkit-lib/test/_fixtures/external-context/index.ts
diff --git a/packages/@aws-cdk/toolkit/test/_fixtures/stack-with-asset/asset/index.d.ts b/packages/@aws-cdk/toolkit-lib/test/_fixtures/stack-with-asset/asset/index.d.ts
similarity index 100%
rename from packages/@aws-cdk/toolkit/test/_fixtures/stack-with-asset/asset/index.d.ts
rename to packages/@aws-cdk/toolkit-lib/test/_fixtures/stack-with-asset/asset/index.d.ts
diff --git a/packages/@aws-cdk/toolkit/test/_fixtures/stack-with-asset/asset/index.d.ts.map b/packages/@aws-cdk/toolkit-lib/test/_fixtures/stack-with-asset/asset/index.d.ts.map
similarity index 100%
rename from packages/@aws-cdk/toolkit/test/_fixtures/stack-with-asset/asset/index.d.ts.map
rename to packages/@aws-cdk/toolkit-lib/test/_fixtures/stack-with-asset/asset/index.d.ts.map
diff --git a/packages/@aws-cdk/toolkit/test/_fixtures/stack-with-asset/asset/index.js b/packages/@aws-cdk/toolkit-lib/test/_fixtures/stack-with-asset/asset/index.js
similarity index 100%
rename from packages/@aws-cdk/toolkit/test/_fixtures/stack-with-asset/asset/index.js
rename to packages/@aws-cdk/toolkit-lib/test/_fixtures/stack-with-asset/asset/index.js
diff --git a/packages/@aws-cdk/toolkit/test/_fixtures/stack-with-asset/index.d.ts b/packages/@aws-cdk/toolkit-lib/test/_fixtures/stack-with-asset/index.d.ts
similarity index 100%
rename from packages/@aws-cdk/toolkit/test/_fixtures/stack-with-asset/index.d.ts
rename to packages/@aws-cdk/toolkit-lib/test/_fixtures/stack-with-asset/index.d.ts
diff --git a/packages/@aws-cdk/toolkit/test/_fixtures/stack-with-asset/index.d.ts.map b/packages/@aws-cdk/toolkit-lib/test/_fixtures/stack-with-asset/index.d.ts.map
similarity index 100%
rename from packages/@aws-cdk/toolkit/test/_fixtures/stack-with-asset/index.d.ts.map
rename to packages/@aws-cdk/toolkit-lib/test/_fixtures/stack-with-asset/index.d.ts.map
diff --git a/packages/@aws-cdk/toolkit/test/_fixtures/stack-with-asset/index.js b/packages/@aws-cdk/toolkit-lib/test/_fixtures/stack-with-asset/index.js
similarity index 100%
rename from packages/@aws-cdk/toolkit/test/_fixtures/stack-with-asset/index.js
rename to packages/@aws-cdk/toolkit-lib/test/_fixtures/stack-with-asset/index.js
diff --git a/packages/@aws-cdk/toolkit/test/_fixtures/stack-with-bucket/cdk.out/Stack1.assets.json b/packages/@aws-cdk/toolkit-lib/test/_fixtures/stack-with-bucket/cdk.out/Stack1.assets.json
similarity index 100%
rename from packages/@aws-cdk/toolkit/test/_fixtures/stack-with-bucket/cdk.out/Stack1.assets.json
rename to packages/@aws-cdk/toolkit-lib/test/_fixtures/stack-with-bucket/cdk.out/Stack1.assets.json
diff --git a/packages/@aws-cdk/toolkit/test/_fixtures/stack-with-bucket/cdk.out/Stack1.template.json b/packages/@aws-cdk/toolkit-lib/test/_fixtures/stack-with-bucket/cdk.out/Stack1.template.json
similarity index 100%
rename from packages/@aws-cdk/toolkit/test/_fixtures/stack-with-bucket/cdk.out/Stack1.template.json
rename to packages/@aws-cdk/toolkit-lib/test/_fixtures/stack-with-bucket/cdk.out/Stack1.template.json
diff --git a/packages/@aws-cdk/toolkit/test/_fixtures/stack-with-bucket/cdk.out/cdk.out b/packages/@aws-cdk/toolkit-lib/test/_fixtures/stack-with-bucket/cdk.out/cdk.out
similarity index 100%
rename from packages/@aws-cdk/toolkit/test/_fixtures/stack-with-bucket/cdk.out/cdk.out
rename to packages/@aws-cdk/toolkit-lib/test/_fixtures/stack-with-bucket/cdk.out/cdk.out
diff --git a/packages/@aws-cdk/toolkit/test/_fixtures/stack-with-bucket/cdk.out/manifest.json b/packages/@aws-cdk/toolkit-lib/test/_fixtures/stack-with-bucket/cdk.out/manifest.json
similarity index 100%
rename from packages/@aws-cdk/toolkit/test/_fixtures/stack-with-bucket/cdk.out/manifest.json
rename to packages/@aws-cdk/toolkit-lib/test/_fixtures/stack-with-bucket/cdk.out/manifest.json
diff --git a/packages/@aws-cdk/toolkit/test/_fixtures/stack-with-bucket/cdk.out/tree.json b/packages/@aws-cdk/toolkit-lib/test/_fixtures/stack-with-bucket/cdk.out/tree.json
similarity index 100%
rename from packages/@aws-cdk/toolkit/test/_fixtures/stack-with-bucket/cdk.out/tree.json
rename to packages/@aws-cdk/toolkit-lib/test/_fixtures/stack-with-bucket/cdk.out/tree.json
diff --git a/packages/@aws-cdk/toolkit/test/_fixtures/stack-with-bucket/index.d.ts b/packages/@aws-cdk/toolkit-lib/test/_fixtures/stack-with-bucket/index.d.ts
similarity index 100%
rename from packages/@aws-cdk/toolkit/test/_fixtures/stack-with-bucket/index.d.ts
rename to packages/@aws-cdk/toolkit-lib/test/_fixtures/stack-with-bucket/index.d.ts
diff --git a/packages/@aws-cdk/toolkit/test/_fixtures/stack-with-bucket/index.d.ts.map b/packages/@aws-cdk/toolkit-lib/test/_fixtures/stack-with-bucket/index.d.ts.map
similarity index 100%
rename from packages/@aws-cdk/toolkit/test/_fixtures/stack-with-bucket/index.d.ts.map
rename to packages/@aws-cdk/toolkit-lib/test/_fixtures/stack-with-bucket/index.d.ts.map
diff --git a/packages/@aws-cdk/toolkit/test/_fixtures/stack-with-bucket/index.js b/packages/@aws-cdk/toolkit-lib/test/_fixtures/stack-with-bucket/index.js
similarity index 100%
rename from packages/@aws-cdk/toolkit/test/_fixtures/stack-with-bucket/index.js
rename to packages/@aws-cdk/toolkit-lib/test/_fixtures/stack-with-bucket/index.js
diff --git a/packages/@aws-cdk/toolkit/test/_fixtures/stack-with-bucket/index.ts b/packages/@aws-cdk/toolkit-lib/test/_fixtures/stack-with-bucket/index.ts
similarity index 100%
rename from packages/@aws-cdk/toolkit/test/_fixtures/stack-with-bucket/index.ts
rename to packages/@aws-cdk/toolkit-lib/test/_fixtures/stack-with-bucket/index.ts
diff --git a/packages/@aws-cdk/toolkit/test/_fixtures/stack-with-notification-arns/index.d.ts b/packages/@aws-cdk/toolkit-lib/test/_fixtures/stack-with-notification-arns/index.d.ts
similarity index 100%
rename from packages/@aws-cdk/toolkit/test/_fixtures/stack-with-notification-arns/index.d.ts
rename to packages/@aws-cdk/toolkit-lib/test/_fixtures/stack-with-notification-arns/index.d.ts
diff --git a/packages/@aws-cdk/toolkit/test/_fixtures/stack-with-notification-arns/index.d.ts.map b/packages/@aws-cdk/toolkit-lib/test/_fixtures/stack-with-notification-arns/index.d.ts.map
similarity index 100%
rename from packages/@aws-cdk/toolkit/test/_fixtures/stack-with-notification-arns/index.d.ts.map
rename to packages/@aws-cdk/toolkit-lib/test/_fixtures/stack-with-notification-arns/index.d.ts.map
diff --git a/packages/@aws-cdk/toolkit/test/_fixtures/stack-with-notification-arns/index.js b/packages/@aws-cdk/toolkit-lib/test/_fixtures/stack-with-notification-arns/index.js
similarity index 100%
rename from packages/@aws-cdk/toolkit/test/_fixtures/stack-with-notification-arns/index.js
rename to packages/@aws-cdk/toolkit-lib/test/_fixtures/stack-with-notification-arns/index.js
diff --git a/packages/@aws-cdk/toolkit/test/_fixtures/stack-with-notification-arns/index.ts b/packages/@aws-cdk/toolkit-lib/test/_fixtures/stack-with-notification-arns/index.ts
similarity index 100%
rename from packages/@aws-cdk/toolkit/test/_fixtures/stack-with-notification-arns/index.ts
rename to packages/@aws-cdk/toolkit-lib/test/_fixtures/stack-with-notification-arns/index.ts
diff --git a/packages/@aws-cdk/toolkit/test/_fixtures/stack-with-role/index.d.ts b/packages/@aws-cdk/toolkit-lib/test/_fixtures/stack-with-role/index.d.ts
similarity index 100%
rename from packages/@aws-cdk/toolkit/test/_fixtures/stack-with-role/index.d.ts
rename to packages/@aws-cdk/toolkit-lib/test/_fixtures/stack-with-role/index.d.ts
diff --git a/packages/@aws-cdk/toolkit/test/_fixtures/stack-with-role/index.d.ts.map b/packages/@aws-cdk/toolkit-lib/test/_fixtures/stack-with-role/index.d.ts.map
similarity index 100%
rename from packages/@aws-cdk/toolkit/test/_fixtures/stack-with-role/index.d.ts.map
rename to packages/@aws-cdk/toolkit-lib/test/_fixtures/stack-with-role/index.d.ts.map
diff --git a/packages/@aws-cdk/toolkit/test/_fixtures/stack-with-role/index.js b/packages/@aws-cdk/toolkit-lib/test/_fixtures/stack-with-role/index.js
similarity index 100%
rename from packages/@aws-cdk/toolkit/test/_fixtures/stack-with-role/index.js
rename to packages/@aws-cdk/toolkit-lib/test/_fixtures/stack-with-role/index.js
diff --git a/packages/@aws-cdk/toolkit/test/_fixtures/stack-with-role/index.ts b/packages/@aws-cdk/toolkit-lib/test/_fixtures/stack-with-role/index.ts
similarity index 100%
rename from packages/@aws-cdk/toolkit/test/_fixtures/stack-with-role/index.ts
rename to packages/@aws-cdk/toolkit-lib/test/_fixtures/stack-with-role/index.ts
diff --git a/packages/@aws-cdk/toolkit/test/_fixtures/two-empty-stacks/app.js b/packages/@aws-cdk/toolkit-lib/test/_fixtures/two-empty-stacks/app.js
similarity index 100%
rename from packages/@aws-cdk/toolkit/test/_fixtures/two-empty-stacks/app.js
rename to packages/@aws-cdk/toolkit-lib/test/_fixtures/two-empty-stacks/app.js
diff --git a/packages/@aws-cdk/toolkit/test/_fixtures/two-empty-stacks/cdk.json b/packages/@aws-cdk/toolkit-lib/test/_fixtures/two-empty-stacks/cdk.json
similarity index 100%
rename from packages/@aws-cdk/toolkit/test/_fixtures/two-empty-stacks/cdk.json
rename to packages/@aws-cdk/toolkit-lib/test/_fixtures/two-empty-stacks/cdk.json
diff --git a/packages/@aws-cdk/toolkit/test/_fixtures/two-empty-stacks/cdk.out/Stack1.assets.json b/packages/@aws-cdk/toolkit-lib/test/_fixtures/two-empty-stacks/cdk.out/Stack1.assets.json
similarity index 100%
rename from packages/@aws-cdk/toolkit/test/_fixtures/two-empty-stacks/cdk.out/Stack1.assets.json
rename to packages/@aws-cdk/toolkit-lib/test/_fixtures/two-empty-stacks/cdk.out/Stack1.assets.json
diff --git a/packages/@aws-cdk/toolkit/test/_fixtures/two-empty-stacks/cdk.out/Stack1.template.json b/packages/@aws-cdk/toolkit-lib/test/_fixtures/two-empty-stacks/cdk.out/Stack1.template.json
similarity index 100%
rename from packages/@aws-cdk/toolkit/test/_fixtures/two-empty-stacks/cdk.out/Stack1.template.json
rename to packages/@aws-cdk/toolkit-lib/test/_fixtures/two-empty-stacks/cdk.out/Stack1.template.json
diff --git a/packages/@aws-cdk/toolkit/test/_fixtures/two-empty-stacks/cdk.out/Stack2.assets.json b/packages/@aws-cdk/toolkit-lib/test/_fixtures/two-empty-stacks/cdk.out/Stack2.assets.json
similarity index 100%
rename from packages/@aws-cdk/toolkit/test/_fixtures/two-empty-stacks/cdk.out/Stack2.assets.json
rename to packages/@aws-cdk/toolkit-lib/test/_fixtures/two-empty-stacks/cdk.out/Stack2.assets.json
diff --git a/packages/@aws-cdk/toolkit/test/_fixtures/two-empty-stacks/cdk.out/Stack2.template.json b/packages/@aws-cdk/toolkit-lib/test/_fixtures/two-empty-stacks/cdk.out/Stack2.template.json
similarity index 100%
rename from packages/@aws-cdk/toolkit/test/_fixtures/two-empty-stacks/cdk.out/Stack2.template.json
rename to packages/@aws-cdk/toolkit-lib/test/_fixtures/two-empty-stacks/cdk.out/Stack2.template.json
diff --git a/packages/@aws-cdk/toolkit/test/_fixtures/two-empty-stacks/cdk.out/cdk.out b/packages/@aws-cdk/toolkit-lib/test/_fixtures/two-empty-stacks/cdk.out/cdk.out
similarity index 100%
rename from packages/@aws-cdk/toolkit/test/_fixtures/two-empty-stacks/cdk.out/cdk.out
rename to packages/@aws-cdk/toolkit-lib/test/_fixtures/two-empty-stacks/cdk.out/cdk.out
diff --git a/packages/@aws-cdk/toolkit/test/_fixtures/two-empty-stacks/cdk.out/manifest.json b/packages/@aws-cdk/toolkit-lib/test/_fixtures/two-empty-stacks/cdk.out/manifest.json
similarity index 100%
rename from packages/@aws-cdk/toolkit/test/_fixtures/two-empty-stacks/cdk.out/manifest.json
rename to packages/@aws-cdk/toolkit-lib/test/_fixtures/two-empty-stacks/cdk.out/manifest.json
diff --git a/packages/@aws-cdk/toolkit/test/_fixtures/two-empty-stacks/cdk.out/tree.json b/packages/@aws-cdk/toolkit-lib/test/_fixtures/two-empty-stacks/cdk.out/tree.json
similarity index 100%
rename from packages/@aws-cdk/toolkit/test/_fixtures/two-empty-stacks/cdk.out/tree.json
rename to packages/@aws-cdk/toolkit-lib/test/_fixtures/two-empty-stacks/cdk.out/tree.json
diff --git a/packages/@aws-cdk/toolkit/test/_fixtures/two-empty-stacks/index.d.ts b/packages/@aws-cdk/toolkit-lib/test/_fixtures/two-empty-stacks/index.d.ts
similarity index 100%
rename from packages/@aws-cdk/toolkit/test/_fixtures/two-empty-stacks/index.d.ts
rename to packages/@aws-cdk/toolkit-lib/test/_fixtures/two-empty-stacks/index.d.ts
diff --git a/packages/@aws-cdk/toolkit/test/_fixtures/two-empty-stacks/index.d.ts.map b/packages/@aws-cdk/toolkit-lib/test/_fixtures/two-empty-stacks/index.d.ts.map
similarity index 100%
rename from packages/@aws-cdk/toolkit/test/_fixtures/two-empty-stacks/index.d.ts.map
rename to packages/@aws-cdk/toolkit-lib/test/_fixtures/two-empty-stacks/index.d.ts.map
diff --git a/packages/@aws-cdk/toolkit/test/_fixtures/two-empty-stacks/index.js b/packages/@aws-cdk/toolkit-lib/test/_fixtures/two-empty-stacks/index.js
similarity index 100%
rename from packages/@aws-cdk/toolkit/test/_fixtures/two-empty-stacks/index.js
rename to packages/@aws-cdk/toolkit-lib/test/_fixtures/two-empty-stacks/index.js
diff --git a/packages/@aws-cdk/toolkit/test/_fixtures/two-empty-stacks/index.ts b/packages/@aws-cdk/toolkit-lib/test/_fixtures/two-empty-stacks/index.ts
similarity index 100%
rename from packages/@aws-cdk/toolkit/test/_fixtures/two-empty-stacks/index.ts
rename to packages/@aws-cdk/toolkit-lib/test/_fixtures/two-empty-stacks/index.ts
diff --git a/packages/@aws-cdk/toolkit/test/_fixtures/validation-error/app.js b/packages/@aws-cdk/toolkit-lib/test/_fixtures/validation-error/app.js
similarity index 100%
rename from packages/@aws-cdk/toolkit/test/_fixtures/validation-error/app.js
rename to packages/@aws-cdk/toolkit-lib/test/_fixtures/validation-error/app.js
diff --git a/packages/@aws-cdk/toolkit/test/_helpers/index.d.ts.map b/packages/@aws-cdk/toolkit-lib/test/_helpers/index.d.ts.map
similarity index 100%
rename from packages/@aws-cdk/toolkit/test/_helpers/index.d.ts.map
rename to packages/@aws-cdk/toolkit-lib/test/_helpers/index.d.ts.map
diff --git a/packages/@aws-cdk/toolkit/test/_helpers/index.ts b/packages/@aws-cdk/toolkit-lib/test/_helpers/index.ts
similarity index 100%
rename from packages/@aws-cdk/toolkit/test/_helpers/index.ts
rename to packages/@aws-cdk/toolkit-lib/test/_helpers/index.ts
diff --git a/packages/@aws-cdk/toolkit/test/_helpers/test-cloud-assembly-source.d.ts.map b/packages/@aws-cdk/toolkit-lib/test/_helpers/test-cloud-assembly-source.d.ts.map
similarity index 100%
rename from packages/@aws-cdk/toolkit/test/_helpers/test-cloud-assembly-source.d.ts.map
rename to packages/@aws-cdk/toolkit-lib/test/_helpers/test-cloud-assembly-source.d.ts.map
diff --git a/packages/@aws-cdk/toolkit/test/_helpers/test-cloud-assembly-source.ts b/packages/@aws-cdk/toolkit-lib/test/_helpers/test-cloud-assembly-source.ts
similarity index 100%
rename from packages/@aws-cdk/toolkit/test/_helpers/test-cloud-assembly-source.ts
rename to packages/@aws-cdk/toolkit-lib/test/_helpers/test-cloud-assembly-source.ts
diff --git a/packages/@aws-cdk/toolkit/test/_helpers/test-io-host.d.ts.map b/packages/@aws-cdk/toolkit-lib/test/_helpers/test-io-host.d.ts.map
similarity index 100%
rename from packages/@aws-cdk/toolkit/test/_helpers/test-io-host.d.ts.map
rename to packages/@aws-cdk/toolkit-lib/test/_helpers/test-io-host.d.ts.map
diff --git a/packages/@aws-cdk/toolkit/test/_helpers/test-io-host.ts b/packages/@aws-cdk/toolkit-lib/test/_helpers/test-io-host.ts
similarity index 100%
rename from packages/@aws-cdk/toolkit/test/_helpers/test-io-host.ts
rename to packages/@aws-cdk/toolkit-lib/test/_helpers/test-io-host.ts
diff --git a/packages/@aws-cdk/toolkit/test/actions/deploy-hotswap.test.d.ts.map b/packages/@aws-cdk/toolkit-lib/test/actions/deploy-hotswap.test.d.ts.map
similarity index 100%
rename from packages/@aws-cdk/toolkit/test/actions/deploy-hotswap.test.d.ts.map
rename to packages/@aws-cdk/toolkit-lib/test/actions/deploy-hotswap.test.d.ts.map
diff --git a/packages/@aws-cdk/toolkit/test/actions/deploy-hotswap.test.ts b/packages/@aws-cdk/toolkit-lib/test/actions/deploy-hotswap.test.ts
similarity index 100%
rename from packages/@aws-cdk/toolkit/test/actions/deploy-hotswap.test.ts
rename to packages/@aws-cdk/toolkit-lib/test/actions/deploy-hotswap.test.ts
diff --git a/packages/@aws-cdk/toolkit/test/actions/deploy.test.d.ts.map b/packages/@aws-cdk/toolkit-lib/test/actions/deploy.test.d.ts.map
similarity index 100%
rename from packages/@aws-cdk/toolkit/test/actions/deploy.test.d.ts.map
rename to packages/@aws-cdk/toolkit-lib/test/actions/deploy.test.d.ts.map
diff --git a/packages/@aws-cdk/toolkit/test/actions/deploy.test.ts b/packages/@aws-cdk/toolkit-lib/test/actions/deploy.test.ts
similarity index 100%
rename from packages/@aws-cdk/toolkit/test/actions/deploy.test.ts
rename to packages/@aws-cdk/toolkit-lib/test/actions/deploy.test.ts
diff --git a/packages/@aws-cdk/toolkit/test/actions/destroy.test.d.ts.map b/packages/@aws-cdk/toolkit-lib/test/actions/destroy.test.d.ts.map
similarity index 100%
rename from packages/@aws-cdk/toolkit/test/actions/destroy.test.d.ts.map
rename to packages/@aws-cdk/toolkit-lib/test/actions/destroy.test.d.ts.map
diff --git a/packages/@aws-cdk/toolkit/test/actions/destroy.test.ts b/packages/@aws-cdk/toolkit-lib/test/actions/destroy.test.ts
similarity index 100%
rename from packages/@aws-cdk/toolkit/test/actions/destroy.test.ts
rename to packages/@aws-cdk/toolkit-lib/test/actions/destroy.test.ts
diff --git a/packages/@aws-cdk/toolkit/test/actions/list.test.d.ts.map b/packages/@aws-cdk/toolkit-lib/test/actions/list.test.d.ts.map
similarity index 100%
rename from packages/@aws-cdk/toolkit/test/actions/list.test.d.ts.map
rename to packages/@aws-cdk/toolkit-lib/test/actions/list.test.d.ts.map
diff --git a/packages/@aws-cdk/toolkit/test/actions/list.test.ts b/packages/@aws-cdk/toolkit-lib/test/actions/list.test.ts
similarity index 100%
rename from packages/@aws-cdk/toolkit/test/actions/list.test.ts
rename to packages/@aws-cdk/toolkit-lib/test/actions/list.test.ts
diff --git a/packages/@aws-cdk/toolkit/test/actions/rollback.test.d.ts.map b/packages/@aws-cdk/toolkit-lib/test/actions/rollback.test.d.ts.map
similarity index 100%
rename from packages/@aws-cdk/toolkit/test/actions/rollback.test.d.ts.map
rename to packages/@aws-cdk/toolkit-lib/test/actions/rollback.test.d.ts.map
diff --git a/packages/@aws-cdk/toolkit/test/actions/rollback.test.ts b/packages/@aws-cdk/toolkit-lib/test/actions/rollback.test.ts
similarity index 100%
rename from packages/@aws-cdk/toolkit/test/actions/rollback.test.ts
rename to packages/@aws-cdk/toolkit-lib/test/actions/rollback.test.ts
diff --git a/packages/@aws-cdk/toolkit/test/actions/synth.test.d.ts.map b/packages/@aws-cdk/toolkit-lib/test/actions/synth.test.d.ts.map
similarity index 100%
rename from packages/@aws-cdk/toolkit/test/actions/synth.test.d.ts.map
rename to packages/@aws-cdk/toolkit-lib/test/actions/synth.test.d.ts.map
diff --git a/packages/@aws-cdk/toolkit/test/actions/synth.test.ts b/packages/@aws-cdk/toolkit-lib/test/actions/synth.test.ts
similarity index 100%
rename from packages/@aws-cdk/toolkit/test/actions/synth.test.ts
rename to packages/@aws-cdk/toolkit-lib/test/actions/synth.test.ts
diff --git a/packages/@aws-cdk/toolkit/test/actions/watch.test.d.ts.map b/packages/@aws-cdk/toolkit-lib/test/actions/watch.test.d.ts.map
similarity index 100%
rename from packages/@aws-cdk/toolkit/test/actions/watch.test.d.ts.map
rename to packages/@aws-cdk/toolkit-lib/test/actions/watch.test.d.ts.map
diff --git a/packages/@aws-cdk/toolkit/test/actions/watch.test.ts b/packages/@aws-cdk/toolkit-lib/test/actions/watch.test.ts
similarity index 100%
rename from packages/@aws-cdk/toolkit/test/actions/watch.test.ts
rename to packages/@aws-cdk/toolkit-lib/test/actions/watch.test.ts
diff --git a/packages/@aws-cdk/toolkit/test/api/cloud-assembly/source-builder.test.d.ts.map b/packages/@aws-cdk/toolkit-lib/test/api/cloud-assembly/source-builder.test.d.ts.map
similarity index 100%
rename from packages/@aws-cdk/toolkit/test/api/cloud-assembly/source-builder.test.d.ts.map
rename to packages/@aws-cdk/toolkit-lib/test/api/cloud-assembly/source-builder.test.d.ts.map
diff --git a/packages/@aws-cdk/toolkit/test/api/cloud-assembly/source-builder.test.ts b/packages/@aws-cdk/toolkit-lib/test/api/cloud-assembly/source-builder.test.ts
similarity index 100%
rename from packages/@aws-cdk/toolkit/test/api/cloud-assembly/source-builder.test.ts
rename to packages/@aws-cdk/toolkit-lib/test/api/cloud-assembly/source-builder.test.ts
diff --git a/packages/@aws-cdk/toolkit/test/api/io/io-message.test.d.ts.map b/packages/@aws-cdk/toolkit-lib/test/api/io/io-message.test.d.ts.map
similarity index 100%
rename from packages/@aws-cdk/toolkit/test/api/io/io-message.test.d.ts.map
rename to packages/@aws-cdk/toolkit-lib/test/api/io/io-message.test.d.ts.map
diff --git a/packages/@aws-cdk/toolkit/test/api/io/io-message.test.ts b/packages/@aws-cdk/toolkit-lib/test/api/io/io-message.test.ts
similarity index 100%
rename from packages/@aws-cdk/toolkit/test/api/io/io-message.test.ts
rename to packages/@aws-cdk/toolkit-lib/test/api/io/io-message.test.ts
diff --git a/packages/@aws-cdk/toolkit/test/toolkit/toolkit.test.d.ts.map b/packages/@aws-cdk/toolkit-lib/test/toolkit/toolkit.test.d.ts.map
similarity index 100%
rename from packages/@aws-cdk/toolkit/test/toolkit/toolkit.test.d.ts.map
rename to packages/@aws-cdk/toolkit-lib/test/toolkit/toolkit.test.d.ts.map
diff --git a/packages/@aws-cdk/toolkit/test/toolkit/toolkit.test.ts b/packages/@aws-cdk/toolkit-lib/test/toolkit/toolkit.test.ts
similarity index 100%
rename from packages/@aws-cdk/toolkit/test/toolkit/toolkit.test.ts
rename to packages/@aws-cdk/toolkit-lib/test/toolkit/toolkit.test.ts
diff --git a/packages/@aws-cdk/toolkit/test/util/aws-cdk.d.ts.map b/packages/@aws-cdk/toolkit-lib/test/util/aws-cdk.d.ts.map
similarity index 100%
rename from packages/@aws-cdk/toolkit/test/util/aws-cdk.d.ts.map
rename to packages/@aws-cdk/toolkit-lib/test/util/aws-cdk.d.ts.map
diff --git a/packages/@aws-cdk/toolkit/test/util/aws-cdk.ts b/packages/@aws-cdk/toolkit-lib/test/util/aws-cdk.ts
similarity index 100%
rename from packages/@aws-cdk/toolkit/test/util/aws-cdk.ts
rename to packages/@aws-cdk/toolkit-lib/test/util/aws-cdk.ts
diff --git a/packages/@aws-cdk/toolkit/tsconfig.dev.json b/packages/@aws-cdk/toolkit-lib/tsconfig.dev.json
similarity index 100%
rename from packages/@aws-cdk/toolkit/tsconfig.dev.json
rename to packages/@aws-cdk/toolkit-lib/tsconfig.dev.json
diff --git a/packages/@aws-cdk/toolkit/tsconfig.json b/packages/@aws-cdk/toolkit-lib/tsconfig.json
similarity index 100%
rename from packages/@aws-cdk/toolkit/tsconfig.json
rename to packages/@aws-cdk/toolkit-lib/tsconfig.json
diff --git a/packages/@aws-cdk/toolkit/README.md b/packages/@aws-cdk/toolkit/README.md
deleted file mode 100644
index 06f28f343..000000000
--- a/packages/@aws-cdk/toolkit/README.md
+++ /dev/null
@@ -1,16 +0,0 @@
-# AWS CDK Programmatic Toolkit
-<!--BEGIN STABILITY BANNER-->
-
----
-
-![@aws-cdk/toolkit: Experimental](https://img.shields.io/badge/@aws--cdk/toolkit-experimental-important.svg?style=for-the-badge)
-
-> The APIs in this module are experimental and under active development.
-> They are subject to non-backward compatible changes or removal in any future version. These are
-> not subject to the [Semantic Versioning](https://semver.org/) model and breaking changes will be
-> announced in the release notes. This means that while you may use them, you may need to update
-> your source code when upgrading to a newer version of this package.
-
----
-
-<!--END STABILITY BANNER-->
diff --git a/tsconfig.dev.json b/tsconfig.dev.json
index 8710b8280..21d106dbc 100644
--- a/tsconfig.dev.json
+++ b/tsconfig.dev.json
@@ -64,7 +64,7 @@
       "path": "packages/@aws-cdk/cli-lib-alpha"
     },
     {
-      "path": "packages/@aws-cdk/toolkit"
+      "path": "packages/@aws-cdk/toolkit-lib"
     },
     {
       "path": "packages/@aws-cdk/cdk-cli-wrapper"
diff --git a/tsconfig.json b/tsconfig.json
index c92d3fb73..e585685fb 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -61,7 +61,7 @@
       "path": "packages/@aws-cdk/cli-lib-alpha"
     },
     {
-      "path": "packages/@aws-cdk/toolkit"
+      "path": "packages/@aws-cdk/toolkit-lib"
     },
     {
       "path": "packages/@aws-cdk/cdk-cli-wrapper"