diff --git a/.coderabbit.yaml b/.coderabbit.yaml
index bb5b9b03..6a499de8 100644
--- a/.coderabbit.yaml
+++ b/.coderabbit.yaml
@@ -44,7 +44,7 @@ reviews:
     - "!**/gen/**"
     - "!**/*.gen.ts"
     - "!**/*.gen.js"
-    - "!apps/fastify/src/db/migrations/**"
+    - "!apps/api/src/db/migrations/**"
     
     # Documentation assets
     - "!**/*.png"
@@ -90,7 +90,7 @@ reviews:
           - .cursor/rules/frontend/react.mdc
           - .cursor/rules/base/typescript.mdc
     
-    - path: "apps/next/**"
+    - path: "apps/web/**"
       instructions: |
         - Verify Next.js App Router conventions and React Server Components usage
         - Follow all coding standards defined in:
@@ -111,7 +111,7 @@ reviews:
           - .cursor/rules/base/docs.mdc
           - .cursor/rules/base/typescript.mdc
     
-    - path: "apps/fastify/**"
+    - path: "apps/api/**"
       instructions: |
         - CRITICAL: never edit db/migrations, openapi schema files directly. All migrations must be created through the typical Drizzle flow and OpenAPI is autogenerated. Always validate no discrepancies.
         - Verify Fastify functional patterns and TypeBox schema usage
diff --git a/.cursor/rules/backend/fastify.mdc b/.cursor/rules/backend/fastify.mdc
index c3beebd2..dc5a2e52 100644
--- a/.cursor/rules/backend/fastify.mdc
+++ b/.cursor/rules/backend/fastify.mdc
@@ -1,6 +1,6 @@
 ---
 description: Fastify backend development standards and patterns
-glob: "apps/fastify/**/*"
+glob: "apps/api/**/*"
 alwaysApply: true
 ---
 
diff --git a/.cursor/rules/frontend/auth.mdc b/.cursor/rules/frontend/auth.mdc
index 214cb01e..8ff525e8 100644
--- a/.cursor/rules/frontend/auth.mdc
+++ b/.cursor/rules/frontend/auth.mdc
@@ -1,6 +1,6 @@
 ---
 description: Next.js auth patterns—single cookie, core client modes, refresh flow
-glob: "apps/next/**/*,packages/core/**/*,packages/react/**/*"
+glob: "apps/web/**/*,packages/core/**/*,packages/react/**/*"
 alwaysApply: false
 ---
 
diff --git a/.cursor/rules/frontend/e2e-playwright.mdc b/.cursor/rules/frontend/e2e-playwright.mdc
index 1bb2457a..810be3de 100644
--- a/.cursor/rules/frontend/e2e-playwright.mdc
+++ b/.cursor/rules/frontend/e2e-playwright.mdc
@@ -1,10 +1,10 @@
 ---
 description: Playwright E2E patterns for Next.js and Fastify API
-glob: "apps/next/e2e/**/*, apps/next/playwright.config.ts, apps/fastify/test/**/*, apps/fastify/playwright.config.ts"
+glob: "apps/web/e2e/**/*, apps/web/playwright.config.ts, apps/api/test/**/*, apps/api/playwright.config.ts"
 ---
 
 ## Config
-- Frontend apps (`apps/next`) use **Playwright E2E only** — no Vitest/Testing Library unit or integration tests
+- Frontend apps (`apps/web`) use **Playwright E2E only** — no Vitest/Testing Library unit or integration tests
 - No webServer; URLs from `PLAYWRIGHT_APP_URL` / `PLAYWRIGHT_API_URL` (env or `--app` / `--api` params)
 - Fastify: only `--api` param; `test:e2e` = URL-based, `test:e2e:local` = spawn API, poll, run, cleanup
 - Param format: `--app=URL` or `--app URL`, `--api=URL` or `--api URL`
diff --git a/.cursor/rules/web3/wagmi.mdc b/.cursor/rules/web3/wagmi.mdc
index e8fc0169..42708373 100644
--- a/.cursor/rules/web3/wagmi.mdc
+++ b/.cursor/rules/web3/wagmi.mdc
@@ -1,6 +1,6 @@
 ---
 description: Web3 integration patterns using Wagmi v3
-glob: "apps/next/**/*.{ts,tsx}"
+glob: "apps/web/**/*.{ts,tsx}"
 alwaysApply: false
 ---
 
diff --git a/.github/workflows/api-e2e.yml b/.github/workflows/api-e2e.yml
index 36c60ba7..5f074555 100644
--- a/.github/workflows/api-e2e.yml
+++ b/.github/workflows/api-e2e.yml
@@ -3,7 +3,7 @@ name: API (E2E)
 on:
   pull_request:
     paths:
-      - 'apps/fastify/**'
+      - 'apps/api/**'
       - 'packages/email/**'
       - 'packages/sentry/**'
       - 'packages/utils/**'
@@ -48,17 +48,17 @@ jobs:
       - name: Install dependencies
         run: pnpm install --frozen-lockfile
       - name: Build
-        run: pnpm turbo run build --filter=@repo/fastify...
+        run: pnpm turbo run build --filter=@repo/api...
       - name: Unit tests
-        run: pnpm turbo run test --filter=@repo/fastify
+        run: pnpm turbo run test --filter=@repo/api
       - name: Install Playwright
-        run: pnpm --filter @repo/fastify exec playwright install chromium --with-deps
+        run: pnpm --filter @repo/api exec playwright install chromium --with-deps
       - name: E2E tests (local)
-        run: pnpm --filter @repo/fastify test:e2e:local
+        run: pnpm --filter @repo/api test:e2e:local
       - name: Upload Playwright report
         if: always()
         uses: actions/upload-artifact@v4
         with:
-          name: playwright-report-fastify
-          path: apps/fastify/playwright-report/
+          name: playwright-report-api
+          path: apps/api/playwright-report/
           retention-days: 30
diff --git a/.github/workflows/packages-test.yml b/.github/workflows/packages-test.yml
index cb1f9757..5461c82e 100644
--- a/.github/workflows/packages-test.yml
+++ b/.github/workflows/packages-test.yml
@@ -43,8 +43,8 @@ jobs:
       - name: Install dependencies
         run: pnpm install --frozen-lockfile
       - name: Generate OpenAPI (for @repo/core)
-        run: pnpm turbo run generate:openapi --filter=@repo/fastify
+        run: pnpm turbo run generate:openapi --filter=@repo/api
       - name: Build packages
-        run: pnpm turbo run build --filter='!@repo/next' --filter='!@repo/fastify' --filter='!@repo/docu'
+        run: pnpm turbo run build --filter='!@repo/web' --filter='!@repo/api' --filter='!@repo/docu'
       - name: Unit tests (packages only)
-        run: pnpm turbo run test --filter='!@repo/next' --filter='!@repo/fastify' --filter='!@repo/docu'
+        run: pnpm turbo run test --filter='!@repo/web' --filter='!@repo/api' --filter='!@repo/docu'
diff --git a/.github/workflows/next-e2e.yml b/.github/workflows/web-e2e.yml
similarity index 78%
rename from .github/workflows/next-e2e.yml
rename to .github/workflows/web-e2e.yml
index 01706c80..e0a64982 100644
--- a/.github/workflows/next-e2e.yml
+++ b/.github/workflows/web-e2e.yml
@@ -1,9 +1,9 @@
-name: Next (E2E)
+name: Web (E2E)
 
 on:
   pull_request:
     paths:
-      - 'apps/next/**'
+      - 'apps/web/**'
       - 'scripts/**'
       - 'packages/core/**'
       - 'packages/react/**'
@@ -11,13 +11,13 @@ on:
       - 'packages/utils/**'
       - 'packages/eslint-config/**'
       - 'packages/typescript-config/**'
-      - 'apps/fastify/openapi/**'
+      - 'apps/api/openapi/**'
       - 'pnpm-lock.yaml'
       - 'package.json'
       - 'turbo.json'
 
 concurrency:
-  group: next-e2e-${{ github.ref }}
+  group: web-e2e-${{ github.ref }}
   cancel-in-progress: false
 
 env:
@@ -52,19 +52,19 @@ jobs:
       - name: Install dependencies
         run: pnpm install --frozen-lockfile
       - name: Build
-        run: pnpm turbo run build --filter=@repo/next...
+        run: pnpm turbo run build --filter=@repo/web...
       - name: Unit tests
-        run: pnpm turbo run test --filter=@repo/next
+        run: pnpm turbo run test --filter=@repo/web
       - name: Install Playwright
-        run: pnpm --filter @repo/next exec playwright install chromium --with-deps
+        run: pnpm --filter @repo/web exec playwright install chromium --with-deps
       - name: E2E tests (local)
         env:
           SKIP_BUILD: '1'
-        run: pnpm --filter @repo/next test:e2e:local
+        run: pnpm --filter @repo/web test:e2e:local
       - name: Upload Playwright report
         if: always()
         uses: actions/upload-artifact@v4
         with:
-          name: playwright-report-next
-          path: apps/next/playwright-report/
+          name: playwright-report-web
+          path: apps/web/playwright-report/
           retention-days: 30
diff --git a/.gitleaks.toml b/.gitleaks.toml
index 2d3ac641..91991728 100644
--- a/.gitleaks.toml
+++ b/.gitleaks.toml
@@ -10,12 +10,12 @@ useDefault = true
 [allowlist]
 description = "Allowlist for test fixtures and example files"
 paths = [
-  '''apps/next/e2e/wallet-setup/.*\.(ts|js|mjs)$''',
+  '''apps/web/e2e/wallet-setup/.*\.(ts|js|mjs)$''',
   '''\.env-example$''',
   '''\.env\.example$''',
   '''\.env\.test\.example$''',
   '''\.env-sample$''',
-  '''^apps/next/\.env\.local\.example$''',
+  '''^apps/web/\.env\.local\.example$''',
   '''\.env\.sample$''',
   '''\.env\.schema$''',
   '''\.env\.test$''',
@@ -28,7 +28,7 @@ paths = [
   '''fixtures/''',
   '''examples/''',
   '''docs/''',
-  '''apps/fastify/scripts/generate-openapi\.ts$''',
+  '''apps/api/scripts/generate-openapi\.ts$''',
   '''scripts/run-qa\.mjs$''',
 ]
 
diff --git a/README.md b/README.md
index 283c92e9..b800c4bd 100644
--- a/README.md
+++ b/README.md
@@ -29,8 +29,8 @@ Fastify • OpenAPI • Next.js • Expo — one stack, multiple platforms.
 
 ## Apps
 
-- **[API](apps/fastify/README.md)** — Type-safe REST API built with Fastify & OpenAPI
-- **[Web App](apps/next/README.md)** — Next.js app with monorepo integration
+- **[API](apps/api/README.md)** — Type-safe REST API built with Fastify & OpenAPI
+- **[Web App](apps/web/README.md)** — Next.js app with monorepo integration
 - **[Documentation](apps/docu/README.md)** — Fumadocs-based docs site for architecture, ADRs, and development workflows
 
 ## Packages
@@ -55,7 +55,7 @@ Run with `pnpm <script>`.
   - `setup:database` — Database tools
 **Primary**
   - `build` — Build packages and apps
-  - `dev` — Start dev (core, react, error, utils, fastify, next)
+  - `dev` — Start dev (core, react, error, utils, api, web)
   - `qa` — Full check: install → checktypes → lint → build → test (unit) → test:e2e (Fastify + Next, local spawn)
 **Format / Lint**
   - `checktypes` — Type-check all packages
@@ -68,7 +68,7 @@ Run with `pnpm <script>`.
   - `test` — Run unit tests (packages + apps)
   - `test:e2e` — E2E (Fastify + Next)
 **CI**
-  - Lint and security run on every PR. App E2E (`next-e2e`, `api-e2e`) and package tests (`packages-test`) run only when relevant code changes. See [GitHub Actions](https://basilic-docs.vercel.app/docs/deployment/github-actions).
+  - Lint and security run on every PR. App E2E (`web-e2e`, `api-e2e`) and package tests (`packages-test`) run only when relevant code changes. See [GitHub Actions](https://basilic-docs.vercel.app/docs/deployment/github-actions).
 **Security**
   - `security:block-files` — Block sensitive file patterns
   - `security:secrets` — Scan staged files for secrets
diff --git a/apps/fastify/.env-sample b/apps/api/.env-sample
similarity index 100%
rename from apps/fastify/.env-sample
rename to apps/api/.env-sample
diff --git a/apps/fastify/.env.test.example b/apps/api/.env.test.example
similarity index 100%
rename from apps/fastify/.env.test.example
rename to apps/api/.env.test.example
diff --git a/apps/fastify/.gitignore b/apps/api/.gitignore
similarity index 100%
rename from apps/fastify/.gitignore
rename to apps/api/.gitignore
diff --git a/apps/fastify/README.md b/apps/api/README.md
similarity index 95%
rename from apps/fastify/README.md
rename to apps/api/README.md
index b5bebc9a..222c8dc4 100644
--- a/apps/fastify/README.md
+++ b/apps/api/README.md
@@ -12,7 +12,7 @@ Uses `framework: "fastify"` in vercel.json. Vercel auto-detects `server.ts` as t
 
 **OPTIONS Allowlist (CORS preflight):** When Deployment Protection is enabled on preview deployments, add `/` (or `/auth`) to **Project Settings > Deployment Protection > OPTIONS Allowlist**. Otherwise, preflight OPTIONS requests are blocked before reaching Fastify and CORS fails for cross-origin clients.
 
-**CI & Builds** (`api-e2e.yml`): Unit tests and E2E run on PR when `apps/fastify` or its dependencies change. Spawns API locally via `test:e2e:local`; no Vercel deploy required.
+**CI & Builds** (`api-e2e.yml`): Unit tests and E2E run on PR when `apps/api` or its dependencies change. Spawns API locally via `test:e2e:local`; no Vercel deploy required.
 
 ## Testing
 
diff --git a/apps/fastify/drizzle.config.ts b/apps/api/drizzle.config.ts
similarity index 100%
rename from apps/fastify/drizzle.config.ts
rename to apps/api/drizzle.config.ts
diff --git a/apps/fastify/eslint.config.mjs b/apps/api/eslint.config.mjs
similarity index 100%
rename from apps/fastify/eslint.config.mjs
rename to apps/api/eslint.config.mjs
diff --git a/apps/fastify/openapi/openapi.json b/apps/api/openapi/openapi.json
similarity index 100%
rename from apps/fastify/openapi/openapi.json
rename to apps/api/openapi/openapi.json
diff --git a/apps/fastify/package.json b/apps/api/package.json
similarity index 99%
rename from apps/fastify/package.json
rename to apps/api/package.json
index 087dd803..88e66d03 100644
--- a/apps/fastify/package.json
+++ b/apps/api/package.json
@@ -1,6 +1,6 @@
 {
   "type": "module",
-  "name": "@repo/fastify",
+  "name": "@repo/api",
   "version": "1.0.0",
   "description": "This project was bootstrapped with Fastify-CLI.",
   "main": "dist/server.js",
diff --git a/apps/fastify/playwright.config.ts b/apps/api/playwright.config.ts
similarity index 100%
rename from apps/fastify/playwright.config.ts
rename to apps/api/playwright.config.ts
diff --git a/apps/fastify/scripts/README.md b/apps/api/scripts/README.md
similarity index 100%
rename from apps/fastify/scripts/README.md
rename to apps/api/scripts/README.md
diff --git a/apps/fastify/scripts/create-verification-table.ts b/apps/api/scripts/create-verification-table.ts
similarity index 100%
rename from apps/fastify/scripts/create-verification-table.ts
rename to apps/api/scripts/create-verification-table.ts
diff --git a/apps/fastify/scripts/generate-openapi.ts b/apps/api/scripts/generate-openapi.ts
similarity index 100%
rename from apps/fastify/scripts/generate-openapi.ts
rename to apps/api/scripts/generate-openapi.ts
diff --git a/apps/fastify/scripts/migrate.ts b/apps/api/scripts/migrate.ts
similarity index 98%
rename from apps/fastify/scripts/migrate.ts
rename to apps/api/scripts/migrate.ts
index 806a8318..9dcae3a2 100644
--- a/apps/fastify/scripts/migrate.ts
+++ b/apps/api/scripts/migrate.ts
@@ -162,7 +162,7 @@ try {
     } else if (isTableExistsError) {
       logger.warn(
         { context: 'migrate', err: migrationError },
-        'Migration failed due to existing tables. Tables appear to match schema. For clean state, run: pnpm --filter @repo/fastify db:reset',
+        'Migration failed due to existing tables. Tables appear to match schema. For clean state, run: pnpm --filter @repo/api db:reset',
       )
       // In development/build, allow this to pass if tables exist and match schema
       // In production, this should fail to ensure proper migration tracking
diff --git a/apps/fastify/scripts/run-e2e-local.mjs b/apps/api/scripts/run-e2e-local.mjs
similarity index 98%
rename from apps/fastify/scripts/run-e2e-local.mjs
rename to apps/api/scripts/run-e2e-local.mjs
index f55022af..63486a2b 100644
--- a/apps/fastify/scripts/run-e2e-local.mjs
+++ b/apps/api/scripts/run-e2e-local.mjs
@@ -13,7 +13,7 @@ const fastifyDir = dirname(scriptDir)
 const repoRoot = dirname(dirname(fastifyDir))
 
 function loadEnvTest() {
-  const path = join(repoRoot, 'apps/fastify/.env.test')
+  const path = join(repoRoot, 'apps/api/.env.test')
   if (!existsSync(path)) return {}
   const lines = readFileSync(path, 'utf8').split('\n')
   const out = {}
diff --git a/apps/fastify/scripts/run-e2e.mjs b/apps/api/scripts/run-e2e.mjs
similarity index 100%
rename from apps/fastify/scripts/run-e2e.mjs
rename to apps/api/scripts/run-e2e.mjs
diff --git a/apps/fastify/server.ts b/apps/api/server.ts
similarity index 100%
rename from apps/fastify/server.ts
rename to apps/api/server.ts
diff --git a/apps/fastify/src/app.ts b/apps/api/src/app.ts
similarity index 100%
rename from apps/fastify/src/app.ts
rename to apps/api/src/app.ts
diff --git a/apps/fastify/src/db/account.ts b/apps/api/src/db/account.ts
similarity index 100%
rename from apps/fastify/src/db/account.ts
rename to apps/api/src/db/account.ts
diff --git a/apps/fastify/src/db/health.ts b/apps/api/src/db/health.ts
similarity index 100%
rename from apps/fastify/src/db/health.ts
rename to apps/api/src/db/health.ts
diff --git a/apps/fastify/src/db/index.ts b/apps/api/src/db/index.ts
similarity index 100%
rename from apps/fastify/src/db/index.ts
rename to apps/api/src/db/index.ts
diff --git a/apps/fastify/src/db/migrate.ts b/apps/api/src/db/migrate.ts
similarity index 100%
rename from apps/fastify/src/db/migrate.ts
rename to apps/api/src/db/migrate.ts
diff --git a/apps/fastify/src/db/migrations/0000_jittery_diamondback.sql b/apps/api/src/db/migrations/0000_jittery_diamondback.sql
similarity index 100%
rename from apps/fastify/src/db/migrations/0000_jittery_diamondback.sql
rename to apps/api/src/db/migrations/0000_jittery_diamondback.sql
diff --git a/apps/fastify/src/db/migrations/0001_petite_cardiac.sql b/apps/api/src/db/migrations/0001_petite_cardiac.sql
similarity index 100%
rename from apps/fastify/src/db/migrations/0001_petite_cardiac.sql
rename to apps/api/src/db/migrations/0001_petite_cardiac.sql
diff --git a/apps/fastify/src/db/migrations/0002_aspiring_ravenous.sql b/apps/api/src/db/migrations/0002_aspiring_ravenous.sql
similarity index 100%
rename from apps/fastify/src/db/migrations/0002_aspiring_ravenous.sql
rename to apps/api/src/db/migrations/0002_aspiring_ravenous.sql
diff --git a/apps/fastify/src/db/migrations/0003_careless_cannonball.sql b/apps/api/src/db/migrations/0003_careless_cannonball.sql
similarity index 100%
rename from apps/fastify/src/db/migrations/0003_careless_cannonball.sql
rename to apps/api/src/db/migrations/0003_careless_cannonball.sql
diff --git a/apps/fastify/src/db/migrations/0004_stormy_bill_hollister.sql b/apps/api/src/db/migrations/0004_stormy_bill_hollister.sql
similarity index 100%
rename from apps/fastify/src/db/migrations/0004_stormy_bill_hollister.sql
rename to apps/api/src/db/migrations/0004_stormy_bill_hollister.sql
diff --git a/apps/fastify/src/db/migrations/0005_medical_sway.sql b/apps/api/src/db/migrations/0005_medical_sway.sql
similarity index 100%
rename from apps/fastify/src/db/migrations/0005_medical_sway.sql
rename to apps/api/src/db/migrations/0005_medical_sway.sql
diff --git a/apps/fastify/src/db/migrations/0006_fantastic_tyger_tiger.sql b/apps/api/src/db/migrations/0006_fantastic_tyger_tiger.sql
similarity index 100%
rename from apps/fastify/src/db/migrations/0006_fantastic_tyger_tiger.sql
rename to apps/api/src/db/migrations/0006_fantastic_tyger_tiger.sql
diff --git a/apps/fastify/src/db/migrations/0007_faithful_ser_duncan.sql b/apps/api/src/db/migrations/0007_faithful_ser_duncan.sql
similarity index 100%
rename from apps/fastify/src/db/migrations/0007_faithful_ser_duncan.sql
rename to apps/api/src/db/migrations/0007_faithful_ser_duncan.sql
diff --git a/apps/fastify/src/db/migrations/0008_cheerful_deadpool.sql b/apps/api/src/db/migrations/0008_cheerful_deadpool.sql
similarity index 100%
rename from apps/fastify/src/db/migrations/0008_cheerful_deadpool.sql
rename to apps/api/src/db/migrations/0008_cheerful_deadpool.sql
diff --git a/apps/fastify/src/db/migrations/0009_flippant_quasar.sql b/apps/api/src/db/migrations/0009_flippant_quasar.sql
similarity index 100%
rename from apps/fastify/src/db/migrations/0009_flippant_quasar.sql
rename to apps/api/src/db/migrations/0009_flippant_quasar.sql
diff --git a/apps/fastify/src/db/migrations/0010_cloudy_ultimatum.sql b/apps/api/src/db/migrations/0010_cloudy_ultimatum.sql
similarity index 100%
rename from apps/fastify/src/db/migrations/0010_cloudy_ultimatum.sql
rename to apps/api/src/db/migrations/0010_cloudy_ultimatum.sql
diff --git a/apps/fastify/src/db/migrations/0011_keen_eternals.sql b/apps/api/src/db/migrations/0011_keen_eternals.sql
similarity index 100%
rename from apps/fastify/src/db/migrations/0011_keen_eternals.sql
rename to apps/api/src/db/migrations/0011_keen_eternals.sql
diff --git a/apps/fastify/src/db/migrations/0012_aberrant_johnny_blaze.sql b/apps/api/src/db/migrations/0012_aberrant_johnny_blaze.sql
similarity index 100%
rename from apps/fastify/src/db/migrations/0012_aberrant_johnny_blaze.sql
rename to apps/api/src/db/migrations/0012_aberrant_johnny_blaze.sql
diff --git a/apps/fastify/src/db/migrations/0013_familiar_master_chief.sql b/apps/api/src/db/migrations/0013_familiar_master_chief.sql
similarity index 100%
rename from apps/fastify/src/db/migrations/0013_familiar_master_chief.sql
rename to apps/api/src/db/migrations/0013_familiar_master_chief.sql
diff --git a/apps/fastify/src/db/migrations/0014_slippery_puff_adder.sql b/apps/api/src/db/migrations/0014_slippery_puff_adder.sql
similarity index 100%
rename from apps/fastify/src/db/migrations/0014_slippery_puff_adder.sql
rename to apps/api/src/db/migrations/0014_slippery_puff_adder.sql
diff --git a/apps/fastify/src/db/migrations/0015_shallow_umar.sql b/apps/api/src/db/migrations/0015_shallow_umar.sql
similarity index 100%
rename from apps/fastify/src/db/migrations/0015_shallow_umar.sql
rename to apps/api/src/db/migrations/0015_shallow_umar.sql
diff --git a/apps/fastify/src/db/migrations/0016_easy_chameleon.sql b/apps/api/src/db/migrations/0016_easy_chameleon.sql
similarity index 100%
rename from apps/fastify/src/db/migrations/0016_easy_chameleon.sql
rename to apps/api/src/db/migrations/0016_easy_chameleon.sql
diff --git a/apps/fastify/src/db/migrations/meta/0000_snapshot.json b/apps/api/src/db/migrations/meta/0000_snapshot.json
similarity index 100%
rename from apps/fastify/src/db/migrations/meta/0000_snapshot.json
rename to apps/api/src/db/migrations/meta/0000_snapshot.json
diff --git a/apps/fastify/src/db/migrations/meta/0001_snapshot.json b/apps/api/src/db/migrations/meta/0001_snapshot.json
similarity index 100%
rename from apps/fastify/src/db/migrations/meta/0001_snapshot.json
rename to apps/api/src/db/migrations/meta/0001_snapshot.json
diff --git a/apps/fastify/src/db/migrations/meta/0002_snapshot.json b/apps/api/src/db/migrations/meta/0002_snapshot.json
similarity index 100%
rename from apps/fastify/src/db/migrations/meta/0002_snapshot.json
rename to apps/api/src/db/migrations/meta/0002_snapshot.json
diff --git a/apps/fastify/src/db/migrations/meta/0003_snapshot.json b/apps/api/src/db/migrations/meta/0003_snapshot.json
similarity index 100%
rename from apps/fastify/src/db/migrations/meta/0003_snapshot.json
rename to apps/api/src/db/migrations/meta/0003_snapshot.json
diff --git a/apps/fastify/src/db/migrations/meta/0004_snapshot.json b/apps/api/src/db/migrations/meta/0004_snapshot.json
similarity index 100%
rename from apps/fastify/src/db/migrations/meta/0004_snapshot.json
rename to apps/api/src/db/migrations/meta/0004_snapshot.json
diff --git a/apps/fastify/src/db/migrations/meta/0005_snapshot.json b/apps/api/src/db/migrations/meta/0005_snapshot.json
similarity index 100%
rename from apps/fastify/src/db/migrations/meta/0005_snapshot.json
rename to apps/api/src/db/migrations/meta/0005_snapshot.json
diff --git a/apps/fastify/src/db/migrations/meta/0006_snapshot.json b/apps/api/src/db/migrations/meta/0006_snapshot.json
similarity index 100%
rename from apps/fastify/src/db/migrations/meta/0006_snapshot.json
rename to apps/api/src/db/migrations/meta/0006_snapshot.json
diff --git a/apps/fastify/src/db/migrations/meta/0007_snapshot.json b/apps/api/src/db/migrations/meta/0007_snapshot.json
similarity index 100%
rename from apps/fastify/src/db/migrations/meta/0007_snapshot.json
rename to apps/api/src/db/migrations/meta/0007_snapshot.json
diff --git a/apps/fastify/src/db/migrations/meta/0008_snapshot.json b/apps/api/src/db/migrations/meta/0008_snapshot.json
similarity index 100%
rename from apps/fastify/src/db/migrations/meta/0008_snapshot.json
rename to apps/api/src/db/migrations/meta/0008_snapshot.json
diff --git a/apps/fastify/src/db/migrations/meta/0009_snapshot.json b/apps/api/src/db/migrations/meta/0009_snapshot.json
similarity index 100%
rename from apps/fastify/src/db/migrations/meta/0009_snapshot.json
rename to apps/api/src/db/migrations/meta/0009_snapshot.json
diff --git a/apps/fastify/src/db/migrations/meta/0010_snapshot.json b/apps/api/src/db/migrations/meta/0010_snapshot.json
similarity index 100%
rename from apps/fastify/src/db/migrations/meta/0010_snapshot.json
rename to apps/api/src/db/migrations/meta/0010_snapshot.json
diff --git a/apps/fastify/src/db/migrations/meta/0011_snapshot.json b/apps/api/src/db/migrations/meta/0011_snapshot.json
similarity index 100%
rename from apps/fastify/src/db/migrations/meta/0011_snapshot.json
rename to apps/api/src/db/migrations/meta/0011_snapshot.json
diff --git a/apps/fastify/src/db/migrations/meta/0012_snapshot.json b/apps/api/src/db/migrations/meta/0012_snapshot.json
similarity index 100%
rename from apps/fastify/src/db/migrations/meta/0012_snapshot.json
rename to apps/api/src/db/migrations/meta/0012_snapshot.json
diff --git a/apps/fastify/src/db/migrations/meta/0013_snapshot.json b/apps/api/src/db/migrations/meta/0013_snapshot.json
similarity index 100%
rename from apps/fastify/src/db/migrations/meta/0013_snapshot.json
rename to apps/api/src/db/migrations/meta/0013_snapshot.json
diff --git a/apps/fastify/src/db/migrations/meta/0014_snapshot.json b/apps/api/src/db/migrations/meta/0014_snapshot.json
similarity index 100%
rename from apps/fastify/src/db/migrations/meta/0014_snapshot.json
rename to apps/api/src/db/migrations/meta/0014_snapshot.json
diff --git a/apps/fastify/src/db/migrations/meta/0015_snapshot.json b/apps/api/src/db/migrations/meta/0015_snapshot.json
similarity index 100%
rename from apps/fastify/src/db/migrations/meta/0015_snapshot.json
rename to apps/api/src/db/migrations/meta/0015_snapshot.json
diff --git a/apps/fastify/src/db/migrations/meta/0016_snapshot.json b/apps/api/src/db/migrations/meta/0016_snapshot.json
similarity index 100%
rename from apps/fastify/src/db/migrations/meta/0016_snapshot.json
rename to apps/api/src/db/migrations/meta/0016_snapshot.json
diff --git a/apps/fastify/src/db/migrations/meta/_journal.json b/apps/api/src/db/migrations/meta/_journal.json
similarity index 100%
rename from apps/fastify/src/db/migrations/meta/_journal.json
rename to apps/api/src/db/migrations/meta/_journal.json
diff --git a/apps/fastify/src/db/passkey-callback.ts b/apps/api/src/db/passkey-callback.ts
similarity index 100%
rename from apps/fastify/src/db/passkey-callback.ts
rename to apps/api/src/db/passkey-callback.ts
diff --git a/apps/fastify/src/db/schema/index.ts b/apps/api/src/db/schema/index.ts
similarity index 100%
rename from apps/fastify/src/db/schema/index.ts
rename to apps/api/src/db/schema/index.ts
diff --git a/apps/fastify/src/db/schema/tables/account.ts b/apps/api/src/db/schema/tables/account.ts
similarity index 100%
rename from apps/fastify/src/db/schema/tables/account.ts
rename to apps/api/src/db/schema/tables/account.ts
diff --git a/apps/fastify/src/db/schema/tables/api-keys.ts b/apps/api/src/db/schema/tables/api-keys.ts
similarity index 100%
rename from apps/fastify/src/db/schema/tables/api-keys.ts
rename to apps/api/src/db/schema/tables/api-keys.ts
diff --git a/apps/fastify/src/db/schema/tables/auth-attempts.ts b/apps/api/src/db/schema/tables/auth-attempts.ts
similarity index 100%
rename from apps/fastify/src/db/schema/tables/auth-attempts.ts
rename to apps/api/src/db/schema/tables/auth-attempts.ts
diff --git a/apps/fastify/src/db/schema/tables/passkey-auth-challenges.ts b/apps/api/src/db/schema/tables/passkey-auth-challenges.ts
similarity index 100%
rename from apps/fastify/src/db/schema/tables/passkey-auth-challenges.ts
rename to apps/api/src/db/schema/tables/passkey-auth-challenges.ts
diff --git a/apps/fastify/src/db/schema/tables/passkey-callback.ts b/apps/api/src/db/schema/tables/passkey-callback.ts
similarity index 100%
rename from apps/fastify/src/db/schema/tables/passkey-callback.ts
rename to apps/api/src/db/schema/tables/passkey-callback.ts
diff --git a/apps/fastify/src/db/schema/tables/passkey-challenges.ts b/apps/api/src/db/schema/tables/passkey-challenges.ts
similarity index 100%
rename from apps/fastify/src/db/schema/tables/passkey-challenges.ts
rename to apps/api/src/db/schema/tables/passkey-challenges.ts
diff --git a/apps/fastify/src/db/schema/tables/passkey-credentials.ts b/apps/api/src/db/schema/tables/passkey-credentials.ts
similarity index 100%
rename from apps/fastify/src/db/schema/tables/passkey-credentials.ts
rename to apps/api/src/db/schema/tables/passkey-credentials.ts
diff --git a/apps/fastify/src/db/schema/tables/sessions.ts b/apps/api/src/db/schema/tables/sessions.ts
similarity index 100%
rename from apps/fastify/src/db/schema/tables/sessions.ts
rename to apps/api/src/db/schema/tables/sessions.ts
diff --git a/apps/fastify/src/db/schema/tables/totp-setup.ts b/apps/api/src/db/schema/tables/totp-setup.ts
similarity index 100%
rename from apps/fastify/src/db/schema/tables/totp-setup.ts
rename to apps/api/src/db/schema/tables/totp-setup.ts
diff --git a/apps/fastify/src/db/schema/tables/totp.ts b/apps/api/src/db/schema/tables/totp.ts
similarity index 100%
rename from apps/fastify/src/db/schema/tables/totp.ts
rename to apps/api/src/db/schema/tables/totp.ts
diff --git a/apps/fastify/src/db/schema/tables/users.ts b/apps/api/src/db/schema/tables/users.ts
similarity index 100%
rename from apps/fastify/src/db/schema/tables/users.ts
rename to apps/api/src/db/schema/tables/users.ts
diff --git a/apps/fastify/src/db/schema/tables/verification.ts b/apps/api/src/db/schema/tables/verification.ts
similarity index 100%
rename from apps/fastify/src/db/schema/tables/verification.ts
rename to apps/api/src/db/schema/tables/verification.ts
diff --git a/apps/fastify/src/db/schema/tables/wallet-identities.ts b/apps/api/src/db/schema/tables/wallet-identities.ts
similarity index 100%
rename from apps/fastify/src/db/schema/tables/wallet-identities.ts
rename to apps/api/src/db/schema/tables/wallet-identities.ts
diff --git a/apps/fastify/src/db/schema/tables/web3-callback.ts b/apps/api/src/db/schema/tables/web3-callback.ts
similarity index 100%
rename from apps/fastify/src/db/schema/tables/web3-callback.ts
rename to apps/api/src/db/schema/tables/web3-callback.ts
diff --git a/apps/fastify/src/db/schema/tables/web3-nonce.ts b/apps/api/src/db/schema/tables/web3-nonce.ts
similarity index 100%
rename from apps/fastify/src/db/schema/tables/web3-nonce.ts
rename to apps/api/src/db/schema/tables/web3-nonce.ts
diff --git a/apps/fastify/src/lib/api-key-auth.ts b/apps/api/src/lib/api-key-auth.ts
similarity index 100%
rename from apps/fastify/src/lib/api-key-auth.ts
rename to apps/api/src/lib/api-key-auth.ts
diff --git a/apps/fastify/src/lib/api-keys.test.ts b/apps/api/src/lib/api-keys.test.ts
similarity index 100%
rename from apps/fastify/src/lib/api-keys.test.ts
rename to apps/api/src/lib/api-keys.test.ts
diff --git a/apps/fastify/src/lib/api-keys.ts b/apps/api/src/lib/api-keys.ts
similarity index 100%
rename from apps/fastify/src/lib/api-keys.ts
rename to apps/api/src/lib/api-keys.ts
diff --git a/apps/fastify/src/lib/auth-guardrails.ts b/apps/api/src/lib/auth-guardrails.ts
similarity index 100%
rename from apps/fastify/src/lib/auth-guardrails.ts
rename to apps/api/src/lib/auth-guardrails.ts
diff --git a/apps/fastify/src/lib/auth-web3.ts b/apps/api/src/lib/auth-web3.ts
similarity index 100%
rename from apps/fastify/src/lib/auth-web3.ts
rename to apps/api/src/lib/auth-web3.ts
diff --git a/apps/fastify/src/lib/auth.ts b/apps/api/src/lib/auth.ts
similarity index 100%
rename from apps/fastify/src/lib/auth.ts
rename to apps/api/src/lib/auth.ts
diff --git a/apps/fastify/src/lib/catalogs/client.ts b/apps/api/src/lib/catalogs/client.ts
similarity index 100%
rename from apps/fastify/src/lib/catalogs/client.ts
rename to apps/api/src/lib/catalogs/client.ts
diff --git a/apps/fastify/src/lib/catalogs/index.ts b/apps/api/src/lib/catalogs/index.ts
similarity index 100%
rename from apps/fastify/src/lib/catalogs/index.ts
rename to apps/api/src/lib/catalogs/index.ts
diff --git a/apps/fastify/src/lib/catalogs/mapper.ts b/apps/api/src/lib/catalogs/mapper.ts
similarity index 100%
rename from apps/fastify/src/lib/catalogs/mapper.ts
rename to apps/api/src/lib/catalogs/mapper.ts
diff --git a/apps/fastify/src/lib/catalogs/server.ts b/apps/api/src/lib/catalogs/server.ts
similarity index 100%
rename from apps/fastify/src/lib/catalogs/server.ts
rename to apps/api/src/lib/catalogs/server.ts
diff --git a/apps/fastify/src/lib/catalogs/web.ts b/apps/api/src/lib/catalogs/web.ts
similarity index 100%
rename from apps/fastify/src/lib/catalogs/web.ts
rename to apps/api/src/lib/catalogs/web.ts
diff --git a/apps/fastify/src/lib/crypto.ts b/apps/api/src/lib/crypto.ts
similarity index 100%
rename from apps/fastify/src/lib/crypto.ts
rename to apps/api/src/lib/crypto.ts
diff --git a/apps/fastify/src/lib/db-errors.ts b/apps/api/src/lib/db-errors.ts
similarity index 100%
rename from apps/fastify/src/lib/db-errors.ts
rename to apps/api/src/lib/db-errors.ts
diff --git a/apps/fastify/src/lib/email.ts b/apps/api/src/lib/email.ts
similarity index 100%
rename from apps/fastify/src/lib/email.ts
rename to apps/api/src/lib/email.ts
diff --git a/apps/fastify/src/lib/env.ts b/apps/api/src/lib/env.ts
similarity index 100%
rename from apps/fastify/src/lib/env.ts
rename to apps/api/src/lib/env.ts
diff --git a/apps/fastify/src/lib/jwt.ts b/apps/api/src/lib/jwt.ts
similarity index 100%
rename from apps/fastify/src/lib/jwt.ts
rename to apps/api/src/lib/jwt.ts
diff --git a/apps/fastify/src/lib/oauth-exchange-state.ts b/apps/api/src/lib/oauth-exchange-state.ts
similarity index 100%
rename from apps/fastify/src/lib/oauth-exchange-state.ts
rename to apps/api/src/lib/oauth-exchange-state.ts
diff --git a/apps/fastify/src/lib/oauth-google.ts b/apps/api/src/lib/oauth-google.ts
similarity index 100%
rename from apps/fastify/src/lib/oauth-google.ts
rename to apps/api/src/lib/oauth-google.ts
diff --git a/apps/fastify/src/lib/oauth-shared.ts b/apps/api/src/lib/oauth-shared.ts
similarity index 100%
rename from apps/fastify/src/lib/oauth-shared.ts
rename to apps/api/src/lib/oauth-shared.ts
diff --git a/apps/fastify/src/lib/oauth-twitter.ts b/apps/api/src/lib/oauth-twitter.ts
similarity index 100%
rename from apps/fastify/src/lib/oauth-twitter.ts
rename to apps/api/src/lib/oauth-twitter.ts
diff --git a/apps/fastify/src/lib/oauth-user.ts b/apps/api/src/lib/oauth-user.ts
similarity index 100%
rename from apps/fastify/src/lib/oauth-user.ts
rename to apps/api/src/lib/oauth-user.ts
diff --git a/apps/fastify/src/lib/passkey-auth.ts b/apps/api/src/lib/passkey-auth.ts
similarity index 100%
rename from apps/fastify/src/lib/passkey-auth.ts
rename to apps/api/src/lib/passkey-auth.ts
diff --git a/apps/fastify/src/lib/passkey.ts b/apps/api/src/lib/passkey.ts
similarity index 100%
rename from apps/fastify/src/lib/passkey.ts
rename to apps/api/src/lib/passkey.ts
diff --git a/apps/fastify/src/lib/request.ts b/apps/api/src/lib/request.ts
similarity index 100%
rename from apps/fastify/src/lib/request.ts
rename to apps/api/src/lib/request.ts
diff --git a/apps/fastify/src/lib/schemas/webauthn.ts b/apps/api/src/lib/schemas/webauthn.ts
similarity index 100%
rename from apps/fastify/src/lib/schemas/webauthn.ts
rename to apps/api/src/lib/schemas/webauthn.ts
diff --git a/apps/fastify/src/lib/security.ts b/apps/api/src/lib/security.ts
similarity index 100%
rename from apps/fastify/src/lib/security.ts
rename to apps/api/src/lib/security.ts
diff --git a/apps/fastify/src/lib/session.ts b/apps/api/src/lib/session.ts
similarity index 100%
rename from apps/fastify/src/lib/session.ts
rename to apps/api/src/lib/session.ts
diff --git a/apps/fastify/src/lib/totp.ts b/apps/api/src/lib/totp.ts
similarity index 100%
rename from apps/fastify/src/lib/totp.ts
rename to apps/api/src/lib/totp.ts
diff --git a/apps/fastify/src/lib/url.spec.ts b/apps/api/src/lib/url.spec.ts
similarity index 100%
rename from apps/fastify/src/lib/url.spec.ts
rename to apps/api/src/lib/url.spec.ts
diff --git a/apps/fastify/src/lib/url.test.ts b/apps/api/src/lib/url.test.ts
similarity index 100%
rename from apps/fastify/src/lib/url.test.ts
rename to apps/api/src/lib/url.test.ts
diff --git a/apps/fastify/src/lib/url.ts b/apps/api/src/lib/url.ts
similarity index 100%
rename from apps/fastify/src/lib/url.ts
rename to apps/api/src/lib/url.ts
diff --git a/apps/fastify/src/lib/username.ts b/apps/api/src/lib/username.ts
similarity index 100%
rename from apps/fastify/src/lib/username.ts
rename to apps/api/src/lib/username.ts
diff --git a/apps/fastify/src/lib/web3-verify.ts b/apps/api/src/lib/web3-verify.ts
similarity index 100%
rename from apps/fastify/src/lib/web3-verify.ts
rename to apps/api/src/lib/web3-verify.ts
diff --git a/apps/fastify/src/plugins/README.md b/apps/api/src/plugins/README.md
similarity index 100%
rename from apps/fastify/src/plugins/README.md
rename to apps/api/src/plugins/README.md
diff --git a/apps/fastify/src/plugins/auth.ts b/apps/api/src/plugins/auth.ts
similarity index 100%
rename from apps/fastify/src/plugins/auth.ts
rename to apps/api/src/plugins/auth.ts
diff --git a/apps/fastify/src/plugins/cors.ts b/apps/api/src/plugins/cors.ts
similarity index 100%
rename from apps/fastify/src/plugins/cors.ts
rename to apps/api/src/plugins/cors.ts
diff --git a/apps/fastify/src/plugins/email.ts b/apps/api/src/plugins/email.ts
similarity index 100%
rename from apps/fastify/src/plugins/email.ts
rename to apps/api/src/plugins/email.ts
diff --git a/apps/fastify/src/plugins/error-handler.ts b/apps/api/src/plugins/error-handler.ts
similarity index 100%
rename from apps/fastify/src/plugins/error-handler.ts
rename to apps/api/src/plugins/error-handler.ts
diff --git a/apps/fastify/src/plugins/jwt.ts b/apps/api/src/plugins/jwt.ts
similarity index 100%
rename from apps/fastify/src/plugins/jwt.ts
rename to apps/api/src/plugins/jwt.ts
diff --git a/apps/fastify/src/plugins/openapi.ts b/apps/api/src/plugins/openapi.ts
similarity index 100%
rename from apps/fastify/src/plugins/openapi.ts
rename to apps/api/src/plugins/openapi.ts
diff --git a/apps/fastify/src/plugins/rate-limit.ts b/apps/api/src/plugins/rate-limit.ts
similarity index 100%
rename from apps/fastify/src/plugins/rate-limit.ts
rename to apps/api/src/plugins/rate-limit.ts
diff --git a/apps/fastify/src/plugins/security.ts b/apps/api/src/plugins/security.ts
similarity index 100%
rename from apps/fastify/src/plugins/security.ts
rename to apps/api/src/plugins/security.ts
diff --git a/apps/fastify/src/routes/README.md b/apps/api/src/routes/README.md
similarity index 100%
rename from apps/fastify/src/routes/README.md
rename to apps/api/src/routes/README.md
diff --git a/apps/fastify/src/routes/account/account.spec.ts b/apps/api/src/routes/account/account.spec.ts
similarity index 100%
rename from apps/fastify/src/routes/account/account.spec.ts
rename to apps/api/src/routes/account/account.spec.ts
diff --git a/apps/fastify/src/routes/account/apikeys/create.test.ts b/apps/api/src/routes/account/apikeys/create.test.ts
similarity index 100%
rename from apps/fastify/src/routes/account/apikeys/create.test.ts
rename to apps/api/src/routes/account/apikeys/create.test.ts
diff --git a/apps/fastify/src/routes/account/apikeys/create.ts b/apps/api/src/routes/account/apikeys/create.ts
similarity index 100%
rename from apps/fastify/src/routes/account/apikeys/create.ts
rename to apps/api/src/routes/account/apikeys/create.ts
diff --git a/apps/fastify/src/routes/account/apikeys/list.test.ts b/apps/api/src/routes/account/apikeys/list.test.ts
similarity index 100%
rename from apps/fastify/src/routes/account/apikeys/list.test.ts
rename to apps/api/src/routes/account/apikeys/list.test.ts
diff --git a/apps/fastify/src/routes/account/apikeys/list.ts b/apps/api/src/routes/account/apikeys/list.ts
similarity index 100%
rename from apps/fastify/src/routes/account/apikeys/list.ts
rename to apps/api/src/routes/account/apikeys/list.ts
diff --git a/apps/fastify/src/routes/account/apikeys/revoke.test.ts b/apps/api/src/routes/account/apikeys/revoke.test.ts
similarity index 100%
rename from apps/fastify/src/routes/account/apikeys/revoke.test.ts
rename to apps/api/src/routes/account/apikeys/revoke.test.ts
diff --git a/apps/fastify/src/routes/account/apikeys/revoke.ts b/apps/api/src/routes/account/apikeys/revoke.ts
similarity index 100%
rename from apps/fastify/src/routes/account/apikeys/revoke.ts
rename to apps/api/src/routes/account/apikeys/revoke.ts
diff --git a/apps/fastify/src/routes/account/email/change/request.test.ts b/apps/api/src/routes/account/email/change/request.test.ts
similarity index 100%
rename from apps/fastify/src/routes/account/email/change/request.test.ts
rename to apps/api/src/routes/account/email/change/request.test.ts
diff --git a/apps/fastify/src/routes/account/email/change/request.ts b/apps/api/src/routes/account/email/change/request.ts
similarity index 100%
rename from apps/fastify/src/routes/account/email/change/request.ts
rename to apps/api/src/routes/account/email/change/request.ts
diff --git a/apps/fastify/src/routes/account/email/change/verify.test.ts b/apps/api/src/routes/account/email/change/verify.test.ts
similarity index 100%
rename from apps/fastify/src/routes/account/email/change/verify.test.ts
rename to apps/api/src/routes/account/email/change/verify.test.ts
diff --git a/apps/fastify/src/routes/account/email/change/verify.ts b/apps/api/src/routes/account/email/change/verify.ts
similarity index 100%
rename from apps/fastify/src/routes/account/email/change/verify.ts
rename to apps/api/src/routes/account/email/change/verify.ts
diff --git a/apps/fastify/src/routes/account/link/email/request.test.ts b/apps/api/src/routes/account/link/email/request.test.ts
similarity index 100%
rename from apps/fastify/src/routes/account/link/email/request.test.ts
rename to apps/api/src/routes/account/link/email/request.test.ts
diff --git a/apps/fastify/src/routes/account/link/email/request.ts b/apps/api/src/routes/account/link/email/request.ts
similarity index 100%
rename from apps/fastify/src/routes/account/link/email/request.ts
rename to apps/api/src/routes/account/link/email/request.ts
diff --git a/apps/fastify/src/routes/account/link/email/verify.test.ts b/apps/api/src/routes/account/link/email/verify.test.ts
similarity index 100%
rename from apps/fastify/src/routes/account/link/email/verify.test.ts
rename to apps/api/src/routes/account/link/email/verify.test.ts
diff --git a/apps/fastify/src/routes/account/link/email/verify.ts b/apps/api/src/routes/account/link/email/verify.ts
similarity index 100%
rename from apps/fastify/src/routes/account/link/email/verify.ts
rename to apps/api/src/routes/account/link/email/verify.ts
diff --git a/apps/fastify/src/routes/account/link/oauth/unlink.test.ts b/apps/api/src/routes/account/link/oauth/unlink.test.ts
similarity index 100%
rename from apps/fastify/src/routes/account/link/oauth/unlink.test.ts
rename to apps/api/src/routes/account/link/oauth/unlink.test.ts
diff --git a/apps/fastify/src/routes/account/link/oauth/unlink.ts b/apps/api/src/routes/account/link/oauth/unlink.ts
similarity index 100%
rename from apps/fastify/src/routes/account/link/oauth/unlink.ts
rename to apps/api/src/routes/account/link/oauth/unlink.ts
diff --git a/apps/fastify/src/routes/account/link/passkey/delete.test.ts b/apps/api/src/routes/account/link/passkey/delete.test.ts
similarity index 100%
rename from apps/fastify/src/routes/account/link/passkey/delete.test.ts
rename to apps/api/src/routes/account/link/passkey/delete.test.ts
diff --git a/apps/fastify/src/routes/account/link/passkey/delete.ts b/apps/api/src/routes/account/link/passkey/delete.ts
similarity index 100%
rename from apps/fastify/src/routes/account/link/passkey/delete.ts
rename to apps/api/src/routes/account/link/passkey/delete.ts
diff --git a/apps/fastify/src/routes/account/link/passkey/finish.test.ts b/apps/api/src/routes/account/link/passkey/finish.test.ts
similarity index 100%
rename from apps/fastify/src/routes/account/link/passkey/finish.test.ts
rename to apps/api/src/routes/account/link/passkey/finish.test.ts
diff --git a/apps/fastify/src/routes/account/link/passkey/finish.ts b/apps/api/src/routes/account/link/passkey/finish.ts
similarity index 100%
rename from apps/fastify/src/routes/account/link/passkey/finish.ts
rename to apps/api/src/routes/account/link/passkey/finish.ts
diff --git a/apps/fastify/src/routes/account/link/passkey/start.test.ts b/apps/api/src/routes/account/link/passkey/start.test.ts
similarity index 100%
rename from apps/fastify/src/routes/account/link/passkey/start.test.ts
rename to apps/api/src/routes/account/link/passkey/start.test.ts
diff --git a/apps/fastify/src/routes/account/link/passkey/start.ts b/apps/api/src/routes/account/link/passkey/start.ts
similarity index 100%
rename from apps/fastify/src/routes/account/link/passkey/start.ts
rename to apps/api/src/routes/account/link/passkey/start.ts
diff --git a/apps/fastify/src/routes/account/link/totp/setup.test.ts b/apps/api/src/routes/account/link/totp/setup.test.ts
similarity index 100%
rename from apps/fastify/src/routes/account/link/totp/setup.test.ts
rename to apps/api/src/routes/account/link/totp/setup.test.ts
diff --git a/apps/fastify/src/routes/account/link/totp/setup.ts b/apps/api/src/routes/account/link/totp/setup.ts
similarity index 100%
rename from apps/fastify/src/routes/account/link/totp/setup.ts
rename to apps/api/src/routes/account/link/totp/setup.ts
diff --git a/apps/fastify/src/routes/account/link/totp/unlink.test.ts b/apps/api/src/routes/account/link/totp/unlink.test.ts
similarity index 100%
rename from apps/fastify/src/routes/account/link/totp/unlink.test.ts
rename to apps/api/src/routes/account/link/totp/unlink.test.ts
diff --git a/apps/fastify/src/routes/account/link/totp/unlink.ts b/apps/api/src/routes/account/link/totp/unlink.ts
similarity index 100%
rename from apps/fastify/src/routes/account/link/totp/unlink.ts
rename to apps/api/src/routes/account/link/totp/unlink.ts
diff --git a/apps/fastify/src/routes/account/link/totp/verify.test.ts b/apps/api/src/routes/account/link/totp/verify.test.ts
similarity index 100%
rename from apps/fastify/src/routes/account/link/totp/verify.test.ts
rename to apps/api/src/routes/account/link/totp/verify.test.ts
diff --git a/apps/fastify/src/routes/account/link/totp/verify.ts b/apps/api/src/routes/account/link/totp/verify.ts
similarity index 100%
rename from apps/fastify/src/routes/account/link/totp/verify.ts
rename to apps/api/src/routes/account/link/totp/verify.ts
diff --git a/apps/fastify/src/routes/account/link/wallet/unlink.test.ts b/apps/api/src/routes/account/link/wallet/unlink.test.ts
similarity index 100%
rename from apps/fastify/src/routes/account/link/wallet/unlink.test.ts
rename to apps/api/src/routes/account/link/wallet/unlink.test.ts
diff --git a/apps/fastify/src/routes/account/link/wallet/unlink.ts b/apps/api/src/routes/account/link/wallet/unlink.ts
similarity index 100%
rename from apps/fastify/src/routes/account/link/wallet/unlink.ts
rename to apps/api/src/routes/account/link/wallet/unlink.ts
diff --git a/apps/fastify/src/routes/account/link/wallet/verify.test.ts b/apps/api/src/routes/account/link/wallet/verify.test.ts
similarity index 100%
rename from apps/fastify/src/routes/account/link/wallet/verify.test.ts
rename to apps/api/src/routes/account/link/wallet/verify.test.ts
diff --git a/apps/fastify/src/routes/account/link/wallet/verify.ts b/apps/api/src/routes/account/link/wallet/verify.ts
similarity index 100%
rename from apps/fastify/src/routes/account/link/wallet/verify.ts
rename to apps/api/src/routes/account/link/wallet/verify.ts
diff --git a/apps/fastify/src/routes/account/passkeys/list.test.ts b/apps/api/src/routes/account/passkeys/list.test.ts
similarity index 100%
rename from apps/fastify/src/routes/account/passkeys/list.test.ts
rename to apps/api/src/routes/account/passkeys/list.test.ts
diff --git a/apps/fastify/src/routes/account/passkeys/list.ts b/apps/api/src/routes/account/passkeys/list.ts
similarity index 100%
rename from apps/fastify/src/routes/account/passkeys/list.ts
rename to apps/api/src/routes/account/passkeys/list.ts
diff --git a/apps/fastify/src/routes/account/profile/update.test.ts b/apps/api/src/routes/account/profile/update.test.ts
similarity index 100%
rename from apps/fastify/src/routes/account/profile/update.test.ts
rename to apps/api/src/routes/account/profile/update.test.ts
diff --git a/apps/fastify/src/routes/account/profile/update.ts b/apps/api/src/routes/account/profile/update.ts
similarity index 100%
rename from apps/fastify/src/routes/account/profile/update.ts
rename to apps/api/src/routes/account/profile/update.ts
diff --git a/apps/fastify/src/routes/ai/account-info-tool.ts b/apps/api/src/routes/ai/account-info-tool.ts
similarity index 100%
rename from apps/fastify/src/routes/ai/account-info-tool.ts
rename to apps/api/src/routes/ai/account-info-tool.ts
diff --git a/apps/fastify/src/routes/ai/ai.spec.ts b/apps/api/src/routes/ai/ai.spec.ts
similarity index 100%
rename from apps/fastify/src/routes/ai/ai.spec.ts
rename to apps/api/src/routes/ai/ai.spec.ts
diff --git a/apps/fastify/src/routes/ai/brave-search.ts b/apps/api/src/routes/ai/brave-search.ts
similarity index 100%
rename from apps/fastify/src/routes/ai/brave-search.ts
rename to apps/api/src/routes/ai/brave-search.ts
diff --git a/apps/fastify/src/routes/ai/chat.test.ts b/apps/api/src/routes/ai/chat.test.ts
similarity index 100%
rename from apps/fastify/src/routes/ai/chat.test.ts
rename to apps/api/src/routes/ai/chat.test.ts
diff --git a/apps/fastify/src/routes/ai/chat.ts b/apps/api/src/routes/ai/chat.ts
similarity index 100%
rename from apps/fastify/src/routes/ai/chat.ts
rename to apps/api/src/routes/ai/chat.ts
diff --git a/apps/fastify/src/routes/ai/generate.test.ts b/apps/api/src/routes/ai/generate.test.ts
similarity index 100%
rename from apps/fastify/src/routes/ai/generate.test.ts
rename to apps/api/src/routes/ai/generate.test.ts
diff --git a/apps/fastify/src/routes/ai/generate.ts b/apps/api/src/routes/ai/generate.ts
similarity index 100%
rename from apps/fastify/src/routes/ai/generate.ts
rename to apps/api/src/routes/ai/generate.ts
diff --git a/apps/fastify/src/routes/ai/provider.ts b/apps/api/src/routes/ai/provider.ts
similarity index 100%
rename from apps/fastify/src/routes/ai/provider.ts
rename to apps/api/src/routes/ai/provider.ts
diff --git a/apps/fastify/src/routes/ai/upstream-error.ts b/apps/api/src/routes/ai/upstream-error.ts
similarity index 100%
rename from apps/fastify/src/routes/ai/upstream-error.ts
rename to apps/api/src/routes/ai/upstream-error.ts
diff --git a/apps/fastify/src/routes/auth/link.spec.ts b/apps/api/src/routes/auth/link.spec.ts
similarity index 100%
rename from apps/fastify/src/routes/auth/link.spec.ts
rename to apps/api/src/routes/auth/link.spec.ts
diff --git a/apps/fastify/src/routes/auth/link/request.test.ts b/apps/api/src/routes/auth/link/request.test.ts
similarity index 100%
rename from apps/fastify/src/routes/auth/link/request.test.ts
rename to apps/api/src/routes/auth/link/request.test.ts
diff --git a/apps/fastify/src/routes/auth/link/verify.test.ts b/apps/api/src/routes/auth/link/verify.test.ts
similarity index 100%
rename from apps/fastify/src/routes/auth/link/verify.test.ts
rename to apps/api/src/routes/auth/link/verify.test.ts
diff --git a/apps/fastify/src/routes/auth/magiclink.spec.ts b/apps/api/src/routes/auth/magiclink.spec.ts
similarity index 100%
rename from apps/fastify/src/routes/auth/magiclink.spec.ts
rename to apps/api/src/routes/auth/magiclink.spec.ts
diff --git a/apps/fastify/src/routes/auth/magiclink/request.test.ts b/apps/api/src/routes/auth/magiclink/request.test.ts
similarity index 100%
rename from apps/fastify/src/routes/auth/magiclink/request.test.ts
rename to apps/api/src/routes/auth/magiclink/request.test.ts
diff --git a/apps/fastify/src/routes/auth/magiclink/request.ts b/apps/api/src/routes/auth/magiclink/request.ts
similarity index 100%
rename from apps/fastify/src/routes/auth/magiclink/request.ts
rename to apps/api/src/routes/auth/magiclink/request.ts
diff --git a/apps/fastify/src/routes/auth/magiclink/verify.test.ts b/apps/api/src/routes/auth/magiclink/verify.test.ts
similarity index 100%
rename from apps/fastify/src/routes/auth/magiclink/verify.test.ts
rename to apps/api/src/routes/auth/magiclink/verify.test.ts
diff --git a/apps/fastify/src/routes/auth/magiclink/verify.ts b/apps/api/src/routes/auth/magiclink/verify.ts
similarity index 100%
rename from apps/fastify/src/routes/auth/magiclink/verify.ts
rename to apps/api/src/routes/auth/magiclink/verify.ts
diff --git a/apps/fastify/src/routes/auth/oauth.spec.ts b/apps/api/src/routes/auth/oauth.spec.ts
similarity index 100%
rename from apps/fastify/src/routes/auth/oauth.spec.ts
rename to apps/api/src/routes/auth/oauth.spec.ts
diff --git a/apps/fastify/src/routes/auth/oauth/facebook/authorize-url.test.ts b/apps/api/src/routes/auth/oauth/facebook/authorize-url.test.ts
similarity index 100%
rename from apps/fastify/src/routes/auth/oauth/facebook/authorize-url.test.ts
rename to apps/api/src/routes/auth/oauth/facebook/authorize-url.test.ts
diff --git a/apps/fastify/src/routes/auth/oauth/facebook/authorize-url.ts b/apps/api/src/routes/auth/oauth/facebook/authorize-url.ts
similarity index 100%
rename from apps/fastify/src/routes/auth/oauth/facebook/authorize-url.ts
rename to apps/api/src/routes/auth/oauth/facebook/authorize-url.ts
diff --git a/apps/fastify/src/routes/auth/oauth/facebook/exchange.test.ts b/apps/api/src/routes/auth/oauth/facebook/exchange.test.ts
similarity index 100%
rename from apps/fastify/src/routes/auth/oauth/facebook/exchange.test.ts
rename to apps/api/src/routes/auth/oauth/facebook/exchange.test.ts
diff --git a/apps/fastify/src/routes/auth/oauth/facebook/exchange.ts b/apps/api/src/routes/auth/oauth/facebook/exchange.ts
similarity index 100%
rename from apps/fastify/src/routes/auth/oauth/facebook/exchange.ts
rename to apps/api/src/routes/auth/oauth/facebook/exchange.ts
diff --git a/apps/fastify/src/routes/auth/oauth/facebook/link-authorize-url.ts b/apps/api/src/routes/auth/oauth/facebook/link-authorize-url.ts
similarity index 100%
rename from apps/fastify/src/routes/auth/oauth/facebook/link-authorize-url.ts
rename to apps/api/src/routes/auth/oauth/facebook/link-authorize-url.ts
diff --git a/apps/fastify/src/routes/auth/oauth/github/authorize-url.test.ts b/apps/api/src/routes/auth/oauth/github/authorize-url.test.ts
similarity index 100%
rename from apps/fastify/src/routes/auth/oauth/github/authorize-url.test.ts
rename to apps/api/src/routes/auth/oauth/github/authorize-url.test.ts
diff --git a/apps/fastify/src/routes/auth/oauth/github/authorize-url.ts b/apps/api/src/routes/auth/oauth/github/authorize-url.ts
similarity index 100%
rename from apps/fastify/src/routes/auth/oauth/github/authorize-url.ts
rename to apps/api/src/routes/auth/oauth/github/authorize-url.ts
diff --git a/apps/fastify/src/routes/auth/oauth/github/authorize.test.ts b/apps/api/src/routes/auth/oauth/github/authorize.test.ts
similarity index 100%
rename from apps/fastify/src/routes/auth/oauth/github/authorize.test.ts
rename to apps/api/src/routes/auth/oauth/github/authorize.test.ts
diff --git a/apps/fastify/src/routes/auth/oauth/github/authorize.ts b/apps/api/src/routes/auth/oauth/github/authorize.ts
similarity index 100%
rename from apps/fastify/src/routes/auth/oauth/github/authorize.ts
rename to apps/api/src/routes/auth/oauth/github/authorize.ts
diff --git a/apps/fastify/src/routes/auth/oauth/github/exchange.test.ts b/apps/api/src/routes/auth/oauth/github/exchange.test.ts
similarity index 100%
rename from apps/fastify/src/routes/auth/oauth/github/exchange.test.ts
rename to apps/api/src/routes/auth/oauth/github/exchange.test.ts
diff --git a/apps/fastify/src/routes/auth/oauth/github/exchange.ts b/apps/api/src/routes/auth/oauth/github/exchange.ts
similarity index 100%
rename from apps/fastify/src/routes/auth/oauth/github/exchange.ts
rename to apps/api/src/routes/auth/oauth/github/exchange.ts
diff --git a/apps/fastify/src/routes/auth/oauth/github/link-authorize-url.ts b/apps/api/src/routes/auth/oauth/github/link-authorize-url.ts
similarity index 100%
rename from apps/fastify/src/routes/auth/oauth/github/link-authorize-url.ts
rename to apps/api/src/routes/auth/oauth/github/link-authorize-url.ts
diff --git a/apps/fastify/src/routes/auth/oauth/google/authorize-url.test.ts b/apps/api/src/routes/auth/oauth/google/authorize-url.test.ts
similarity index 100%
rename from apps/fastify/src/routes/auth/oauth/google/authorize-url.test.ts
rename to apps/api/src/routes/auth/oauth/google/authorize-url.test.ts
diff --git a/apps/fastify/src/routes/auth/oauth/google/authorize-url.ts b/apps/api/src/routes/auth/oauth/google/authorize-url.ts
similarity index 100%
rename from apps/fastify/src/routes/auth/oauth/google/authorize-url.ts
rename to apps/api/src/routes/auth/oauth/google/authorize-url.ts
diff --git a/apps/fastify/src/routes/auth/oauth/google/exchange-helpers.ts b/apps/api/src/routes/auth/oauth/google/exchange-helpers.ts
similarity index 100%
rename from apps/fastify/src/routes/auth/oauth/google/exchange-helpers.ts
rename to apps/api/src/routes/auth/oauth/google/exchange-helpers.ts
diff --git a/apps/fastify/src/routes/auth/oauth/google/exchange.test.ts b/apps/api/src/routes/auth/oauth/google/exchange.test.ts
similarity index 100%
rename from apps/fastify/src/routes/auth/oauth/google/exchange.test.ts
rename to apps/api/src/routes/auth/oauth/google/exchange.test.ts
diff --git a/apps/fastify/src/routes/auth/oauth/google/exchange.ts b/apps/api/src/routes/auth/oauth/google/exchange.ts
similarity index 100%
rename from apps/fastify/src/routes/auth/oauth/google/exchange.ts
rename to apps/api/src/routes/auth/oauth/google/exchange.ts
diff --git a/apps/fastify/src/routes/auth/oauth/google/link-authorize-url.ts b/apps/api/src/routes/auth/oauth/google/link-authorize-url.ts
similarity index 100%
rename from apps/fastify/src/routes/auth/oauth/google/link-authorize-url.ts
rename to apps/api/src/routes/auth/oauth/google/link-authorize-url.ts
diff --git a/apps/fastify/src/routes/auth/oauth/google/verify-id-token.test.ts b/apps/api/src/routes/auth/oauth/google/verify-id-token.test.ts
similarity index 100%
rename from apps/fastify/src/routes/auth/oauth/google/verify-id-token.test.ts
rename to apps/api/src/routes/auth/oauth/google/verify-id-token.test.ts
diff --git a/apps/fastify/src/routes/auth/oauth/google/verify-id-token.ts b/apps/api/src/routes/auth/oauth/google/verify-id-token.ts
similarity index 100%
rename from apps/fastify/src/routes/auth/oauth/google/verify-id-token.ts
rename to apps/api/src/routes/auth/oauth/google/verify-id-token.ts
diff --git a/apps/fastify/src/routes/auth/oauth/providers.test.ts b/apps/api/src/routes/auth/oauth/providers.test.ts
similarity index 100%
rename from apps/fastify/src/routes/auth/oauth/providers.test.ts
rename to apps/api/src/routes/auth/oauth/providers.test.ts
diff --git a/apps/fastify/src/routes/auth/oauth/providers.ts b/apps/api/src/routes/auth/oauth/providers.ts
similarity index 100%
rename from apps/fastify/src/routes/auth/oauth/providers.ts
rename to apps/api/src/routes/auth/oauth/providers.ts
diff --git a/apps/fastify/src/routes/auth/oauth/twitter/authorize-url.test.ts b/apps/api/src/routes/auth/oauth/twitter/authorize-url.test.ts
similarity index 100%
rename from apps/fastify/src/routes/auth/oauth/twitter/authorize-url.test.ts
rename to apps/api/src/routes/auth/oauth/twitter/authorize-url.test.ts
diff --git a/apps/fastify/src/routes/auth/oauth/twitter/authorize-url.ts b/apps/api/src/routes/auth/oauth/twitter/authorize-url.ts
similarity index 100%
rename from apps/fastify/src/routes/auth/oauth/twitter/authorize-url.ts
rename to apps/api/src/routes/auth/oauth/twitter/authorize-url.ts
diff --git a/apps/fastify/src/routes/auth/oauth/twitter/exchange.test.ts b/apps/api/src/routes/auth/oauth/twitter/exchange.test.ts
similarity index 100%
rename from apps/fastify/src/routes/auth/oauth/twitter/exchange.test.ts
rename to apps/api/src/routes/auth/oauth/twitter/exchange.test.ts
diff --git a/apps/fastify/src/routes/auth/oauth/twitter/exchange.ts b/apps/api/src/routes/auth/oauth/twitter/exchange.ts
similarity index 100%
rename from apps/fastify/src/routes/auth/oauth/twitter/exchange.ts
rename to apps/api/src/routes/auth/oauth/twitter/exchange.ts
diff --git a/apps/fastify/src/routes/auth/oauth/twitter/link-authorize-url.ts b/apps/api/src/routes/auth/oauth/twitter/link-authorize-url.ts
similarity index 100%
rename from apps/fastify/src/routes/auth/oauth/twitter/link-authorize-url.ts
rename to apps/api/src/routes/auth/oauth/twitter/link-authorize-url.ts
diff --git a/apps/fastify/src/routes/auth/passkey.spec.ts b/apps/api/src/routes/auth/passkey.spec.ts
similarity index 100%
rename from apps/fastify/src/routes/auth/passkey.spec.ts
rename to apps/api/src/routes/auth/passkey.spec.ts
diff --git a/apps/fastify/src/routes/auth/passkey/exchange.ts b/apps/api/src/routes/auth/passkey/exchange.ts
similarity index 100%
rename from apps/fastify/src/routes/auth/passkey/exchange.ts
rename to apps/api/src/routes/auth/passkey/exchange.ts
diff --git a/apps/fastify/src/routes/auth/passkey/resolve-user.ts b/apps/api/src/routes/auth/passkey/resolve-user.ts
similarity index 100%
rename from apps/fastify/src/routes/auth/passkey/resolve-user.ts
rename to apps/api/src/routes/auth/passkey/resolve-user.ts
diff --git a/apps/fastify/src/routes/auth/passkey/start.ts b/apps/api/src/routes/auth/passkey/start.ts
similarity index 100%
rename from apps/fastify/src/routes/auth/passkey/start.ts
rename to apps/api/src/routes/auth/passkey/start.ts
diff --git a/apps/fastify/src/routes/auth/passkey/verify.ts b/apps/api/src/routes/auth/passkey/verify.ts
similarity index 100%
rename from apps/fastify/src/routes/auth/passkey/verify.ts
rename to apps/api/src/routes/auth/passkey/verify.ts
diff --git a/apps/fastify/src/routes/auth/session.spec.ts b/apps/api/src/routes/auth/session.spec.ts
similarity index 100%
rename from apps/fastify/src/routes/auth/session.spec.ts
rename to apps/api/src/routes/auth/session.spec.ts
diff --git a/apps/fastify/src/routes/auth/session/logout.test.ts b/apps/api/src/routes/auth/session/logout.test.ts
similarity index 100%
rename from apps/fastify/src/routes/auth/session/logout.test.ts
rename to apps/api/src/routes/auth/session/logout.test.ts
diff --git a/apps/fastify/src/routes/auth/session/logout.ts b/apps/api/src/routes/auth/session/logout.ts
similarity index 100%
rename from apps/fastify/src/routes/auth/session/logout.ts
rename to apps/api/src/routes/auth/session/logout.ts
diff --git a/apps/fastify/src/routes/auth/session/refresh.test.ts b/apps/api/src/routes/auth/session/refresh.test.ts
similarity index 100%
rename from apps/fastify/src/routes/auth/session/refresh.test.ts
rename to apps/api/src/routes/auth/session/refresh.test.ts
diff --git a/apps/fastify/src/routes/auth/session/refresh.ts b/apps/api/src/routes/auth/session/refresh.ts
similarity index 100%
rename from apps/fastify/src/routes/auth/session/refresh.ts
rename to apps/api/src/routes/auth/session/refresh.ts
diff --git a/apps/fastify/src/routes/auth/session/user.test.ts b/apps/api/src/routes/auth/session/user.test.ts
similarity index 100%
rename from apps/fastify/src/routes/auth/session/user.test.ts
rename to apps/api/src/routes/auth/session/user.test.ts
diff --git a/apps/fastify/src/routes/auth/session/user.ts b/apps/api/src/routes/auth/session/user.ts
similarity index 100%
rename from apps/fastify/src/routes/auth/session/user.ts
rename to apps/api/src/routes/auth/session/user.ts
diff --git a/apps/fastify/src/routes/auth/web3.spec.ts b/apps/api/src/routes/auth/web3.spec.ts
similarity index 100%
rename from apps/fastify/src/routes/auth/web3.spec.ts
rename to apps/api/src/routes/auth/web3.spec.ts
diff --git a/apps/fastify/src/routes/auth/web3/eip155/nonce.test.ts b/apps/api/src/routes/auth/web3/eip155/nonce.test.ts
similarity index 100%
rename from apps/fastify/src/routes/auth/web3/eip155/nonce.test.ts
rename to apps/api/src/routes/auth/web3/eip155/nonce.test.ts
diff --git a/apps/fastify/src/routes/auth/web3/eip155/nonce.ts b/apps/api/src/routes/auth/web3/eip155/nonce.ts
similarity index 100%
rename from apps/fastify/src/routes/auth/web3/eip155/nonce.ts
rename to apps/api/src/routes/auth/web3/eip155/nonce.ts
diff --git a/apps/fastify/src/routes/auth/web3/eip155/verify.test.ts b/apps/api/src/routes/auth/web3/eip155/verify.test.ts
similarity index 100%
rename from apps/fastify/src/routes/auth/web3/eip155/verify.test.ts
rename to apps/api/src/routes/auth/web3/eip155/verify.test.ts
diff --git a/apps/fastify/src/routes/auth/web3/eip155/verify.ts b/apps/api/src/routes/auth/web3/eip155/verify.ts
similarity index 100%
rename from apps/fastify/src/routes/auth/web3/eip155/verify.ts
rename to apps/api/src/routes/auth/web3/eip155/verify.ts
diff --git a/apps/fastify/src/routes/auth/web3/exchange.test.ts b/apps/api/src/routes/auth/web3/exchange.test.ts
similarity index 100%
rename from apps/fastify/src/routes/auth/web3/exchange.test.ts
rename to apps/api/src/routes/auth/web3/exchange.test.ts
diff --git a/apps/fastify/src/routes/auth/web3/exchange.ts b/apps/api/src/routes/auth/web3/exchange.ts
similarity index 100%
rename from apps/fastify/src/routes/auth/web3/exchange.ts
rename to apps/api/src/routes/auth/web3/exchange.ts
diff --git a/apps/fastify/src/routes/auth/web3/nonce.test.ts b/apps/api/src/routes/auth/web3/nonce.test.ts
similarity index 100%
rename from apps/fastify/src/routes/auth/web3/nonce.test.ts
rename to apps/api/src/routes/auth/web3/nonce.test.ts
diff --git a/apps/fastify/src/routes/auth/web3/nonce.ts b/apps/api/src/routes/auth/web3/nonce.ts
similarity index 100%
rename from apps/fastify/src/routes/auth/web3/nonce.ts
rename to apps/api/src/routes/auth/web3/nonce.ts
diff --git a/apps/fastify/src/routes/auth/web3/siws-parse.ts b/apps/api/src/routes/auth/web3/siws-parse.ts
similarity index 100%
rename from apps/fastify/src/routes/auth/web3/siws-parse.ts
rename to apps/api/src/routes/auth/web3/siws-parse.ts
diff --git a/apps/fastify/src/routes/auth/web3/solana/nonce.test.ts b/apps/api/src/routes/auth/web3/solana/nonce.test.ts
similarity index 100%
rename from apps/fastify/src/routes/auth/web3/solana/nonce.test.ts
rename to apps/api/src/routes/auth/web3/solana/nonce.test.ts
diff --git a/apps/fastify/src/routes/auth/web3/solana/nonce.ts b/apps/api/src/routes/auth/web3/solana/nonce.ts
similarity index 100%
rename from apps/fastify/src/routes/auth/web3/solana/nonce.ts
rename to apps/api/src/routes/auth/web3/solana/nonce.ts
diff --git a/apps/fastify/src/routes/auth/web3/solana/verify.test.ts b/apps/api/src/routes/auth/web3/solana/verify.test.ts
similarity index 100%
rename from apps/fastify/src/routes/auth/web3/solana/verify.test.ts
rename to apps/api/src/routes/auth/web3/solana/verify.test.ts
diff --git a/apps/fastify/src/routes/auth/web3/solana/verify.ts b/apps/api/src/routes/auth/web3/solana/verify.ts
similarity index 100%
rename from apps/fastify/src/routes/auth/web3/solana/verify.ts
rename to apps/api/src/routes/auth/web3/solana/verify.ts
diff --git a/apps/fastify/src/routes/auth/web3/validate-address.ts b/apps/api/src/routes/auth/web3/validate-address.ts
similarity index 100%
rename from apps/fastify/src/routes/auth/web3/validate-address.ts
rename to apps/api/src/routes/auth/web3/validate-address.ts
diff --git a/apps/fastify/src/routes/health.spec.ts b/apps/api/src/routes/health.spec.ts
similarity index 100%
rename from apps/fastify/src/routes/health.spec.ts
rename to apps/api/src/routes/health.spec.ts
diff --git a/apps/fastify/src/routes/health.ts b/apps/api/src/routes/health.ts
similarity index 100%
rename from apps/fastify/src/routes/health.ts
rename to apps/api/src/routes/health.ts
diff --git a/apps/fastify/src/routes/reference.ts b/apps/api/src/routes/reference.ts
similarity index 100%
rename from apps/fastify/src/routes/reference.ts
rename to apps/api/src/routes/reference.ts
diff --git a/apps/fastify/src/routes/reference/template-scripts.ts b/apps/api/src/routes/reference/template-scripts.ts
similarity index 100%
rename from apps/fastify/src/routes/reference/template-scripts.ts
rename to apps/api/src/routes/reference/template-scripts.ts
diff --git a/apps/fastify/src/routes/reference/template-styles.ts b/apps/api/src/routes/reference/template-styles.ts
similarity index 100%
rename from apps/fastify/src/routes/reference/template-styles.ts
rename to apps/api/src/routes/reference/template-styles.ts
diff --git a/apps/fastify/src/routes/reference/template.ts b/apps/api/src/routes/reference/template.ts
similarity index 100%
rename from apps/fastify/src/routes/reference/template.ts
rename to apps/api/src/routes/reference/template.ts
diff --git a/apps/fastify/src/routes/root.spec.ts b/apps/api/src/routes/root.spec.ts
similarity index 100%
rename from apps/fastify/src/routes/root.spec.ts
rename to apps/api/src/routes/root.spec.ts
diff --git a/apps/fastify/src/routes/root.ts b/apps/api/src/routes/root.ts
similarity index 100%
rename from apps/fastify/src/routes/root.ts
rename to apps/api/src/routes/root.ts
diff --git a/apps/fastify/src/routes/schemas.ts b/apps/api/src/routes/schemas.ts
similarity index 100%
rename from apps/fastify/src/routes/schemas.ts
rename to apps/api/src/routes/schemas.ts
diff --git a/apps/fastify/src/routes/test/authed.test.ts b/apps/api/src/routes/test/authed.test.ts
similarity index 100%
rename from apps/fastify/src/routes/test/authed.test.ts
rename to apps/api/src/routes/test/authed.test.ts
diff --git a/apps/fastify/src/routes/test/authed.ts b/apps/api/src/routes/test/authed.ts
similarity index 100%
rename from apps/fastify/src/routes/test/authed.ts
rename to apps/api/src/routes/test/authed.ts
diff --git a/apps/fastify/src/routes/test/magic-link.test.ts b/apps/api/src/routes/test/magic-link.test.ts
similarity index 100%
rename from apps/fastify/src/routes/test/magic-link.test.ts
rename to apps/api/src/routes/test/magic-link.test.ts
diff --git a/apps/fastify/src/routes/test/magic-link.ts b/apps/api/src/routes/test/magic-link.ts
similarity index 100%
rename from apps/fastify/src/routes/test/magic-link.ts
rename to apps/api/src/routes/test/magic-link.ts
diff --git a/apps/fastify/src/routes/test/test.spec.ts b/apps/api/src/routes/test/test.spec.ts
similarity index 100%
rename from apps/fastify/src/routes/test/test.spec.ts
rename to apps/api/src/routes/test/test.spec.ts
diff --git a/apps/fastify/src/routes/test/totp.test.ts b/apps/api/src/routes/test/totp.test.ts
similarity index 100%
rename from apps/fastify/src/routes/test/totp.test.ts
rename to apps/api/src/routes/test/totp.test.ts
diff --git a/apps/fastify/src/routes/test/totp.ts b/apps/api/src/routes/test/totp.ts
similarity index 100%
rename from apps/fastify/src/routes/test/totp.ts
rename to apps/api/src/routes/test/totp.ts
diff --git a/apps/fastify/supabase/.gitignore b/apps/api/supabase/.gitignore
similarity index 100%
rename from apps/fastify/supabase/.gitignore
rename to apps/api/supabase/.gitignore
diff --git a/apps/fastify/supabase/config.toml b/apps/api/supabase/config.toml
similarity index 100%
rename from apps/fastify/supabase/config.toml
rename to apps/api/supabase/config.toml
diff --git a/apps/fastify/test/api-keys.spec.ts b/apps/api/test/api-keys.spec.ts
similarity index 100%
rename from apps/fastify/test/api-keys.spec.ts
rename to apps/api/test/api-keys.spec.ts
diff --git a/apps/fastify/test/crypto.spec.ts b/apps/api/test/crypto.spec.ts
similarity index 100%
rename from apps/fastify/test/crypto.spec.ts
rename to apps/api/test/crypto.spec.ts
diff --git a/apps/fastify/test/helper.ts b/apps/api/test/helper.ts
similarity index 100%
rename from apps/fastify/test/helper.ts
rename to apps/api/test/helper.ts
diff --git a/apps/fastify/test/playwright-global-setup.ts b/apps/api/test/playwright-global-setup.ts
similarity index 100%
rename from apps/fastify/test/playwright-global-setup.ts
rename to apps/api/test/playwright-global-setup.ts
diff --git a/apps/fastify/test/playwright-global-teardown.ts b/apps/api/test/playwright-global-teardown.ts
similarity index 100%
rename from apps/fastify/test/playwright-global-teardown.ts
rename to apps/api/test/playwright-global-teardown.ts
diff --git a/apps/fastify/test/swagger-login.e2e.spec.ts b/apps/api/test/swagger-login.e2e.spec.ts
similarity index 100%
rename from apps/fastify/test/swagger-login.e2e.spec.ts
rename to apps/api/test/swagger-login.e2e.spec.ts
diff --git a/apps/fastify/test/tsconfig.json b/apps/api/test/tsconfig.json
similarity index 100%
rename from apps/fastify/test/tsconfig.json
rename to apps/api/test/tsconfig.json
diff --git a/apps/fastify/test/utils/ai-remote.ts b/apps/api/test/utils/ai-remote.ts
similarity index 100%
rename from apps/fastify/test/utils/ai-remote.ts
rename to apps/api/test/utils/ai-remote.ts
diff --git a/apps/fastify/test/utils/auth-helper.ts b/apps/api/test/utils/auth-helper.ts
similarity index 100%
rename from apps/fastify/test/utils/auth-helper.ts
rename to apps/api/test/utils/auth-helper.ts
diff --git a/apps/fastify/test/utils/db-setup.ts b/apps/api/test/utils/db-setup.ts
similarity index 98%
rename from apps/fastify/test/utils/db-setup.ts
rename to apps/api/test/utils/db-setup.ts
index 3c70af77..4e4664ed 100644
--- a/apps/fastify/test/utils/db-setup.ts
+++ b/apps/api/test/utils/db-setup.ts
@@ -38,8 +38,8 @@ import { getTestDatabase, truncateAllTables } from './db.js'
 
 const setupFile = fileURLToPath(import.meta.url)
 const setupDir = dirname(setupFile)
-// setupDir is apps/fastify/test/utils
-// projectRoot is apps/fastify
+// setupDir is apps/api/test/utils
+// projectRoot is apps/api
 const projectRoot = dirname(dirname(setupDir))
 
 // Track if migrations have been run in this worker
diff --git a/apps/fastify/test/utils/db.ts b/apps/api/test/utils/db.ts
similarity index 97%
rename from apps/fastify/test/utils/db.ts
rename to apps/api/test/utils/db.ts
index 3f0a876e..f3602524 100644
--- a/apps/fastify/test/utils/db.ts
+++ b/apps/api/test/utils/db.ts
@@ -20,7 +20,7 @@
  * ## Important Notes
  *
  * - Per-worker pattern: Each Vitest worker gets its own database directory
- * - Database directory: `/tmp/basilic-fastify-test-db-{workerId}`
+ * - Database directory: `/tmp/basilic-api-test-db-{workerId}`
  * - Instance created once per worker before tests in that worker execute
  * - Instance deleted once per worker after all tests in that worker complete
  * - Workers are isolated - no shared state/data across workers
@@ -52,7 +52,7 @@ export const TEST_DATABASE_URL = 'postgresql://localhost/test'
 function getWorkerDbDir(): string {
   // Vitest sets VITEST_WORKER_ID for each worker thread
   const workerId = process.env.VITEST_WORKER_ID || process.pid.toString()
-  return join(tmpdir(), `basilic-fastify-test-db-${workerId}`)
+  return join(tmpdir(), `basilic-api-test-db-${workerId}`)
 }
 
 /**
diff --git a/apps/fastify/test/utils/fake-email.ts b/apps/api/test/utils/fake-email.ts
similarity index 100%
rename from apps/fastify/test/utils/fake-email.ts
rename to apps/api/test/utils/fake-email.ts
diff --git a/apps/fastify/test/utils/fastify.ts b/apps/api/test/utils/fastify.ts
similarity index 100%
rename from apps/fastify/test/utils/fastify.ts
rename to apps/api/test/utils/fastify.ts
diff --git a/apps/fastify/test/utils/migrate.ts b/apps/api/test/utils/migrate.ts
similarity index 100%
rename from apps/fastify/test/utils/migrate.ts
rename to apps/api/test/utils/migrate.ts
diff --git a/apps/fastify/tsconfig.build.json b/apps/api/tsconfig.build.json
similarity index 100%
rename from apps/fastify/tsconfig.build.json
rename to apps/api/tsconfig.build.json
diff --git a/apps/fastify/tsconfig.json b/apps/api/tsconfig.json
similarity index 100%
rename from apps/fastify/tsconfig.json
rename to apps/api/tsconfig.json
diff --git a/apps/fastify/vercel.json b/apps/api/vercel.json
similarity index 83%
rename from apps/fastify/vercel.json
rename to apps/api/vercel.json
index 28f31253..700f70bc 100644
--- a/apps/fastify/vercel.json
+++ b/apps/api/vercel.json
@@ -1,10 +1,10 @@
 {
   "$schema": "https://openapi.vercel.sh/vercel.json",
   "framework": "fastify",
-  "ignoreCommand": "npx turbo-ignore @repo/fastify --fallback=HEAD^1",
-  "buildCommand": "cd ../.. && pnpm turbo run build --filter=@repo/fastify...",
+  "ignoreCommand": "npx turbo-ignore @repo/api --fallback=HEAD^1",
+  "buildCommand": "cd ../.. && pnpm turbo run build --filter=@repo/api...",
   "installCommand": "cd ../.. && pnpm install",
-  "devCommand": "cd ../.. && pnpm dev --filter=@repo/fastify",
+  "devCommand": "cd ../.. && pnpm dev --filter=@repo/api",
   "git": { "deploymentEnabled": { "main": true, "develop": true } },
   "headers": [
     {
diff --git a/apps/fastify/vitest.config.ts b/apps/api/vitest.config.ts
similarity index 100%
rename from apps/fastify/vitest.config.ts
rename to apps/api/vitest.config.ts
diff --git a/apps/fastify/vitest.global-setup.ts b/apps/api/vitest.global-setup.ts
similarity index 100%
rename from apps/fastify/vitest.global-setup.ts
rename to apps/api/vitest.global-setup.ts
diff --git a/apps/fastify/vitest.setup.ts b/apps/api/vitest.setup.ts
similarity index 100%
rename from apps/fastify/vitest.setup.ts
rename to apps/api/vitest.setup.ts
diff --git a/apps/docu/content/docs/adrs/005-package-manager.mdx b/apps/docu/content/docs/adrs/005-package-manager.mdx
index e96ee0a8..535e3230 100644
--- a/apps/docu/content/docs/adrs/005-package-manager.mdx
+++ b/apps/docu/content/docs/adrs/005-package-manager.mdx
@@ -22,7 +22,7 @@ Mature, workspace-optimized package manager.
 **Pros**
 
 - Correctly hoists and resolves dependencies across workspace packages
-- Handles complex scenarios like `@tailwindcss/postcss` in `@repo/ui` being accessible to `apps/next`
+- Handles complex scenarios like `@tailwindcss/postcss` in `@repo/ui` being accessible to `apps/web`
 - Uses symlinks and proper node_modules structure for workspace packages
 - Well-tested with Next.js, Fastify, and Turbo
 - Mature support for monorepo patterns
@@ -79,7 +79,7 @@ We will use **pnpm** as our package manager.
 
 **Main reasons:**
 
-- **Reliable workspace resolution**: Correctly hoists and resolves dependencies across workspace packages, handling complex scenarios like `@tailwindcss/postcss` in `@repo/ui` being accessible to `apps/next`
+- **Reliable workspace resolution**: Correctly hoists and resolves dependencies across workspace packages, handling complex scenarios like `@tailwindcss/postcss` in `@repo/ui` being accessible to `apps/web`
 - **Monorepo maturity**: Well-tested with Next.js, Fastify, and Turbo with mature support for monorepo patterns
 - **Production stability**: Battle-tested in production environments with reliable builds and no module resolution issues
 - **Ecosystem support**: Extensive community adoption, documentation, and better tooling support for debugging, monitoring, and CI/CD
diff --git a/apps/docu/content/docs/adrs/009-api-architecture.mdx b/apps/docu/content/docs/adrs/009-api-architecture.mdx
index 0d491bf6..76d3350d 100644
--- a/apps/docu/content/docs/adrs/009-api-architecture.mdx
+++ b/apps/docu/content/docs/adrs/009-api-architecture.mdx
@@ -136,7 +136,7 @@ We will use **Fastify REST API** with **OpenAPI spec generation from routes** an
 
 ### OpenAPI Specification
 
-OpenAPI specs are generated in `apps/fastify/openapi/openapi.json` from Fastify routes via `generate-openapi.ts`:
+OpenAPI specs are generated in `apps/api/openapi/openapi.json` from Fastify routes via `generate-openapi.ts`:
 
 ```json
 {
@@ -188,7 +188,7 @@ TypeScript clients are generated using `@hey-api/openapi-ts`:
 
 Fastify routes are the source of truth:
 
-- Routes implemented in `apps/fastify/src/routes/` with TypeBox schemas (native JSON Schema)
+- Routes implemented in `apps/api/src/routes/` with TypeBox schemas (native JSON Schema)
 - OpenAPI spec automatically generated from route definitions via `generate-openapi.ts`
 - Type-safe request/response handling via route schemas with TypeBox type provider
 - Validation uses TypeBox schemas defined in routes (no conversion overhead)
diff --git a/apps/docu/content/docs/architecture/api.mdx b/apps/docu/content/docs/architecture/api.mdx
index d0e1d9f0..c3ce7c28 100644
--- a/apps/docu/content/docs/architecture/api.mdx
+++ b/apps/docu/content/docs/architecture/api.mdx
@@ -28,7 +28,7 @@ Data flow: TypeBox (backend) → OpenAPI spec → generated types & Zod schemas
 
 ## How it works
 
-1. **Author routes** with TypeBox schemas (in `apps/fastify/src/routes/`; Fastify uses them for validation)
+1. **Author routes** with TypeBox schemas (in `apps/api/src/routes/`; Fastify uses them for validation)
 2. **Generate OpenAPI** from route definitions
 3. **Generate SDKs** from OpenAPI (TypeScript client + Zod schemas + React Query hooks)
 
@@ -60,10 +60,10 @@ fastify.get('/health', {
 
 ### Generate OpenAPI
 
-The OpenAPI spec is generated from route definitions and written to `apps/fastify/openapi/openapi.json`.
+The OpenAPI spec is generated from route definitions and written to `apps/api/openapi/openapi.json`.
 
 ```bash
-pnpm --filter @repo/fastify generate:openapi
+pnpm --filter @repo/api generate:openapi
 ```
 
 ### Generate TypeScript client
@@ -110,7 +110,7 @@ const { data } = useHealthCheck()
 
 ## OpenAPI Integration
 
-- **Generation**: `apps/fastify/openapi/openapi.json` (generated from routes via `generate-openapi.ts`)
+- **Generation**: `apps/api/openapi/openapi.json` (generated from routes via `generate-openapi.ts`)
 - **Serving**: `/reference/openapi.json` (programmatic access)
 - **Docs UI**: `/reference` (Scalar)
 - **AI tooling**: MCP integration can consume the spec for agent workflows
diff --git a/apps/docu/content/docs/architecture/authentication.mdx b/apps/docu/content/docs/architecture/authentication.mdx
index 36a4f6d4..ff96fd7d 100644
--- a/apps/docu/content/docs/architecture/authentication.mdx
+++ b/apps/docu/content/docs/architecture/authentication.mdx
@@ -12,7 +12,7 @@ description: JWT-based auth with access + refresh tokens. Supports magic links,
 
 ## Overview
 
-Authentication is implemented in `apps/fastify` as a **JWT Bearer** system backed by **Drizzle + PostgreSQL/PGLite** session state.
+Authentication is implemented in `apps/api` as a **JWT Bearer** system backed by **Drizzle + PostgreSQL/PGLite** session state.
 
 We use JWTs to support **all client types** (web, mobile, desktop, servers, CLIs) with a single, standard `Authorization: Bearer` integration.
 
@@ -155,13 +155,13 @@ Web3 sign-in follows a **nonce → sign → verify** flow and returns access + r
 
 **Flow:** Client fetches nonce → builds message → signs with wallet → POSTs verify to Fastify with optional `callbackUrl`. When `callbackUrl` is set: Fastify returns 302 to callback with one-time `code` → callback page exchanges code via `POST /auth/web3/exchange` → sets cookies and redirects. When absent: Fastify returns JSON `{ token, refreshToken }` (mobile/CLI).
 
-**Framework support:** Wallet integration lives in `apps/next` (`@/hooks/`, `@/wallet/`). `@repo/react` exposes verify hooks: `useVerifyWeb3Auth`, `useVerifyLinkWallet`. Pass `callbackUrl` to `useVerifyWeb3Auth().mutate()` for redirect flow.
+**Framework support:** Wallet integration lives in `apps/web` (`@/hooks/`, `@/wallet/`). `@repo/react` exposes verify hooks: `useVerifyWeb3Auth`, `useVerifyLinkWallet`. Pass `callbackUrl` to `useVerifyWeb3Auth().mutate()` for redirect flow.
 
-**WalletAdaptersInjector:** In `apps/next`, mount `WalletAdaptersInjector` inside providers. Triggers sign-out on wallet disconnect (redirects to `/auth/logout`).
+**WalletAdaptersInjector:** In `apps/web`, mount `WalletAdaptersInjector` inside providers. Triggers sign-out on wallet disconnect (redirects to `/auth/logout`).
 
 **Error codes:** `INVALID_NONCE`, `EXPIRED_NONCE`, `INVALID_SIGNATURE` for consistent UI handling. Wallet rejection (e.g. user denies signing) is surfaced as a non-fatal error. Account link: `WALLET_ALREADY_LINKED`, `EMAIL_ALREADY_IN_USE`, `EXPIRED_TOKEN`.
 
-**JWT cookie refresh:** After link email or profile edit, the client receives `{ token, refreshToken }` from the verify endpoint. Call `POST /api/auth/update-tokens` with those values to update cookies. In `apps/next`, use `updateAuthTokens` from `@/lib/auth-client`.
+**JWT cookie refresh:** After link email or profile edit, the client receives `{ token, refreshToken }` from the verify endpoint. Call `POST /api/auth/update-tokens` with those values to update cookies. In `apps/web`, use `updateAuthTokens` from `@/lib/auth-client`.
 
 **Data model:** Nonces are stored in `web3_nonce` (5-min TTL); identities in `wallet_identities`.
 
@@ -198,7 +198,7 @@ sequenceDiagram
 
 ```mermaid
 flowchart TB
-  subgraph App [apps/next]
+  subgraph App [apps/web]
     WAI[WalletAdaptersInjector]
     Providers[providers.tsx]
   end
@@ -212,7 +212,7 @@ flowchart TB
     useWallet
   end
 
-  subgraph AppHooks [apps/next @/hooks @/wallet]
+  subgraph AppHooks [apps/web @/hooks @/wallet]
     WalletProvider
     useWalletAuth
     useLinkWallet
@@ -299,7 +299,7 @@ stateDiagram-v2
 
 ## Endpoints
 
-All endpoints below are served by `apps/fastify`. The API does not set cookies; tokens are returned as JSON.
+All endpoints below are served by `apps/api`. The API does not set cookies; tokens are returned as JSON.
 
 - **Magic link**
   - `POST /auth/magiclink/request` → `{ ok }`
diff --git a/apps/docu/content/docs/architecture/error-handling.mdx b/apps/docu/content/docs/architecture/error-handling.mdx
index f229b779..35753b54 100644
--- a/apps/docu/content/docs/architecture/error-handling.mdx
+++ b/apps/docu/content/docs/architecture/error-handling.mdx
@@ -10,7 +10,7 @@ Complete guide for error handling across the monorepo: **`@repo/error`** for err
 - **`@repo/error`** – `captureError(options)` sends errors to the reporting backend (void; does not return a catalog). Use platform subpaths: `node`, `nextjs`, `browser`, `react`.
 - **`@repo/error`** – `getErrorMessage(error)` and related utilities for type-safe message extraction (base export or `@repo/error/nextjs`).
 - **Initialization** – Use `initErrorReporting` from `@repo/error/node` or `@repo/error/nextjs`. [GlitchTip](https://glitchtip.com/sdkdocs/javascript/) is recommended; Sentry also works (same DSN format).
-- **Error catalogs and safe responses** – Implemented in each app (e.g. Fastify’s `apps/fastify/src/lib/catalogs/` with `getError`, `mapHttpStatusToErrorCode`). Apps build the safe `{ code, message }` response themselves.
+- **Error catalogs and safe responses** – Implemented in each app (e.g. Fastify’s `apps/api/src/lib/catalogs/` with `getError`, `mapHttpStatusToErrorCode`). Apps build the safe `{ code, message }` response themselves.
 
 **Key principles:**
 - Two-track: Sentry gets real errors (debugging); API returns safe catalog errors (users), built by the app.
@@ -96,9 +96,9 @@ reply.status(500).send(catalogError)
 
 ### App-level error catalogs
 
-Error catalogs and safe responses are implemented **per app**, not in `@repo/error`. For example, the Fastify app defines catalogs in `apps/fastify/src/lib/catalogs/` (e.g. `server.ts`, `client.ts`, `common.ts`) and exposes `getError(code)`, `mapHttpStatusToErrorCode(statusCode)`. The error handler calls `captureError` from `@repo/error/node` then builds the response using the app’s `getError`.
+Error catalogs and safe responses are implemented **per app**, not in `@repo/error`. For example, the Fastify app defines catalogs in `apps/api/src/lib/catalogs/` (e.g. `server.ts`, `client.ts`, `common.ts`) and exposes `getError(code)`, `mapHttpStatusToErrorCode(statusCode)`. The error handler calls `captureError` from `@repo/error/node` then builds the response using the app’s `getError`.
 
-**Adding new error codes:** Add them to your app’s catalog (e.g. `apps/fastify/src/lib/catalogs/`), then use `getError(yourCode)` when building responses. Use `UPPER_SNAKE_CASE` (e.g. `NETWORK_ERROR`, `USER_NOT_FOUND`).
+**Adding new error codes:** Add them to your app’s catalog (e.g. `apps/api/src/lib/catalogs/`), then use `getError(yourCode)` when building responses. Use `UPPER_SNAKE_CASE` (e.g. `NETWORK_ERROR`, `USER_NOT_FOUND`).
 
 ### Security
 
@@ -121,10 +121,10 @@ Error catalogs and safe responses are implemented **per app**, not in `@repo/err
 
 #### Global Error Handler Plugin
 
-Use `captureError` from `@repo/error/node` (void); build the response from the app’s catalog (`getError`, `mapHttpStatusToErrorCode` from `apps/fastify/src/lib/catalogs/`):
+Use `captureError` from `@repo/error/node` (void); build the response from the app’s catalog (`getError`, `mapHttpStatusToErrorCode` from `apps/api/src/lib/catalogs/`):
 
 ```typescript
-// apps/fastify/src/plugins/error-handler.ts
+// apps/api/src/plugins/error-handler.ts
 import { captureError } from '@repo/error/node'
 import { getError, mapHttpStatusToErrorCode } from '../lib/catalogs/mapper.js'
 // ... route extraction, redaction ...
@@ -155,7 +155,7 @@ fastify.setErrorHandler((error, request, reply) => {
 **Recommended: Use AppErrorBoundary**
 
 ```typescript
-// apps/next/app/layout.tsx
+// apps/web/app/layout.tsx
 'use client'
 
 import { AppErrorBoundary } from '@repo/error/react'
@@ -302,7 +302,7 @@ const message = getErrorMessage(error) // Type-safe extraction from unknown
 
 ### App-level: `getError`, `mapHttpStatusToErrorCode`
 
-These live in each app (e.g. Fastify’s `apps/fastify/src/lib/catalogs/mapper.ts`). `mapHttpStatusToErrorCode(statusCode)` maps HTTP status to a catalog code; `getError(code)` returns `{ code, message }` for the response. Not part of `@repo/error`.
+These live in each app (e.g. Fastify’s `apps/api/src/lib/catalogs/mapper.ts`). `mapHttpStatusToErrorCode(statusCode)` maps HTTP status to a catalog code; `getError(code)` returns `{ code, message }` for the response. Not part of `@repo/error`.
 
 ## Best Practices
 
diff --git a/apps/docu/content/docs/architecture/frontend-stack.mdx b/apps/docu/content/docs/architecture/frontend-stack.mdx
index 8aa7a023..7db9f473 100644
--- a/apps/docu/content/docs/architecture/frontend-stack.mdx
+++ b/apps/docu/content/docs/architecture/frontend-stack.mdx
@@ -27,14 +27,14 @@ Core technology choices and patterns for frontend apps. See [Frontend Architectu
 
 ## Web3 & wallet auth
 
-Wallet hooks live in `apps/next` (`@/hooks/`, `@/wallet/`). `@repo/react` exposes only verify hooks (`useVerifyWeb3Auth`, `useVerifyLinkWallet`).
+Wallet hooks live in `apps/web` (`@/hooks/`, `@/wallet/`). `@repo/react` exposes only verify hooks (`useVerifyWeb3Auth`, `useVerifyLinkWallet`).
 
 - **`useWallet`** (`@/hooks/use-wallet`): returns adapter for a chain from WalletProvider context
 - **`useWalletAuth`** (`@/hooks/use-wallet-auth`): wallet sign-in via SIWE/SIWS
 - **`useLinkWallet`** (`@/hooks/use-link-wallet`): link connected wallet to account (Bearer required)
 - **`useLinkEmail`** (`@repo/react`): request link email + verify from token
 
-**WalletProvider** and adapters: In `apps/next`, `WalletAdaptersInjector` bridges wagmi + Solana into adapters, enforces single-wallet mode, and triggers sign-out on wallet disconnect when session was created by wallet.
+**WalletProvider** and adapters: In `apps/web`, `WalletAdaptersInjector` bridges wagmi + Solana into adapters, enforces single-wallet mode, and triggers sign-out on wallet disconnect when session was created by wallet.
 
 **Post-login home:** After auth (magic link or wallet), users are redirected to `/`. The home page renders merged dashboard content including Link wallet, Link email (formerly on `/dashboard`).
 
@@ -49,7 +49,7 @@ flowchart TB
     Login[Login page]
   end
 
-  subgraph AppHooks [apps/next @/hooks @/wallet]
+  subgraph AppHooks [apps/web @/hooks @/wallet]
     useWalletAuth[useWalletAuth]
     useLinkWallet[useLinkWallet]
     useWallet[useWallet]
diff --git a/apps/docu/content/docs/architecture/frontend.mdx b/apps/docu/content/docs/architecture/frontend.mdx
index 7ce26952..eb0c6609 100644
--- a/apps/docu/content/docs/architecture/frontend.mdx
+++ b/apps/docu/content/docs/architecture/frontend.mdx
@@ -3,14 +3,14 @@ title: "Frontend Architecture"
 description: "Next.js (App Router, RSC-first) with shadcn/ui + Tailwind CSS in @repo/ui and type-safe API consumption via @repo/core + @repo/react."
 ---
 
-Frontend apps (for example `apps/next` and `apps/docu`) are built on **Next.js** and share UI, data access, and utilities through monorepo packages.
+Frontend apps (for example `apps/web` and `apps/docu`) are built on **Next.js** and share UI, data access, and utilities through monorepo packages.
 
 ## Architecture at a glance
 
 ```mermaid
 flowchart TB
   subgraph Apps["Applications (Next.js)"]
-    Web["apps/next<br/>(product web app)"]
+    Web["apps/web<br/>(product web app)"]
     Docs["apps/docu<br/>(docs site)"]
   end
 
diff --git a/apps/docu/content/docs/architecture/logging.mdx b/apps/docu/content/docs/architecture/logging.mdx
index 442e4fdb..b7faa4d3 100644
--- a/apps/docu/content/docs/architecture/logging.mdx
+++ b/apps/docu/content/docs/architecture/logging.mdx
@@ -39,7 +39,7 @@ logger.error({ error }, 'Request failed')
 **Fastify routes**: prefer `request.log` for automatic request context.
 
 ```ts
-// apps/fastify/src/routes/users.ts
+// apps/api/src/routes/users.ts
 import type { FastifyInstance } from 'fastify'
 
 export async function userRoutes(fastify: FastifyInstance) {
@@ -215,7 +215,7 @@ try {
 }
 ```
 
-**5. Integration with `@repo/error`** - When using `captureError` in Fastify, pass `request.log` to use Fastify's native logger. The catalog and response are built in the app (e.g. from `apps/fastify/src/lib/catalogs/`):
+**5. Integration with `@repo/error`** - When using `captureError` in Fastify, pass `request.log` to use Fastify's native logger. The catalog and response are built in the app (e.g. from `apps/api/src/lib/catalogs/`):
 
 ```typescript
 import { captureError } from '@repo/error/node'
diff --git a/apps/docu/content/docs/architecture/monorepo.mdx b/apps/docu/content/docs/architecture/monorepo.mdx
index 4ded517c..6bdfcda9 100644
--- a/apps/docu/content/docs/architecture/monorepo.mdx
+++ b/apps/docu/content/docs/architecture/monorepo.mdx
@@ -62,8 +62,8 @@ flowchart TB
 
 Each application is self-contained but can import shared packages:
 
-- `apps/fastify` - Fastify backend API
-- `apps/next` - Next.js frontend application
+- `apps/api` - Fastify backend API
+- `apps/web` - Next.js frontend application
 - `apps/docu` - Documentation site (Fumadocs)
 
 ### Packages (`packages/`)
@@ -85,9 +85,9 @@ Strict one-way dependencies prevent circular references:
 ```
 core → react
   ↑
-apps/fastify (OpenAPI)
+apps/api (OpenAPI)
   ↓
-apps/next
+apps/web
 ```
 
 ## Workspace Configuration
diff --git a/apps/docu/content/docs/architecture/security.mdx b/apps/docu/content/docs/architecture/security.mdx
index 156e11b1..1b6cda9c 100644
--- a/apps/docu/content/docs/architecture/security.mdx
+++ b/apps/docu/content/docs/architecture/security.mdx
@@ -289,7 +289,7 @@ The API automatically sets security headers on all responses:
 - **Content-Security-Policy** - Restricts resource loading to prevent XSS
 - **Strict-Transport-Security** - Enforces HTTPS in production (HSTS)
 
-Security headers are configured in `apps/fastify/src/plugins/security.ts` and can be disabled via the `SECURITY_HEADERS_ENABLED` environment variable.
+Security headers are configured in `apps/api/src/plugins/security.ts` and can be disabled via the `SECURITY_HEADERS_ENABLED` environment variable.
 
 ### CORS Configuration
 
@@ -300,7 +300,7 @@ Cross-Origin Resource Sharing (CORS) allows all origins. Security is enforced vi
 - **Allowed Headers**: Content-Type, Authorization, X-Requested-With
 - **Credentials**: Disabled (JWT-only auth, no cookies required)
 
-CORS configuration is in `apps/fastify/src/plugins/cors.ts`.
+CORS configuration is in `apps/api/src/plugins/cors.ts`.
 
 ### Rate Limiting
 
@@ -312,7 +312,7 @@ Rate limiting protects against abuse and brute force attacks:
 - **Response Headers**: Includes rate limit information (`x-ratelimit-limit`, `x-ratelimit-remaining`, `x-ratelimit-reset`)
 - **Error Response**: Returns 429 status with retry information
 
-Rate limiting is configured in `apps/fastify/src/plugins/rate-limit.ts`.
+Rate limiting is configured in `apps/api/src/plugins/rate-limit.ts`.
 
 ### Trust Proxy Configuration
 
@@ -331,7 +331,7 @@ All API requests are validated using Zod schemas:
 
 - **Schema Validation**: Defined in route handlers using Fastify's schema option
 - **Type Safety**: End-to-end type safety from OpenAPI spec to runtime validation
-- **Input Sanitization**: Additional sanitization layer in `apps/fastify/src/lib/security.ts`
+- **Input Sanitization**: Additional sanitization layer in `apps/api/src/lib/security.ts`
 - **Error Messages**: Sanitized in production to prevent information leakage
 
 ### Security Event Logging
@@ -343,7 +343,7 @@ Security events are automatically logged:
 - **Authentication Failures**: Logs 401/403 errors
 - **Request Logging**: All requests logged in production with security context
 
-Security logging is implemented in `apps/fastify/src/plugins/security.ts` and `apps/fastify/src/lib/security.ts`.
+Security logging is implemented in `apps/api/src/plugins/security.ts` and `apps/api/src/lib/security.ts`.
 
 ### Environment Variables
 
@@ -382,7 +382,7 @@ API keys are stored hashed (SHA-256) and never in plaintext. Use timing-safe com
 
 If a security incident is detected:
 
-1. **Review security logs** - Check `apps/fastify/src/plugins/security.ts` logs
+1. **Review security logs** - Check `apps/api/src/plugins/security.ts` logs
 2. **Identify affected endpoints** - Review request patterns
 3. **Block malicious IPs** - Add to blocklist if needed (requires custom implementation)
 4. **Rotate secrets** - If credentials are compromised
diff --git a/apps/docu/content/docs/deployment/github-actions.mdx b/apps/docu/content/docs/deployment/github-actions.mdx
index 22e96d7c..f8ddbe53 100644
--- a/apps/docu/content/docs/deployment/github-actions.mdx
+++ b/apps/docu/content/docs/deployment/github-actions.mdx
@@ -9,17 +9,17 @@ GitHub Actions workflows automate quality checks on pull requests (opened and up
 
 Path filters are used only for test workflows (app E2E and package unit tests) so they run when relevant code changes. Lint and security run on every PR. Path patterns are defined in each workflow file.
 
-### Next (`next-e2e.yml`)
+### Web (`web-e2e.yml`)
 
-Build → Unit → E2E. Triggers on pull request when `apps/next/**`, shared packages, or openapi change. Single job: build (with localhost API URL), unit tests, E2E via `test:e2e:local` (spawns Fastify + Next locally).
+Build → Unit → E2E. Triggers on pull request when `apps/web/**`, shared packages, or openapi change. Single job: build (with localhost API URL), unit tests, E2E via `test:e2e:local` (spawns Fastify + Next locally).
 
 ### API (`api-e2e.yml`)
 
-Build → Unit → E2E. Triggers on pull request when `apps/fastify/**` or shared packages change. Single job: build, unit tests, E2E via `test:e2e:local` (spawns API locally, runs Scalar login E2E).
+Build → Unit → E2E. Triggers on pull request when `apps/api/**` or shared packages change. Single job: build, unit tests, E2E via `test:e2e:local` (spawns API locally, runs Scalar login E2E).
 
 ### Packages (`packages-test.yml`)
 
-Unit tests for shared packages (core, react, sentry, etc.). Triggers on pull request when `packages/**` or `tools/**` change. Excludes app tests (handled by api-e2e, next-e2e).
+Unit tests for shared packages (core, react, sentry, etc.). Triggers on pull request when `packages/**` or `tools/**` change. Excludes app tests (handled by api-e2e, web-e2e).
 
 ### Docu (Vercel)
 
@@ -87,7 +87,7 @@ Pre-commit hooks check:
 ## Workflow Files
 
 All workflows are in `.github/workflows/`:
-- `next-e2e.yml` - Next: unit → E2E (local servers, path-filtered)
+- `web-e2e.yml` - Next: unit → E2E (local servers, path-filtered)
 - `api-e2e.yml` - API: unit → E2E (local servers, path-filtered)
 - `packages-test.yml` - Packages: unit tests (path-filtered)
 - `lint.yml` - Linting checks (every PR)
diff --git a/apps/docu/content/docs/deployment/self-hosted-llm.mdx b/apps/docu/content/docs/deployment/self-hosted-llm.mdx
index 3e043b00..972ebac1 100644
--- a/apps/docu/content/docs/deployment/self-hosted-llm.mdx
+++ b/apps/docu/content/docs/deployment/self-hosted-llm.mdx
@@ -101,7 +101,7 @@ sudo systemctl enable ollama
 
 ### 3. CI / Parallel Workflows
 
-When Ollama is used as the CI AI provider (e.g. `OLLAMA_BASE_URL` secret in GitHub Actions), `api-e2e` and `next-e2e` can run in parallel and both hit the same server. With `OLLAMA_NUM_PARALLEL=1`, requests serialize and tests may time out.
+When Ollama is used as the CI AI provider (e.g. `OLLAMA_BASE_URL` secret in GitHub Actions), `api-e2e` and `web-e2e` can run in parallel and both hit the same server. With `OLLAMA_NUM_PARALLEL=1`, requests serialize and tests may time out.
 
 For CI hosts, increase parallelism if the machine has enough RAM:
 
diff --git a/apps/docu/content/docs/deployment/vercel.mdx b/apps/docu/content/docs/deployment/vercel.mdx
index 8819a35c..7082dd7c 100644
--- a/apps/docu/content/docs/deployment/vercel.mdx
+++ b/apps/docu/content/docs/deployment/vercel.mdx
@@ -30,7 +30,7 @@ Vercel provides:
 
 Set environment variables in Vercel project settings:
 
-**For API (`apps/fastify`):**
+**For API (`apps/api`):**
 ```bash
 DATABASE_URL=postgresql://user:pass@host:5432/dbname
 ENCRYPTION_KEY=<64-char-hex>
@@ -45,7 +45,7 @@ SENTRY_DSN=https://...
 # Optional: OAuth — see [Authentication](/docs/architecture/authentication) for GITHUB_*, GOOGLE_*, OAUTH_*_CALLBACK_URL(S).
 ```
 
-**For Web (`apps/next`):**
+**For Web (`apps/web`):**
 ```bash
 NEXT_PUBLIC_API_URL=https://api.yourdomain.com
 NEXT_PUBLIC_SENTRY_DSN=https://...
@@ -58,26 +58,26 @@ NEXT_PUBLIC_SITE_URL=https://docs.yourdomain.com
 
 ### 3. Deploy
 
-Git deployments are enabled. Vercel automatically builds and deploys on push: preview environments for PRs and branches, production for main/develop. CI workflows (next-e2e, api-e2e, packages-test) run tests locally; they do not trigger deploys.
+Git deployments are enabled. Vercel automatically builds and deploys on push: preview environments for PRs and branches, production for main/develop. CI workflows (web-e2e, api-e2e, packages-test) run tests locally; they do not trigger deploys.
 
 ## Deployment Configuration
 
 ### `vercel.json` (Optional)
 
-Monorepo apps use custom configs. Example for `apps/next`:
+Monorepo apps use custom configs. Example for `apps/web`:
 
 ```json
 {
   "$schema": "https://openapi.vercel.sh/vercel.json",
-  "ignoreCommand": "npx turbo-ignore @repo/next --fallback=HEAD^1",
-  "buildCommand": "cd ../.. && pnpm turbo run build --filter=@repo/next...",
+  "ignoreCommand": "npx turbo-ignore @repo/web --fallback=HEAD^1",
+  "buildCommand": "cd ../.. && pnpm turbo run build --filter=@repo/web...",
   "installCommand": "cd ../.. && pnpm install",
   "framework": "nextjs",
   "outputDirectory": ".next"
 }
 ```
 
-Root Directory must be set in Vercel project settings (e.g. `apps/next`).
+Root Directory must be set in Vercel project settings (e.g. `apps/web`).
 
 ## Environment-Specific Configuration
 
@@ -93,18 +93,18 @@ Root Directory must be set in Vercel project settings (e.g. `apps/next`).
 
 ## Path-Based Deploys
 
-Each app uses `ignoreCommand` in `vercel.json` (e.g. `turbo-ignore @repo/next --fallback=HEAD^1`) so Vercel skips builds when the app and its dependencies are unchanged. The build command uses `--filter=@repo/<app>...` to include dependencies. Vercel also has built-in [skipping unaffected projects](https://vercel.com/docs/monorepos#skipping-unaffected-projects) for monorepos; turbo-ignore provides explicit control when Vercel cannot compare against a previous deployment (e.g. new branches).
+Each app uses `ignoreCommand` in `vercel.json` (e.g. `turbo-ignore @repo/web --fallback=HEAD^1`) so Vercel skips builds when the app and its dependencies are unchanged. The build command uses `--filter=@repo/<app>...` to include dependencies. Vercel also has built-in [skipping unaffected projects](https://vercel.com/docs/monorepos#skipping-unaffected-projects) for monorepos; turbo-ignore provides explicit control when Vercel cannot compare against a previous deployment (e.g. new branches).
 
 ## Branch Preview Coupling
 
-Next's `apps/next/next.config.mjs` derives `NEXT_PUBLIC_API_URL` for preview branches as `basilic-fastify-git-{branch}-*.vercel.app`. Ensure Fastify and Next projects are connected to the same Git repo so both get preview deploys on PR branches.
+Next's `apps/web/next.config.mjs` derives `NEXT_PUBLIC_API_URL` for preview branches as `basilic-fastify-git-{branch}-*.vercel.app`. Ensure Fastify and Next projects are connected to the same Git repo so both get preview deploys on PR branches.
 
 ## Monorepo Configuration
 
 For monorepo apps, Vercel needs to know the root directory:
 
 1. Go to Vercel project settings
-2. Set "Root Directory" to `apps/next` (or `apps/docu`, `apps/fastify`)
+2. Set "Root Directory" to `apps/web` (or `apps/docu`, `apps/api`)
 3. Vercel automatically detects package dependencies
 
 **Fork or different project names**: Next's `next.config.mjs` uses `API_PROJECT_NAME` and `TEAM_SLUG` to compute preview API URLs. Update these constants to match your Fastify Vercel project name and team slug.
diff --git a/apps/docu/content/docs/development/dev-tooling.mdx b/apps/docu/content/docs/development/dev-tooling.mdx
index 3371f32b..2ab2576a 100644
--- a/apps/docu/content/docs/development/dev-tooling.mdx
+++ b/apps/docu/content/docs/development/dev-tooling.mdx
@@ -132,8 +132,8 @@ Tasks are configured in `turbo.json` with:
 - **`@repo/react`** - Watches OpenAPI spec and regenerates React hooks, watches TypeScript for rebuilds
 - **`@repo/error`** - Watches TypeScript for rebuilds
 - **`@repo/utils`** - Watches TypeScript for rebuilds
-- **`@repo/fastify`** - Starts Fastify API server with OpenAPI generation watcher
-- **`@repo/next`** - Starts Next.js development server
+- **`@repo/api`** - Starts Fastify API server with OpenAPI generation watcher
+- **`@repo/web`** - Starts Next.js development server
 
 **Key Features:**
 - Watch mode for automatic rebuilds
@@ -159,6 +159,6 @@ You can run apps directly, but build dependencies first:
 pnpm build --filter=@repo/core --filter=@repo/react --filter=@repo/error --filter=@repo/utils
 
 # Then run the app
-cd apps/next
+cd apps/web
 pnpm dev
 ```
\ No newline at end of file
diff --git a/apps/docu/content/docs/development/index.mdx b/apps/docu/content/docs/development/index.mdx
index fb992295..a2b362e9 100644
--- a/apps/docu/content/docs/development/index.mdx
+++ b/apps/docu/content/docs/development/index.mdx
@@ -73,14 +73,14 @@ To run the docs site: `pnpm --filter @repo/docu dev` (e.g. http://localhost:3002
 
 ### 4. Understand the Structure
 
-**Apps:** `apps/fastify/` (Fastify backend), `apps/next/` (Next.js frontend), `apps/docu/` (documentation)
+**Apps:** `apps/api/` (Fastify backend), `apps/web/` (Next.js frontend), `apps/docu/` (documentation)
 
 **Packages:** `core/` (generated API client + types), `react/` (React Query hooks), `ui/` (components), `sentry/` (Sentry integration), `utils/` (utilities)
 
 ```mermaid
 flowchart TB
   subgraph Apps["Applications"]
-    API["apps/fastify<br/>Fastify backend"]
+    API["apps/api<br/>Fastify backend"]
     Docs["apps/docu<br/>Documentation"]
   end
 
diff --git a/apps/docu/content/docs/development/openapi-generation.mdx b/apps/docu/content/docs/development/openapi-generation.mdx
index 7c3922c5..163240ad 100644
--- a/apps/docu/content/docs/development/openapi-generation.mdx
+++ b/apps/docu/content/docs/development/openapi-generation.mdx
@@ -25,7 +25,7 @@ flowchart LR
 TypeBox schemas are native JSON Schema definitions for Fastify routes:
 
 ```typescript
-// apps/fastify/src/routes/users.ts
+// apps/api/src/routes/users.ts
 import { Type } from '@sinclair/typebox'
 
 const UserSchema = Type.Object({
@@ -57,13 +57,13 @@ fastify.get('/users/:id', {
 The OpenAPI specification is automatically generated from Fastify routes:
 
 ```bash
-pnpm --filter @repo/fastify generate:openapi
+pnpm --filter @repo/api generate:openapi
 ```
 
 This runs `generate-openapi.ts` which:
 1. Scans Fastify route definitions
 2. Extracts TypeBox schemas
-3. Generates OpenAPI 3.0 spec at `apps/fastify/openapi/openapi.json`
+3. Generates OpenAPI 3.0 spec at `apps/api/openapi/openapi.json`
 
 **Key benefits:**
 - No manual OpenAPI writing
@@ -128,14 +128,14 @@ const { data, isLoading, error } = useUser()
 When adding a new endpoint:
 
 1. **Implement route** - Define TypeBox schemas and implement Fastify route
-2. **Generate OpenAPI** - Run `pnpm --filter @repo/fastify generate:openapi`
+2. **Generate OpenAPI** - Run `pnpm --filter @repo/api generate:openapi`
 3. **Generate clients** - Run `pnpm --filter @repo/core generate` (generates client and types; `@repo/react` consumes `@repo/core`)
 4. **Use typed client** - Import and use in frontend with full type safety
 
 ## OpenAPI Spec Location
 
 The generated OpenAPI spec is available at:
-- **File**: `apps/fastify/openapi/openapi.json`
+- **File**: `apps/api/openapi/openapi.json`
 - **Endpoint**: `/reference/openapi.json` (programmatic access)
 - **Interactive docs**: `/reference` (Scalar UI)
 
diff --git a/apps/docu/content/docs/development/package-conventions.mdx b/apps/docu/content/docs/development/package-conventions.mdx
index f939c26f..4618c8c9 100644
--- a/apps/docu/content/docs/development/package-conventions.mdx
+++ b/apps/docu/content/docs/development/package-conventions.mdx
@@ -91,8 +91,8 @@ The **HTTP boundary** is defined by Fastify route schemas (TypeBox). The OpenAPI
 
 **What goes here**
 
-* Route schemas + handlers in `apps/fastify/src/routes/`
-* Generated OpenAPI 3.0 file at `apps/fastify/openapi/openapi.json` (do not hand-edit)
+* Route schemas + handlers in `apps/api/src/routes/`
+* Generated OpenAPI 3.0 file at `apps/api/openapi/openapi.json` (do not hand-edit)
 * Served OpenAPI JSON at `/reference/openapi.json` and Scalar UI at `/reference`
 
 See **[OpenAPI Generation](/docs/development/openapi-generation)** for the exact workflow.
@@ -132,10 +132,10 @@ React-only helpers using **TanStack Query**.
 
 ## Server implementation generates OpenAPI
 
-The server app (`apps/fastify`) should treat **Fastify routes + TypeBox schemas** as the source of truth.
+The server app (`apps/api`) should treat **Fastify routes + TypeBox schemas** as the source of truth.
 
 1. Define request/response schemas in the route (TypeBox)
-2. Generate OpenAPI from routes into `apps/fastify/openapi/openapi.json`
+2. Generate OpenAPI from routes into `apps/api/openapi/openapi.json`
 3. Expose OpenAPI JSON at `/reference/openapi.json`
 4. Mount Scalar UI at `/reference`
 
@@ -177,8 +177,8 @@ Also: list peer deps in `devDependencies` too so the package type-checks and tes
 
 When you add or change an endpoint:
 
-1. Add/update the Fastify route + TypeBox schemas in `apps/fastify/src/routes/**`
-2. Regenerate OpenAPI: `pnpm --filter @repo/fastify generate:openapi`
+1. Add/update the Fastify route + TypeBox schemas in `apps/api/src/routes/**`
+2. Regenerate OpenAPI: `pnpm --filter @repo/api generate:openapi`
 3. Regenerate the core client: `pnpm --filter @repo/core generate`
 4. If you want a React Query wrapper, add/update a hook in `packages/react/src/hooks/`
 5. Consume the types from `@repo/core` (single source of truth)
diff --git a/apps/docu/content/docs/development/packages.mdx b/apps/docu/content/docs/development/packages.mdx
index 19ce8ba2..1a5f35c9 100644
--- a/apps/docu/content/docs/development/packages.mdx
+++ b/apps/docu/content/docs/development/packages.mdx
@@ -49,7 +49,7 @@ Examples:
 
 ### `@repo/core` — API client & types
 
-Generated client and types from `apps/fastify/openapi/openapi.json`.
+Generated client and types from `apps/api/openapi/openapi.json`.
 
 **Exports** (public):
 - `createClient()` — nested namespace API
diff --git a/apps/docu/content/docs/testing/e2e-testing.mdx b/apps/docu/content/docs/testing/e2e-testing.mdx
index 259d7ac3..d5638952 100644
--- a/apps/docu/content/docs/testing/e2e-testing.mdx
+++ b/apps/docu/content/docs/testing/e2e-testing.mdx
@@ -3,7 +3,7 @@ title: "E2E Testing"
 description: "Playwright E2E tests for Next.js app and Fastify API (Scalar login)."
 ---
 
-End-to-end tests run full user flows using Playwright. Two suites: **Next E2E** (apps/next) tests the web app + auth; **Fastify E2E** (apps/fastify) tests Scalar UI login. Both use `test@test.ai` for magic-link when `ALLOW_TEST=true`.
+End-to-end tests run full user flows using Playwright. Two suites: **Web E2E** (apps/web) tests the web app + auth; **Fastify E2E** (apps/api) tests Scalar UI login. Both use `test@test.ai` for magic-link when `ALLOW_TEST=true`.
 
 **Root QA**: `pnpm qa` runs the full pipeline (install → checktypes → lint → build → test) and ends with `pnpm test:e2e`, which runs Fastify E2E then Next E2E via `scripts/run-e2e.mjs` (both use `test:e2e:local` to spawn servers). The E2E script kills any processes on ports 3000 and 3001 before starting (unless `SKIP_KILL_PORTS=1`).
 
@@ -12,12 +12,12 @@ End-to-end tests run full user flows using Playwright. Two suites: **Next E2E**
 | Command | Description |
 |---------|-------------|
 | `pnpm test:e2e` (root) | Run Fastify API E2E, then Next E2E (spawns local servers) |
-| `pnpm test:e2e` (in apps/next) | Run E2E; expects URLs via env or `--app`/`--api` params |
-| `pnpm test:e2e:local` (in apps/next) | Build (unless `SKIP_BUILD=1`), spawn Fastify + Next, poll until healthy, run tests, cleanup |
-| `pnpm test:e2e` (in apps/fastify) | Run E2E; expects API URL via env or `--api` param |
-| `pnpm test:e2e:local` (in apps/fastify) | Spawn API, poll until healthy, run tests, cleanup |
-| `pnpm test:e2e:ui` (in apps/next or apps/fastify) | Run with Playwright UI |
-| `pnpm test:e2e:debug` (in apps/next or apps/fastify) | Run in debug mode |
+| `pnpm test:e2e` (in apps/web) | Run E2E; expects URLs via env or `--app`/`--api` params |
+| `pnpm test:e2e:local` (in apps/web) | Build (unless `SKIP_BUILD=1`), spawn Fastify + Next, poll until healthy, run tests, cleanup |
+| `pnpm test:e2e` (in apps/api) | Run E2E; expects API URL via env or `--api` param |
+| `pnpm test:e2e:local` (in apps/api) | Spawn API, poll until healthy, run tests, cleanup |
+| `pnpm test:e2e:ui` (in apps/web or apps/api) | Run with Playwright UI |
+| `pnpm test:e2e:debug` (in apps/web or apps/api) | Run in debug mode |
 
 ## URL Configuration
 
@@ -41,9 +41,9 @@ Defaults: Next `NEXT_PUBLIC_APP_URL` or `http://localhost:3000`; API `NEXT_PUBLI
 ## Local Development
 
 1. **Full suite** (root): `pnpm test:e2e` — runs Fastify E2E then Next E2E (both spawn servers, poll, run, cleanup).
-2. **Next only**: `pnpm --filter @repo/next test:e2e:local` — builds, spawns Fastify + Next, runs Next E2E, cleanup.
-3. **Fastify only**: `pnpm --filter @repo/fastify test:e2e:local` — spawns API, runs Scalar login E2E, cleanup.
-4. **Manual** (two terminals): Build with `pnpm --filter @repo/next build:e2e`, run `pnpm --filter @repo/next start:e2e:servers` in one terminal and `pnpm --filter @repo/next test:e2e` in another.
+2. **Next only**: `pnpm --filter @repo/web test:e2e:local` — builds, spawns Fastify + Next, runs Next E2E, cleanup.
+3. **Fastify only**: `pnpm --filter @repo/api test:e2e:local` — spawns API, runs Scalar login E2E, cleanup.
+4. **Manual** (two terminals): Build with `pnpm --filter @repo/web build:e2e`, run `pnpm --filter @repo/web start:e2e:servers` in one terminal and `pnpm --filter @repo/web test:e2e` in another.
 5. **External URLs**: Use `--app` and `--api` (Next) or `--api` (Fastify) to target already-running servers or Vercel previews.
 
 ## Test Email (test@test.ai)
@@ -57,8 +57,8 @@ Magic-link E2E tests use `test@test.ai` when `ALLOW_TEST=true`. The token is sto
 
 Test workflows run on pull requests (path-filtered):
 
-- **API E2E** (`api-e2e.yml`) — Runs when `apps/fastify` or its deps change. Spawns Fastify locally, runs Playwright.
-- **Next E2E** (`next-e2e.yml`) — Runs when `apps/next` or its deps change. Spawns Fastify + Next locally, runs Playwright.
+- **API E2E** (`api-e2e.yml`) — Runs when `apps/api` or its deps change. Spawns Fastify locally, runs Playwright.
+- **Web E2E** (`web-e2e.yml`) — Runs when `apps/web` or its deps change. Spawns Fastify + Next locally, runs Playwright.
 - **Packages** (`packages-test.yml`) — Runs when `packages` or `tools` change. Unit tests only; excludes app E2E.
 
 Lint and security run on every PR. See [GitHub Actions](/docs/deployment/github-actions).
diff --git a/apps/docu/content/docs/testing/frontend-testing.mdx b/apps/docu/content/docs/testing/frontend-testing.mdx
index 11f79a2b..4732ddd3 100644
--- a/apps/docu/content/docs/testing/frontend-testing.mdx
+++ b/apps/docu/content/docs/testing/frontend-testing.mdx
@@ -3,7 +3,7 @@ title: "Frontend Testing"
 description: "E2E-only testing strategy for frontend (Next.js) applications using Playwright."
 ---
 
-Frontend apps (for example `apps/next`) use **Playwright E2E tests only**. We do not maintain separate unit or integration test suites for frontend components.
+Frontend apps (for example `apps/web`) use **Playwright E2E tests only**. We do not maintain separate unit or integration test suites for frontend components.
 
 ## Testing Philosophy
 
@@ -24,7 +24,7 @@ We intentionally invest in a smaller number of high-signal E2E tests instead of
 - **Pattern**: Test full user flows with real infrastructure
 - **Real APIs**: All tests use real APIs and infrastructure
 - **Tools**: Playwright
-- **Commands**: Next: `pnpm --filter @repo/next test:e2e:local` (spawn servers) or `pnpm test:e2e` (URLs from env/params). Root: `pnpm test:e2e` runs Fastify + Next E2E.
+- **Commands**: Next: `pnpm --filter @repo/web test:e2e:local` (spawn servers) or `pnpm test:e2e` (URLs from env/params). Root: `pnpm test:e2e` runs Fastify + Next E2E.
 
 See [E2E Testing](/docs/testing/e2e-testing) for full documentation.
 
@@ -116,11 +116,11 @@ Tests require these environment variables:
 
 ### Test Utilities
 
-Create/maintain Playwright helpers in `apps/next/e2e` for common flows (auth, navigation, fixtures). Prefer shared fixtures over ad-hoc login logic inside individual specs.
+Create/maintain Playwright helpers in `apps/web/e2e` for common flows (auth, navigation, fixtures). Prefer shared fixtures over ad-hoc login logic inside individual specs.
 
 ## Running Tests
 
-See [apps/next/README.md](../../../../apps/next/README.md) and [E2E Testing](/docs/testing/e2e-testing) for E2E scripts (`test:e2e`, `test:e2e:local`, `test:e2e:ui`, `test:e2e:debug`).
+See [apps/web/README.md](../../../../apps/web/README.md) and [E2E Testing](/docs/testing/e2e-testing) for E2E scripts (`test:e2e`, `test:e2e:local`, `test:e2e:ui`, `test:e2e:debug`).
 
 ## Related Documentation
 
diff --git a/apps/docu/content/docs/testing/index.mdx b/apps/docu/content/docs/testing/index.mdx
index 53dbe15f..3112d050 100644
--- a/apps/docu/content/docs/testing/index.mdx
+++ b/apps/docu/content/docs/testing/index.mdx
@@ -17,7 +17,7 @@ Testing patterns using Vitest for backend and Playwright E2E for frontend.
 ### Setup
 
 ```typescript
-// apps/fastify/src/routes/users.test.ts
+// apps/api/src/routes/users.test.ts
 import { describe, it, expect } from 'vitest'
 import { createApp } from '../app'
 
@@ -63,7 +63,7 @@ Frontend apps use **Playwright E2E only** — no unit or integration test suites
 ### E2E Example
 
 ```typescript
-// apps/next/e2e/magic-link-auth.spec.ts
+// apps/web/e2e/magic-link-auth.spec.ts
 import { expect, test } from '@playwright/test'
 import { authHelpers } from './auth-helpers'
 
diff --git a/apps/next/.env.development b/apps/web/.env.development
similarity index 100%
rename from apps/next/.env.development
rename to apps/web/.env.development
diff --git a/apps/next/.env.local.example b/apps/web/.env.local.example
similarity index 100%
rename from apps/next/.env.local.example
rename to apps/web/.env.local.example
diff --git a/apps/next/.env.production b/apps/web/.env.production
similarity index 100%
rename from apps/next/.env.production
rename to apps/web/.env.production
diff --git a/apps/next/.env.staging b/apps/web/.env.staging
similarity index 100%
rename from apps/next/.env.staging
rename to apps/web/.env.staging
diff --git a/apps/next/README.md b/apps/web/README.md
similarity index 94%
rename from apps/next/README.md
rename to apps/web/README.md
index c73abc65..93349daf 100644
--- a/apps/next/README.md
+++ b/apps/web/README.md
@@ -57,7 +57,7 @@ This starts all development servers including:
 pnpm build --filter=@repo/core --filter=@repo/react --filter=@repo/error --filter=@repo/utils
 
 # Then run from this directory
-cd apps/next
+cd apps/web
 pnpm dev
 ```
 
@@ -72,7 +72,7 @@ The application will be available at `http://localhost:3000` (or the next availa
 pnpm build
 
 # Or build just this app
-cd apps/next
+cd apps/web
 pnpm build
 ```
 
@@ -84,7 +84,7 @@ pnpm build
 - `pnpm build` - Build for production
 - `pnpm start` - Start production server
 - `pnpm lint` - Run ESLint
-- `pnpm test` - No-op (E2E only; apps/next has no unit tests)
+- `pnpm test` - No-op (E2E only; apps/web has no unit tests)
 - `pnpm test:e2e` - Run E2E tests (Playwright; expects URLs via env or `--app`/`--api` params)
 - `pnpm test:e2e:local` - Build, spawn servers, run E2E, cleanup (recommended for local/CI)
 - `pnpm start:e2e:servers` - Start Fastify + Next for manual E2E; run `pnpm test:e2e` in another terminal (run `pnpm build:e2e` first)
@@ -100,7 +100,7 @@ Optional environment variables (see `.env-example`):
 ## Project Structure
 
 ```
-apps/next/
+apps/web/
 ├── app/                    # Next.js app directory
 │   ├── api/auth/          # Cookie update routes (update-tokens)
 │   ├── auth/              # Callbacks (magiclink, oauth, web3), logout
@@ -146,15 +146,15 @@ See [Frontend Testing Documentation](@apps/docu/content/docs/testing/frontend-te
 
 This app includes a `vercel.json` configuration file. If deploying to Vercel:
 
-1. **Root Directory**: Set the root directory to `apps/next` in Vercel project settings
-2. **Build Command**: Should be `cd ../.. && pnpm build --filter=@repo/next` (configured in `vercel.json`)
+1. **Root Directory**: Set the root directory to `apps/web` in Vercel project settings
+2. **Build Command**: Should be `cd ../.. && pnpm build --filter=@repo/web` (configured in `vercel.json`)
 3. **Install Command**: Should be `cd ../.. && pnpm install` (configured in `vercel.json`)
 
 **Important**: If you see build errors about a package named "mathler" or any other incorrect filter, check your Vercel project settings and ensure they match the `vercel.json` configuration. Vercel project settings override `vercel.json`, so make sure they're aligned.
 
 ## CI & Builds
 
-- **E2E tests** (`next-e2e.yml`) — Run on PR when `apps/next` or its dependencies change. Spawns Fastify + Next locally via `test:e2e:local`
+- **E2E tests** (`web-e2e.yml`) — Run on PR when `apps/web` or its dependencies change. Spawns Fastify + Next locally via `test:e2e:local`
 - **Package tests** (`packages-test.yml`) — Run on PR when `packages` or `tools` change
 
 ## Related Documentation
diff --git a/apps/next/app/(dashboard)/(news)/news-list.tsx b/apps/web/app/(dashboard)/(news)/news-list.tsx
similarity index 100%
rename from apps/next/app/(dashboard)/(news)/news-list.tsx
rename to apps/web/app/(dashboard)/(news)/news-list.tsx
diff --git a/apps/next/app/(dashboard)/(news)/page.tsx b/apps/web/app/(dashboard)/(news)/page.tsx
similarity index 100%
rename from apps/next/app/(dashboard)/(news)/page.tsx
rename to apps/web/app/(dashboard)/(news)/page.tsx
diff --git a/apps/next/app/(dashboard)/_dashboard-shell.tsx b/apps/web/app/(dashboard)/_dashboard-shell.tsx
similarity index 100%
rename from apps/next/app/(dashboard)/_dashboard-shell.tsx
rename to apps/web/app/(dashboard)/_dashboard-shell.tsx
diff --git a/apps/next/app/(dashboard)/layout.tsx b/apps/web/app/(dashboard)/layout.tsx
similarity index 100%
rename from apps/next/app/(dashboard)/layout.tsx
rename to apps/web/app/(dashboard)/layout.tsx
diff --git a/apps/next/app/(dashboard)/markets/markets-table.tsx b/apps/web/app/(dashboard)/markets/markets-table.tsx
similarity index 100%
rename from apps/next/app/(dashboard)/markets/markets-table.tsx
rename to apps/web/app/(dashboard)/markets/markets-table.tsx
diff --git a/apps/next/app/(dashboard)/markets/page.tsx b/apps/web/app/(dashboard)/markets/page.tsx
similarity index 100%
rename from apps/next/app/(dashboard)/markets/page.tsx
rename to apps/web/app/(dashboard)/markets/page.tsx
diff --git a/apps/next/app/(dashboard)/page-title.tsx b/apps/web/app/(dashboard)/page-title.tsx
similarity index 100%
rename from apps/next/app/(dashboard)/page-title.tsx
rename to apps/web/app/(dashboard)/page-title.tsx
diff --git a/apps/next/app/(dashboard)/settings/(profile)/change-email-block.tsx b/apps/web/app/(dashboard)/settings/(profile)/change-email-block.tsx
similarity index 100%
rename from apps/next/app/(dashboard)/settings/(profile)/change-email-block.tsx
rename to apps/web/app/(dashboard)/settings/(profile)/change-email-block.tsx
diff --git a/apps/next/app/(dashboard)/settings/(profile)/linked-accounts-section.tsx b/apps/web/app/(dashboard)/settings/(profile)/linked-accounts-section.tsx
similarity index 100%
rename from apps/next/app/(dashboard)/settings/(profile)/linked-accounts-section.tsx
rename to apps/web/app/(dashboard)/settings/(profile)/linked-accounts-section.tsx
diff --git a/apps/next/app/(dashboard)/settings/(profile)/page.tsx b/apps/web/app/(dashboard)/settings/(profile)/page.tsx
similarity index 100%
rename from apps/next/app/(dashboard)/settings/(profile)/page.tsx
rename to apps/web/app/(dashboard)/settings/(profile)/page.tsx
diff --git a/apps/next/app/(dashboard)/settings/(profile)/profile-section.tsx b/apps/web/app/(dashboard)/settings/(profile)/profile-section.tsx
similarity index 100%
rename from apps/next/app/(dashboard)/settings/(profile)/profile-section.tsx
rename to apps/web/app/(dashboard)/settings/(profile)/profile-section.tsx
diff --git a/apps/next/app/(dashboard)/settings/security/api-keys-card.tsx b/apps/web/app/(dashboard)/settings/security/api-keys-card.tsx
similarity index 100%
rename from apps/next/app/(dashboard)/settings/security/api-keys-card.tsx
rename to apps/web/app/(dashboard)/settings/security/api-keys-card.tsx
diff --git a/apps/next/app/(dashboard)/settings/security/apikeys/page.tsx b/apps/web/app/(dashboard)/settings/security/apikeys/page.tsx
similarity index 100%
rename from apps/next/app/(dashboard)/settings/security/apikeys/page.tsx
rename to apps/web/app/(dashboard)/settings/security/apikeys/page.tsx
diff --git a/apps/next/app/(dashboard)/settings/security/layout.tsx b/apps/web/app/(dashboard)/settings/security/layout.tsx
similarity index 100%
rename from apps/next/app/(dashboard)/settings/security/layout.tsx
rename to apps/web/app/(dashboard)/settings/security/layout.tsx
diff --git a/apps/next/app/(dashboard)/settings/security/page.tsx b/apps/web/app/(dashboard)/settings/security/page.tsx
similarity index 100%
rename from apps/next/app/(dashboard)/settings/security/page.tsx
rename to apps/web/app/(dashboard)/settings/security/page.tsx
diff --git a/apps/next/app/(dashboard)/settings/security/passkeys-card.tsx b/apps/web/app/(dashboard)/settings/security/passkeys-card.tsx
similarity index 100%
rename from apps/next/app/(dashboard)/settings/security/passkeys-card.tsx
rename to apps/web/app/(dashboard)/settings/security/passkeys-card.tsx
diff --git a/apps/next/app/(dashboard)/settings/security/passkeys/page.tsx b/apps/web/app/(dashboard)/settings/security/passkeys/page.tsx
similarity index 100%
rename from apps/next/app/(dashboard)/settings/security/passkeys/page.tsx
rename to apps/web/app/(dashboard)/settings/security/passkeys/page.tsx
diff --git a/apps/next/app/(dashboard)/settings/security/security-tabs.tsx b/apps/web/app/(dashboard)/settings/security/security-tabs.tsx
similarity index 100%
rename from apps/next/app/(dashboard)/settings/security/security-tabs.tsx
rename to apps/web/app/(dashboard)/settings/security/security-tabs.tsx
diff --git a/apps/next/app/(dashboard)/settings/security/totp-card.tsx b/apps/web/app/(dashboard)/settings/security/totp-card.tsx
similarity index 100%
rename from apps/next/app/(dashboard)/settings/security/totp-card.tsx
rename to apps/web/app/(dashboard)/settings/security/totp-card.tsx
diff --git a/apps/next/app/(dashboard)/settings/security/totp/page.tsx b/apps/web/app/(dashboard)/settings/security/totp/page.tsx
similarity index 100%
rename from apps/next/app/(dashboard)/settings/security/totp/page.tsx
rename to apps/web/app/(dashboard)/settings/security/totp/page.tsx
diff --git a/apps/next/app/(dashboard)/sidebar.tsx b/apps/web/app/(dashboard)/sidebar.tsx
similarity index 100%
rename from apps/next/app/(dashboard)/sidebar.tsx
rename to apps/web/app/(dashboard)/sidebar.tsx
diff --git a/apps/next/app/api/auth/update-tokens/route.ts b/apps/web/app/api/auth/update-tokens/route.ts
similarity index 100%
rename from apps/next/app/api/auth/update-tokens/route.ts
rename to apps/web/app/api/auth/update-tokens/route.ts
diff --git a/apps/next/app/auth/callback/change-email/route.ts b/apps/web/app/auth/callback/change-email/route.ts
similarity index 100%
rename from apps/next/app/auth/callback/change-email/route.ts
rename to apps/web/app/auth/callback/change-email/route.ts
diff --git a/apps/next/app/auth/callback/magiclink/route.ts b/apps/web/app/auth/callback/magiclink/route.ts
similarity index 100%
rename from apps/next/app/auth/callback/magiclink/route.ts
rename to apps/web/app/auth/callback/magiclink/route.ts
diff --git a/apps/next/app/auth/callback/oauth/facebook/route.ts b/apps/web/app/auth/callback/oauth/facebook/route.ts
similarity index 100%
rename from apps/next/app/auth/callback/oauth/facebook/route.ts
rename to apps/web/app/auth/callback/oauth/facebook/route.ts
diff --git a/apps/next/app/auth/callback/oauth/github/route.ts b/apps/web/app/auth/callback/oauth/github/route.ts
similarity index 100%
rename from apps/next/app/auth/callback/oauth/github/route.ts
rename to apps/web/app/auth/callback/oauth/github/route.ts
diff --git a/apps/next/app/auth/callback/oauth/google/route.ts b/apps/web/app/auth/callback/oauth/google/route.ts
similarity index 100%
rename from apps/next/app/auth/callback/oauth/google/route.ts
rename to apps/web/app/auth/callback/oauth/google/route.ts
diff --git a/apps/next/app/auth/callback/oauth/twitter/route.ts b/apps/web/app/auth/callback/oauth/twitter/route.ts
similarity index 100%
rename from apps/next/app/auth/callback/oauth/twitter/route.ts
rename to apps/web/app/auth/callback/oauth/twitter/route.ts
diff --git a/apps/next/app/auth/callback/page.tsx b/apps/web/app/auth/callback/page.tsx
similarity index 100%
rename from apps/next/app/auth/callback/page.tsx
rename to apps/web/app/auth/callback/page.tsx
diff --git a/apps/next/app/auth/callback/passkey/route.ts b/apps/web/app/auth/callback/passkey/route.ts
similarity index 100%
rename from apps/next/app/auth/callback/passkey/route.ts
rename to apps/web/app/auth/callback/passkey/route.ts
diff --git a/apps/next/app/auth/callback/web3/route.ts b/apps/web/app/auth/callback/web3/route.ts
similarity index 100%
rename from apps/next/app/auth/callback/web3/route.ts
rename to apps/web/app/auth/callback/web3/route.ts
diff --git a/apps/next/app/auth/login/login-actions.tsx b/apps/web/app/auth/login/login-actions.tsx
similarity index 100%
rename from apps/next/app/auth/login/login-actions.tsx
rename to apps/web/app/auth/login/login-actions.tsx
diff --git a/apps/next/app/auth/login/login-code-view.tsx b/apps/web/app/auth/login/login-code-view.tsx
similarity index 100%
rename from apps/next/app/auth/login/login-code-view.tsx
rename to apps/web/app/auth/login/login-code-view.tsx
diff --git a/apps/next/app/auth/login/login-form.tsx b/apps/web/app/auth/login/login-form.tsx
similarity index 100%
rename from apps/next/app/auth/login/login-form.tsx
rename to apps/web/app/auth/login/login-form.tsx
diff --git a/apps/next/app/auth/login/page.tsx b/apps/web/app/auth/login/page.tsx
similarity index 100%
rename from apps/next/app/auth/login/page.tsx
rename to apps/web/app/auth/login/page.tsx
diff --git a/apps/next/app/auth/login/passkey-shortcut.tsx b/apps/web/app/auth/login/passkey-shortcut.tsx
similarity index 100%
rename from apps/next/app/auth/login/passkey-shortcut.tsx
rename to apps/web/app/auth/login/passkey-shortcut.tsx
diff --git a/apps/next/app/auth/login/use-google-one-tap.ts b/apps/web/app/auth/login/use-google-one-tap.ts
similarity index 100%
rename from apps/next/app/auth/login/use-google-one-tap.ts
rename to apps/web/app/auth/login/use-google-one-tap.ts
diff --git a/apps/next/app/auth/logout/route.ts b/apps/web/app/auth/logout/route.ts
similarity index 100%
rename from apps/next/app/auth/logout/route.ts
rename to apps/web/app/auth/logout/route.ts
diff --git a/apps/next/app/error.tsx b/apps/web/app/error.tsx
similarity index 100%
rename from apps/next/app/error.tsx
rename to apps/web/app/error.tsx
diff --git a/apps/next/app/favicon.ico b/apps/web/app/favicon.ico
similarity index 100%
rename from apps/next/app/favicon.ico
rename to apps/web/app/favicon.ico
diff --git a/apps/next/app/global-error.tsx b/apps/web/app/global-error.tsx
similarity index 100%
rename from apps/next/app/global-error.tsx
rename to apps/web/app/global-error.tsx
diff --git a/apps/next/app/globals.css b/apps/web/app/globals.css
similarity index 100%
rename from apps/next/app/globals.css
rename to apps/web/app/globals.css
diff --git a/apps/next/app/layout.tsx b/apps/web/app/layout.tsx
similarity index 100%
rename from apps/next/app/layout.tsx
rename to apps/web/app/layout.tsx
diff --git a/apps/next/app/privacy/page.tsx b/apps/web/app/privacy/page.tsx
similarity index 100%
rename from apps/next/app/privacy/page.tsx
rename to apps/web/app/privacy/page.tsx
diff --git a/apps/next/app/providers.tsx b/apps/web/app/providers.tsx
similarity index 100%
rename from apps/next/app/providers.tsx
rename to apps/web/app/providers.tsx
diff --git a/apps/next/app/terms/page.tsx b/apps/web/app/terms/page.tsx
similarity index 100%
rename from apps/next/app/terms/page.tsx
rename to apps/web/app/terms/page.tsx
diff --git a/apps/next/components.json b/apps/web/components.json
similarity index 100%
rename from apps/next/components.json
rename to apps/web/components.json
diff --git a/apps/next/components/assistant/assistant-chat.tsx b/apps/web/components/assistant/assistant-chat.tsx
similarity index 100%
rename from apps/next/components/assistant/assistant-chat.tsx
rename to apps/web/components/assistant/assistant-chat.tsx
diff --git a/apps/next/components/assistant/assistant-sidebar.tsx b/apps/web/components/assistant/assistant-sidebar.tsx
similarity index 100%
rename from apps/next/components/assistant/assistant-sidebar.tsx
rename to apps/web/components/assistant/assistant-sidebar.tsx
diff --git a/apps/next/components/assistant/conversation.tsx b/apps/web/components/assistant/conversation.tsx
similarity index 100%
rename from apps/next/components/assistant/conversation.tsx
rename to apps/web/components/assistant/conversation.tsx
diff --git a/apps/next/components/assistant/index.tsx b/apps/web/components/assistant/index.tsx
similarity index 100%
rename from apps/next/components/assistant/index.tsx
rename to apps/web/components/assistant/index.tsx
diff --git a/apps/next/components/assistant/message.tsx b/apps/web/components/assistant/message.tsx
similarity index 100%
rename from apps/next/components/assistant/message.tsx
rename to apps/web/components/assistant/message.tsx
diff --git a/apps/next/components/assistant/prompt-input.tsx b/apps/web/components/assistant/prompt-input.tsx
similarity index 100%
rename from apps/next/components/assistant/prompt-input.tsx
rename to apps/web/components/assistant/prompt-input.tsx
diff --git a/apps/next/components/assistant/user-info-catalog.tsx b/apps/web/components/assistant/user-info-catalog.tsx
similarity index 100%
rename from apps/next/components/assistant/user-info-catalog.tsx
rename to apps/web/components/assistant/user-info-catalog.tsx
diff --git a/apps/next/components/icons/facebook.tsx b/apps/web/components/icons/facebook.tsx
similarity index 100%
rename from apps/next/components/icons/facebook.tsx
rename to apps/web/components/icons/facebook.tsx
diff --git a/apps/next/components/icons/github.tsx b/apps/web/components/icons/github.tsx
similarity index 100%
rename from apps/next/components/icons/github.tsx
rename to apps/web/components/icons/github.tsx
diff --git a/apps/next/components/icons/google.tsx b/apps/web/components/icons/google.tsx
similarity index 100%
rename from apps/next/components/icons/google.tsx
rename to apps/web/components/icons/google.tsx
diff --git a/apps/next/components/icons/index.ts b/apps/web/components/icons/index.ts
similarity index 100%
rename from apps/next/components/icons/index.ts
rename to apps/web/components/icons/index.ts
diff --git a/apps/next/components/icons/passkey.tsx b/apps/web/components/icons/passkey.tsx
similarity index 100%
rename from apps/next/components/icons/passkey.tsx
rename to apps/web/components/icons/passkey.tsx
diff --git a/apps/next/components/icons/twitter.tsx b/apps/web/components/icons/twitter.tsx
similarity index 100%
rename from apps/next/components/icons/twitter.tsx
rename to apps/web/components/icons/twitter.tsx
diff --git a/apps/next/components/policy-page-shell.tsx b/apps/web/components/policy-page-shell.tsx
similarity index 100%
rename from apps/next/components/policy-page-shell.tsx
rename to apps/web/components/policy-page-shell.tsx
diff --git a/apps/next/components/shared/api-health-badge.tsx b/apps/web/components/shared/api-health-badge.tsx
similarity index 100%
rename from apps/next/components/shared/api-health-badge.tsx
rename to apps/web/components/shared/api-health-badge.tsx
diff --git a/apps/next/components/shared/auth-badge.tsx b/apps/web/components/shared/auth-badge.tsx
similarity index 100%
rename from apps/next/components/shared/auth-badge.tsx
rename to apps/web/components/shared/auth-badge.tsx
diff --git a/apps/next/components/shared/error-boundary.tsx b/apps/web/components/shared/error-boundary.tsx
similarity index 100%
rename from apps/next/components/shared/error-boundary.tsx
rename to apps/web/components/shared/error-boundary.tsx
diff --git a/apps/next/e2e/auth-helpers.ts b/apps/web/e2e/auth-helpers.ts
similarity index 100%
rename from apps/next/e2e/auth-helpers.ts
rename to apps/web/e2e/auth-helpers.ts
diff --git a/apps/next/e2e/chat-assistant.spec.ts b/apps/web/e2e/chat-assistant.spec.ts
similarity index 100%
rename from apps/next/e2e/chat-assistant.spec.ts
rename to apps/web/e2e/chat-assistant.spec.ts
diff --git a/apps/next/e2e/fixtures.ts b/apps/web/e2e/fixtures.ts
similarity index 100%
rename from apps/next/e2e/fixtures.ts
rename to apps/web/e2e/fixtures.ts
diff --git a/apps/next/e2e/magic-link-auth.spec.ts b/apps/web/e2e/magic-link-auth.spec.ts
similarity index 100%
rename from apps/next/e2e/magic-link-auth.spec.ts
rename to apps/web/e2e/magic-link-auth.spec.ts
diff --git a/apps/next/e2e/passkey-auth.spec.ts b/apps/web/e2e/passkey-auth.spec.ts
similarity index 100%
rename from apps/next/e2e/passkey-auth.spec.ts
rename to apps/web/e2e/passkey-auth.spec.ts
diff --git a/apps/next/e2e/playwright-global-setup.ts b/apps/web/e2e/playwright-global-setup.ts
similarity index 100%
rename from apps/next/e2e/playwright-global-setup.ts
rename to apps/web/e2e/playwright-global-setup.ts
diff --git a/apps/next/e2e/playwright-global-teardown.ts b/apps/web/e2e/playwright-global-teardown.ts
similarity index 100%
rename from apps/next/e2e/playwright-global-teardown.ts
rename to apps/web/e2e/playwright-global-teardown.ts
diff --git a/apps/next/e2e/security/api-keys.spec.ts b/apps/web/e2e/security/api-keys.spec.ts
similarity index 100%
rename from apps/next/e2e/security/api-keys.spec.ts
rename to apps/web/e2e/security/api-keys.spec.ts
diff --git a/apps/next/e2e/security/authenticator.spec.ts b/apps/web/e2e/security/authenticator.spec.ts
similarity index 100%
rename from apps/next/e2e/security/authenticator.spec.ts
rename to apps/web/e2e/security/authenticator.spec.ts
diff --git a/apps/next/e2e/security/passkeys.spec.ts b/apps/web/e2e/security/passkeys.spec.ts
similarity index 100%
rename from apps/next/e2e/security/passkeys.spec.ts
rename to apps/web/e2e/security/passkeys.spec.ts
diff --git a/apps/next/error-reporting.client.ts b/apps/web/error-reporting.client.ts
similarity index 100%
rename from apps/next/error-reporting.client.ts
rename to apps/web/error-reporting.client.ts
diff --git a/apps/next/error-reporting.server.ts b/apps/web/error-reporting.server.ts
similarity index 100%
rename from apps/next/error-reporting.server.ts
rename to apps/web/error-reporting.server.ts
diff --git a/apps/next/eslint.config.js b/apps/web/eslint.config.js
similarity index 100%
rename from apps/next/eslint.config.js
rename to apps/web/eslint.config.js
diff --git a/apps/next/hooks/.gitkeep b/apps/web/hooks/.gitkeep
similarity index 100%
rename from apps/next/hooks/.gitkeep
rename to apps/web/hooks/.gitkeep
diff --git a/apps/next/instrumentation-client.ts b/apps/web/instrumentation-client.ts
similarity index 100%
rename from apps/next/instrumentation-client.ts
rename to apps/web/instrumentation-client.ts
diff --git a/apps/next/instrumentation.ts b/apps/web/instrumentation.ts
similarity index 100%
rename from apps/next/instrumentation.ts
rename to apps/web/instrumentation.ts
diff --git a/apps/next/lib/auth/auth-client.ts b/apps/web/lib/auth/auth-client.ts
similarity index 100%
rename from apps/next/lib/auth/auth-client.ts
rename to apps/web/lib/auth/auth-client.ts
diff --git a/apps/next/lib/auth/auth-error-messages.ts b/apps/web/lib/auth/auth-error-messages.ts
similarity index 100%
rename from apps/next/lib/auth/auth-error-messages.ts
rename to apps/web/lib/auth/auth-error-messages.ts
diff --git a/apps/next/lib/auth/auth-schemas.ts b/apps/web/lib/auth/auth-schemas.ts
similarity index 100%
rename from apps/next/lib/auth/auth-schemas.ts
rename to apps/web/lib/auth/auth-schemas.ts
diff --git a/apps/next/lib/auth/auth-server.ts b/apps/web/lib/auth/auth-server.ts
similarity index 100%
rename from apps/next/lib/auth/auth-server.ts
rename to apps/web/lib/auth/auth-server.ts
diff --git a/apps/next/lib/auth/auth-utils.ts b/apps/web/lib/auth/auth-utils.ts
similarity index 100%
rename from apps/next/lib/auth/auth-utils.ts
rename to apps/web/lib/auth/auth-utils.ts
diff --git a/apps/next/lib/auth/callback-utils.ts b/apps/web/lib/auth/callback-utils.ts
similarity index 100%
rename from apps/next/lib/auth/callback-utils.ts
rename to apps/web/lib/auth/callback-utils.ts
diff --git a/apps/next/lib/auth/jwt-utils.ts b/apps/web/lib/auth/jwt-utils.ts
similarity index 100%
rename from apps/next/lib/auth/jwt-utils.ts
rename to apps/web/lib/auth/jwt-utils.ts
diff --git a/apps/next/lib/auth/parse-auth-cookie.ts b/apps/web/lib/auth/parse-auth-cookie.ts
similarity index 100%
rename from apps/next/lib/auth/parse-auth-cookie.ts
rename to apps/web/lib/auth/parse-auth-cookie.ts
diff --git a/apps/next/lib/env.ts b/apps/web/lib/env.ts
similarity index 100%
rename from apps/next/lib/env.ts
rename to apps/web/lib/env.ts
diff --git a/apps/next/lib/query-keys.ts b/apps/web/lib/query-keys.ts
similarity index 100%
rename from apps/next/lib/query-keys.ts
rename to apps/web/lib/query-keys.ts
diff --git a/apps/next/next.config.mjs b/apps/web/next.config.mjs
similarity index 100%
rename from apps/next/next.config.mjs
rename to apps/web/next.config.mjs
diff --git a/apps/next/package.json b/apps/web/package.json
similarity index 99%
rename from apps/next/package.json
rename to apps/web/package.json
index f3709f96..b14d605b 100644
--- a/apps/next/package.json
+++ b/apps/web/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "@repo/next",
+  "name": "@repo/web",
   "version": "0.1.0",
   "type": "module",
   "private": true,
diff --git a/apps/next/playwright.config.ts b/apps/web/playwright.config.ts
similarity index 100%
rename from apps/next/playwright.config.ts
rename to apps/web/playwright.config.ts
diff --git a/apps/next/postcss.config.mjs b/apps/web/postcss.config.mjs
similarity index 100%
rename from apps/next/postcss.config.mjs
rename to apps/web/postcss.config.mjs
diff --git a/apps/next/proxy.ts b/apps/web/proxy.ts
similarity index 100%
rename from apps/next/proxy.ts
rename to apps/web/proxy.ts
diff --git a/apps/next/public/images/auth-login-hero.webp b/apps/web/public/images/auth-login-hero.webp
similarity index 100%
rename from apps/next/public/images/auth-login-hero.webp
rename to apps/web/public/images/auth-login-hero.webp
diff --git a/apps/next/scripts/run-e2e-local.mjs b/apps/web/scripts/run-e2e-local.mjs
similarity index 89%
rename from apps/next/scripts/run-e2e-local.mjs
rename to apps/web/scripts/run-e2e-local.mjs
index 3f0683ed..5d5557ad 100644
--- a/apps/next/scripts/run-e2e-local.mjs
+++ b/apps/web/scripts/run-e2e-local.mjs
@@ -14,7 +14,7 @@ const nextDir = dirname(scriptDir)
 const repoRoot = dirname(dirname(nextDir))
 
 function loadEnvTest() {
-  const path = join(repoRoot, 'apps/fastify/.env.test')
+  const path = join(repoRoot, 'apps/api/.env.test')
   if (!existsSync(path)) return {}
   const lines = readFileSync(path, 'utf8').split('\n')
   const out = {}
@@ -71,7 +71,7 @@ async function main() {
         process.env.JWT_SECRET ??
         'e2e-jwt-secret-min-32-chars-for-tests',
     }
-    const build = spawn('pnpm', ['-F', '@repo/next', 'run', 'build:e2e'], {
+    const build = spawn('pnpm', ['-F', '@repo/web', 'run', 'build:e2e'], {
       cwd: repoRoot,
       stdio: 'inherit',
       env: buildEnv,
@@ -95,27 +95,24 @@ async function main() {
   delete env.OPEN_ROUTER_API_KEY
   delete env.OLLAMA_BASE_URL
 
-  const fastify = spawn('node', ['--import', 'tsx', 'server.ts'], {
-    cwd: join(repoRoot, 'apps/fastify'),
+  const api = spawn('node', ['--import', 'tsx', 'server.ts'], {
+    cwd: join(repoRoot, 'apps/api'),
     env,
     stdio: 'inherit',
   })
-  const next = spawn('pnpm', ['exec', 'next', 'start'], {
+  const web = spawn('pnpm', ['exec', 'next', 'start'], {
     cwd: nextDir,
     env: { ...env, PORT: '3000' },
     stdio: 'inherit',
   })
 
   const killAll = (signal = 'SIGTERM') => {
-    fastify.kill(signal)
-    next.kill(signal)
+    api.kill(signal)
+    web.kill(signal)
   }
   const waitForExits = (timeoutMs = 2000) =>
     Promise.race([
-      Promise.all([
-        new Promise(r => fastify.once('exit', r)),
-        new Promise(r => next.once('exit', r)),
-      ]),
+      Promise.all([new Promise(r => api.once('exit', r)), new Promise(r => web.once('exit', r))]),
       new Promise(r => setTimeout(r, timeoutMs)),
     ])
 
@@ -163,8 +160,8 @@ async function main() {
   await new Promise(r => pw.on('exit', r))
   cleanup()
   await waitForExits(5000)
-  if (fastify.exitCode == null) fastify.kill('SIGKILL')
-  if (next.exitCode == null) next.kill('SIGKILL')
+  if (api.exitCode == null) api.kill('SIGKILL')
+  if (web.exitCode == null) web.kill('SIGKILL')
   process.exit(exitCode)
 }
 
diff --git a/apps/next/scripts/run-e2e.mjs b/apps/web/scripts/run-e2e.mjs
similarity index 100%
rename from apps/next/scripts/run-e2e.mjs
rename to apps/web/scripts/run-e2e.mjs
diff --git a/apps/next/scripts/start-e2e-servers.mjs b/apps/web/scripts/start-e2e-servers.mjs
similarity index 81%
rename from apps/next/scripts/start-e2e-servers.mjs
rename to apps/web/scripts/start-e2e-servers.mjs
index 572baa1a..9e795ec6 100644
--- a/apps/next/scripts/start-e2e-servers.mjs
+++ b/apps/web/scripts/start-e2e-servers.mjs
@@ -20,20 +20,20 @@ const env = {
   NEXT_PUBLIC_API_URL: 'http://localhost:3001',
 }
 
-const fastify = spawn('pnpm', ['--filter', '@repo/fastify', 'start:ci'], {
+const api = spawn('pnpm', ['--filter', '@repo/api', 'start:ci'], {
   cwd: repoRoot,
   env,
   stdio: 'inherit',
 })
-const next = spawn('pnpm', ['--filter', '@repo/next', 'start:e2e:server'], {
+const web = spawn('pnpm', ['--filter', '@repo/web', 'start:e2e:server'], {
   cwd: repoRoot,
   env: { ...env, PORT: '3000' },
   stdio: 'inherit',
 })
 
 function killAll(signal = 'SIGTERM') {
-  fastify.kill(signal)
-  next.kill(signal)
+  api.kill(signal)
+  web.kill(signal)
 }
 process.on('SIGINT', () => {
   killAll()
@@ -44,7 +44,7 @@ process.on('SIGTERM', () => {
   process.exit(0)
 })
 
-for (const proc of [fastify, next])
+for (const proc of [api, web])
   proc.on('exit', code => {
     killAll('SIGKILL')
     process.exit(code ?? 1)
diff --git a/apps/next/sentry.edge.config.ts b/apps/web/sentry.edge.config.ts
similarity index 100%
rename from apps/next/sentry.edge.config.ts
rename to apps/web/sentry.edge.config.ts
diff --git a/apps/next/sentry.server.config.ts b/apps/web/sentry.server.config.ts
similarity index 100%
rename from apps/next/sentry.server.config.ts
rename to apps/web/sentry.server.config.ts
diff --git a/apps/next/tsconfig.json b/apps/web/tsconfig.json
similarity index 100%
rename from apps/next/tsconfig.json
rename to apps/web/tsconfig.json
diff --git a/apps/next/vercel.json b/apps/web/vercel.json
similarity index 70%
rename from apps/next/vercel.json
rename to apps/web/vercel.json
index bb4cd717..08d0213f 100644
--- a/apps/next/vercel.json
+++ b/apps/web/vercel.json
@@ -1,8 +1,8 @@
 {
   "$schema": "https://openapi.vercel.sh/vercel.json",
-  "ignoreCommand": "npx turbo-ignore @repo/next --fallback=HEAD^1",
-  "buildCommand": "cd ../.. && pnpm turbo run build --filter=@repo/next...",
-  "devCommand": "cd ../.. && pnpm dev --filter=@repo/next",
+  "ignoreCommand": "npx turbo-ignore @repo/web --fallback=HEAD^1",
+  "buildCommand": "cd ../.. && pnpm turbo run build --filter=@repo/web...",
+  "devCommand": "cd ../.. && pnpm dev --filter=@repo/web",
   "installCommand": "cd ../.. && pnpm install",
   "framework": "nextjs",
   "outputDirectory": ".next",
diff --git a/packages/core/openapi-ts.config.ts b/packages/core/openapi-ts.config.ts
index 57e3529d..e3f55947 100644
--- a/packages/core/openapi-ts.config.ts
+++ b/packages/core/openapi-ts.config.ts
@@ -1,7 +1,7 @@
 import { defineConfig } from '@hey-api/openapi-ts'
 
 export default defineConfig({
-  input: '../../apps/fastify/openapi/openapi.json',
+  input: '../../apps/api/openapi/openapi.json',
   output: {
     path: './src/gen',
     postProcess: ['prettier'],
diff --git a/packages/core/scripts/generate-wrapper.mjs b/packages/core/scripts/generate-wrapper.mjs
index a0e76171..cd6310cf 100644
--- a/packages/core/scripts/generate-wrapper.mjs
+++ b/packages/core/scripts/generate-wrapper.mjs
@@ -5,7 +5,7 @@ import { logger } from '@repo/utils/logger/server'
 
 const scriptFile = fileURLToPath(import.meta.url)
 const scriptDir = dirname(scriptFile)
-const openapiPath = join(scriptDir, '../../../apps/fastify/openapi/openapi.json')
+const openapiPath = join(scriptDir, '../../../apps/api/openapi/openapi.json')
 const outputPath = join(scriptDir, '../src/api-wrapper.gen.ts')
 const apiClientOutputPath = join(scriptDir, '../src/api-client.gen.ts')
 
diff --git a/packages/core/scripts/wait-and-watch.mjs b/packages/core/scripts/wait-and-watch.mjs
index 706828a0..92c6135b 100644
--- a/packages/core/scripts/wait-and-watch.mjs
+++ b/packages/core/scripts/wait-and-watch.mjs
@@ -6,7 +6,7 @@ import { logger } from '@repo/utils/logger/server'
 
 const scriptFile = fileURLToPath(import.meta.url)
 const scriptDir = dirname(scriptFile)
-const openapiPath = join(scriptDir, '../../../apps/fastify/openapi/openapi.json')
+const openapiPath = join(scriptDir, '../../../apps/api/openapi/openapi.json')
 
 function waitForFile() {
   if (existsSync(openapiPath)) {
diff --git a/packages/react/README.md b/packages/react/README.md
index 864f2fec..998659cf 100644
--- a/packages/react/README.md
+++ b/packages/react/README.md
@@ -57,7 +57,7 @@ export default nextConfig
 
 #### Setup Provider
 
-Create a client component provider (e.g., `app/providers.tsx`). For JWT mode with automatic refresh on 401, provide `getAuthToken`, `getRefreshToken`, and `onTokensRefreshed` (all three required). In `apps/next`, use `getAuthToken`, `getRefreshToken`, and `updateAuthTokens` from `lib/auth/auth-client` (reads single cookie `api.session`):
+Create a client component provider (e.g., `app/providers.tsx`). For JWT mode with automatic refresh on 401, provide `getAuthToken`, `getRefreshToken`, and `onTokensRefreshed` (all three required). In `apps/web`, use `getAuthToken`, `getRefreshToken`, and `updateAuthTokens` from `lib/auth/auth-client` (reads single cookie `api.session`):
 
 ```tsx
 'use client'
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 21614737..0a178476 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -62,80 +62,7 @@ importers:
         specifier: ^4.0.18
         version: 4.0.18(@edge-runtime/vm@3.2.0)(@opentelemetry/api@1.9.0)(@types/node@25.2.3)(@vitest/ui@4.0.18)(jiti@2.6.1)(jsdom@28.1.0(@noble/hashes@2.0.1))(lightningcss@1.30.2)(terser@5.46.0)(tsx@4.21.0)(yaml@2.8.2)
 
-  apps/docu:
-    dependencies:
-      '@repo/ui':
-        specifier: workspace:*
-        version: link:../../packages/ui
-      '@t3-oss/env-nextjs':
-        specifier: ^0.13.10
-        version: 0.13.10(typescript@5.9.3)(zod@4.3.6)
-      fumadocs-core:
-        specifier: 16.6.0
-        version: 16.6.0(@mdx-js/mdx@3.1.1)(@types/estree-jsx@1.0.5)(@types/hast@3.0.4)(@types/mdast@4.0.4)(@types/react@19.2.14)(lucide-react@0.564.0(react@19.2.4))(next@16.1.6(@opentelemetry/api@1.9.0)(@playwright/test@1.58.2)(react-dom@19.2.4(react@19.2.4))(react@19.2.4))(react-dom@19.2.4(react@19.2.4))(react@19.2.4)(zod@4.3.6)
-      fumadocs-mdx:
-        specifier: 14.2.7
-        version: 14.2.7(@types/mdast@4.0.4)(@types/mdx@2.0.13)(@types/react@19.2.14)(fumadocs-core@16.6.0(@mdx-js/mdx@3.1.1)(@types/estree-jsx@1.0.5)(@types/hast@3.0.4)(@types/mdast@4.0.4)(@types/react@19.2.14)(lucide-react@0.564.0(react@19.2.4))(next@16.1.6(@opentelemetry/api@1.9.0)(@playwright/test@1.58.2)(react-dom@19.2.4(react@19.2.4))(react@19.2.4))(react-dom@19.2.4(react@19.2.4))(react@19.2.4)(zod@4.3.6))(mdast-util-mdx-jsx@3.2.0)(next@16.1.6(@opentelemetry/api@1.9.0)(@playwright/test@1.58.2)(react-dom@19.2.4(react@19.2.4))(react@19.2.4))(react@19.2.4)(vite@7.3.1(@types/node@25.2.3)(jiti@2.6.1)(lightningcss@1.30.2)(terser@5.46.0)(tsx@4.21.0)(yaml@2.8.2))
-      fumadocs-ui:
-        specifier: 16.6.0
-        version: 16.6.0(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(fumadocs-core@16.6.0(@mdx-js/mdx@3.1.1)(@types/estree-jsx@1.0.5)(@types/hast@3.0.4)(@types/mdast@4.0.4)(@types/react@19.2.14)(lucide-react@0.564.0(react@19.2.4))(next@16.1.6(@opentelemetry/api@1.9.0)(@playwright/test@1.58.2)(react-dom@19.2.4(react@19.2.4))(react@19.2.4))(react-dom@19.2.4(react@19.2.4))(react@19.2.4)(zod@4.3.6))(next@16.1.6(@opentelemetry/api@1.9.0)(@playwright/test@1.58.2)(react-dom@19.2.4(react@19.2.4))(react@19.2.4))(react-dom@19.2.4(react@19.2.4))(react@19.2.4)(tailwindcss@4.1.18)
-      lucide-react:
-        specifier: ^0.564.0
-        version: 0.564.0(react@19.2.4)
-      mermaid:
-        specifier: ^11.12.2
-        version: 11.12.2
-      next:
-        specifier: 16.1.6
-        version: 16.1.6(@babel/core@7.29.0)(@opentelemetry/api@1.9.0)(@playwright/test@1.58.2)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)
-      next-themes:
-        specifier: ^0.4.6
-        version: 0.4.6(react-dom@19.2.4(react@19.2.4))(react@19.2.4)
-      react:
-        specifier: ^19.2.4
-        version: 19.2.4
-      react-dom:
-        specifier: ^19.2.4
-        version: 19.2.4(react@19.2.4)
-      zod:
-        specifier: ^4.3.6
-        version: 4.3.6
-    devDependencies:
-      '@repo/eslint-config':
-        specifier: workspace:*
-        version: link:../../tools/eslint
-      '@tailwindcss/postcss':
-        specifier: ^4.1.18
-        version: 4.1.18
-      '@types/mdx':
-        specifier: ^2.0.13
-        version: 2.0.13
-      '@types/node':
-        specifier: ^25.2.3
-        version: 25.2.3
-      '@types/react':
-        specifier: ^19.2.14
-        version: 19.2.14
-      '@types/react-dom':
-        specifier: ^19.2.3
-        version: 19.2.3(@types/react@19.2.14)
-      '@typescript/native-preview':
-        specifier: 7.0.0-dev.20260213.1
-        version: 7.0.0-dev.20260213.1
-      browserslist:
-        specifier: ^4.28.1
-        version: 4.28.1
-      eslint:
-        specifier: ^9.0.0
-        version: 9.39.2(jiti@2.6.1)
-      postcss:
-        specifier: ^8.5.6
-        version: 8.5.6
-      tailwindcss:
-        specifier: ^4.1.18
-        version: 4.1.18
-
-  apps/fastify:
+  apps/api:
     dependencies:
       '@ai-sdk/anthropic':
         specifier: ^3.0.58
@@ -325,7 +252,80 @@ importers:
         specifier: ^4.0.18
         version: 4.0.18(@edge-runtime/vm@3.2.0)(@opentelemetry/api@1.9.0)(@types/node@25.2.3)(@vitest/ui@4.0.18)(jiti@2.6.1)(jsdom@28.1.0(@noble/hashes@2.0.1))(lightningcss@1.30.2)(terser@5.46.0)(tsx@4.21.0)(yaml@2.8.2)
 
-  apps/next:
+  apps/docu:
+    dependencies:
+      '@repo/ui':
+        specifier: workspace:*
+        version: link:../../packages/ui
+      '@t3-oss/env-nextjs':
+        specifier: ^0.13.10
+        version: 0.13.10(typescript@5.9.3)(zod@4.3.6)
+      fumadocs-core:
+        specifier: 16.6.0
+        version: 16.6.0(@mdx-js/mdx@3.1.1)(@types/estree-jsx@1.0.5)(@types/hast@3.0.4)(@types/mdast@4.0.4)(@types/react@19.2.14)(lucide-react@0.564.0(react@19.2.4))(next@16.1.6(@opentelemetry/api@1.9.0)(@playwright/test@1.58.2)(react-dom@19.2.4(react@19.2.4))(react@19.2.4))(react-dom@19.2.4(react@19.2.4))(react@19.2.4)(zod@4.3.6)
+      fumadocs-mdx:
+        specifier: 14.2.7
+        version: 14.2.7(@types/mdast@4.0.4)(@types/mdx@2.0.13)(@types/react@19.2.14)(fumadocs-core@16.6.0(@mdx-js/mdx@3.1.1)(@types/estree-jsx@1.0.5)(@types/hast@3.0.4)(@types/mdast@4.0.4)(@types/react@19.2.14)(lucide-react@0.564.0(react@19.2.4))(next@16.1.6(@opentelemetry/api@1.9.0)(@playwright/test@1.58.2)(react-dom@19.2.4(react@19.2.4))(react@19.2.4))(react-dom@19.2.4(react@19.2.4))(react@19.2.4)(zod@4.3.6))(mdast-util-mdx-jsx@3.2.0)(next@16.1.6(@opentelemetry/api@1.9.0)(@playwright/test@1.58.2)(react-dom@19.2.4(react@19.2.4))(react@19.2.4))(react@19.2.4)(vite@7.3.1(@types/node@25.2.3)(jiti@2.6.1)(lightningcss@1.30.2)(terser@5.46.0)(tsx@4.21.0)(yaml@2.8.2))
+      fumadocs-ui:
+        specifier: 16.6.0
+        version: 16.6.0(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(fumadocs-core@16.6.0(@mdx-js/mdx@3.1.1)(@types/estree-jsx@1.0.5)(@types/hast@3.0.4)(@types/mdast@4.0.4)(@types/react@19.2.14)(lucide-react@0.564.0(react@19.2.4))(next@16.1.6(@opentelemetry/api@1.9.0)(@playwright/test@1.58.2)(react-dom@19.2.4(react@19.2.4))(react@19.2.4))(react-dom@19.2.4(react@19.2.4))(react@19.2.4)(zod@4.3.6))(next@16.1.6(@opentelemetry/api@1.9.0)(@playwright/test@1.58.2)(react-dom@19.2.4(react@19.2.4))(react@19.2.4))(react-dom@19.2.4(react@19.2.4))(react@19.2.4)(tailwindcss@4.1.18)
+      lucide-react:
+        specifier: ^0.564.0
+        version: 0.564.0(react@19.2.4)
+      mermaid:
+        specifier: ^11.12.2
+        version: 11.12.2
+      next:
+        specifier: 16.1.6
+        version: 16.1.6(@babel/core@7.29.0)(@opentelemetry/api@1.9.0)(@playwright/test@1.58.2)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)
+      next-themes:
+        specifier: ^0.4.6
+        version: 0.4.6(react-dom@19.2.4(react@19.2.4))(react@19.2.4)
+      react:
+        specifier: ^19.2.4
+        version: 19.2.4
+      react-dom:
+        specifier: ^19.2.4
+        version: 19.2.4(react@19.2.4)
+      zod:
+        specifier: ^4.3.6
+        version: 4.3.6
+    devDependencies:
+      '@repo/eslint-config':
+        specifier: workspace:*
+        version: link:../../tools/eslint
+      '@tailwindcss/postcss':
+        specifier: ^4.1.18
+        version: 4.1.18
+      '@types/mdx':
+        specifier: ^2.0.13
+        version: 2.0.13
+      '@types/node':
+        specifier: ^25.2.3
+        version: 25.2.3
+      '@types/react':
+        specifier: ^19.2.14
+        version: 19.2.14
+      '@types/react-dom':
+        specifier: ^19.2.3
+        version: 19.2.3(@types/react@19.2.14)
+      '@typescript/native-preview':
+        specifier: 7.0.0-dev.20260213.1
+        version: 7.0.0-dev.20260213.1
+      browserslist:
+        specifier: ^4.28.1
+        version: 4.28.1
+      eslint:
+        specifier: ^9.0.0
+        version: 9.39.2(jiti@2.6.1)
+      postcss:
+        specifier: ^8.5.6
+        version: 8.5.6
+      tailwindcss:
+        specifier: ^4.1.18
+        version: 4.1.18
+
+  apps/web:
     dependencies:
       '@json-render/core':
         specifier: ^0.7.0
@@ -13198,18 +13198,6 @@ packages:
       utf-8-validate:
         optional: true
 
-  ws@8.17.1:
-    resolution: {integrity: sha512-6XQFvXTkbfUOZOKKILFG1PDK2NDQs4azKQl26T0YS5CxqWLgXajbPZ+h4gZekJyRqFU8pvnbAbbs/3TgRPy+GQ==}
-    engines: {node: '>=10.0.0'}
-    peerDependencies:
-      bufferutil: ^4.0.1
-      utf-8-validate: '>=5.0.2'
-    peerDependenciesMeta:
-      bufferutil:
-        optional: true
-      utf-8-validate:
-        optional: true
-
   ws@8.18.0:
     resolution: {integrity: sha512-8VbfWfHLbbwu3+N6OKsOMpBdT4kXPDDB9cJk2bJ6mh9ucxdlnNvH1e+roYkKmN9Nxw2yjz7VzeO9oOz2zJ04Pw==}
     engines: {node: '>=10.0.0'}
@@ -15087,7 +15075,7 @@ snapshots:
       '@types/estree-jsx': 1.0.5
       '@types/hast': 3.0.4
       '@types/mdx': 2.0.13
-      acorn: 8.15.0
+      acorn: 8.16.0
       collapse-white-space: 2.1.0
       devlop: 1.1.0
       estree-util-is-identifier-name: 3.0.0
@@ -15096,7 +15084,7 @@ snapshots:
       hast-util-to-jsx-runtime: 2.3.6
       markdown-extensions: 2.0.0
       recma-build-jsx: 1.0.0
-      recma-jsx: 1.0.1(acorn@8.15.0)
+      recma-jsx: 1.0.1(acorn@8.16.0)
       recma-stringify: 1.0.0
       rehype-recma: 1.0.0
       remark-mdx: 3.1.1
@@ -17405,7 +17393,7 @@ snapshots:
       '@sentry/node-core': 10.39.0(@opentelemetry/api@1.9.0)(@opentelemetry/context-async-hooks@2.5.1(@opentelemetry/api@1.9.0))(@opentelemetry/core@2.5.1(@opentelemetry/api@1.9.0))(@opentelemetry/instrumentation@0.211.0(@opentelemetry/api@1.9.0))(@opentelemetry/resources@2.5.1(@opentelemetry/api@1.9.0))(@opentelemetry/sdk-trace-base@2.5.1(@opentelemetry/api@1.9.0))(@opentelemetry/semantic-conventions@1.39.0)
       '@sentry/opentelemetry': 10.39.0(@opentelemetry/api@1.9.0)(@opentelemetry/context-async-hooks@2.5.1(@opentelemetry/api@1.9.0))(@opentelemetry/core@2.5.1(@opentelemetry/api@1.9.0))(@opentelemetry/sdk-trace-base@2.5.1(@opentelemetry/api@1.9.0))(@opentelemetry/semantic-conventions@1.39.0)
       import-in-the-middle: 2.0.6
-      minimatch: 10.2.3
+      minimatch: 9.0.7
     transitivePeerDependencies:
       - supports-color
 
@@ -20579,7 +20567,7 @@ snapshots:
     dependencies:
       '@noble/hashes': 1.8.0
       eventemitter3: 5.0.1
-      ws: 8.17.1(bufferutil@4.1.0)(utf-8-validate@5.0.10)
+      ws: 8.19.0(bufferutil@4.1.0)(utf-8-validate@5.0.10)
     transitivePeerDependencies:
       - bufferutil
       - utf-8-validate
@@ -20629,10 +20617,6 @@ snapshots:
       mime-types: 3.0.2
       negotiator: 1.0.0
 
-  acorn-import-attributes@1.9.5(acorn@8.15.0):
-    dependencies:
-      acorn: 8.15.0
-
   acorn-import-attributes@1.9.5(acorn@8.16.0):
     dependencies:
       acorn: 8.16.0
@@ -20651,7 +20635,7 @@ snapshots:
 
   acorn-walk@8.3.4:
     dependencies:
-      acorn: 8.15.0
+      acorn: 8.16.0
 
   acorn@8.15.0: {}
 
@@ -23295,7 +23279,7 @@ snapshots:
     dependencies:
       foreground-child: 3.3.1
       jackspeak: 3.4.3
-      minimatch: 10.2.3
+      minimatch: 9.0.7
       minipass: 7.1.2
       package-json-from-dist: 1.0.1
       path-scurry: 1.11.1
@@ -23713,8 +23697,8 @@ snapshots:
 
   import-in-the-middle@3.0.0:
     dependencies:
-      acorn: 8.15.0
-      acorn-import-attributes: 1.9.5(acorn@8.15.0)
+      acorn: 8.16.0
+      acorn-import-attributes: 1.9.5(acorn@8.16.0)
       cjs-module-lexer: 2.2.0
       module-details-from-path: 1.0.4
 
@@ -24487,7 +24471,7 @@ snapshots:
 
   md5.js@1.3.5:
     dependencies:
-      hash-base: 3.0.5
+      hash-base: 3.1.2
       inherits: 2.0.4
       safe-buffer: 5.2.1
 
@@ -25616,11 +25600,11 @@ snapshots:
   ox@0.6.7(typescript@5.9.3)(zod@4.3.6):
     dependencies:
       '@adraffy/ens-normalize': 1.11.1
-      '@noble/curves': 1.8.1
+      '@noble/curves': 1.9.7
       '@noble/hashes': 1.8.0
-      '@scure/bip32': 1.6.2
-      '@scure/bip39': 1.5.4
-      abitype: 1.0.8(typescript@5.9.3)(zod@4.3.6)
+      '@scure/bip32': 1.7.0
+      '@scure/bip39': 1.6.0
+      abitype: 1.2.3(typescript@5.9.3)(zod@4.3.6)
       eventemitter3: 5.0.1
     optionalDependencies:
       typescript: 5.9.3
@@ -26468,10 +26452,10 @@ snapshots:
       estree-util-build-jsx: 3.0.1
       vfile: 6.0.3
 
-  recma-jsx@1.0.1(acorn@8.15.0):
+  recma-jsx@1.0.1(acorn@8.16.0):
     dependencies:
-      acorn: 8.15.0
-      acorn-jsx: 5.3.2(acorn@8.15.0)
+      acorn: 8.16.0
+      acorn-jsx: 5.3.2(acorn@8.16.0)
       estree-util-to-js: 2.0.0
       recma-parse: 1.0.0
       recma-stringify: 1.0.0
@@ -26813,7 +26797,7 @@ snapshots:
       buffer: 6.0.3
       eventemitter3: 5.0.4
       uuid: 8.3.2
-      ws: 8.17.1(bufferutil@4.1.0)(utf-8-validate@5.0.10)
+      ws: 8.19.0(bufferutil@4.1.0)(utf-8-validate@5.0.10)
     optionalDependencies:
       bufferutil: 4.1.0
       utf-8-validate: 5.0.10
@@ -27598,7 +27582,7 @@ snapshots:
       '@tsconfig/node14': 1.0.3
       '@tsconfig/node16': 1.0.4
       '@types/node': 25.2.3
-      acorn: 8.15.0
+      acorn: 8.16.0
       acorn-walk: 8.3.4
       arg: 4.1.3
       create-require: 1.1.1
@@ -28486,11 +28470,6 @@ snapshots:
       bufferutil: 4.1.0
       utf-8-validate: 5.0.10
 
-  ws@8.17.1(bufferutil@4.1.0)(utf-8-validate@5.0.10):
-    optionalDependencies:
-      bufferutil: 4.1.0
-      utf-8-validate: 5.0.10
-
   ws@8.18.0(bufferutil@4.1.0)(utf-8-validate@5.0.10):
     optionalDependencies:
       bufferutil: 4.1.0
diff --git a/scripts/run-e2e.mjs b/scripts/run-e2e.mjs
index dfdb1727..7f04c0cd 100644
--- a/scripts/run-e2e.mjs
+++ b/scripts/run-e2e.mjs
@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 /**
- * Run E2E tests locally: Fastify API E2E, then Next app E2E.
+ * Run E2E tests locally: API E2E, then Web app E2E.
  * Spawns servers locally (no external URLs). Used by pnpm qa.
  * Kills processes on ports 3000/3001 before starting (unless SKIP_KILL_PORTS=1).
  */
@@ -32,12 +32,12 @@ function run(cmd, args, opts = {}) {
 
 async function main() {
   killPorts()
-  await run('pnpm', ['-F', '@repo/fastify', 'test:e2e:local'])
+  await run('pnpm', ['-F', '@repo/api', 'test:e2e:local'])
   killPorts()
   // Allow server shutdown and port release before starting Next e2e; 2s is conservative;
   // shorten if CI is stable.
   await new Promise(r => setTimeout(r, 2000))
-  await run('pnpm', ['-F', '@repo/next', 'test:e2e:local'])
+  await run('pnpm', ['-F', '@repo/web', 'test:e2e:local'])
 }
 
 main().catch(err => {
diff --git a/tools/typescript/README.md b/tools/typescript/README.md
index b1fdcb58..e697bbb6 100644
--- a/tools/typescript/README.md
+++ b/tools/typescript/README.md
@@ -166,7 +166,7 @@ Packages that don't override `include` will automatically get `reset.d.ts` from
 ### Next.js App
 
 ```json
-// apps/next/tsconfig.json
+// apps/web/tsconfig.json
 {
   "extends": "@repo/typescript-config/nextjs",
   "include": ["next-env.d.ts", "**/*.ts", "**/*.tsx", ".next/types/**/*.ts"],
diff --git a/turbo.json b/turbo.json
index 8fa515a2..b95d5b57 100644
--- a/turbo.json
+++ b/turbo.json
@@ -4,11 +4,11 @@
   "tasks": {
     "generate": {
       "dependsOn": [],
-      "inputs": ["$TURBO_DEFAULT$", "../../apps/fastify/openapi/openapi.json"],
+      "inputs": ["$TURBO_DEFAULT$", "../../apps/api/openapi/openapi.json"],
       "outputs": ["src/gen/**"],
       "env": ["NODE_ENV"]
     },
-    "@repo/fastify#generate:openapi": {
+    "@repo/api#generate:openapi": {
       "dependsOn": ["@repo/utils#build", "@repo/error#build"],
       "inputs": ["$TURBO_DEFAULT$", "src/**/*.ts"],
       "outputs": ["openapi/openapi.json"],
@@ -21,8 +21,8 @@
       ]
     },
     "@repo/core#generate": {
-      "dependsOn": ["@repo/fastify#generate:openapi"],
-      "inputs": ["$TURBO_DEFAULT$", "../../apps/fastify/openapi/openapi.json"],
+      "dependsOn": ["@repo/api#generate:openapi"],
+      "inputs": ["$TURBO_DEFAULT$", "../../apps/api/openapi/openapi.json"],
       "outputs": ["src/gen/**"],
       "env": ["NODE_ENV"]
     },
@@ -167,7 +167,7 @@
         "NEXT_PUBLIC_AUTH_COOKIE_NAME"
       ]
     },
-    "@repo/next#test": {
+    "@repo/web#test": {
       "env": [
         "NODE_ENV",
         "DATABASE_URL",