diff --git a/astro/.gitignore b/apps/astro/.gitignore
similarity index 100%
rename from astro/.gitignore
rename to apps/astro/.gitignore
diff --git a/astro/.vscode/extensions.json b/apps/astro/.vscode/extensions.json
similarity index 100%
rename from astro/.vscode/extensions.json
rename to apps/astro/.vscode/extensions.json
diff --git a/astro/.vscode/launch.json b/apps/astro/.vscode/launch.json
similarity index 100%
rename from astro/.vscode/launch.json
rename to apps/astro/.vscode/launch.json
diff --git a/astro/README.md b/apps/astro/README.md
similarity index 100%
rename from astro/README.md
rename to apps/astro/README.md
diff --git a/astro/astro.config.mjs b/apps/astro/astro.config.mjs
similarity index 100%
rename from astro/astro.config.mjs
rename to apps/astro/astro.config.mjs
diff --git a/astro/package.json b/apps/astro/package.json
similarity index 100%
rename from astro/package.json
rename to apps/astro/package.json
diff --git a/astro/public/favicon.svg b/apps/astro/public/favicon.svg
similarity index 100%
rename from astro/public/favicon.svg
rename to apps/astro/public/favicon.svg
diff --git a/astro/src/api/payload.ts b/apps/astro/src/api/payload.ts
similarity index 100%
rename from astro/src/api/payload.ts
rename to apps/astro/src/api/payload.ts
diff --git a/astro/src/components/Card.astro b/apps/astro/src/components/Card.astro
similarity index 100%
rename from astro/src/components/Card.astro
rename to apps/astro/src/components/Card.astro
diff --git a/astro/src/env.d.ts b/apps/astro/src/env.d.ts
similarity index 100%
rename from astro/src/env.d.ts
rename to apps/astro/src/env.d.ts
diff --git a/astro/src/layouts/Layout.astro b/apps/astro/src/layouts/Layout.astro
similarity index 100%
rename from astro/src/layouts/Layout.astro
rename to apps/astro/src/layouts/Layout.astro
diff --git a/astro/src/pages/index.astro b/apps/astro/src/pages/index.astro
similarity index 100%
rename from astro/src/pages/index.astro
rename to apps/astro/src/pages/index.astro
diff --git a/astro/tsconfig.json b/apps/astro/tsconfig.json
similarity index 100%
rename from astro/tsconfig.json
rename to apps/astro/tsconfig.json
diff --git a/payload/.gitignore b/apps/payload/.gitignore
similarity index 100%
rename from payload/.gitignore
rename to apps/payload/.gitignore
diff --git a/payload/Dockerfile b/apps/payload/Dockerfile
similarity index 100%
rename from payload/Dockerfile
rename to apps/payload/Dockerfile
diff --git a/payload/nodemon.json b/apps/payload/nodemon.json
similarity index 100%
rename from payload/nodemon.json
rename to apps/payload/nodemon.json
diff --git a/payload/package.json b/apps/payload/package.json
similarity index 100%
rename from payload/package.json
rename to apps/payload/package.json
diff --git a/payload/src/collections/Posts.ts b/apps/payload/src/collections/Posts.ts
similarity index 100%
rename from payload/src/collections/Posts.ts
rename to apps/payload/src/collections/Posts.ts
diff --git a/payload/src/collections/Users.ts b/apps/payload/src/collections/Users.ts
similarity index 100%
rename from payload/src/collections/Users.ts
rename to apps/payload/src/collections/Users.ts
diff --git a/payload/src/payload.config.ts b/apps/payload/src/payload.config.ts
similarity index 100%
rename from payload/src/payload.config.ts
rename to apps/payload/src/payload.config.ts
diff --git a/payload/src/server.ts b/apps/payload/src/server.ts
similarity index 100%
rename from payload/src/server.ts
rename to apps/payload/src/server.ts
diff --git a/payload/src/types.ts b/apps/payload/src/types.ts
similarity index 100%
rename from payload/src/types.ts
rename to apps/payload/src/types.ts
diff --git a/payload/tsconfig.json b/apps/payload/tsconfig.json
similarity index 100%
rename from payload/tsconfig.json
rename to apps/payload/tsconfig.json
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index c5e60dc..8b259db 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -21,13 +21,13 @@ importers:
         specifier: 1.11.2
         version: 1.11.2
 
-  astro:
+  apps/astro:
     dependencies:
       astro:
         specifier: ^4.0.4
         version: 4.0.4
 
-  payload:
+  apps/payload:
     dependencies:
       '@payloadcms/bundler-webpack':
         specifier: ^1.0.0
diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml
index 3388d09..852bf6b 100644
--- a/pnpm-workspace.yaml
+++ b/pnpm-workspace.yaml
@@ -1,3 +1,2 @@
 packages:
-  - astro
-  - payload
+  - apps/*
diff --git a/tsconfig.json b/tsconfig.json
deleted file mode 100644
index 360fc87..0000000
--- a/tsconfig.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "include": ["*.ts"],
-  "references": [
-    {
-      "path": "./astro/tsconfig.json"
-    },
-    {
-      "path": "./payload/tsconfig.json"
-    }
-  ]
-}