From be27e3a69d074c15d16b546d1b9efafec6a7667e Mon Sep 17 00:00:00 2001
From: Harold Hunt <harold@pwrdrvr.com>
Date: Sat, 27 Nov 2021 20:38:09 -0500
Subject: [PATCH] Move src/ to packages/ (#138)

---
 .github/workflows/main-build.yml              |  26 +-
 .github/workflows/prbuild.yml                 |  10 +-
 .github/workflows/release.yml                 |  48 +--
 .vscode/launch.json                           |  30 +-
 CONTRIBUTING.md                               |   6 +-
 cdk.json                                      |   2 +-
 jest.config.js                                |   2 +-
 package-lock.json                             | 403 ++++++++++++++----
 package.json                                  |  24 +-
 {src => packages}/cdk/.gitignore              |   0
 {src => packages}/cdk/.npmignore              |   0
 {src => packages}/cdk/LICENSE                 |   0
 {src => packages}/cdk/README.md               |   0
 {src => packages}/cdk/bin/cdk.ts              |   0
 {src => packages}/cdk/lib/Imports.ts          |   0
 {src => packages}/cdk/lib/MicroApps.ts        |   0
 {src => packages}/cdk/lib/MicroAppsBuilder.ts |   0
 {src => packages}/cdk/lib/SharedProps.ts      |   0
 {src => packages}/cdk/lib/SharedTags.ts       |   0
 {src => packages}/cdk/lib/Types.ts            |   0
 {src => packages}/cdk/package.json            |   0
 {src => packages}/cdk/tsconfig.json           |   0
 .../microapps-cdk/.eslintrc.json              |   0
 .../microapps-cdk/.gitattributes              |   0
 .../.github/pull_request_template.md          |   0
 .../microapps-cdk/.github/workflows/build.yml |   0
 .../.github/workflows/pull-request-lint.yml   |   0
 .../.github/workflows/release.yml             |   0
 .../microapps-cdk/.github/workflows/stale.yml |   0
 .../.github/workflows/upgrade-main.yml        |   0
 {src => packages}/microapps-cdk/.gitignore    |   0
 {src => packages}/microapps-cdk/.mergify.yml  |   0
 {src => packages}/microapps-cdk/.npmignore    |   0
 .../microapps-cdk/.projen/deps.json           |   0
 .../microapps-cdk/.projen/tasks.json          |   0
 {src => packages}/microapps-cdk/.projenrc.js  |   0
 {src => packages}/microapps-cdk/API.md        |   0
 {src => packages}/microapps-cdk/LICENSE       |   0
 {src => packages}/microapps-cdk/README.md     |   8 +-
 .../microapps-cdk/package-lock.json           |   0
 {src => packages}/microapps-cdk/package.json  |   0
 .../microapps-cdk/src/MicroApps.ts            |   0
 .../microapps-cdk/src/MicroAppsCF.ts          |   0
 .../microapps-cdk/src/MicroAppsS3.ts          |   0
 .../microapps-cdk/src/MicroAppsSvcs.ts        |   6 +-
 {src => packages}/microapps-cdk/src/index.ts  |   0
 .../microapps-cdk/tsconfig.dev.json           |   0
 {src => packages}/microapps-cdk/tsconfig.json |   0
 .../microapps-datalib/.npmignore              |   0
 .../microapps-datalib/LICENSE                 |   0
 .../microapps-datalib/package.json            |   0
 .../microapps-datalib/src/config.ts           |   0
 .../microapps-datalib/src/index.ts            |   0
 .../microapps-datalib/src/manager.ts          |   0
 .../src/models/application.spec.ts            |   0
 .../src/models/application.ts                 |   0
 .../src/models/rules.spec.ts                  |   0
 .../microapps-datalib/src/models/rules.ts     |   0
 .../src/models/version.spec.ts                |   0
 .../microapps-datalib/src/models/version.ts   |   0
 .../microapps-datalib/tsconfig.json           |   2 +-
 {src => packages}/microapps-deployer/LICENSE  |   0
 .../microapps-deployer/configs/config-dev.yml |   0
 .../configs/config-prod.yml                   |   0
 .../microapps-deployer/configs/config-qa.yml  |   0
 .../microapps-deployer/configs/config.yaml    |   0
 .../microapps-deployer/package.json           |   0
 .../src/config/APIGateway.ts                  |   0
 .../microapps-deployer/src/config/Config.ts   |   0
 .../microapps-deployer/src/config/Database.ts |   0
 .../src/config/FileStore.ts                   |   0
 .../src/controllers/AppController.spec.ts     |   0
 .../src/controllers/AppController.ts          |   0
 .../src/controllers/VersionController.spec.ts |   0
 .../src/controllers/VersionController.ts      |   0
 .../microapps-deployer/src/index.ts           |   0
 .../microapps-deployer/src/lib/FilesExist.ts  |   0
 .../microapps-deployer/src/lib/GatewayInfo.ts |   0
 .../microapps-deployer/src/lib/Log.ts         |   0
 .../microapps-deployer/tsconfig.json          |   2 +-
 .../microapps-publish/.npmignore              |   0
 .../microapps-publish/CONTRIBUTING.md         |   0
 {src => packages}/microapps-publish/LICENSE   |   0
 {src => packages}/microapps-publish/README.md |   0
 .../microapps-publish/configs/config-dev.yml  |   0
 .../microapps-publish/configs/config-prod.yml |   0
 .../microapps-publish/configs/config-qa.yml   |   0
 .../microapps-publish/configs/config.yaml     |   0
 .../microapps-publish/microapps.json          |   0
 .../microapps-publish/microapps.yaml          |   0
 .../microapps-publish/package-lock.json       |   0
 .../microapps-publish/package.json            |   0
 .../microapps-publish/src/DeployClient.ts     |   0
 .../src/S3TransferUtility.ts                  |   0
 .../microapps-publish/src/S3Uploader.ts       |   0
 .../src/config/Application.ts                 |   0
 .../microapps-publish/src/config/Config.ts    |   0
 .../microapps-publish/src/config/Deployer.ts  |   0
 .../microapps-publish/src/config/FileStore.ts |   0
 .../microapps-publish/src/index.ts            |   0
 .../microapps-publish/src/lib/FilesExist.ts   |   0
 .../microapps-publish/static/index.html       |   0
 .../static/subdir/index.html                  |   0
 .../microapps-publish/tsconfig.json           |   0
 {src => packages}/microapps-router/LICENSE    |   0
 .../microapps-router/appFrame.html            |   0
 .../microapps-router/configs/config-dev.yml   |   0
 .../microapps-router/configs/config-prod.yml  |   0
 .../microapps-router/configs/config-qa.yml    |   0
 .../microapps-router/configs/config.yaml      |   0
 .../microapps-router/package.json             |   0
 .../microapps-router/src/config/Config.ts     |   0
 .../microapps-router/src/config/Database.ts   |   0
 .../microapps-router/src/index.spec.ts        |   0
 .../microapps-router/src/index.ts             |   0
 .../microapps-router/src/lib/FilesExist.ts    |   0
 .../microapps-router/templates/appFrame.html  |   0
 .../microapps-router/tsconfig.json            |   2 +-
 rollup.deployer.js                            |   2 +-
 rollup.router.js                              |   2 +-
 tsconfig.bundle-deployer.json                 |   2 +-
 tsconfig.bundle-router.json                   |   2 +-
 tsconfig.eslint.json                          |   7 +-
 tsconfig.json                                 |  12 +-
 tsconfig.publish.json                         |   6 +-
 125 files changed, 434 insertions(+), 170 deletions(-)
 rename {src => packages}/cdk/.gitignore (100%)
 rename {src => packages}/cdk/.npmignore (100%)
 rename {src => packages}/cdk/LICENSE (100%)
 rename {src => packages}/cdk/README.md (100%)
 rename {src => packages}/cdk/bin/cdk.ts (100%)
 rename {src => packages}/cdk/lib/Imports.ts (100%)
 rename {src => packages}/cdk/lib/MicroApps.ts (100%)
 rename {src => packages}/cdk/lib/MicroAppsBuilder.ts (100%)
 rename {src => packages}/cdk/lib/SharedProps.ts (100%)
 rename {src => packages}/cdk/lib/SharedTags.ts (100%)
 rename {src => packages}/cdk/lib/Types.ts (100%)
 rename {src => packages}/cdk/package.json (100%)
 rename {src => packages}/cdk/tsconfig.json (100%)
 rename {src => packages}/microapps-cdk/.eslintrc.json (100%)
 rename {src => packages}/microapps-cdk/.gitattributes (100%)
 rename {src => packages}/microapps-cdk/.github/pull_request_template.md (100%)
 rename {src => packages}/microapps-cdk/.github/workflows/build.yml (100%)
 rename {src => packages}/microapps-cdk/.github/workflows/pull-request-lint.yml (100%)
 rename {src => packages}/microapps-cdk/.github/workflows/release.yml (100%)
 rename {src => packages}/microapps-cdk/.github/workflows/stale.yml (100%)
 rename {src => packages}/microapps-cdk/.github/workflows/upgrade-main.yml (100%)
 rename {src => packages}/microapps-cdk/.gitignore (100%)
 rename {src => packages}/microapps-cdk/.mergify.yml (100%)
 rename {src => packages}/microapps-cdk/.npmignore (100%)
 rename {src => packages}/microapps-cdk/.projen/deps.json (100%)
 rename {src => packages}/microapps-cdk/.projen/tasks.json (100%)
 rename {src => packages}/microapps-cdk/.projenrc.js (100%)
 rename {src => packages}/microapps-cdk/API.md (100%)
 rename {src => packages}/microapps-cdk/LICENSE (100%)
 rename {src => packages}/microapps-cdk/README.md (97%)
 rename {src => packages}/microapps-cdk/package-lock.json (100%)
 rename {src => packages}/microapps-cdk/package.json (100%)
 rename {src => packages}/microapps-cdk/src/MicroApps.ts (100%)
 rename {src => packages}/microapps-cdk/src/MicroAppsCF.ts (100%)
 rename {src => packages}/microapps-cdk/src/MicroAppsS3.ts (100%)
 rename {src => packages}/microapps-cdk/src/MicroAppsSvcs.ts (98%)
 rename {src => packages}/microapps-cdk/src/index.ts (100%)
 rename {src => packages}/microapps-cdk/tsconfig.dev.json (100%)
 rename {src => packages}/microapps-cdk/tsconfig.json (100%)
 rename {src/common => packages}/microapps-datalib/.npmignore (100%)
 rename {src/common => packages}/microapps-datalib/LICENSE (100%)
 rename {src/common => packages}/microapps-datalib/package.json (100%)
 rename {src/common => packages}/microapps-datalib/src/config.ts (100%)
 rename {src/common => packages}/microapps-datalib/src/index.ts (100%)
 rename {src/common => packages}/microapps-datalib/src/manager.ts (100%)
 rename {src/common => packages}/microapps-datalib/src/models/application.spec.ts (100%)
 rename {src/common => packages}/microapps-datalib/src/models/application.ts (100%)
 rename {src/common => packages}/microapps-datalib/src/models/rules.spec.ts (100%)
 rename {src/common => packages}/microapps-datalib/src/models/rules.ts (100%)
 rename {src/common => packages}/microapps-datalib/src/models/version.spec.ts (100%)
 rename {src/common => packages}/microapps-datalib/src/models/version.ts (100%)
 rename {src/common => packages}/microapps-datalib/tsconfig.json (83%)
 rename {src => packages}/microapps-deployer/LICENSE (100%)
 rename {src => packages}/microapps-deployer/configs/config-dev.yml (100%)
 rename {src => packages}/microapps-deployer/configs/config-prod.yml (100%)
 rename {src => packages}/microapps-deployer/configs/config-qa.yml (100%)
 rename {src => packages}/microapps-deployer/configs/config.yaml (100%)
 rename {src => packages}/microapps-deployer/package.json (100%)
 rename {src => packages}/microapps-deployer/src/config/APIGateway.ts (100%)
 rename {src => packages}/microapps-deployer/src/config/Config.ts (100%)
 rename {src => packages}/microapps-deployer/src/config/Database.ts (100%)
 rename {src => packages}/microapps-deployer/src/config/FileStore.ts (100%)
 rename {src => packages}/microapps-deployer/src/controllers/AppController.spec.ts (100%)
 rename {src => packages}/microapps-deployer/src/controllers/AppController.ts (100%)
 rename {src => packages}/microapps-deployer/src/controllers/VersionController.spec.ts (100%)
 rename {src => packages}/microapps-deployer/src/controllers/VersionController.ts (100%)
 rename {src => packages}/microapps-deployer/src/index.ts (100%)
 rename {src => packages}/microapps-deployer/src/lib/FilesExist.ts (100%)
 rename {src => packages}/microapps-deployer/src/lib/GatewayInfo.ts (100%)
 rename {src => packages}/microapps-deployer/src/lib/Log.ts (100%)
 rename {src => packages}/microapps-deployer/tsconfig.json (83%)
 rename {src => packages}/microapps-publish/.npmignore (100%)
 rename {src => packages}/microapps-publish/CONTRIBUTING.md (100%)
 rename {src => packages}/microapps-publish/LICENSE (100%)
 rename {src => packages}/microapps-publish/README.md (100%)
 rename {src => packages}/microapps-publish/configs/config-dev.yml (100%)
 rename {src => packages}/microapps-publish/configs/config-prod.yml (100%)
 rename {src => packages}/microapps-publish/configs/config-qa.yml (100%)
 rename {src => packages}/microapps-publish/configs/config.yaml (100%)
 rename {src => packages}/microapps-publish/microapps.json (100%)
 rename {src => packages}/microapps-publish/microapps.yaml (100%)
 rename {src => packages}/microapps-publish/package-lock.json (100%)
 rename {src => packages}/microapps-publish/package.json (100%)
 rename {src => packages}/microapps-publish/src/DeployClient.ts (100%)
 rename {src => packages}/microapps-publish/src/S3TransferUtility.ts (100%)
 rename {src => packages}/microapps-publish/src/S3Uploader.ts (100%)
 rename {src => packages}/microapps-publish/src/config/Application.ts (100%)
 rename {src => packages}/microapps-publish/src/config/Config.ts (100%)
 rename {src => packages}/microapps-publish/src/config/Deployer.ts (100%)
 rename {src => packages}/microapps-publish/src/config/FileStore.ts (100%)
 rename {src => packages}/microapps-publish/src/index.ts (100%)
 rename {src => packages}/microapps-publish/src/lib/FilesExist.ts (100%)
 rename {src => packages}/microapps-publish/static/index.html (100%)
 rename {src => packages}/microapps-publish/static/subdir/index.html (100%)
 rename {src => packages}/microapps-publish/tsconfig.json (100%)
 rename {src => packages}/microapps-router/LICENSE (100%)
 rename {src => packages}/microapps-router/appFrame.html (100%)
 rename {src => packages}/microapps-router/configs/config-dev.yml (100%)
 rename {src => packages}/microapps-router/configs/config-prod.yml (100%)
 rename {src => packages}/microapps-router/configs/config-qa.yml (100%)
 rename {src => packages}/microapps-router/configs/config.yaml (100%)
 rename {src => packages}/microapps-router/package.json (100%)
 rename {src => packages}/microapps-router/src/config/Config.ts (100%)
 rename {src => packages}/microapps-router/src/config/Database.ts (100%)
 rename {src => packages}/microapps-router/src/index.spec.ts (100%)
 rename {src => packages}/microapps-router/src/index.ts (100%)
 rename {src => packages}/microapps-router/src/lib/FilesExist.ts (100%)
 rename {src => packages}/microapps-router/templates/appFrame.html (100%)
 rename {src => packages}/microapps-router/tsconfig.json (83%)

diff --git a/.github/workflows/main-build.yml b/.github/workflows/main-build.yml
index cf84dd04..6c9ab5ba 100644
--- a/.github/workflows/main-build.yml
+++ b/.github/workflows/main-build.yml
@@ -54,7 +54,7 @@ jobs:
 
       - name: Generate Projen Files
         run: |
-          cd src/microapps-cdk/
+          cd packages/microapps-cdk/
           npm run projen
 
       - name: Build All TypeScript
@@ -65,12 +65,12 @@ jobs:
 
       - name: Install CDK Construct Deps
         run: |
-          cd src/microapps-cdk
+          cd packages/microapps-cdk
           npm ci
 
       - name: Build CDK Construct
         run: |
-          cd src/microapps-cdk
+          cd packages/microapps-cdk
           npm run build
 
       - name: Check for new commits
@@ -83,7 +83,7 @@ jobs:
         uses: actions/upload-artifact@v2
         with:
           name: cdk-construct-dist
-          path: src/microapps-cdk/dist
+          path: packages/microapps-cdk/dist
     container:
       image: ghcr.io/pwrdrvr/jsii-node-16
 
@@ -149,8 +149,8 @@ jobs:
         with:
           name: publish-tool-dist
           path: |
-            src/microapps-publish/
-            !src/microapps-publish/node_modules/
+            packages/microapps-publish/
+            !packages/microapps-publish/node_modules/
 
       - name: Upload Datalib artifact
         if: ${{ steps.git_remote.outputs.latest_commit == github.sha }}
@@ -158,8 +158,8 @@ jobs:
         with:
           name: datalib-dist
           path: |
-            src/common/microapps-datalib/
-            !src/common/microapps-datalib/node_modules/
+            packages/microapps-datalib/
+            !packages/microapps-datalib/node_modules/
 
   #
   # Release Assets
@@ -176,19 +176,19 @@ jobs:
         uses: actions/download-artifact@v2
         with:
           name: cdk-construct-dist
-          path: src/microapps-cdk/dist
+          path: packages/microapps-cdk/dist
 
       - name: Download Publish Tool build artifacts
         uses: actions/download-artifact@v2
         with:
           name: publish-tool-dist
-          path: src/microapps-publish
+          path: packages/microapps-publish
 
       - name: Download Datalib build artifacts
         uses: actions/download-artifact@v2
         with:
           name: datalib-dist
-          path: src/common/microapps-datalib
+          path: packages/microapps-datalib
 
       #
       # Publish other non-JSII Artifacts to NPM
@@ -198,12 +198,12 @@ jobs:
 
       - name: Release Publish Tool - NPM
         run: |
-          cd src/microapps-publish
+          cd packages/microapps-publish
           npm publish --dry-run
 
       - name: Release DataLib - NPM
         run: |
-          cd src/common/microapps-datalib
+          cd packages/microapps-datalib
           npm publish --dry-run
 
     container:
diff --git a/.github/workflows/prbuild.yml b/.github/workflows/prbuild.yml
index 4fd2620b..0c854046 100644
--- a/.github/workflows/prbuild.yml
+++ b/.github/workflows/prbuild.yml
@@ -49,10 +49,10 @@ jobs:
       - name: Install Node Modules
         run: npm ci
 
-      # Projen keeps creating `src/microapps-cdk/test/hello.test.ts`
+      # Projen keeps creating `packages/microapps-cdk/test/hello.test.ts`
       - name: Generate Projen Files
         run: |
-          cd src/microapps-cdk/
+          cd packages/microapps-cdk/
           npx projen --version
           npm run projen
           ls -la test/
@@ -61,8 +61,8 @@ jobs:
 
       - name: Modify microapps-cdk tsconfig.json
         run: |
-          mv ./src/microapps-cdk/tsconfig.json ./src/microapps-cdk/tsconfig.jsii.json
-          jq ".compilerOptions += { \"skipLibCheck\": true }" ./src/microapps-cdk/tsconfig.jsii.json > ./src/microapps-cdk/tsconfig.json
+          mv packages/microapps-cdk/tsconfig.json packages/microapps-cdk/tsconfig.jsii.json
+          jq ".compilerOptions += { \"skipLibCheck\": true }" packages/microapps-cdk/tsconfig.jsii.json > packages/microapps-cdk/tsconfig.json
 
       - name: Build All TypeScript
         run: npm run build --if-present
@@ -79,7 +79,7 @@ jobs:
       
       - name: Build CDK Construct
         run: |
-          cd src/microapps-cdk
+          cd packages/microapps-cdk
           npm ci
           npm run build
 
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index b63bbca3..095feba7 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -1,4 +1,4 @@
-# Based on projen template from src/microapps-cdk/.github/workflows/release.yml
+# Based on projen template from packages/microapps-cdk/.github/workflows/release.yml
 # ~~ Generated by projen. To modify, edit .projenrc.js and run "npx projen".
 
 name: Release Packages
@@ -59,7 +59,7 @@ jobs:
 
       - name: Generate Projen Files
         run: |
-          cd src/microapps-cdk/
+          cd packages/microapps-cdk/
           npm run projen
 
       - name: Build All TypeScript
@@ -70,16 +70,16 @@ jobs:
 
       - name: Install CDK Construct Deps
         run: |
-          cd src/microapps-cdk
+          cd packages/microapps-cdk
           npm ci
 
       - name: Build CDK Construct
         run: |
-          cd src/microapps-cdk
+          cd packages/microapps-cdk
           npx projen release
 
       - name: Apply Version to Everything (Deployer / Datalib)
-        run: npm version v$(cat src/microapps-cdk/dist/version.txt) --no-git-tag-version --workspaces
+        run: npm version v$(cat packages/microapps-cdk/dist/version.txt) --no-git-tag-version --workspaces
 
       - name: Check for new commits
         id: git_remote
@@ -91,12 +91,12 @@ jobs:
         uses: actions/upload-artifact@v2
         with:
           name: version-txt
-          path: src/microapps-cdk/dist/version.txt
+          path: packages/microapps-cdk/dist/version.txt
 
       - name: Create release
         if: ${{ steps.git_remote.outputs.latest_commit == github.sha }}
         run: |
-          cd src/microapps-cdk
+          cd packages/microapps-cdk
           gh release create v$(cat dist/version.txt) -F dist/changelog.md -t v$(cat dist/version.txt)
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -106,7 +106,7 @@ jobs:
         uses: actions/upload-artifact@v2
         with:
           name: cdk-construct-dist
-          path: src/microapps-cdk/dist
+          path: packages/microapps-cdk/dist
     container:
       image: ghcr.io/pwrdrvr/jsii-node-16
 
@@ -181,8 +181,8 @@ jobs:
         with:
           name: publish-tool-dist
           path: |
-            src/microapps-publish/
-            !src/microapps-publish/node_modules/
+            packages/microapps-publish/
+            !packages/microapps-publish/node_modules/
 
       - name: Upload Datalib artifact
         if: ${{ steps.git_remote.outputs.latest_commit == github.sha }}
@@ -190,8 +190,8 @@ jobs:
         with:
           name: datalib-dist
           path: |
-            src/common/microapps-datalib/
-            !src/common/microapps-datalib/node_modules/
+            packages/microapps-datalib/
+            !packages/microapps-datalib/node_modules/
 
   #
   # Release Assets
@@ -208,33 +208,33 @@ jobs:
         uses: actions/download-artifact@v2
         with:
           name: cdk-construct-dist
-          path: src/microapps-cdk/dist
+          path: packages/microapps-cdk/dist
 
       - name: Download Publish Tool build artifacts
         uses: actions/download-artifact@v2
         with:
           name: publish-tool-dist
-          path: src/microapps-publish
+          path: packages/microapps-publish
 
       - name: Download Datalib build artifacts
         uses: actions/download-artifact@v2
         with:
           name: datalib-dist
-          path: src/common/microapps-datalib
+          path: packages/microapps-datalib
 
       # Docs for GitHub Nuget
       # https://docs.github.com/en/packages/working-with-a-github-packages-registry/working-with-the-nuget-registry
       # Docs for jsii-release-nuget
       # https://github.com/cdklabs/jsii-release#nuget
       # - name: Release CDK Construct - GitHub NuGet
-      #   run: cd src/microapps-cdk && npx -p jsii-release@latest jsii-release-nuget
+      #   run: cd packages/microapps-cdk && npx -p jsii-release@latest jsii-release-nuget
       #   env:
       #     NUGET_SERVER: https://nuget.pkg.github.com/pwrdrvr/index.json
       #     NUGET_API_KEY: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Release CDK Construct - NuGet.org
         run: |
-          cd src/microapps-cdk
+          cd packages/microapps-cdk
           npx -p jsii-release@latest jsii-release-nuget
         env:
           NUGET_API_KEY: ${{ secrets.NUGET_MICROAPPS }}
@@ -245,7 +245,7 @@ jobs:
       # https://github.com/cdklabs/jsii-release#maven
       - name: Release CDK Construct - Maven
         run: |
-          cd src/microapps-cdk
+          cd packages/microapps-cdk
           npx -p jsii-release@latest jsii-release-maven
         env:
           MAVEN_SERVER_ID: github
@@ -258,7 +258,7 @@ jobs:
       # Docs for jsii-release-npm
       # https://github.com/cdklabs/jsii-release#npm
       # - name: Release CDK Construct - GitHub NPM
-      #   run: cd src/microapps-cdk && npx -p jsii-release@latest jsii-release-npm
+      #   run: cd packages/microapps-cdk && npx -p jsii-release@latest jsii-release-npm
       #   env:
       #     NPM_DIST_TAG: latest
       #     NPM_REGISTRY: npm.pkg.github.com
@@ -266,7 +266,7 @@ jobs:
 
       - name: Release CDK Construct - npmjs.org
         run: |
-          cd src/microapps-cdk
+          cd packages/microapps-cdk
           npx -p jsii-release@latest jsii-release-npm
         env:
           NPM_TOKEN: ${{ secrets.NPMJSORG_PUBLISH_TOKEN }} # jsii-release requires NPM_TOKEN as an env var
@@ -275,12 +275,12 @@ jobs:
       # Publish other non-JSII Artifacts to GitHub Packages
       #
       # - name: Release Publish Tool - GitHub NPM
-      #   run: npm config set registry https://npm.pkg.github.com && cd src/microapps-publish/dist && npm publish
+      #   run: npm config set registry https://npm.pkg.github.com && cd packages/microapps-publish/dist && npm publish
       #   env:
       #     NODE_AUTH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
       # - name: Release DataLib - GitHub NPM
-      #   run: npm config set registry https://npm.pkg.github.com && cd src/common/microapps-datalib/dist && npm publish
+      #   run: npm config set registry https://npm.pkg.github.com && cd packages/microapps-datalib/dist && npm publish
       #   env:
       #     NODE_AUTH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
@@ -292,12 +292,12 @@ jobs:
 
       - name: Release Publish Tool - NPM
         run: |
-          cd src/microapps-publish
+          cd packages/microapps-publish
           npm publish
 
       - name: Release DataLib - NPM
         run: |
-          cd src/common/microapps-datalib
+          cd packages/microapps-datalib
           npm publish
 
       # - name: Github package registry authentication
diff --git a/.vscode/launch.json b/.vscode/launch.json
index fc7e6f8b..e109add8 100644
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -15,35 +15,39 @@
       "name": "Debug microapps-publish",
       "type": "pwa-node",
       "request": "launch",
-      "cwd": "${workspaceFolder}/src/microapps-publish/",
+      "cwd": "${workspaceFolder}/packages/microapps-publish/",
       // "cwd": "/Users/huntharo/pwrdrvr/microapps-app-release/",
-      "skipFiles": ["${workspaceFolder}/src/microapps-publish/<node_internals>/**"],
+      "skipFiles": ["${workspaceFolder}/packages/microapps-publish/<node_internals>/**"],
       "runtimeVersion": "15.3.0",
       "envFile": "${workspaceFolder}/.env",
-      // "outFiles": ["${workspaceFolder}/src/microapps-publish/dist/**/*.js"],
+      // "outFiles": ["${workspaceFolder}/packages/microapps-publish/dist/**/*.js"],
       "runtimeArgs": ["-r", "ts-node/register/transpile-only"],
-      "args": ["${workspaceFolder}/src/microapps-publish/src/index.ts", "--new-version", "0.1.5"]
+      "args": [
+        "${workspaceFolder}/packages/microapps-publish/src/index.ts",
+        "--new-version",
+        "0.1.5"
+      ]
     },
     {
       "name": "Debug TS Router",
       "type": "node",
       "request": "launch",
-      "cwd": "${workspaceFolder}/src/microapps-router/",
-      "skipFiles": ["${workspaceFolder}/src/microapps-router/<node_internals>/**"],
+      "cwd": "${workspaceFolder}/packages/microapps-router/",
+      "skipFiles": ["${workspaceFolder}/packages/microapps-router/<node_internals>/**"],
       "runtimeVersion": "15.3.0",
       "env": {
         "DEBUG": "true"
       },
       "envFile": "${workspaceFolder}/.env",
       "runtimeArgs": ["-r", "ts-node/register/transpile-only"],
-      "args": ["${workspaceFolder}/src/microapps-router/src/index.ts"]
+      "args": ["${workspaceFolder}/packages/microapps-router/src/index.ts"]
     },
     {
       "name": "Debug TS Deployer",
       "type": "node",
       "request": "launch",
-      "cwd": "${workspaceFolder}/src/microapps-deployer/",
-      "skipFiles": ["${workspaceFolder}/src/microapps-deployer/<node_internals>/**"],
+      "cwd": "${workspaceFolder}/packages/microapps-deployer/",
+      "skipFiles": ["${workspaceFolder}/packages/microapps-deployer/<node_internals>/**"],
       "runtimeVersion": "15.3.0",
       "env": {
         "DEBUG": "true",
@@ -52,7 +56,7 @@
       },
       "envFile": "${workspaceFolder}/.env",
       "runtimeArgs": ["-r", "ts-node/register/transpile-only"],
-      "args": ["${workspaceFolder}/src/microapps-deployer/src/index.ts"]
+      "args": ["${workspaceFolder}/packages/microapps-deployer/src/index.ts"]
     },
     {
       "type": "node",
@@ -76,12 +80,10 @@
         "-p",
         "tsconfig.json",
         "--ignore",
-        "\"./src/**/node_modules/**/*.spec.ts\"",
+        "\"./packages/**/node_modules/**/*.spec.ts\"",
         "--retries",
         "2",
-        "--require",
-        "./src/fixtures.ts",
-        "\"./src/**/*.spec.ts\""
+        "\"./packages/**/*.spec.ts\""
       ],
       "cwd": "${workspaceFolder}/",
       "console": "integratedTerminal",
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 7d578781..6264649a 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -19,9 +19,9 @@ npm run preinstall
 ```log
 npm ERR! code ENOENT
 npm ERR! syscall chmod
-npm ERR! path /Users/myusername/pwrdrvr/microapps-core/node_modules/@pwrdrvr/microapps-publish/dist/src/index.js
+npm ERR! path /Users/myusername/pwrdrvr/microapps-core/node_modules/@pwrdrvr/microapps-publish/dist/index.js
 npm ERR! errno -2
-npm ERR! enoent ENOENT: no such file or directory, chmod '/Users/myusername/pwrdrvr/microapps-core/node_modules/@pwrdrvr/microapps-publish/dist/src/index.js'
+npm ERR! enoent ENOENT: no such file or directory, chmod '/Users/myusername/pwrdrvr/microapps-core/node_modules/@pwrdrvr/microapps-publish/dist/index.js'
 npm ERR! enoent This is related to npm not being able to find a file.
 npm ERR! enoent
 ```
@@ -38,7 +38,7 @@ npx projen new awscdk-construct --no-git --name @pwrdrvr/microapps-cdk --author
 
 # Releasing NPM Packages
 
-Challenge: `projen` does not support monorepos well, so it can build, tag, version, and release the CDK Construct library in `src/microapps-cdk` but it cannot be invoked to release `src/microapps-publish` and, because it doesn't support monorepos well, it cannot build and publish both in one invocation.
+Challenge: `projen` does not support monorepos well, so it can build, tag, version, and release the CDK Construct library in `packages/microapps-cdk` but it cannot be invoked to release `packages/microapps-publish` and, because it doesn't support monorepos well, it cannot build and publish both in one invocation.
 
 Below are tips, tricks, and commands used to build and release `microapps-publish` to NPM after `microapps-cdk` is done being published by `projen`.
 
diff --git a/cdk.json b/cdk.json
index 0513c507..eb6590d7 100644
--- a/cdk.json
+++ b/cdk.json
@@ -1,5 +1,5 @@
 {
-  "app": "npx ts-node --project src/cdk/tsconfig.json  --prefer-ts-exts src/cdk/bin/cdk.ts",
+  "app": "npx ts-node --project packages/cdk/tsconfig.json  --prefer-ts-exts packages/cdk/bin/cdk.ts",
   "context": {
     "@aws-cdk/aws-apigateway:usagePlanKeyOrderInsensitiveId": true,
     "@aws-cdk/core:enableStackNameDuplicates": "true",
diff --git a/jest.config.js b/jest.config.js
index 3c2f686d..1b28b99e 100644
--- a/jest.config.js
+++ b/jest.config.js
@@ -131,7 +131,7 @@ module.exports = {
   //   "<rootDir>"
   // ],
   roots: [
-    '<rootDir>src/',
+    '<rootDir>packages/',
   ],
 
   // Allows you to use a custom runner instead of Jest's default test runner
diff --git a/package-lock.json b/package-lock.json
index db86842b..667fda4c 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -9,12 +9,12 @@
       "version": "0.0.0",
       "license": "MIT",
       "workspaces": [
-        "./src/common/microapps-datalib/",
-        "./src/microapps-cdk/",
-        "./src/microapps-deployer/",
-        "./src/microapps-publish/",
-        "./src/microapps-router/",
-        "./src/cdk/"
+        "./packages/microapps-datalib/",
+        "./packages/microapps-cdk/",
+        "./packages/microapps-deployer/",
+        "./packages/microapps-publish/",
+        "./packages/microapps-router/",
+        "./packages/cdk/"
       ],
       "devDependencies": {
         "@rollup/plugin-commonjs": "^17.1.0",
@@ -4365,23 +4365,23 @@
       }
     },
     "node_modules/@pwrdrvr/microapps-cdk": {
-      "resolved": "src/microapps-cdk",
+      "resolved": "packages/microapps-cdk",
       "link": true
     },
     "node_modules/@pwrdrvr/microapps-datalib": {
-      "resolved": "src/common/microapps-datalib",
+      "resolved": "packages/microapps-datalib",
       "link": true
     },
     "node_modules/@pwrdrvr/microapps-deployer": {
-      "resolved": "src/microapps-deployer",
+      "resolved": "packages/microapps-deployer",
       "link": true
     },
     "node_modules/@pwrdrvr/microapps-publish": {
-      "resolved": "src/microapps-publish",
+      "resolved": "packages/microapps-publish",
       "link": true
     },
     "node_modules/@pwrdrvr/microapps-router": {
-      "resolved": "src/microapps-router",
+      "resolved": "packages/microapps-router",
       "link": true
     },
     "node_modules/@rollup/plugin-commonjs": {
@@ -4710,9 +4710,9 @@
       "integrity": "sha512-ZHty/hKoOLZvSz6BtP1g7tc7nUeJhoCf3flLjh8ZEv1vFKBWHXcnMbJMyN/pftSljNyy0kNW/UqI3DccnBnZ8w=="
     },
     "node_modules/@types/node-fetch": {
-      "version": "2.5.11",
-      "resolved": "https://registry.npmjs.org/@types/node-fetch/-/node-fetch-2.5.11.tgz",
-      "integrity": "sha512-2upCKaqVZETDRb8A2VTaRymqFBEgH8u6yr96b/u3+1uQEPDRo3mJLEiPk7vdXBHRtjwkjqzFYMJXrt0Z9QsYjQ==",
+      "version": "2.5.12",
+      "resolved": "https://registry.npmjs.org/@types/node-fetch/-/node-fetch-2.5.12.tgz",
+      "integrity": "sha512-MKgC4dlq4kKNa/mYrwpKfzQMB5X3ee5U6fSprkKpToBqBmX4nFZL9cW5jl6sWn+xpRJ7ypWh2yyqqr8UUCstSw==",
       "dev": true,
       "dependencies": {
         "@types/node": "*",
@@ -5974,7 +5974,7 @@
       "dev": true
     },
     "node_modules/cdk": {
-      "resolved": "src/cdk",
+      "resolved": "packages/cdk",
       "link": true
     },
     "node_modules/chalk": {
@@ -14620,14 +14620,39 @@
       }
     },
     "node_modules/node-fetch": {
-      "version": "2.6.1",
-      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.1.tgz",
-      "integrity": "sha512-V4aYg89jEoVRxRb2fJdAg8FHvI7cEyYdVAh94HH0UIK8oJxUfkjlDQN9RbMx+bEjP7+ggMiFRprSti032Oipxw==",
+      "version": "2.6.6",
+      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.6.tgz",
+      "integrity": "sha512-Z8/6vRlTUChSdIgMa51jxQ4lrw/Jy5SOW10ObaA47/RElsAN2c5Pn8bTgFGWn/ibwzXTE8qwr1Yzx28vsecXEA==",
       "dev": true,
+      "dependencies": {
+        "whatwg-url": "^5.0.0"
+      },
       "engines": {
         "node": "4.x || >=6.0.0"
       }
     },
+    "node_modules/node-fetch/node_modules/tr46": {
+      "version": "0.0.3",
+      "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz",
+      "integrity": "sha1-gYT9NH2snNwYWZLzpmIuFLnZq2o=",
+      "dev": true
+    },
+    "node_modules/node-fetch/node_modules/webidl-conversions": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz",
+      "integrity": "sha1-JFNCdeKnvGvnvIZhHMFq4KVlSHE=",
+      "dev": true
+    },
+    "node_modules/node-fetch/node_modules/whatwg-url": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz",
+      "integrity": "sha1-lmRU6HZUYuN2RNNib2dCzotwll0=",
+      "dev": true,
+      "dependencies": {
+        "tr46": "~0.0.3",
+        "webidl-conversions": "^3.0.0"
+      }
+    },
     "node_modules/node-gyp": {
       "version": "7.1.2",
       "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-7.1.2.tgz",
@@ -19655,7 +19680,7 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "src/cdk": {
+    "packages/cdk": {
       "version": "0.0.0",
       "license": "MIT",
       "dependencies": {
@@ -19672,7 +19697,7 @@
         "typescript": "~4.0.0"
       }
     },
-    "src/cdk/node_modules/typescript": {
+    "packages/cdk/node_modules/typescript": {
       "version": "4.0.8",
       "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.0.8.tgz",
       "integrity": "sha512-oz1765PN+imfz1MlZzSZPtC/tqcwsCyIYA8L47EkRnRW97ztRk83SzMiWLrnChC0vqoYxSU1fcFUDA5gV/ZiPg==",
@@ -19685,24 +19710,7 @@
         "node": ">=4.2.0"
       }
     },
-    "src/common/microapps-datalib": {
-      "name": "@pwrdrvr/microapps-datalib",
-      "version": "0.0.0",
-      "license": "MIT",
-      "dependencies": {
-        "class-transformer": "^0.4.0"
-      },
-      "devDependencies": {
-        "@types/node-fetch": "^2.5.8",
-        "node-fetch": "^2.6.1"
-      },
-      "peerDependencies": {
-        "@aws-sdk/client-dynamodb": "^3.20.0",
-        "@aws-sdk/lib-dynamodb": "^3.20.0",
-        "tslib": "^2.1.0"
-      }
-    },
-    "src/microapps-cdk": {
+    "packages/microapps-cdk": {
       "name": "@pwrdrvr/microapps-cdk",
       "version": "0.0.0",
       "license": "MIT",
@@ -19765,13 +19773,29 @@
         "constructs": "^3.2.27"
       }
     },
-    "src/microapps-cdk/node_modules/@types/node": {
+    "packages/microapps-cdk/node_modules/@types/node": {
       "version": "12.20.37",
       "resolved": "https://registry.npmjs.org/@types/node/-/node-12.20.37.tgz",
       "integrity": "sha512-i1KGxqcvJaLQali+WuypQnXwcplhtNtjs66eNsZpp2P2FL/trJJxx/VWsM0YCL2iMoIJrbXje48lvIQAQ4p2ZA==",
       "dev": true
     },
-    "src/microapps-deployer": {
+    "packages/microapps-datalib": {
+      "version": "0.0.0",
+      "license": "MIT",
+      "dependencies": {
+        "class-transformer": "^0.4.0"
+      },
+      "devDependencies": {
+        "@types/node-fetch": "^2.5.8",
+        "node-fetch": "^2.6.1"
+      },
+      "peerDependencies": {
+        "@aws-sdk/client-dynamodb": "^3.20.0",
+        "@aws-sdk/lib-dynamodb": "^3.20.0",
+        "tslib": "^2.1.0"
+      }
+    },
+    "packages/microapps-deployer": {
       "name": "@pwrdrvr/microapps-deployer",
       "version": "0.0.0",
       "license": "MIT",
@@ -19808,18 +19832,18 @@
         "sinon": "^10.0.0"
       }
     },
-    "src/microapps-deployer/node_modules/@types/node": {
+    "packages/microapps-deployer/node_modules/@types/node": {
       "version": "14.17.34",
       "resolved": "https://registry.npmjs.org/@types/node/-/node-14.17.34.tgz",
       "integrity": "sha512-USUftMYpmuMzeWobskoPfzDi+vkpe0dvcOBRNOscFrGxVp4jomnRxWuVohgqBow2xyIPC0S3gjxV/5079jhmDg==",
       "dev": true
     },
-    "src/microapps-deployer/node_modules/argparse": {
+    "packages/microapps-deployer/node_modules/argparse": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
       "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q=="
     },
-    "src/microapps-deployer/node_modules/fs-extra": {
+    "packages/microapps-deployer/node_modules/fs-extra": {
       "version": "9.1.0",
       "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-9.1.0.tgz",
       "integrity": "sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ==",
@@ -19833,7 +19857,7 @@
         "node": ">=10"
       }
     },
-    "src/microapps-deployer/node_modules/js-yaml": {
+    "packages/microapps-deployer/node_modules/js-yaml": {
       "version": "4.1.0",
       "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
       "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==",
@@ -19844,7 +19868,7 @@
         "js-yaml": "bin/js-yaml.js"
       }
     },
-    "src/microapps-deployer/node_modules/jsonfile": {
+    "packages/microapps-deployer/node_modules/jsonfile": {
       "version": "6.1.0",
       "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz",
       "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==",
@@ -19855,7 +19879,7 @@
         "graceful-fs": "^4.1.6"
       }
     },
-    "src/microapps-deployer/node_modules/universalify": {
+    "packages/microapps-deployer/node_modules/universalify": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz",
       "integrity": "sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==",
@@ -19863,7 +19887,7 @@
         "node": ">= 10.0.0"
       }
     },
-    "src/microapps-publish": {
+    "packages/microapps-publish": {
       "name": "@pwrdrvr/microapps-publish",
       "version": "0.0.0",
       "license": "MIT",
@@ -19902,12 +19926,12 @@
         "type-fest": "^0.20.2"
       }
     },
-    "src/microapps-publish/node_modules/argparse": {
+    "packages/microapps-publish/node_modules/argparse": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
       "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q=="
     },
-    "src/microapps-publish/node_modules/commander": {
+    "packages/microapps-publish/node_modules/commander": {
       "version": "7.2.0",
       "resolved": "https://registry.npmjs.org/commander/-/commander-7.2.0.tgz",
       "integrity": "sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw==",
@@ -19915,7 +19939,7 @@
         "node": ">= 10"
       }
     },
-    "src/microapps-publish/node_modules/fs-extra": {
+    "packages/microapps-publish/node_modules/fs-extra": {
       "version": "9.1.0",
       "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-9.1.0.tgz",
       "integrity": "sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ==",
@@ -19929,7 +19953,7 @@
         "node": ">=10"
       }
     },
-    "src/microapps-publish/node_modules/js-yaml": {
+    "packages/microapps-publish/node_modules/js-yaml": {
       "version": "4.1.0",
       "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
       "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==",
@@ -19940,7 +19964,7 @@
         "js-yaml": "bin/js-yaml.js"
       }
     },
-    "src/microapps-publish/node_modules/jsonfile": {
+    "packages/microapps-publish/node_modules/jsonfile": {
       "version": "6.1.0",
       "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz",
       "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==",
@@ -19951,7 +19975,7 @@
         "graceful-fs": "^4.1.6"
       }
     },
-    "src/microapps-publish/node_modules/universalify": {
+    "packages/microapps-publish/node_modules/universalify": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz",
       "integrity": "sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==",
@@ -19959,7 +19983,7 @@
         "node": ">= 10.0.0"
       }
     },
-    "src/microapps-router": {
+    "packages/microapps-router": {
       "name": "@pwrdrvr/microapps-router",
       "version": "0.0.0",
       "license": "MIT",
@@ -19986,18 +20010,18 @@
         "@types/source-map-support": "^0.5.4"
       }
     },
-    "src/microapps-router/node_modules/@types/node": {
+    "packages/microapps-router/node_modules/@types/node": {
       "version": "14.17.34",
       "resolved": "https://registry.npmjs.org/@types/node/-/node-14.17.34.tgz",
       "integrity": "sha512-USUftMYpmuMzeWobskoPfzDi+vkpe0dvcOBRNOscFrGxVp4jomnRxWuVohgqBow2xyIPC0S3gjxV/5079jhmDg==",
       "dev": true
     },
-    "src/microapps-router/node_modules/argparse": {
+    "packages/microapps-router/node_modules/argparse": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
       "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q=="
     },
-    "src/microapps-router/node_modules/fs-extra": {
+    "packages/microapps-router/node_modules/fs-extra": {
       "version": "9.1.0",
       "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-9.1.0.tgz",
       "integrity": "sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ==",
@@ -20011,7 +20035,7 @@
         "node": ">=10"
       }
     },
-    "src/microapps-router/node_modules/js-yaml": {
+    "packages/microapps-router/node_modules/js-yaml": {
       "version": "4.1.0",
       "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
       "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==",
@@ -20022,7 +20046,7 @@
         "js-yaml": "bin/js-yaml.js"
       }
     },
-    "src/microapps-router/node_modules/jsonfile": {
+    "packages/microapps-router/node_modules/jsonfile": {
       "version": "6.1.0",
       "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz",
       "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==",
@@ -20033,13 +20057,219 @@
         "graceful-fs": "^4.1.6"
       }
     },
-    "src/microapps-router/node_modules/universalify": {
+    "packages/microapps-router/node_modules/universalify": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz",
       "integrity": "sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==",
       "engines": {
         "node": ">= 10.0.0"
       }
+    },
+    "src/cdk": {
+      "version": "0.0.0",
+      "extraneous": true,
+      "license": "MIT",
+      "dependencies": {
+        "@aws-cdk/assert": "^1.111.0",
+        "@aws-cdk/aws-certificatemanager": "^1.112.0",
+        "@aws-cdk/aws-iam": "^1.111.0",
+        "@aws-cdk/core": "^1.111.0",
+        "@cloudcomponents/cdk-temp-stack": "^1.37.0",
+        "source-map-support": "^0.5.16"
+      },
+      "devDependencies": {
+        "@types/node": "^16.9.2",
+        "ts-node": "^9.0.0",
+        "typescript": "~4.0.0"
+      }
+    },
+    "src/common/microapps-datalib": {
+      "name": "@pwrdrvr/microapps-datalib",
+      "version": "0.0.0",
+      "extraneous": true,
+      "license": "MIT",
+      "dependencies": {
+        "class-transformer": "^0.4.0"
+      },
+      "devDependencies": {
+        "@types/node-fetch": "^2.5.8",
+        "node-fetch": "^2.6.1"
+      },
+      "peerDependencies": {
+        "@aws-sdk/client-dynamodb": "^3.20.0",
+        "@aws-sdk/lib-dynamodb": "^3.20.0",
+        "tslib": "^2.1.0"
+      }
+    },
+    "src/microapps-cdk": {
+      "name": "@pwrdrvr/microapps-cdk",
+      "version": "0.0.0",
+      "extraneous": true,
+      "license": "MIT",
+      "dependencies": {
+        "@aws-cdk/aws-apigatewayv2": "^1.95.2",
+        "@aws-cdk/aws-apigatewayv2-integrations": "^1.95.2",
+        "@aws-cdk/aws-certificatemanager": "^1.95.2",
+        "@aws-cdk/aws-cloudfront": "^1.95.2",
+        "@aws-cdk/aws-cloudfront-origins": "^1.95.2",
+        "@aws-cdk/aws-dynamodb": "^1.95.2",
+        "@aws-cdk/aws-ecr": "^1.95.2",
+        "@aws-cdk/aws-iam": "^1.95.2",
+        "@aws-cdk/aws-lambda": "^1.95.2",
+        "@aws-cdk/aws-lambda-nodejs": "^1.95.2",
+        "@aws-cdk/aws-logs": "^1.95.2",
+        "@aws-cdk/aws-route53": "^1.95.2",
+        "@aws-cdk/aws-route53-targets": "^1.95.2",
+        "@aws-cdk/aws-s3": "^1.95.2",
+        "@aws-cdk/core": "^1.95.2"
+      },
+      "devDependencies": {
+        "@aws-cdk/assert": "^1.95.2",
+        "@types/node": "^12.0.0",
+        "@typescript-eslint/eslint-plugin": "^4.28.2",
+        "@typescript-eslint/parser": "^4.28.2",
+        "esbuild": "^0.12.15",
+        "eslint": "^7.30.0",
+        "eslint-import-resolver-node": "^0.3.4",
+        "eslint-import-resolver-typescript": "^2.4.0",
+        "eslint-plugin-import": "^2.23.4",
+        "jsii": "^1.31.0",
+        "jsii-diff": "^1.31.0",
+        "jsii-docgen": "^2.0.6",
+        "jsii-pacmak": "^1.31.0",
+        "json-schema": "^0.3.0",
+        "npm-check-updates": "^11",
+        "projen": "0.34.20",
+        "standard-version": "^9",
+        "typescript": "^4.3.5"
+      },
+      "engines": {
+        "node": ">= 12.0.0"
+      },
+      "peerDependencies": {
+        "@aws-cdk/aws-apigatewayv2": "^1.95.2",
+        "@aws-cdk/aws-apigatewayv2-integrations": "^1.95.2",
+        "@aws-cdk/aws-certificatemanager": "^1.95.2",
+        "@aws-cdk/aws-cloudfront": "^1.95.2",
+        "@aws-cdk/aws-cloudfront-origins": "^1.95.2",
+        "@aws-cdk/aws-dynamodb": "^1.95.2",
+        "@aws-cdk/aws-ecr": "^1.95.2",
+        "@aws-cdk/aws-iam": "^1.95.2",
+        "@aws-cdk/aws-lambda": "^1.95.2",
+        "@aws-cdk/aws-lambda-nodejs": "^1.95.2",
+        "@aws-cdk/aws-logs": "^1.95.2",
+        "@aws-cdk/aws-route53": "^1.95.2",
+        "@aws-cdk/aws-route53-targets": "^1.95.2",
+        "@aws-cdk/aws-s3": "^1.95.2",
+        "@aws-cdk/core": "^1.95.2",
+        "constructs": "^3.2.27"
+      }
+    },
+    "src/microapps-deployer": {
+      "name": "@pwrdrvr/microapps-deployer",
+      "version": "0.0.0",
+      "extraneous": true,
+      "license": "MIT",
+      "dependencies": {
+        "@aws-cdk/aws-iam": "^1.111.0",
+        "@aws-sdk/client-apigatewayv2": "^3.20.0",
+        "@aws-sdk/client-dynamodb": "^3.20.0",
+        "@aws-sdk/client-iam": "^3.20.0",
+        "@aws-sdk/client-lambda": "^3.20.0",
+        "@aws-sdk/client-s3": "^3.20.0",
+        "@aws-sdk/client-sts": "^3.20.0",
+        "@aws-sdk/lib-dynamodb": "^3.20.0",
+        "convict": "^6.1.0",
+        "convict-format-with-validator": "^6.0.1",
+        "fs-extra": "^9.1.0",
+        "js-yaml": "^4.1.0",
+        "lambda-log": "^2.4.0",
+        "reflect-metadata": "^0.1.13",
+        "source-map-support": "^0.5.19",
+        "ts-convict": "^1.1.0",
+        "tslib": "^2.1.0"
+      },
+      "devDependencies": {
+        "@types/aws-lambda": "^8.10.72",
+        "@types/convict": "^6.0.2",
+        "@types/convict-format-with-validator": "^6.0.2",
+        "@types/fs-extra": "^9.0.11",
+        "@types/js-yaml": "^4.0.1",
+        "@types/lambda-log": "^2.2.0",
+        "@types/node": "^14.17.34",
+        "@types/sinon": "^10.0.0",
+        "@types/source-map-support": "^0.5.4",
+        "aws-sdk-client-mock": "^0.3.0",
+        "sinon": "^10.0.0"
+      }
+    },
+    "src/microapps-publish": {
+      "name": "@pwrdrvr/microapps-publish",
+      "version": "0.0.0",
+      "extraneous": true,
+      "license": "MIT",
+      "dependencies": {
+        "@aws-sdk/client-lambda": "^3.20.0",
+        "@aws-sdk/client-s3": "^3.20.0",
+        "@aws-sdk/client-sts": "^3.20.0",
+        "@aws-sdk/lib-storage": "^3.20.0",
+        "@oclif/command": "^1.8.4",
+        "@oclif/config": "^1.17.1",
+        "@oclif/errors": "^1.3.5",
+        "chalk": "^4.1.2",
+        "commander": "^7.1.0",
+        "convict": "^6.1.0",
+        "convict-format-with-validator": "^6.0.1",
+        "fs-extra": "^9.1.0",
+        "js-yaml": "^4.1.0",
+        "listr2": "^3.13.5",
+        "mime-types": "^2.1.30",
+        "p-map": "^4.0.0",
+        "reflect-metadata": "^0.1.13",
+        "source-map-support": "^0.5.19",
+        "ts-convict": "^1.1.0",
+        "tslib": "^2.1.0"
+      },
+      "bin": {
+        "microapps-publish": "dist/index.js"
+      },
+      "devDependencies": {
+        "@types/convict": "^6.0.2",
+        "@types/convict-format-with-validator": "^6.0.2",
+        "@types/fs-extra": "^9.0.11",
+        "@types/js-yaml": "^4.0.1",
+        "@types/mime-types": "^2.1.0",
+        "@types/source-map-support": "^0.5.4",
+        "type-fest": "^0.20.2"
+      }
+    },
+    "src/microapps-router": {
+      "name": "@pwrdrvr/microapps-router",
+      "version": "0.0.0",
+      "extraneous": true,
+      "license": "MIT",
+      "dependencies": {
+        "@aws-sdk/client-dynamodb": "^3.21.0",
+        "convict": "^6.1.0",
+        "convict-format-with-validator": "^6.0.1",
+        "fs-extra": "^9.1.0",
+        "js-yaml": "^4.1.0",
+        "lambda-log": "^2.4.0",
+        "reflect-metadata": "^0.1.13",
+        "source-map-support": "^0.5.19",
+        "ts-convict": "^1.1.0",
+        "tslib": "^2.1.0"
+      },
+      "devDependencies": {
+        "@types/aws-lambda": "^8.10.72",
+        "@types/convict": "^6.0.2",
+        "@types/convict-format-with-validator": "^6.0.2",
+        "@types/fs-extra": "^9.0.11",
+        "@types/js-yaml": "^4.0.1",
+        "@types/lambda-log": "^2.2.0",
+        "@types/node": "^14.17.34",
+        "@types/source-map-support": "^0.5.4"
+      }
     }
   },
   "dependencies": {
@@ -23120,7 +23350,7 @@
       }
     },
     "@pwrdrvr/microapps-cdk": {
-      "version": "file:src/microapps-cdk",
+      "version": "file:packages/microapps-cdk",
       "requires": {
         "@aws-cdk/assert": "^1.95.2",
         "@aws-cdk/aws-apigatewayv2": "^1.95.2",
@@ -23166,7 +23396,7 @@
       }
     },
     "@pwrdrvr/microapps-datalib": {
-      "version": "file:src/common/microapps-datalib",
+      "version": "file:packages/microapps-datalib",
       "requires": {
         "@types/node-fetch": "^2.5.8",
         "class-transformer": "^0.4.0",
@@ -23174,7 +23404,7 @@
       }
     },
     "@pwrdrvr/microapps-deployer": {
-      "version": "file:src/microapps-deployer",
+      "version": "file:packages/microapps-deployer",
       "requires": {
         "@aws-cdk/aws-iam": "^1.111.0",
         "@aws-sdk/client-apigatewayv2": "^3.20.0",
@@ -23253,7 +23483,7 @@
       }
     },
     "@pwrdrvr/microapps-publish": {
-      "version": "file:src/microapps-publish",
+      "version": "file:packages/microapps-publish",
       "requires": {
         "@aws-sdk/client-lambda": "^3.20.0",
         "@aws-sdk/client-s3": "^3.20.0",
@@ -23330,7 +23560,7 @@
       }
     },
     "@pwrdrvr/microapps-router": {
-      "version": "file:src/microapps-router",
+      "version": "file:packages/microapps-router",
       "requires": {
         "@aws-sdk/client-dynamodb": "^3.21.0",
         "@types/aws-lambda": "^8.10.72",
@@ -23696,9 +23926,9 @@
       "integrity": "sha512-ZHty/hKoOLZvSz6BtP1g7tc7nUeJhoCf3flLjh8ZEv1vFKBWHXcnMbJMyN/pftSljNyy0kNW/UqI3DccnBnZ8w=="
     },
     "@types/node-fetch": {
-      "version": "2.5.11",
-      "resolved": "https://registry.npmjs.org/@types/node-fetch/-/node-fetch-2.5.11.tgz",
-      "integrity": "sha512-2upCKaqVZETDRb8A2VTaRymqFBEgH8u6yr96b/u3+1uQEPDRo3mJLEiPk7vdXBHRtjwkjqzFYMJXrt0Z9QsYjQ==",
+      "version": "2.5.12",
+      "resolved": "https://registry.npmjs.org/@types/node-fetch/-/node-fetch-2.5.12.tgz",
+      "integrity": "sha512-MKgC4dlq4kKNa/mYrwpKfzQMB5X3ee5U6fSprkKpToBqBmX4nFZL9cW5jl6sWn+xpRJ7ypWh2yyqqr8UUCstSw==",
       "dev": true,
       "requires": {
         "@types/node": "*",
@@ -24633,7 +24863,7 @@
       "dev": true
     },
     "cdk": {
-      "version": "file:src/cdk",
+      "version": "file:packages/cdk",
       "requires": {
         "@aws-cdk/assert": "^1.111.0",
         "@aws-cdk/aws-certificatemanager": "^1.112.0",
@@ -31214,10 +31444,37 @@
       }
     },
     "node-fetch": {
-      "version": "2.6.1",
-      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.1.tgz",
-      "integrity": "sha512-V4aYg89jEoVRxRb2fJdAg8FHvI7cEyYdVAh94HH0UIK8oJxUfkjlDQN9RbMx+bEjP7+ggMiFRprSti032Oipxw==",
-      "dev": true
+      "version": "2.6.6",
+      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.6.tgz",
+      "integrity": "sha512-Z8/6vRlTUChSdIgMa51jxQ4lrw/Jy5SOW10ObaA47/RElsAN2c5Pn8bTgFGWn/ibwzXTE8qwr1Yzx28vsecXEA==",
+      "dev": true,
+      "requires": {
+        "whatwg-url": "^5.0.0"
+      },
+      "dependencies": {
+        "tr46": {
+          "version": "0.0.3",
+          "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz",
+          "integrity": "sha1-gYT9NH2snNwYWZLzpmIuFLnZq2o=",
+          "dev": true
+        },
+        "webidl-conversions": {
+          "version": "3.0.1",
+          "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz",
+          "integrity": "sha1-JFNCdeKnvGvnvIZhHMFq4KVlSHE=",
+          "dev": true
+        },
+        "whatwg-url": {
+          "version": "5.0.0",
+          "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz",
+          "integrity": "sha1-lmRU6HZUYuN2RNNib2dCzotwll0=",
+          "dev": true,
+          "requires": {
+            "tr46": "~0.0.3",
+            "webidl-conversions": "^3.0.0"
+          }
+        }
+      }
     },
     "node-gyp": {
       "version": "7.1.2",
diff --git a/package.json b/package.json
index c783c076..9c4dec9e 100644
--- a/package.json
+++ b/package.json
@@ -9,28 +9,28 @@
   "license": "MIT",
   "homepage": "https://github.com/pwrdrvr/microapps-core#readme",
   "workspaces": [
-    "./src/common/microapps-datalib/",
-    "./src/microapps-cdk/",
-    "./src/microapps-deployer/",
-    "./src/microapps-publish/",
-    "./src/microapps-router/",
-    "./src/cdk/"
+    "./packages/microapps-datalib/",
+    "./packages/microapps-cdk/",
+    "./packages/microapps-deployer/",
+    "./packages/microapps-publish/",
+    "./packages/microapps-router/",
+    "./packages/cdk/"
   ],
   "private": true,
   "scripts": {
     "clean": "npm run clean:dist && npm run clean:modules",
     "clean:dist": "npm exec --workspaces -- npx rimraf dist && npx rimraf dist",
     "clean:modules": "npm exec --workspaces -- npx rimraf node_modules && npx rimraf node_modules",
-    "fixinstall": "mkdir -p ./src/microapps-publish/dist/ && touch ./src/microapps-publish/dist/index.js",
+    "fixinstall": "mkdir -p packages/microapps-publish/dist/ && touch packages/microapps-publish/dist/index.js",
     "cloc": "cloc --exclude-dir=node_modules,dist,distb,cdk.out --exclude-ext=json .",
-    "start:publish": "node src/microapps-publish/dist/src/index.js",
-    "start:publish:debug": "ts-node --inspect=5858 --debug-brk --ignore false src/microapps-publish/src/index.ts",
+    "start:publish": "node packages/microapps-publish/dist/src/index.js",
+    "start:publish:debug": "ts-node --inspect=5858 --debug-brk --ignore false packages/microapps-publish/src/index.ts",
     "build": "tsc --build tsconfig.json",
     "build:publish": "tsc --build tsconfig.publish.json",
-    "esbuild:deployer": "esbuild src/microapps-deployer/src/index.ts --bundle --minify --sourcemap --platform=node --target=node14 --external:aws-sdk --outfile=src/cdk/dist/microapps-deployer/index.js",
-    "esbuild:router": "esbuild src/microapps-router/src/index.ts --bundle --minify --sourcemap --platform=node --target=node14 --external:aws-sdk --outfile=src/cdk/dist/microapps-router/index.js",
+    "esbuild:deployer": "esbuild packages/microapps-deployer/src/index.ts --bundle --minify --sourcemap --platform=node --target=node14 --external:aws-sdk --outfile=packages/cdk/dist/microapps-deployer/index.js",
+    "esbuild:router": "esbuild packages/microapps-router/src/index.ts --bundle --minify --sourcemap --platform=node --target=node14 --external:aws-sdk --outfile=packages/cdk/dist/microapps-router/index.js",
     "build:deployer": "rollup --config rollup.deployer.js",
-    "build:router": "rollup --config rollup.router.js && cp src/microapps-router/appFrame.html distb/microapps-router/",
+    "build:router": "rollup --config rollup.router.js && cp packages/microapps-router/appFrame.html distb/microapps-router/",
     "test": "AWS_EMF_ENVIRONMENT=Local jest",
     "lint": "eslint ./ --ext .ts --ext .tsx",
     "lint-and-fix": "eslint ./ --ext .ts --ext .tsx --fix"
diff --git a/src/cdk/.gitignore b/packages/cdk/.gitignore
similarity index 100%
rename from src/cdk/.gitignore
rename to packages/cdk/.gitignore
diff --git a/src/cdk/.npmignore b/packages/cdk/.npmignore
similarity index 100%
rename from src/cdk/.npmignore
rename to packages/cdk/.npmignore
diff --git a/src/cdk/LICENSE b/packages/cdk/LICENSE
similarity index 100%
rename from src/cdk/LICENSE
rename to packages/cdk/LICENSE
diff --git a/src/cdk/README.md b/packages/cdk/README.md
similarity index 100%
rename from src/cdk/README.md
rename to packages/cdk/README.md
diff --git a/src/cdk/bin/cdk.ts b/packages/cdk/bin/cdk.ts
similarity index 100%
rename from src/cdk/bin/cdk.ts
rename to packages/cdk/bin/cdk.ts
diff --git a/src/cdk/lib/Imports.ts b/packages/cdk/lib/Imports.ts
similarity index 100%
rename from src/cdk/lib/Imports.ts
rename to packages/cdk/lib/Imports.ts
diff --git a/src/cdk/lib/MicroApps.ts b/packages/cdk/lib/MicroApps.ts
similarity index 100%
rename from src/cdk/lib/MicroApps.ts
rename to packages/cdk/lib/MicroApps.ts
diff --git a/src/cdk/lib/MicroAppsBuilder.ts b/packages/cdk/lib/MicroAppsBuilder.ts
similarity index 100%
rename from src/cdk/lib/MicroAppsBuilder.ts
rename to packages/cdk/lib/MicroAppsBuilder.ts
diff --git a/src/cdk/lib/SharedProps.ts b/packages/cdk/lib/SharedProps.ts
similarity index 100%
rename from src/cdk/lib/SharedProps.ts
rename to packages/cdk/lib/SharedProps.ts
diff --git a/src/cdk/lib/SharedTags.ts b/packages/cdk/lib/SharedTags.ts
similarity index 100%
rename from src/cdk/lib/SharedTags.ts
rename to packages/cdk/lib/SharedTags.ts
diff --git a/src/cdk/lib/Types.ts b/packages/cdk/lib/Types.ts
similarity index 100%
rename from src/cdk/lib/Types.ts
rename to packages/cdk/lib/Types.ts
diff --git a/src/cdk/package.json b/packages/cdk/package.json
similarity index 100%
rename from src/cdk/package.json
rename to packages/cdk/package.json
diff --git a/src/cdk/tsconfig.json b/packages/cdk/tsconfig.json
similarity index 100%
rename from src/cdk/tsconfig.json
rename to packages/cdk/tsconfig.json
diff --git a/src/microapps-cdk/.eslintrc.json b/packages/microapps-cdk/.eslintrc.json
similarity index 100%
rename from src/microapps-cdk/.eslintrc.json
rename to packages/microapps-cdk/.eslintrc.json
diff --git a/src/microapps-cdk/.gitattributes b/packages/microapps-cdk/.gitattributes
similarity index 100%
rename from src/microapps-cdk/.gitattributes
rename to packages/microapps-cdk/.gitattributes
diff --git a/src/microapps-cdk/.github/pull_request_template.md b/packages/microapps-cdk/.github/pull_request_template.md
similarity index 100%
rename from src/microapps-cdk/.github/pull_request_template.md
rename to packages/microapps-cdk/.github/pull_request_template.md
diff --git a/src/microapps-cdk/.github/workflows/build.yml b/packages/microapps-cdk/.github/workflows/build.yml
similarity index 100%
rename from src/microapps-cdk/.github/workflows/build.yml
rename to packages/microapps-cdk/.github/workflows/build.yml
diff --git a/src/microapps-cdk/.github/workflows/pull-request-lint.yml b/packages/microapps-cdk/.github/workflows/pull-request-lint.yml
similarity index 100%
rename from src/microapps-cdk/.github/workflows/pull-request-lint.yml
rename to packages/microapps-cdk/.github/workflows/pull-request-lint.yml
diff --git a/src/microapps-cdk/.github/workflows/release.yml b/packages/microapps-cdk/.github/workflows/release.yml
similarity index 100%
rename from src/microapps-cdk/.github/workflows/release.yml
rename to packages/microapps-cdk/.github/workflows/release.yml
diff --git a/src/microapps-cdk/.github/workflows/stale.yml b/packages/microapps-cdk/.github/workflows/stale.yml
similarity index 100%
rename from src/microapps-cdk/.github/workflows/stale.yml
rename to packages/microapps-cdk/.github/workflows/stale.yml
diff --git a/src/microapps-cdk/.github/workflows/upgrade-main.yml b/packages/microapps-cdk/.github/workflows/upgrade-main.yml
similarity index 100%
rename from src/microapps-cdk/.github/workflows/upgrade-main.yml
rename to packages/microapps-cdk/.github/workflows/upgrade-main.yml
diff --git a/src/microapps-cdk/.gitignore b/packages/microapps-cdk/.gitignore
similarity index 100%
rename from src/microapps-cdk/.gitignore
rename to packages/microapps-cdk/.gitignore
diff --git a/src/microapps-cdk/.mergify.yml b/packages/microapps-cdk/.mergify.yml
similarity index 100%
rename from src/microapps-cdk/.mergify.yml
rename to packages/microapps-cdk/.mergify.yml
diff --git a/src/microapps-cdk/.npmignore b/packages/microapps-cdk/.npmignore
similarity index 100%
rename from src/microapps-cdk/.npmignore
rename to packages/microapps-cdk/.npmignore
diff --git a/src/microapps-cdk/.projen/deps.json b/packages/microapps-cdk/.projen/deps.json
similarity index 100%
rename from src/microapps-cdk/.projen/deps.json
rename to packages/microapps-cdk/.projen/deps.json
diff --git a/src/microapps-cdk/.projen/tasks.json b/packages/microapps-cdk/.projen/tasks.json
similarity index 100%
rename from src/microapps-cdk/.projen/tasks.json
rename to packages/microapps-cdk/.projen/tasks.json
diff --git a/src/microapps-cdk/.projenrc.js b/packages/microapps-cdk/.projenrc.js
similarity index 100%
rename from src/microapps-cdk/.projenrc.js
rename to packages/microapps-cdk/.projenrc.js
diff --git a/src/microapps-cdk/API.md b/packages/microapps-cdk/API.md
similarity index 100%
rename from src/microapps-cdk/API.md
rename to packages/microapps-cdk/API.md
diff --git a/src/microapps-cdk/LICENSE b/packages/microapps-cdk/LICENSE
similarity index 100%
rename from src/microapps-cdk/LICENSE
rename to packages/microapps-cdk/LICENSE
diff --git a/src/microapps-cdk/README.md b/packages/microapps-cdk/README.md
similarity index 97%
rename from src/microapps-cdk/README.md
rename to packages/microapps-cdk/README.md
index 4092570d..91b4d694 100644
--- a/src/microapps-cdk/README.md
+++ b/packages/microapps-cdk/README.md
@@ -4,7 +4,7 @@ The MicroApps project....
 
 # Project Layout
 
-- [src/cdk]() - CDK Stacks
+- [packages/cdk]() - CDK Stacks
   - MicroAppsS3
     - Creates S3 buckets
   - MicroAppsRepos
@@ -20,16 +20,16 @@ The MicroApps project....
     - Creates Cloudfront distribution
   - MicroAppsR53
     - Creates domain names to point to the edge (Cloudfront) and origin (API Gateway)
-- [src/microapps-deployer]()
+- [packages/microapps-deployer]()
   - Lambda service invoked by `microapps-publish` to record new app/version in the DynamoDB table, create API Gateway integrations, copy S3 assets from staging to prod bucket, etc.
-- [src/microapps-publish]()
+- [packages/microapps-publish]()
   - Node executable that updates versions in config files, deploys static assets to the S3 staging bucket, optionally compiles and deploys a new Lambda function version, and invokes `microapps-deployer`
   - Permissions required:
     - Lambda invoke
     - S3 publish to the staging bucket
     - ECR write
     - Lambda version publish
-- [src/microapps-router]()
+- [packages/microapps-router]()
   - Lambda function that determines which version of an app to point a user to on a particular invocation
 
 # Useful Commands
diff --git a/src/microapps-cdk/package-lock.json b/packages/microapps-cdk/package-lock.json
similarity index 100%
rename from src/microapps-cdk/package-lock.json
rename to packages/microapps-cdk/package-lock.json
diff --git a/src/microapps-cdk/package.json b/packages/microapps-cdk/package.json
similarity index 100%
rename from src/microapps-cdk/package.json
rename to packages/microapps-cdk/package.json
diff --git a/src/microapps-cdk/src/MicroApps.ts b/packages/microapps-cdk/src/MicroApps.ts
similarity index 100%
rename from src/microapps-cdk/src/MicroApps.ts
rename to packages/microapps-cdk/src/MicroApps.ts
diff --git a/src/microapps-cdk/src/MicroAppsCF.ts b/packages/microapps-cdk/src/MicroAppsCF.ts
similarity index 100%
rename from src/microapps-cdk/src/MicroAppsCF.ts
rename to packages/microapps-cdk/src/MicroAppsCF.ts
diff --git a/src/microapps-cdk/src/MicroAppsS3.ts b/packages/microapps-cdk/src/MicroAppsS3.ts
similarity index 100%
rename from src/microapps-cdk/src/MicroAppsS3.ts
rename to packages/microapps-cdk/src/MicroAppsS3.ts
diff --git a/src/microapps-cdk/src/MicroAppsSvcs.ts b/packages/microapps-cdk/src/MicroAppsSvcs.ts
similarity index 98%
rename from src/microapps-cdk/src/MicroAppsSvcs.ts
rename to packages/microapps-cdk/src/MicroAppsSvcs.ts
index 02a0e756..fb39e016 100644
--- a/src/microapps-cdk/src/MicroAppsSvcs.ts
+++ b/packages/microapps-cdk/src/MicroAppsSvcs.ts
@@ -137,7 +137,7 @@ export class MicroAppsSvcs extends cdk.Construct implements IMicroAppsSvcsExport
       });
     } else {
       deployerFunc = new lambdaNodejs.NodejsFunction(this, 'microapps-deployer-func', {
-        entry: './src/microapps-deployer/src/index.ts',
+        entry: './packages/microapps-deployer/src/index.ts',
         handler: 'handler',
         bundling: {
           minify: true,
@@ -354,14 +354,14 @@ export class MicroAppsSvcs extends cdk.Construct implements IMicroAppsSvcsExport
     } else {
       // Create Router Lambda Layer
       const routerDataFiles = new lambda.LayerVersion(this, 'microapps-router-layer', {
-        code: lambda.Code.fromAsset('./src/microapps-router/templates/'),
+        code: lambda.Code.fromAsset('./packages/microapps-router/templates/'),
       });
       if (autoDeleteEverything) {
         routerDataFiles.applyRemovalPolicy(cdk.RemovalPolicy.DESTROY);
       }
 
       routerFunc = new lambdaNodejs.NodejsFunction(this, 'microapps-router-func', {
-        entry: './src/microapps-router/src/index.ts',
+        entry: './packages/microapps-router/src/index.ts',
         handler: 'handler',
         bundling: {
           minify: true,
diff --git a/src/microapps-cdk/src/index.ts b/packages/microapps-cdk/src/index.ts
similarity index 100%
rename from src/microapps-cdk/src/index.ts
rename to packages/microapps-cdk/src/index.ts
diff --git a/src/microapps-cdk/tsconfig.dev.json b/packages/microapps-cdk/tsconfig.dev.json
similarity index 100%
rename from src/microapps-cdk/tsconfig.dev.json
rename to packages/microapps-cdk/tsconfig.dev.json
diff --git a/src/microapps-cdk/tsconfig.json b/packages/microapps-cdk/tsconfig.json
similarity index 100%
rename from src/microapps-cdk/tsconfig.json
rename to packages/microapps-cdk/tsconfig.json
diff --git a/src/common/microapps-datalib/.npmignore b/packages/microapps-datalib/.npmignore
similarity index 100%
rename from src/common/microapps-datalib/.npmignore
rename to packages/microapps-datalib/.npmignore
diff --git a/src/common/microapps-datalib/LICENSE b/packages/microapps-datalib/LICENSE
similarity index 100%
rename from src/common/microapps-datalib/LICENSE
rename to packages/microapps-datalib/LICENSE
diff --git a/src/common/microapps-datalib/package.json b/packages/microapps-datalib/package.json
similarity index 100%
rename from src/common/microapps-datalib/package.json
rename to packages/microapps-datalib/package.json
diff --git a/src/common/microapps-datalib/src/config.ts b/packages/microapps-datalib/src/config.ts
similarity index 100%
rename from src/common/microapps-datalib/src/config.ts
rename to packages/microapps-datalib/src/config.ts
diff --git a/src/common/microapps-datalib/src/index.ts b/packages/microapps-datalib/src/index.ts
similarity index 100%
rename from src/common/microapps-datalib/src/index.ts
rename to packages/microapps-datalib/src/index.ts
diff --git a/src/common/microapps-datalib/src/manager.ts b/packages/microapps-datalib/src/manager.ts
similarity index 100%
rename from src/common/microapps-datalib/src/manager.ts
rename to packages/microapps-datalib/src/manager.ts
diff --git a/src/common/microapps-datalib/src/models/application.spec.ts b/packages/microapps-datalib/src/models/application.spec.ts
similarity index 100%
rename from src/common/microapps-datalib/src/models/application.spec.ts
rename to packages/microapps-datalib/src/models/application.spec.ts
diff --git a/src/common/microapps-datalib/src/models/application.ts b/packages/microapps-datalib/src/models/application.ts
similarity index 100%
rename from src/common/microapps-datalib/src/models/application.ts
rename to packages/microapps-datalib/src/models/application.ts
diff --git a/src/common/microapps-datalib/src/models/rules.spec.ts b/packages/microapps-datalib/src/models/rules.spec.ts
similarity index 100%
rename from src/common/microapps-datalib/src/models/rules.spec.ts
rename to packages/microapps-datalib/src/models/rules.spec.ts
diff --git a/src/common/microapps-datalib/src/models/rules.ts b/packages/microapps-datalib/src/models/rules.ts
similarity index 100%
rename from src/common/microapps-datalib/src/models/rules.ts
rename to packages/microapps-datalib/src/models/rules.ts
diff --git a/src/common/microapps-datalib/src/models/version.spec.ts b/packages/microapps-datalib/src/models/version.spec.ts
similarity index 100%
rename from src/common/microapps-datalib/src/models/version.spec.ts
rename to packages/microapps-datalib/src/models/version.spec.ts
diff --git a/src/common/microapps-datalib/src/models/version.ts b/packages/microapps-datalib/src/models/version.ts
similarity index 100%
rename from src/common/microapps-datalib/src/models/version.ts
rename to packages/microapps-datalib/src/models/version.ts
diff --git a/src/common/microapps-datalib/tsconfig.json b/packages/microapps-datalib/tsconfig.json
similarity index 83%
rename from src/common/microapps-datalib/tsconfig.json
rename to packages/microapps-datalib/tsconfig.json
index 9a35f617..2c4768e7 100644
--- a/src/common/microapps-datalib/tsconfig.json
+++ b/packages/microapps-datalib/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../../tsconfig.packages.json",
+  "extends": "../../tsconfig.packages.json",
   "compilerOptions": {
     "rootDir": "src",
     "outDir": "dist",
diff --git a/src/microapps-deployer/LICENSE b/packages/microapps-deployer/LICENSE
similarity index 100%
rename from src/microapps-deployer/LICENSE
rename to packages/microapps-deployer/LICENSE
diff --git a/src/microapps-deployer/configs/config-dev.yml b/packages/microapps-deployer/configs/config-dev.yml
similarity index 100%
rename from src/microapps-deployer/configs/config-dev.yml
rename to packages/microapps-deployer/configs/config-dev.yml
diff --git a/src/microapps-deployer/configs/config-prod.yml b/packages/microapps-deployer/configs/config-prod.yml
similarity index 100%
rename from src/microapps-deployer/configs/config-prod.yml
rename to packages/microapps-deployer/configs/config-prod.yml
diff --git a/src/microapps-deployer/configs/config-qa.yml b/packages/microapps-deployer/configs/config-qa.yml
similarity index 100%
rename from src/microapps-deployer/configs/config-qa.yml
rename to packages/microapps-deployer/configs/config-qa.yml
diff --git a/src/microapps-deployer/configs/config.yaml b/packages/microapps-deployer/configs/config.yaml
similarity index 100%
rename from src/microapps-deployer/configs/config.yaml
rename to packages/microapps-deployer/configs/config.yaml
diff --git a/src/microapps-deployer/package.json b/packages/microapps-deployer/package.json
similarity index 100%
rename from src/microapps-deployer/package.json
rename to packages/microapps-deployer/package.json
diff --git a/src/microapps-deployer/src/config/APIGateway.ts b/packages/microapps-deployer/src/config/APIGateway.ts
similarity index 100%
rename from src/microapps-deployer/src/config/APIGateway.ts
rename to packages/microapps-deployer/src/config/APIGateway.ts
diff --git a/src/microapps-deployer/src/config/Config.ts b/packages/microapps-deployer/src/config/Config.ts
similarity index 100%
rename from src/microapps-deployer/src/config/Config.ts
rename to packages/microapps-deployer/src/config/Config.ts
diff --git a/src/microapps-deployer/src/config/Database.ts b/packages/microapps-deployer/src/config/Database.ts
similarity index 100%
rename from src/microapps-deployer/src/config/Database.ts
rename to packages/microapps-deployer/src/config/Database.ts
diff --git a/src/microapps-deployer/src/config/FileStore.ts b/packages/microapps-deployer/src/config/FileStore.ts
similarity index 100%
rename from src/microapps-deployer/src/config/FileStore.ts
rename to packages/microapps-deployer/src/config/FileStore.ts
diff --git a/src/microapps-deployer/src/controllers/AppController.spec.ts b/packages/microapps-deployer/src/controllers/AppController.spec.ts
similarity index 100%
rename from src/microapps-deployer/src/controllers/AppController.spec.ts
rename to packages/microapps-deployer/src/controllers/AppController.spec.ts
diff --git a/src/microapps-deployer/src/controllers/AppController.ts b/packages/microapps-deployer/src/controllers/AppController.ts
similarity index 100%
rename from src/microapps-deployer/src/controllers/AppController.ts
rename to packages/microapps-deployer/src/controllers/AppController.ts
diff --git a/src/microapps-deployer/src/controllers/VersionController.spec.ts b/packages/microapps-deployer/src/controllers/VersionController.spec.ts
similarity index 100%
rename from src/microapps-deployer/src/controllers/VersionController.spec.ts
rename to packages/microapps-deployer/src/controllers/VersionController.spec.ts
diff --git a/src/microapps-deployer/src/controllers/VersionController.ts b/packages/microapps-deployer/src/controllers/VersionController.ts
similarity index 100%
rename from src/microapps-deployer/src/controllers/VersionController.ts
rename to packages/microapps-deployer/src/controllers/VersionController.ts
diff --git a/src/microapps-deployer/src/index.ts b/packages/microapps-deployer/src/index.ts
similarity index 100%
rename from src/microapps-deployer/src/index.ts
rename to packages/microapps-deployer/src/index.ts
diff --git a/src/microapps-deployer/src/lib/FilesExist.ts b/packages/microapps-deployer/src/lib/FilesExist.ts
similarity index 100%
rename from src/microapps-deployer/src/lib/FilesExist.ts
rename to packages/microapps-deployer/src/lib/FilesExist.ts
diff --git a/src/microapps-deployer/src/lib/GatewayInfo.ts b/packages/microapps-deployer/src/lib/GatewayInfo.ts
similarity index 100%
rename from src/microapps-deployer/src/lib/GatewayInfo.ts
rename to packages/microapps-deployer/src/lib/GatewayInfo.ts
diff --git a/src/microapps-deployer/src/lib/Log.ts b/packages/microapps-deployer/src/lib/Log.ts
similarity index 100%
rename from src/microapps-deployer/src/lib/Log.ts
rename to packages/microapps-deployer/src/lib/Log.ts
diff --git a/src/microapps-deployer/tsconfig.json b/packages/microapps-deployer/tsconfig.json
similarity index 83%
rename from src/microapps-deployer/tsconfig.json
rename to packages/microapps-deployer/tsconfig.json
index 6fc62274..c57192ad 100644
--- a/src/microapps-deployer/tsconfig.json
+++ b/packages/microapps-deployer/tsconfig.json
@@ -7,7 +7,7 @@
   },
   "references": [
     {
-      "path": "../common/microapps-datalib/"
+      "path": "../microapps-datalib/"
     }
   ],
   "exclude": ["**/*.spec.ts", "dist"]
diff --git a/src/microapps-publish/.npmignore b/packages/microapps-publish/.npmignore
similarity index 100%
rename from src/microapps-publish/.npmignore
rename to packages/microapps-publish/.npmignore
diff --git a/src/microapps-publish/CONTRIBUTING.md b/packages/microapps-publish/CONTRIBUTING.md
similarity index 100%
rename from src/microapps-publish/CONTRIBUTING.md
rename to packages/microapps-publish/CONTRIBUTING.md
diff --git a/src/microapps-publish/LICENSE b/packages/microapps-publish/LICENSE
similarity index 100%
rename from src/microapps-publish/LICENSE
rename to packages/microapps-publish/LICENSE
diff --git a/src/microapps-publish/README.md b/packages/microapps-publish/README.md
similarity index 100%
rename from src/microapps-publish/README.md
rename to packages/microapps-publish/README.md
diff --git a/src/microapps-publish/configs/config-dev.yml b/packages/microapps-publish/configs/config-dev.yml
similarity index 100%
rename from src/microapps-publish/configs/config-dev.yml
rename to packages/microapps-publish/configs/config-dev.yml
diff --git a/src/microapps-publish/configs/config-prod.yml b/packages/microapps-publish/configs/config-prod.yml
similarity index 100%
rename from src/microapps-publish/configs/config-prod.yml
rename to packages/microapps-publish/configs/config-prod.yml
diff --git a/src/microapps-publish/configs/config-qa.yml b/packages/microapps-publish/configs/config-qa.yml
similarity index 100%
rename from src/microapps-publish/configs/config-qa.yml
rename to packages/microapps-publish/configs/config-qa.yml
diff --git a/src/microapps-publish/configs/config.yaml b/packages/microapps-publish/configs/config.yaml
similarity index 100%
rename from src/microapps-publish/configs/config.yaml
rename to packages/microapps-publish/configs/config.yaml
diff --git a/src/microapps-publish/microapps.json b/packages/microapps-publish/microapps.json
similarity index 100%
rename from src/microapps-publish/microapps.json
rename to packages/microapps-publish/microapps.json
diff --git a/src/microapps-publish/microapps.yaml b/packages/microapps-publish/microapps.yaml
similarity index 100%
rename from src/microapps-publish/microapps.yaml
rename to packages/microapps-publish/microapps.yaml
diff --git a/src/microapps-publish/package-lock.json b/packages/microapps-publish/package-lock.json
similarity index 100%
rename from src/microapps-publish/package-lock.json
rename to packages/microapps-publish/package-lock.json
diff --git a/src/microapps-publish/package.json b/packages/microapps-publish/package.json
similarity index 100%
rename from src/microapps-publish/package.json
rename to packages/microapps-publish/package.json
diff --git a/src/microapps-publish/src/DeployClient.ts b/packages/microapps-publish/src/DeployClient.ts
similarity index 100%
rename from src/microapps-publish/src/DeployClient.ts
rename to packages/microapps-publish/src/DeployClient.ts
diff --git a/src/microapps-publish/src/S3TransferUtility.ts b/packages/microapps-publish/src/S3TransferUtility.ts
similarity index 100%
rename from src/microapps-publish/src/S3TransferUtility.ts
rename to packages/microapps-publish/src/S3TransferUtility.ts
diff --git a/src/microapps-publish/src/S3Uploader.ts b/packages/microapps-publish/src/S3Uploader.ts
similarity index 100%
rename from src/microapps-publish/src/S3Uploader.ts
rename to packages/microapps-publish/src/S3Uploader.ts
diff --git a/src/microapps-publish/src/config/Application.ts b/packages/microapps-publish/src/config/Application.ts
similarity index 100%
rename from src/microapps-publish/src/config/Application.ts
rename to packages/microapps-publish/src/config/Application.ts
diff --git a/src/microapps-publish/src/config/Config.ts b/packages/microapps-publish/src/config/Config.ts
similarity index 100%
rename from src/microapps-publish/src/config/Config.ts
rename to packages/microapps-publish/src/config/Config.ts
diff --git a/src/microapps-publish/src/config/Deployer.ts b/packages/microapps-publish/src/config/Deployer.ts
similarity index 100%
rename from src/microapps-publish/src/config/Deployer.ts
rename to packages/microapps-publish/src/config/Deployer.ts
diff --git a/src/microapps-publish/src/config/FileStore.ts b/packages/microapps-publish/src/config/FileStore.ts
similarity index 100%
rename from src/microapps-publish/src/config/FileStore.ts
rename to packages/microapps-publish/src/config/FileStore.ts
diff --git a/src/microapps-publish/src/index.ts b/packages/microapps-publish/src/index.ts
similarity index 100%
rename from src/microapps-publish/src/index.ts
rename to packages/microapps-publish/src/index.ts
diff --git a/src/microapps-publish/src/lib/FilesExist.ts b/packages/microapps-publish/src/lib/FilesExist.ts
similarity index 100%
rename from src/microapps-publish/src/lib/FilesExist.ts
rename to packages/microapps-publish/src/lib/FilesExist.ts
diff --git a/src/microapps-publish/static/index.html b/packages/microapps-publish/static/index.html
similarity index 100%
rename from src/microapps-publish/static/index.html
rename to packages/microapps-publish/static/index.html
diff --git a/src/microapps-publish/static/subdir/index.html b/packages/microapps-publish/static/subdir/index.html
similarity index 100%
rename from src/microapps-publish/static/subdir/index.html
rename to packages/microapps-publish/static/subdir/index.html
diff --git a/src/microapps-publish/tsconfig.json b/packages/microapps-publish/tsconfig.json
similarity index 100%
rename from src/microapps-publish/tsconfig.json
rename to packages/microapps-publish/tsconfig.json
diff --git a/src/microapps-router/LICENSE b/packages/microapps-router/LICENSE
similarity index 100%
rename from src/microapps-router/LICENSE
rename to packages/microapps-router/LICENSE
diff --git a/src/microapps-router/appFrame.html b/packages/microapps-router/appFrame.html
similarity index 100%
rename from src/microapps-router/appFrame.html
rename to packages/microapps-router/appFrame.html
diff --git a/src/microapps-router/configs/config-dev.yml b/packages/microapps-router/configs/config-dev.yml
similarity index 100%
rename from src/microapps-router/configs/config-dev.yml
rename to packages/microapps-router/configs/config-dev.yml
diff --git a/src/microapps-router/configs/config-prod.yml b/packages/microapps-router/configs/config-prod.yml
similarity index 100%
rename from src/microapps-router/configs/config-prod.yml
rename to packages/microapps-router/configs/config-prod.yml
diff --git a/src/microapps-router/configs/config-qa.yml b/packages/microapps-router/configs/config-qa.yml
similarity index 100%
rename from src/microapps-router/configs/config-qa.yml
rename to packages/microapps-router/configs/config-qa.yml
diff --git a/src/microapps-router/configs/config.yaml b/packages/microapps-router/configs/config.yaml
similarity index 100%
rename from src/microapps-router/configs/config.yaml
rename to packages/microapps-router/configs/config.yaml
diff --git a/src/microapps-router/package.json b/packages/microapps-router/package.json
similarity index 100%
rename from src/microapps-router/package.json
rename to packages/microapps-router/package.json
diff --git a/src/microapps-router/src/config/Config.ts b/packages/microapps-router/src/config/Config.ts
similarity index 100%
rename from src/microapps-router/src/config/Config.ts
rename to packages/microapps-router/src/config/Config.ts
diff --git a/src/microapps-router/src/config/Database.ts b/packages/microapps-router/src/config/Database.ts
similarity index 100%
rename from src/microapps-router/src/config/Database.ts
rename to packages/microapps-router/src/config/Database.ts
diff --git a/src/microapps-router/src/index.spec.ts b/packages/microapps-router/src/index.spec.ts
similarity index 100%
rename from src/microapps-router/src/index.spec.ts
rename to packages/microapps-router/src/index.spec.ts
diff --git a/src/microapps-router/src/index.ts b/packages/microapps-router/src/index.ts
similarity index 100%
rename from src/microapps-router/src/index.ts
rename to packages/microapps-router/src/index.ts
diff --git a/src/microapps-router/src/lib/FilesExist.ts b/packages/microapps-router/src/lib/FilesExist.ts
similarity index 100%
rename from src/microapps-router/src/lib/FilesExist.ts
rename to packages/microapps-router/src/lib/FilesExist.ts
diff --git a/src/microapps-router/templates/appFrame.html b/packages/microapps-router/templates/appFrame.html
similarity index 100%
rename from src/microapps-router/templates/appFrame.html
rename to packages/microapps-router/templates/appFrame.html
diff --git a/src/microapps-router/tsconfig.json b/packages/microapps-router/tsconfig.json
similarity index 83%
rename from src/microapps-router/tsconfig.json
rename to packages/microapps-router/tsconfig.json
index 6fc62274..c57192ad 100644
--- a/src/microapps-router/tsconfig.json
+++ b/packages/microapps-router/tsconfig.json
@@ -7,7 +7,7 @@
   },
   "references": [
     {
-      "path": "../common/microapps-datalib/"
+      "path": "../microapps-datalib/"
     }
   ],
   "exclude": ["**/*.spec.ts", "dist"]
diff --git a/rollup.deployer.js b/rollup.deployer.js
index c4c98959..b6d840be 100644
--- a/rollup.deployer.js
+++ b/rollup.deployer.js
@@ -9,7 +9,7 @@ const LOCAL_EXTERNALS = [];
 const NPM_EXTERNALS = [];
 
 const generateConfig = (input) => ({
-  input: `./src/microapps-deployer/src/${input.filename}.ts`,
+  input: `./packages/microapps-deployer/src/${input.filename}.ts`,
   output: {
     file: `./distb/microapps-deployer/src/${input.filename}${input.minify ? '' : '.max'}.js`,
     format: 'cjs',
diff --git a/rollup.router.js b/rollup.router.js
index 0947e014..b802fc5f 100644
--- a/rollup.router.js
+++ b/rollup.router.js
@@ -9,7 +9,7 @@ const LOCAL_EXTERNALS = [];
 const NPM_EXTERNALS = [];
 
 const generateConfig = (input) => ({
-  input: `./src/microapps-router/src/${input.filename}.ts`,
+  input: `./packages/microapps-router/src/${input.filename}.ts`,
   output: {
     file: `./distb/microapps-router/src/${input.filename}${input.minify ? '' : '.max'}.js`,
     format: 'cjs',
diff --git a/tsconfig.bundle-deployer.json b/tsconfig.bundle-deployer.json
index 7908d5ac..977c3df8 100644
--- a/tsconfig.bundle-deployer.json
+++ b/tsconfig.bundle-deployer.json
@@ -14,5 +14,5 @@
     "emitDecoratorMetadata": true,
     "experimentalDecorators": true
   },
-  "include": ["./src/microapps-deployer/src/index.ts"]
+  "include": ["packages/microapps-deployer/src/index.ts"]
 }
diff --git a/tsconfig.bundle-router.json b/tsconfig.bundle-router.json
index 1488a545..e18db7ef 100644
--- a/tsconfig.bundle-router.json
+++ b/tsconfig.bundle-router.json
@@ -15,5 +15,5 @@
     "emitDecoratorMetadata": true,
     "experimentalDecorators": true
   },
-  "include": ["./src/microapps-router/src/index.ts"]
+  "include": ["packages/microapps-router/src/index.ts"]
 }
diff --git a/tsconfig.eslint.json b/tsconfig.eslint.json
index 61450bc5..e7689d7a 100644
--- a/tsconfig.eslint.json
+++ b/tsconfig.eslint.json
@@ -21,6 +21,11 @@
     "target": "ES2018",
     "skipLibCheck": true
   },
-  "include": ["src/**/.projenrc.js", "src/**/.projenrc.ts", "src/**/*.ts", "test/**/*.ts"],
+  "include": [
+    "packages/**/.projenrc.js",
+    "packages/**/.projenrc.ts",
+    "packages/**/*.ts",
+    "test/**/*.ts"
+  ],
   "exclude": ["node_modules"]
 }
diff --git a/tsconfig.json b/tsconfig.json
index 2f59a2f6..1dc5a00b 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -2,22 +2,22 @@
   "files": [],
   "references": [
     {
-      "path": "./src/common/microapps-datalib/"
+      "path": "packages/microapps-datalib/"
     },
     {
-      "path": "./src/microapps-deployer/"
+      "path": "packages/microapps-deployer/"
     },
     {
-      "path": "./src/microapps-router/"
+      "path": "packages/microapps-router/"
     },
     {
-      "path": "./src/microapps-cdk/"
+      "path": "packages/microapps-cdk/"
     },
     {
-      "path": "./src/cdk/"
+      "path": "packages/cdk/"
     },
     {
-      "path": "./src/microapps-publish/"
+      "path": "packages/microapps-publish/"
     }
   ]
 }
diff --git a/tsconfig.publish.json b/tsconfig.publish.json
index da648567..9103572f 100644
--- a/tsconfig.publish.json
+++ b/tsconfig.publish.json
@@ -2,13 +2,13 @@
   "files": [],
   "references": [
     {
-      "path": "./src/common/microapps-datalib/"
+      "path": "packages/microapps-datalib/"
     },
     {
-      "path": "./src/microapps-deployer/"
+      "path": "packages/microapps-deployer/"
     },
     {
-      "path": "./src/microapps-publish/"
+      "path": "packages/microapps-publish/"
     }
   ]
 }