From 180471eda711a2065b76c22bd2a705ed4f20d0da Mon Sep 17 00:00:00 2001
From: prk-Jr <prakashsagwara@gmail.com>
Date: Wed, 18 Mar 2026 16:54:17 +0530
Subject: [PATCH] Rename crates to trusted-server-core and
 trusted-server-adapter-fastly
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Rename crates/common → crates/trusted-server-core and crates/fastly →
crates/trusted-server-adapter-fastly following the EdgeZero naming
convention. Add EdgeZero workspace dependencies pinned to rev 170b74b.
Update all references across docs, CI workflows, scripts, agent files,
and configuration.
---
 .claude/agents/build-validator.md             |   4 +-
 .claude/agents/pr-creator.md                  |   2 +-
 .claude/agents/pr-reviewer.md                 |   8 +-
 .claude/agents/repo-explorer.md               |   4 +-
 .claude/agents/verify-app.md                  |   4 +-
 .claude/commands/check-ci.md                  |   2 +-
 .claude/commands/verify.md                    |   4 +-
 .../setup-integration-test-env/action.yml     |   2 +-
 .github/pull_request_template.md              |   4 +-
 .github/workflows/format.yml                  |   2 +-
 .github/workflows/integration-tests.yml       |   4 +-
 AGENTS.md                                     |   2 +-
 CLAUDE.md                                     |  26 +-
 Cargo.lock                                    | 260 ++++++++++++++++--
 Cargo.toml                                    |  14 +-
 OPTIMIZATION.md                               |  10 +-
 PUBLISHER_IDS_AUDIT.md                        |   8 +-
 README.md                                     |   2 +-
 .../integration-tests/browser/global-setup.ts |   2 +-
 .../integration-tests/tests/common/runtime.rs |   2 +-
 .../google_tag_manager/script_guard.ts        |   2 +-
 .../Cargo.toml                                |   5 +-
 .../src/error.rs                              |   2 +-
 .../src/main.rs                               |  28 +-
 .../tests/kv_store/counter_store.json         |   0
 .../tests/kv_store/opid_store.json            |   0
 .../Cargo.toml                                |   3 +-
 .../{common => trusted-server-core}/README.md |   4 +-
 .../{common => trusted-server-core}/build.rs  |   0
 .../src/auction/README.md                     |   4 +-
 .../src/auction/config.rs                     |   0
 .../src/auction/context.rs                    |   0
 .../src/auction/endpoints.rs                  |   0
 .../src/auction/formats.rs                    |   0
 .../src/auction/mod.rs                        |   0
 .../src/auction/orchestrator.rs               |   0
 .../src/auction/provider.rs                   |   0
 .../src/auction/types.rs                      |   0
 .../src/auction_config_types.rs               |   0
 .../src/auth.rs                               |   0
 .../src/backend.rs                            |   0
 .../src/constants.rs                          |   0
 .../src/cookies.rs                            |   0
 .../src/creative.rs                           |   0
 .../src/error.rs                              |   0
 .../src/fastly_storage.rs                     |   0
 .../src/geo.rs                                |   0
 .../src/host_rewrite.rs                       |   0
 .../src/html_processor.rs                     |   0
 .../src/html_processor.test.html              |   0
 .../src/http_util.rs                          |   0
 .../src/integrations/adserver_mock.rs         |   0
 .../src/integrations/aps.rs                   |   0
 .../src/integrations/datadome.rs              |   0
 .../src/integrations/didomi.rs                |   0
 .../src/integrations/google_tag_manager.rs    |   0
 .../src/integrations/gpt.rs                   |   0
 .../src/integrations/lockr.rs                 |   0
 .../src/integrations/mod.rs                   |   0
 .../nextjs/fixtures/inlined-data-escaped.html |   0
 .../nextjs/fixtures/inlined-data-nonce.html   |   0
 .../integrations/nextjs/html_post_process.rs  |   0
 .../src/integrations/nextjs/mod.rs            |   0
 .../src/integrations/nextjs/rsc.rs            |   0
 .../integrations/nextjs/rsc_placeholders.rs   |   0
 .../integrations/nextjs/script_rewriter.rs    |   0
 .../src/integrations/nextjs/shared.rs         |   0
 .../src/integrations/permutive.rs             |   0
 .../src/integrations/prebid.rs                |   0
 .../src/integrations/registry.rs              |   0
 .../src/integrations/testlight.rs             |   0
 .../src/lib.rs                                |   0
 .../src/models.rs                             |   0
 .../src/openrtb.rs                            |   0
 .../src/proxy.rs                              |   0
 .../src/publisher.rs                          |   0
 .../src/request_signing/discovery.rs          |   0
 .../src/request_signing/endpoints.rs          |   0
 .../src/request_signing/jwks.rs               |   0
 .../src/request_signing/mod.rs                |   0
 .../src/request_signing/rotation.rs           |   0
 .../src/request_signing/signing.rs            |   0
 .../src/rsc_flight.rs                         |   0
 .../src/settings.rs                           |  10 +-
 .../src/settings_data.rs                      |   0
 .../src/streaming_processor.rs                |   0
 .../src/streaming_replacer.rs                 |   0
 .../src/synthetic.rs                          |   0
 .../src/test_support.rs                       |   0
 .../src/tsjs.rs                               |   0
 docs/guide/architecture.md                    |   4 +-
 docs/guide/auction-orchestration.md           |  16 +-
 docs/guide/configuration.md                   |   2 +-
 docs/guide/error-reference.md                 |   4 +-
 docs/guide/integration-guide.md               |  36 +--
 docs/guide/integrations/aps.md                |   8 +-
 docs/guide/integrations/didomi.md             |   2 +-
 docs/guide/integrations/google_tag_manager.md |   2 +-
 docs/guide/integrations/gpt.md                |   2 +-
 docs/guide/integrations/lockr.md              |   2 +-
 docs/guide/integrations/nextjs.md             |   6 +-
 docs/guide/integrations/permutive.md          |   2 +-
 docs/guide/integrations/prebid.md             |   2 +-
 docs/guide/key-rotation.md                    |   4 +-
 docs/guide/onboarding.md                      |  16 +-
 docs/guide/request-signing.md                 |   4 +-
 docs/guide/rsc-hydration.md                   |   4 +-
 docs/guide/testing.md                         |  16 +-
 fastly.toml                                   |   4 +-
 scripts/integration-tests-browser.sh          |   4 +-
 scripts/integration-tests.sh                  |   4 +-
 111 files changed, 387 insertions(+), 181 deletions(-)
 rename crates/{fastly => trusted-server-adapter-fastly}/Cargo.toml (73%)
 rename crates/{fastly => trusted-server-adapter-fastly}/src/error.rs (89%)
 rename crates/{fastly => trusted-server-adapter-fastly}/src/main.rs (90%)
 rename crates/{fastly => trusted-server-adapter-fastly}/tests/kv_store/counter_store.json (100%)
 rename crates/{fastly => trusted-server-adapter-fastly}/tests/kv_store/opid_store.json (100%)
 rename crates/{common => trusted-server-core}/Cargo.toml (96%)
 rename crates/{common => trusted-server-core}/README.md (96%)
 rename crates/{common => trusted-server-core}/build.rs (100%)
 rename crates/{common => trusted-server-core}/src/auction/README.md (99%)
 rename crates/{common => trusted-server-core}/src/auction/config.rs (100%)
 rename crates/{common => trusted-server-core}/src/auction/context.rs (100%)
 rename crates/{common => trusted-server-core}/src/auction/endpoints.rs (100%)
 rename crates/{common => trusted-server-core}/src/auction/formats.rs (100%)
 rename crates/{common => trusted-server-core}/src/auction/mod.rs (100%)
 rename crates/{common => trusted-server-core}/src/auction/orchestrator.rs (100%)
 rename crates/{common => trusted-server-core}/src/auction/provider.rs (100%)
 rename crates/{common => trusted-server-core}/src/auction/types.rs (100%)
 rename crates/{common => trusted-server-core}/src/auction_config_types.rs (100%)
 rename crates/{common => trusted-server-core}/src/auth.rs (100%)
 rename crates/{common => trusted-server-core}/src/backend.rs (100%)
 rename crates/{common => trusted-server-core}/src/constants.rs (100%)
 rename crates/{common => trusted-server-core}/src/cookies.rs (100%)
 rename crates/{common => trusted-server-core}/src/creative.rs (100%)
 rename crates/{common => trusted-server-core}/src/error.rs (100%)
 rename crates/{common => trusted-server-core}/src/fastly_storage.rs (100%)
 rename crates/{common => trusted-server-core}/src/geo.rs (100%)
 rename crates/{common => trusted-server-core}/src/host_rewrite.rs (100%)
 rename crates/{common => trusted-server-core}/src/html_processor.rs (100%)
 rename crates/{common => trusted-server-core}/src/html_processor.test.html (100%)
 rename crates/{common => trusted-server-core}/src/http_util.rs (100%)
 rename crates/{common => trusted-server-core}/src/integrations/adserver_mock.rs (100%)
 rename crates/{common => trusted-server-core}/src/integrations/aps.rs (100%)
 rename crates/{common => trusted-server-core}/src/integrations/datadome.rs (100%)
 rename crates/{common => trusted-server-core}/src/integrations/didomi.rs (100%)
 rename crates/{common => trusted-server-core}/src/integrations/google_tag_manager.rs (100%)
 rename crates/{common => trusted-server-core}/src/integrations/gpt.rs (100%)
 rename crates/{common => trusted-server-core}/src/integrations/lockr.rs (100%)
 rename crates/{common => trusted-server-core}/src/integrations/mod.rs (100%)
 rename crates/{common => trusted-server-core}/src/integrations/nextjs/fixtures/inlined-data-escaped.html (100%)
 rename crates/{common => trusted-server-core}/src/integrations/nextjs/fixtures/inlined-data-nonce.html (100%)
 rename crates/{common => trusted-server-core}/src/integrations/nextjs/html_post_process.rs (100%)
 rename crates/{common => trusted-server-core}/src/integrations/nextjs/mod.rs (100%)
 rename crates/{common => trusted-server-core}/src/integrations/nextjs/rsc.rs (100%)
 rename crates/{common => trusted-server-core}/src/integrations/nextjs/rsc_placeholders.rs (100%)
 rename crates/{common => trusted-server-core}/src/integrations/nextjs/script_rewriter.rs (100%)
 rename crates/{common => trusted-server-core}/src/integrations/nextjs/shared.rs (100%)
 rename crates/{common => trusted-server-core}/src/integrations/permutive.rs (100%)
 rename crates/{common => trusted-server-core}/src/integrations/prebid.rs (100%)
 rename crates/{common => trusted-server-core}/src/integrations/registry.rs (100%)
 rename crates/{common => trusted-server-core}/src/integrations/testlight.rs (100%)
 rename crates/{common => trusted-server-core}/src/lib.rs (100%)
 rename crates/{common => trusted-server-core}/src/models.rs (100%)
 rename crates/{common => trusted-server-core}/src/openrtb.rs (100%)
 rename crates/{common => trusted-server-core}/src/proxy.rs (100%)
 rename crates/{common => trusted-server-core}/src/publisher.rs (100%)
 rename crates/{common => trusted-server-core}/src/request_signing/discovery.rs (100%)
 rename crates/{common => trusted-server-core}/src/request_signing/endpoints.rs (100%)
 rename crates/{common => trusted-server-core}/src/request_signing/jwks.rs (100%)
 rename crates/{common => trusted-server-core}/src/request_signing/mod.rs (100%)
 rename crates/{common => trusted-server-core}/src/request_signing/rotation.rs (100%)
 rename crates/{common => trusted-server-core}/src/request_signing/signing.rs (100%)
 rename crates/{common => trusted-server-core}/src/rsc_flight.rs (100%)
 rename crates/{common => trusted-server-core}/src/settings.rs (99%)
 rename crates/{common => trusted-server-core}/src/settings_data.rs (100%)
 rename crates/{common => trusted-server-core}/src/streaming_processor.rs (100%)
 rename crates/{common => trusted-server-core}/src/streaming_replacer.rs (100%)
 rename crates/{common => trusted-server-core}/src/synthetic.rs (100%)
 rename crates/{common => trusted-server-core}/src/test_support.rs (100%)
 rename crates/{common => trusted-server-core}/src/tsjs.rs (100%)

diff --git a/.claude/agents/build-validator.md b/.claude/agents/build-validator.md
index e559e506..a35b2824 100644
--- a/.claude/agents/build-validator.md
+++ b/.claude/agents/build-validator.md
@@ -17,13 +17,13 @@ Validate that the project builds correctly across all targets.
 2. **WASM build** (production target)
 
    ```bash
-   cargo build --bin trusted-server-fastly --release --target wasm32-wasip1
+   cargo build --package trusted-server-adapter-fastly --release --target wasm32-wasip1
    ```
 
 3. **Clippy**
 
    ```bash
-   cargo clippy --all-targets --all-features -- -D warnings
+   cargo clippy --workspace --all-targets --all-features -- -D warnings
    ```
 
 4. **Format check**
diff --git a/.claude/agents/pr-creator.md b/.claude/agents/pr-creator.md
index 1ac4c337..9825ec08 100644
--- a/.claude/agents/pr-creator.md
+++ b/.claude/agents/pr-creator.md
@@ -21,7 +21,7 @@ Before creating the PR, verify the branch is healthy:
 
 ```
 cargo fmt --all -- --check
-cargo clippy --all-targets --all-features -- -D warnings
+cargo clippy --workspace --all-targets --all-features -- -D warnings
 cargo test --workspace
 cd crates/js/lib && npx vitest run
 cd crates/js/lib && npm run format
diff --git a/.claude/agents/pr-reviewer.md b/.claude/agents/pr-reviewer.md
index 0a596f41..c771aa03 100644
--- a/.claude/agents/pr-reviewer.md
+++ b/.claude/agents/pr-reviewer.md
@@ -70,8 +70,8 @@ For each changed file, evaluate:
 #### WASM compatibility
 
 - Target is `wasm32-wasip1` — no std::net, std::thread, or OS-specific APIs
-- No Tokio or runtime-specific deps in `crates/common`
-- Fastly-specific APIs only in `crates/fastly`
+- No Tokio or runtime-specific deps in `crates/trusted-server-core`
+- Fastly-specific APIs only in `crates/trusted-server-adapter-fastly`
 
 #### Convention compliance (from CLAUDE.md)
 
@@ -177,7 +177,7 @@ comment. Use the file's **current line number** (not diff position) with the
 
 ````json
 {
-  "path": "crates/common/src/publisher.rs",
+  "path": "crates/trusted-server-core/src/publisher.rs",
   "line": 166,
   "side": "RIGHT",
   "body": "🔧 **wrench** — Race condition: Description of the issue...\n\n**Fix**:\n```rust\n// suggested code\n```"
@@ -288,6 +288,6 @@ Output:
 - Do not include any byline, "Generated with" footer, `Co-Authored-By`
   trailer, or self-referential titles (e.g., "Staff Engineer Review") in
   review comments or the review body.
-- If the diff is very large (>50 files), prioritize `crates/common/` changes
+- If the diff is very large (>50 files), prioritize `crates/trusted-server-core/` changes
   and new files over mechanical changes (Cargo.lock, generated code).
 - Never submit a review without explicit user approval of the findings.
diff --git a/.claude/agents/repo-explorer.md b/.claude/agents/repo-explorer.md
index e7fa3114..570686f8 100644
--- a/.claude/agents/repo-explorer.md
+++ b/.claude/agents/repo-explorer.md
@@ -11,8 +11,8 @@ implementation details.
 
 This is a Rust workspace with three crates:
 
-- `crates/common/` — core library (integrations, HTML processing, synthetic IDs, GDPR)
-- `crates/fastly/` — Fastly Compute entry point
+- `crates/trusted-server-core/` — core library (integrations, HTML processing, synthetic IDs, GDPR)
+- `crates/trusted-server-adapter-fastly/` — Fastly Compute entry point
 - `crates/js/` — TypeScript/JS build pipeline (per-integration IIFE bundles)
 
 Target: `wasm32-wasip1` (Fastly Compute)
diff --git a/.claude/agents/verify-app.md b/.claude/agents/verify-app.md
index c6ac995b..5d26c679 100644
--- a/.claude/agents/verify-app.md
+++ b/.claude/agents/verify-app.md
@@ -19,7 +19,7 @@ cargo fmt --all -- --check
 ### 2. Clippy
 
 ```bash
-cargo clippy --all-targets --all-features -- -D warnings
+cargo clippy --workspace --all-targets --all-features -- -D warnings
 ```
 
 ### 3. Rust Tests
@@ -49,7 +49,7 @@ cd docs && npm run format
 ### 7. WASM Build
 
 ```bash
-cargo build --bin trusted-server-fastly --release --target wasm32-wasip1
+cargo build --package trusted-server-adapter-fastly --release --target wasm32-wasip1
 ```
 
 ## Output
diff --git a/.claude/commands/check-ci.md b/.claude/commands/check-ci.md
index c6b2d942..dc4a63c0 100644
--- a/.claude/commands/check-ci.md
+++ b/.claude/commands/check-ci.md
@@ -1,7 +1,7 @@
 Run all CI checks locally, in order. Stop and report if any step fails.
 
 1. `cargo fmt --all -- --check`
-2. `cargo clippy --all-targets --all-features -- -D warnings`
+2. `cargo clippy --workspace --all-targets --all-features -- -D warnings`
 3. `cargo test --workspace`
 4. `cd crates/js/lib && npx vitest run`
 5. `cd crates/js/lib && npm run format`
diff --git a/.claude/commands/verify.md b/.claude/commands/verify.md
index f6764efc..04fc8931 100644
--- a/.claude/commands/verify.md
+++ b/.claude/commands/verify.md
@@ -1,9 +1,9 @@
 Full verification: build, test, and lint the entire project.
 
 1. `cargo build --workspace`
-2. `cargo build --bin trusted-server-fastly --release --target wasm32-wasip1`
+2. `cargo build --package trusted-server-adapter-fastly --release --target wasm32-wasip1`
 3. `cargo fmt --all -- --check`
-4. `cargo clippy --all-targets --all-features -- -D warnings`
+4. `cargo clippy --workspace --all-targets --all-features -- -D warnings`
 5. `cargo test --workspace`
 6. `cd crates/js/lib && npx vitest run`
 7. `cd crates/js/lib && npm run format`
diff --git a/.github/actions/setup-integration-test-env/action.yml b/.github/actions/setup-integration-test-env/action.yml
index 103f022f..aa89e1ef 100644
--- a/.github/actions/setup-integration-test-env/action.yml
+++ b/.github/actions/setup-integration-test-env/action.yml
@@ -71,7 +71,7 @@ runs:
       env:
         TRUSTED_SERVER__PUBLISHER__ORIGIN_URL: http://127.0.0.1:${{ inputs.origin-port }}
         TRUSTED_SERVER__PROXY__CERTIFICATE_CHECK: "false"
-      run: cargo build --bin trusted-server-fastly --release --target wasm32-wasip1
+      run: cargo build --package trusted-server-adapter-fastly --release --target wasm32-wasip1
 
     - name: Build WordPress test container
       if: ${{ inputs.build-test-images == 'true' }}
diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
index 8fba567c..fbe95847 100644
--- a/.github/pull_request_template.md
+++ b/.github/pull_request_template.md
@@ -24,12 +24,12 @@ Closes #
 <!-- How did you verify this works? Check all that apply -->
 
 - [ ] `cargo test --workspace`
-- [ ] `cargo clippy --all-targets --all-features -- -D warnings`
+- [ ] `cargo clippy --workspace --all-targets --all-features -- -D warnings`
 - [ ] `cargo fmt --all -- --check`
 - [ ] JS tests: `cd crates/js/lib && npx vitest run`
 - [ ] JS format: `cd crates/js/lib && npm run format`
 - [ ] Docs format: `cd docs && npm run format`
-- [ ] WASM build: `cargo build --bin trusted-server-fastly --release --target wasm32-wasip1`
+- [ ] WASM build: `cargo build --package trusted-server-adapter-fastly --release --target wasm32-wasip1`
 - [ ] Manual testing via `fastly compute serve`
 - [ ] Other: <!-- describe -->
 
diff --git a/.github/workflows/format.yml b/.github/workflows/format.yml
index 223601b1..b6aba137 100644
--- a/.github/workflows/format.yml
+++ b/.github/workflows/format.yml
@@ -33,7 +33,7 @@ jobs:
         uses: actions-rust-lang/rustfmt@v1
 
       - name: Run cargo clippy
-        run: cargo clippy --all-targets --all-features -- -D warnings
+        run: cargo clippy --workspace --all-targets --all-features -- -D warnings
 
   format-typescript:
     runs-on: ubuntu-latest
diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml
index 92bdfd74..da467583 100644
--- a/.github/workflows/integration-tests.yml
+++ b/.github/workflows/integration-tests.yml
@@ -13,7 +13,7 @@ on:
 env:
   ORIGIN_PORT: 8888
   ARTIFACTS_DIR: /tmp/integration-test-artifacts
-  WASM_ARTIFACT_PATH: /tmp/integration-test-artifacts/wasm/trusted-server-fastly.wasm
+  WASM_ARTIFACT_PATH: /tmp/integration-test-artifacts/wasm/trusted-server-adapter-fastly.wasm
   DOCKER_ARTIFACT_PATH: /tmp/integration-test-artifacts/docker/test-images.tar
 
 jobs:
@@ -33,7 +33,7 @@ jobs:
       - name: Package integration test artifacts
         run: |
           mkdir -p "$(dirname "$WASM_ARTIFACT_PATH")" "$(dirname "$DOCKER_ARTIFACT_PATH")"
-          cp target/wasm32-wasip1/release/trusted-server-fastly.wasm "$WASM_ARTIFACT_PATH"
+          cp target/wasm32-wasip1/release/trusted-server-adapter-fastly.wasm "$WASM_ARTIFACT_PATH"
           docker save \
             --output "$DOCKER_ARTIFACT_PATH" \
             test-wordpress:latest test-nextjs:latest
diff --git a/AGENTS.md b/AGENTS.md
index 17b51b88..b1f457f2 100644
--- a/AGENTS.md
+++ b/AGENTS.md
@@ -18,7 +18,7 @@ If you cannot read `CLAUDE.md`, follow these rules:
 1. Present a plan and get approval before coding.
 2. Keep changes minimal — do not refactor unrelated code.
 3. Run `cargo test --workspace` after every code change.
-4. Run `cargo fmt --all -- --check` and `cargo clippy --all-targets --all-features -- -D warnings`.
+4. Run `cargo fmt --all -- --check` and `cargo clippy --workspace --all-targets --all-features -- -D warnings`.
 5. Run JS tests with `cd crates/js/lib && npx vitest run` when touching JS/TS code.
 6. Use `error-stack` (`Report<E>`) for error handling — not anyhow, eyre, or thiserror.
 7. Use `tracing` macros (not `println!`) and `expect("should ...")` (not `unwrap()`).
diff --git a/CLAUDE.md b/CLAUDE.md
index 9ad1845c..0411d36f 100644
--- a/CLAUDE.md
+++ b/CLAUDE.md
@@ -13,8 +13,8 @@ real-time bidding integration, and publisher-side JavaScript injection.
 
 ```
 crates/
-  common/        # Core library — shared logic, integrations, HTML processing
-  fastly/        # Fastly Compute entry point (wasm32-wasip1 binary)
+  trusted-server-core/                  # Core library — shared logic, integrations, HTML processing
+  trusted-server-adapter-fastly/        # Fastly Compute entry point (wasm32-wasip1 binary)
   js/            # TypeScript/JS build — per-integration IIFE bundles
     lib/         # TS source, Vitest tests, esbuild pipeline
 ```
@@ -42,7 +42,7 @@ Supporting files: `fastly.toml`, `trusted-server.toml`, `.env.dev`,
 cargo build
 
 # Production build for Fastly
-cargo build --bin trusted-server-fastly --release --target wasm32-wasip1
+cargo build --package trusted-server-adapter-fastly --release --target wasm32-wasip1
 
 # Run locally with Fastly simulator
 fastly compute serve
@@ -61,7 +61,7 @@ cargo test --workspace
 cargo fmt --all -- --check
 
 # Lint
-cargo clippy --all-targets --all-features -- -D warnings
+cargo clippy --workspace --all-targets --all-features -- -D warnings
 
 # Check compilation
 cargo check
@@ -268,7 +268,7 @@ IntegrationRegistration::builder(ID)
 Every PR must pass:
 
 1. `cargo fmt --all -- --check`
-2. `cargo clippy --all-targets --all-features -- -D warnings`
+2. `cargo clippy --workspace --all-targets --all-features -- -D warnings`
 3. `cargo test --workspace`
 4. JS build and test (`cd crates/js/lib && npx vitest run`)
 5. JS format (`cd crates/js/lib && npm run format`)
@@ -362,14 +362,14 @@ both runtime behavior and build/tooling changes.
 
 | File                                         | Purpose                                           |
 | -------------------------------------------- | ------------------------------------------------- |
-| `crates/common/src/integrations/registry.rs` | IntegrationRegistry, `js_module_ids()`            |
-| `crates/common/src/tsjs.rs`                  | Script tag generation with module IDs             |
-| `crates/common/src/html_processor.rs`        | Injects `<script>` at `<head>` start              |
-| `crates/common/src/publisher.rs`             | `/static/tsjs=` handler, concatenates modules     |
-| `crates/common/src/synthetic.rs`             | Synthetic ID generation                           |
-| `crates/common/src/cookies.rs`               | Cookie handling                                   |
-| `crates/common/src/gdpr.rs`                  | GDPR consent management                           |
-| `crates/common/src/http_wrapper.rs`          | HTTP abstractions                                 |
+| `crates/trusted-server-core/src/integrations/registry.rs` | IntegrationRegistry, `js_module_ids()`            |
+| `crates/trusted-server-core/src/tsjs.rs`                  | Script tag generation with module IDs             |
+| `crates/trusted-server-core/src/html_processor.rs`        | Injects `<script>` at `<head>` start              |
+| `crates/trusted-server-core/src/publisher.rs`             | `/static/tsjs=` handler, concatenates modules     |
+| `crates/trusted-server-core/src/synthetic.rs`             | Synthetic ID generation                           |
+| `crates/trusted-server-core/src/cookies.rs`               | Cookie handling                                   |
+| `crates/trusted-server-core/src/gdpr.rs`                  | GDPR consent management                           |
+| `crates/trusted-server-core/src/http_wrapper.rs`          | HTTP abstractions                                 |
 | `crates/js/build.rs`                         | Discovers dist files, generates `tsjs_modules.rs` |
 | `crates/js/src/bundle.rs`                    | Module map, concatenation, hashing                |
 
diff --git a/Cargo.lock b/Cargo.lock
index 5792c2bb..0f36ff24 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -69,6 +69,40 @@ version = "0.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7d902e3d592a523def97af8f317b08ce16b7ab854c1985a0c671e6f15cebc236"
 
+[[package]]
+name = "async-compression"
+version = "0.4.41"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d0f9ee0f6e02ffd7ad5816e9464499fba7b3effd01123b515c41d1697c43dad1"
+dependencies = [
+ "compression-codecs",
+ "compression-core",
+ "futures-io",
+ "pin-project-lite",
+]
+
+[[package]]
+name = "async-stream"
+version = "0.3.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0b5a71a6f37880a80d1d7f19efd781e4b5de42c88f0722cc13bcb6cc2cfe8476"
+dependencies = [
+ "async-stream-impl",
+ "futures-core",
+ "pin-project-lite",
+]
+
+[[package]]
+name = "async-stream-impl"
+version = "0.3.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c7c24de15d275a1ecfd47a380fb4d5ec9bfe0933f309ed5e705b775596a3574d"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.111",
+]
+
 [[package]]
 name = "async-trait"
 version = "0.1.89"
@@ -240,6 +274,24 @@ dependencies = [
  "zeroize",
 ]
 
+[[package]]
+name = "compression-codecs"
+version = "0.4.37"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "eb7b51a7d9c967fc26773061ba86150f19c50c0d65c887cb1fbe295fd16619b7"
+dependencies = [
+ "brotli",
+ "compression-core",
+ "flate2",
+ "memchr",
+]
+
+[[package]]
+name = "compression-core"
+version = "0.4.31"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "75984efb6ed102a0d42db99afb6c1948f0380d1d91808d5529916e6c08b49d8d"
+
 [[package]]
 name = "config"
 version = "0.15.19"
@@ -255,8 +307,8 @@ dependencies = [
  "serde-untagged",
  "serde_core",
  "serde_json",
- "toml",
- "winnow",
+ "toml 0.9.8",
+ "winnow 0.7.14",
  "yaml-rust2",
 ]
 
@@ -602,6 +654,67 @@ dependencies = [
  "zeroize",
 ]
 
+[[package]]
+name = "edgezero-adapter-fastly"
+version = "0.1.0"
+source = "git+https://github.com/stackpop/edgezero?rev=170b74b#170b74bd2c9933b7d561f7ccdb67c53b239e9527"
+dependencies = [
+ "anyhow",
+ "async-stream",
+ "async-trait",
+ "brotli",
+ "bytes",
+ "chrono",
+ "edgezero-core",
+ "fern",
+ "flate2",
+ "futures",
+ "futures-util",
+ "log",
+]
+
+[[package]]
+name = "edgezero-core"
+version = "0.1.0"
+source = "git+https://github.com/stackpop/edgezero?rev=170b74b#170b74bd2c9933b7d561f7ccdb67c53b239e9527"
+dependencies = [
+ "anyhow",
+ "async-compression",
+ "async-stream",
+ "async-trait",
+ "bytes",
+ "edgezero-macros",
+ "futures",
+ "futures-util",
+ "http",
+ "http-body",
+ "log",
+ "matchit",
+ "serde",
+ "serde_json",
+ "serde_urlencoded",
+ "thiserror 2.0.17",
+ "toml 1.0.7+spec-1.1.0",
+ "tower-service",
+ "tracing",
+ "validator",
+ "web-time",
+]
+
+[[package]]
+name = "edgezero-macros"
+version = "0.1.0"
+source = "git+https://github.com/stackpop/edgezero?rev=170b74b#170b74bd2c9933b7d561f7ccdb67c53b239e9527"
+dependencies = [
+ "log",
+ "proc-macro2",
+ "quote",
+ "serde",
+ "syn 2.0.111",
+ "toml 1.0.7+spec-1.1.0",
+ "validator",
+]
+
 [[package]]
 name = "either"
 version = "1.15.0"
@@ -1032,6 +1145,16 @@ dependencies = [
  "itoa",
 ]
 
+[[package]]
+name = "http-body"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1efedce1fb8e6913f23e0c92de8e62cd5b772a67e7b3946df930a62566c93184"
+dependencies = [
+ "bytes",
+ "http",
+]
+
 [[package]]
 name = "iana-time-zone"
 version = "0.1.64"
@@ -1994,9 +2117,9 @@ dependencies = [
 
 [[package]]
 name = "serde_spanned"
-version = "1.0.3"
+version = "1.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e24345aa0fe688594e73770a5f6d1b216508b4f93484c0026d521acd30134392"
+checksum = "f8bbf91e5a4d6315eee45e704372590b30e260ee83af6639d64557f51b067776"
 dependencies = [
  "serde_core",
 ]
@@ -2301,14 +2424,27 @@ name = "toml"
 version = "0.9.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f0dc8b1fb61449e27716ec0e1bdf0f6b8f3e8f6b05391e8497b8b6d7804ea6d8"
+dependencies = [
+ "serde_core",
+ "serde_spanned",
+ "toml_datetime 0.7.3",
+ "toml_parser",
+ "winnow 0.7.14",
+]
+
+[[package]]
+name = "toml"
+version = "1.0.7+spec-1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dd28d57d8a6f6e458bc0b8784f8fdcc4b99a437936056fa122cb234f18656a96"
 dependencies = [
  "indexmap",
  "serde_core",
  "serde_spanned",
- "toml_datetime",
+ "toml_datetime 1.0.1+spec-1.1.0",
  "toml_parser",
  "toml_writer",
- "winnow",
+ "winnow 1.0.0",
 ]
 
 [[package]]
@@ -2320,23 +2456,87 @@ dependencies = [
  "serde_core",
 ]
 
+[[package]]
+name = "toml_datetime"
+version = "1.0.1+spec-1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9b320e741db58cac564e26c607d3cc1fdc4a88fd36c879568c07856ed83ff3e9"
+dependencies = [
+ "serde_core",
+]
+
 [[package]]
 name = "toml_parser"
-version = "1.0.4"
+version = "1.0.10+spec-1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c0cbe268d35bdb4bb5a56a2de88d0ad0eb70af5384a99d648cd4b3d04039800e"
+checksum = "7df25b4befd31c4816df190124375d5a20c6b6921e2cad937316de3fccd63420"
 dependencies = [
- "winnow",
+ "winnow 1.0.0",
 ]
 
 [[package]]
 name = "toml_writer"
-version = "1.0.4"
+version = "1.0.7+spec-1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "df8b2b54733674ad286d16267dcfc7a71ed5c776e4ac7aa3c3e2561f7c637bf2"
+checksum = "f17aaa1c6e3dc22b1da4b6bba97d066e354c7945cac2f7852d4e4e7ca7a6b56d"
+
+[[package]]
+name = "tower-service"
+version = "0.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8df9b6e13f2d32c91b9bd719c00d1958837bc7dec474d94952798cc8e69eeec3"
+
+[[package]]
+name = "tracing"
+version = "0.1.44"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "63e71662fa4b2a2c3a26f570f037eb95bb1f85397f3cd8076caed2f026a6d100"
+dependencies = [
+ "pin-project-lite",
+ "tracing-attributes",
+ "tracing-core",
+]
+
+[[package]]
+name = "tracing-attributes"
+version = "0.1.31"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7490cfa5ec963746568740651ac6781f701c9c5ea257c58e057f3ba8cf69e8da"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.111",
+]
+
+[[package]]
+name = "tracing-core"
+version = "0.1.36"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "db97caf9d906fbde555dd62fa95ddba9eecfd14cb388e4f491a66d74cd5fb79a"
+dependencies = [
+ "once_cell",
+]
+
+[[package]]
+name = "trusted-server-adapter-fastly"
+version = "0.1.0"
+dependencies = [
+ "chrono",
+ "edgezero-adapter-fastly",
+ "error-stack",
+ "fastly",
+ "fern",
+ "futures",
+ "log",
+ "log-fastly",
+ "serde",
+ "serde_json",
+ "trusted-server-core",
+ "trusted-server-js",
+]
 
 [[package]]
-name = "trusted-server-common"
+name = "trusted-server-core"
 version = "0.1.0"
 dependencies = [
  "async-trait",
@@ -2349,6 +2549,7 @@ dependencies = [
  "cookie",
  "derive_more",
  "ed25519-dalek",
+ "edgezero-core",
  "error-stack",
  "fastly",
  "flate2",
@@ -2372,7 +2573,7 @@ dependencies = [
  "temp-env",
  "tokio",
  "tokio-test",
- "toml",
+ "toml 1.0.7+spec-1.1.0",
  "trusted-server-js",
  "url",
  "urlencoding",
@@ -2380,23 +2581,6 @@ dependencies = [
  "validator",
 ]
 
-[[package]]
-name = "trusted-server-fastly"
-version = "0.1.0"
-dependencies = [
- "chrono",
- "error-stack",
- "fastly",
- "fern",
- "futures",
- "log",
- "log-fastly",
- "serde",
- "serde_json",
- "trusted-server-common",
- "trusted-server-js",
-]
-
 [[package]]
 name = "trusted-server-js"
 version = "0.1.0"
@@ -2584,6 +2768,16 @@ dependencies = [
  "unicode-ident",
 ]
 
+[[package]]
+name = "web-time"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5a6580f308b1fad9207618087a65c04e7a10bc77e02c8e84e9b00dd4b12fa0bb"
+dependencies = [
+ "js-sys",
+ "wasm-bindgen",
+]
+
 [[package]]
 name = "which"
 version = "8.0.0"
@@ -2672,6 +2866,12 @@ dependencies = [
  "memchr",
 ]
 
+[[package]]
+name = "winnow"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a90e88e4667264a994d34e6d1ab2d26d398dcdca8b7f52bec8668957517fc7d8"
+
 [[package]]
 name = "winsafe"
 version = "0.0.19"
diff --git a/Cargo.toml b/Cargo.toml
index 67dc7668..7b55bd53 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,8 +1,8 @@
 [workspace]
 resolver = "2"
 members = [
-    "crates/common",
-    "crates/fastly",
+    "crates/trusted-server-core",
+    "crates/trusted-server-adapter-fastly",
     "crates/js",
 ]
 # integration-tests is intentionally excluded from workspace members because it
@@ -13,8 +13,8 @@ exclude = [
 ]
 
 default-members = [
-    "crates/common",
-    "crates/fastly",
+    "crates/trusted-server-core",
+    "crates/trusted-server-adapter-fastly",
 ]
 
 [workspace.lints.clippy]
@@ -54,6 +54,10 @@ config = "0.15.19"
 cookie = "0.18.1"
 derive_more = { version = "2.0", features = ["display", "error"] }
 ed25519-dalek = { version = "2.2", features = ["rand_core"] }
+edgezero-adapter-axum = { git = "https://github.com/stackpop/edgezero", rev = "170b74b", default-features = false }
+edgezero-adapter-cloudflare = { git = "https://github.com/stackpop/edgezero", rev = "170b74b", default-features = false }
+edgezero-adapter-fastly = { git = "https://github.com/stackpop/edgezero", rev = "170b74b", default-features = false }
+edgezero-core = { git = "https://github.com/stackpop/edgezero", rev = "170b74b", default-features = false }
 error-stack = "0.6"
 fastly = "0.11.12"
 fern = "0.7.1"
@@ -78,7 +82,7 @@ sha2 = "0.10.9"
 temp-env = "0.3.6"
 tokio = { version = "1.49", features = ["sync", "macros", "io-util", "rt", "time"] }
 tokio-test = "0.4"
-toml = "0.9.8"
+toml = "1.0"
 url = "2.5.8"
 urlencoding = "2.1"
 uuid = { version = "1.18", features = ["v4"] }
diff --git a/OPTIMIZATION.md b/OPTIMIZATION.md
index 05e23247..750e3dec 100644
--- a/OPTIMIZATION.md
+++ b/OPTIMIZATION.md
@@ -139,7 +139,7 @@ Small, safe changes that reduce CPU and memory waste. Ship as one PR, measure be
 
 #### 1.1 Fix gzip streaming — remove full-body buffering
 
-**File**: `crates/common/src/streaming_processor.rs` — `process_gzip_to_gzip`
+**File**: `crates/trusted-server-core/src/streaming_processor.rs` — `process_gzip_to_gzip`
 
 **Problem**: Reads entire decompressed body into memory via `read_to_end`, despite deflate/brotli paths already using chunk-based `process_through_compression`.
 
@@ -159,7 +159,7 @@ fn process_gzip_to_gzip<R: Read, W: Write>(&mut self, input: R, output: W) -> Re
 
 #### 1.2 Fix `HtmlRewriterAdapter` — enable true streaming
 
-**File**: `crates/common/src/streaming_processor.rs` — `HtmlRewriterAdapter`
+**File**: `crates/trusted-server-core/src/streaming_processor.rs` — `HtmlRewriterAdapter`
 
 **Problem**: Accumulates entire HTML document before processing, defeating the streaming pipeline. The comment says this is a `lol_html` limitation — **it's not**. `lol_html::HtmlRewriter` supports incremental `write()` calls and emits output via its `OutputSink` callback per-chunk.
 
@@ -203,7 +203,7 @@ impl StreamProcessor for HtmlRewriterAdapter {
 
 #### 1.3 ~~Eliminate redundant `config` crate parsing in `get_settings()` — ~5-8% CPU~~ DONE (~3.3% post-fix)
 
-**Files**: `crates/common/src/settings_data.rs`, `crates/common/src/settings.rs`
+**Files**: `crates/trusted-server-core/src/settings_data.rs`, `crates/trusted-server-core/src/settings.rs`
 
 **Problem**: Profiling shows `get_settings()` consuming ~5-8% of per-request CPU. The `build.rs` already merges `trusted-server.toml` + all `TRUSTED_SERVER__*` env vars at compile time and writes a fully-resolved TOML file to `target/trusted-server-out.toml`. But at runtime, `get_settings()` calls `Settings::from_toml()`, which re-runs the entire `config` crate pipeline — `Config::builder().add_source(File).add_source(Environment).build().try_deserialize()` — redundantly scanning env vars and merging sources that were already resolved at build time.
 
@@ -244,7 +244,7 @@ let settings: Settings = postcard::from_bytes(SETTINGS_DATA)
 
 #### 1.4 Reduce verbose per-request logging — ~0.5% CPU
 
-**Files**: `crates/fastly/src/main.rs:37,64-67,152-177`
+**Files**: `crates/trusted-server-adapter-fastly/src/main.rs:37,64-67,152-177`
 
 **Problem**: `log::info!("Settings {settings:?}")` serializes the entire Settings struct (~2KB) on every request. `FASTLY_SERVICE_VERSION` env var logged at info level. The logger is configured with `max_level(LevelFilter::Debug)`, meaning every `debug!` and above is evaluated.
 
@@ -282,7 +282,7 @@ The high-impact architectural change. Uses Fastly's `stream_to_client()` API to
 
 #### 2.1 Publisher proxy: `stream_to_client()` integration
 
-**Files**: `crates/common/src/publisher.rs`, `crates/fastly/src/main.rs`
+**Files**: `crates/trusted-server-core/src/publisher.rs`, `crates/trusted-server-adapter-fastly/src/main.rs`
 
 **Current flow** (fully buffered):
 ```
diff --git a/PUBLISHER_IDS_AUDIT.md b/PUBLISHER_IDS_AUDIT.md
index cf9b3195..37c5b7f3 100644
--- a/PUBLISHER_IDS_AUDIT.md
+++ b/PUBLISHER_IDS_AUDIT.md
@@ -26,7 +26,7 @@ This document lists all publisher-specific IDs and configurations found in the c
 
 ## Hardcoded in Source Code
 
-### /Users/jevans/trusted-server/crates/common/src/gam.rs
+### /Users/jevans/trusted-server/crates/trusted-server-core/src/gam.rs
 
 **Permutive Segment Data (lines 295 and 486):**
 ```rust
@@ -35,7 +35,7 @@ This document lists all publisher-specific IDs and configurations found in the c
 
 This large string contains Permutive segment IDs that appear to be captured from a specific test publisher's live traffic.
 
-### /Users/jevans/trusted-server/crates/common/src/prebid.rs
+### /Users/jevans/trusted-server/crates/trusted-server-core/src/prebid.rs
 
 **Equativ Integration:**
 - `"pageId": 2040327` (matches config)
@@ -72,6 +72,6 @@ This large string contains Permutive segment IDs that appear to be captured from
 ## Files to Update
 
 - `trusted-server.toml` - Add permutive segments configuration
-- `crates/common/src/gam.rs` - Remove hardcoded segments (lines 295, 486)
-- `crates/common/src/prebid.rs` - Use configuration for Equativ IDs
+- `crates/trusted-server-core/src/gam.rs` - Remove hardcoded segments (lines 295, 486)
+- `crates/trusted-server-core/src/prebid.rs` - Use configuration for Equativ IDs
 - Test files - Use environment-agnostic test data
\ No newline at end of file
diff --git a/README.md b/README.md
index d70c0e5a..82dfe7b5 100644
--- a/README.md
+++ b/README.md
@@ -39,7 +39,7 @@ fastly compute serve
 cargo fmt
 
 # Lint
-cargo clippy --all-targets --all-features -- -D warnings
+cargo clippy --workspace --all-targets --all-features -- -D warnings
 
 # Run tests
 cargo test
diff --git a/crates/integration-tests/browser/global-setup.ts b/crates/integration-tests/browser/global-setup.ts
index 3cdc771c..04a72929 100644
--- a/crates/integration-tests/browser/global-setup.ts
+++ b/crates/integration-tests/browser/global-setup.ts
@@ -13,7 +13,7 @@ const WASM_PATH =
   process.env.WASM_BINARY_PATH ||
   resolve(
     __dirname,
-    "../../../target/wasm32-wasip1/release/trusted-server-fastly.wasm",
+    "../../../target/wasm32-wasip1/release/trusted-server-adapter-fastly.wasm",
   );
 
 const VICEROY_CONFIG =
diff --git a/crates/integration-tests/tests/common/runtime.rs b/crates/integration-tests/tests/common/runtime.rs
index 5f343ebb..bf8b795a 100644
--- a/crates/integration-tests/tests/common/runtime.rs
+++ b/crates/integration-tests/tests/common/runtime.rs
@@ -106,7 +106,7 @@ pub fn wasm_binary_path() -> PathBuf {
         .map(PathBuf::from)
         .unwrap_or_else(|_| {
             PathBuf::from(env!("CARGO_MANIFEST_DIR"))
-                .join("../../target/wasm32-wasip1/release/trusted-server-fastly.wasm")
+                .join("../../target/wasm32-wasip1/release/trusted-server-adapter-fastly.wasm")
         })
 }
 
diff --git a/crates/js/lib/src/integrations/google_tag_manager/script_guard.ts b/crates/js/lib/src/integrations/google_tag_manager/script_guard.ts
index 990f2fdf..2072c040 100644
--- a/crates/js/lib/src/integrations/google_tag_manager/script_guard.ts
+++ b/crates/js/lib/src/integrations/google_tag_manager/script_guard.ts
@@ -21,7 +21,7 @@ const GTM_URL_PATTERN =
 /**
  * Supported paths that the server can proxy.
  * Must match the route patterns defined in the GoogleTagManagerIntegration handler
- * in crates/common/src/integrations/google_tag_manager.rs
+ * in crates/trusted-server-core/src/integrations/google_tag_manager.rs
  */
 const SUPPORTED_PATHS = ['/gtm.js', '/gtag/js', '/gtag.js', '/collect', '/g/collect'];
 
diff --git a/crates/fastly/Cargo.toml b/crates/trusted-server-adapter-fastly/Cargo.toml
similarity index 73%
rename from crates/fastly/Cargo.toml
rename to crates/trusted-server-adapter-fastly/Cargo.toml
index 42fae0c2..edd5ab54 100644
--- a/crates/fastly/Cargo.toml
+++ b/crates/trusted-server-adapter-fastly/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "trusted-server-fastly"
+name = "trusted-server-adapter-fastly"
 version = "0.1.0"
 edition = "2021"
 
@@ -8,6 +8,7 @@ workspace = true
 
 [dependencies]
 chrono = { workspace = true }
+edgezero-adapter-fastly = { workspace = true }
 error-stack = { workspace = true }
 fastly = { workspace = true }
 fern = { workspace = true }
@@ -16,5 +17,5 @@ log = { workspace = true }
 log-fastly = { workspace = true }
 serde = { workspace = true }
 serde_json = { workspace = true }
-trusted-server-common = { path = "../common" }
+trusted-server-core = { path = "../trusted-server-core" }
 trusted-server-js = { path = "../js" }
diff --git a/crates/fastly/src/error.rs b/crates/trusted-server-adapter-fastly/src/error.rs
similarity index 89%
rename from crates/fastly/src/error.rs
rename to crates/trusted-server-adapter-fastly/src/error.rs
index a055ecba..560a2e18 100644
--- a/crates/fastly/src/error.rs
+++ b/crates/trusted-server-adapter-fastly/src/error.rs
@@ -4,7 +4,7 @@
 
 use error_stack::Report;
 use fastly::Response;
-use trusted_server_common::error::{IntoHttpResponse, TrustedServerError};
+use trusted_server_core::error::{IntoHttpResponse, TrustedServerError};
 
 /// Converts a [`TrustedServerError`] into an HTTP error response.
 pub fn to_error_response(report: &Report<TrustedServerError>) -> Response {
diff --git a/crates/fastly/src/main.rs b/crates/trusted-server-adapter-fastly/src/main.rs
similarity index 90%
rename from crates/fastly/src/main.rs
rename to crates/trusted-server-adapter-fastly/src/main.rs
index 9f4ef479..26a6667f 100644
--- a/crates/fastly/src/main.rs
+++ b/crates/trusted-server-adapter-fastly/src/main.rs
@@ -3,28 +3,28 @@ use fastly::http::Method;
 use fastly::{Error, Request, Response};
 use log_fastly::Logger;
 
-use trusted_server_common::auction::endpoints::handle_auction;
-use trusted_server_common::auction::{build_orchestrator, AuctionOrchestrator};
-use trusted_server_common::auth::enforce_basic_auth;
-use trusted_server_common::constants::{
+use trusted_server_core::auction::endpoints::handle_auction;
+use trusted_server_core::auction::{build_orchestrator, AuctionOrchestrator};
+use trusted_server_core::auth::enforce_basic_auth;
+use trusted_server_core::constants::{
     ENV_FASTLY_IS_STAGING, ENV_FASTLY_SERVICE_VERSION, HEADER_X_GEO_INFO_AVAILABLE,
     HEADER_X_TS_ENV, HEADER_X_TS_VERSION,
 };
-use trusted_server_common::error::TrustedServerError;
-use trusted_server_common::geo::GeoInfo;
-use trusted_server_common::http_util::sanitize_forwarded_headers;
-use trusted_server_common::integrations::IntegrationRegistry;
-use trusted_server_common::proxy::{
+use trusted_server_core::error::TrustedServerError;
+use trusted_server_core::geo::GeoInfo;
+use trusted_server_core::http_util::sanitize_forwarded_headers;
+use trusted_server_core::integrations::IntegrationRegistry;
+use trusted_server_core::proxy::{
     handle_first_party_click, handle_first_party_proxy, handle_first_party_proxy_rebuild,
     handle_first_party_proxy_sign,
 };
-use trusted_server_common::publisher::{handle_publisher_request, handle_tsjs_dynamic};
-use trusted_server_common::request_signing::{
+use trusted_server_core::publisher::{handle_publisher_request, handle_tsjs_dynamic};
+use trusted_server_core::request_signing::{
     handle_deactivate_key, handle_rotate_key, handle_trusted_server_discovery,
     handle_verify_signature,
 };
-use trusted_server_common::settings::Settings;
-use trusted_server_common::settings_data::get_settings;
+use trusted_server_core::settings::Settings;
+use trusted_server_core::settings_data::get_settings;
 
 mod error;
 use crate::error::to_error_response;
@@ -106,7 +106,7 @@ async fn route_request(
         (Method::POST, "/verify-signature") => handle_verify_signature(settings, req),
 
         // Key rotation admin endpoints
-        // Keep in sync with Settings::ADMIN_ENDPOINTS in crates/common/src/settings.rs
+        // Keep in sync with Settings::ADMIN_ENDPOINTS in crates/trusted-server-core/src/settings.rs
         (Method::POST, "/admin/keys/rotate") => handle_rotate_key(settings, req),
         (Method::POST, "/admin/keys/deactivate") => handle_deactivate_key(settings, req),
 
diff --git a/crates/fastly/tests/kv_store/counter_store.json b/crates/trusted-server-adapter-fastly/tests/kv_store/counter_store.json
similarity index 100%
rename from crates/fastly/tests/kv_store/counter_store.json
rename to crates/trusted-server-adapter-fastly/tests/kv_store/counter_store.json
diff --git a/crates/fastly/tests/kv_store/opid_store.json b/crates/trusted-server-adapter-fastly/tests/kv_store/opid_store.json
similarity index 100%
rename from crates/fastly/tests/kv_store/opid_store.json
rename to crates/trusted-server-adapter-fastly/tests/kv_store/opid_store.json
diff --git a/crates/common/Cargo.toml b/crates/trusted-server-core/Cargo.toml
similarity index 96%
rename from crates/common/Cargo.toml
rename to crates/trusted-server-core/Cargo.toml
index c360474e..e3d776c1 100644
--- a/crates/common/Cargo.toml
+++ b/crates/trusted-server-core/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "trusted-server-common"
+name = "trusted-server-core"
 version = "0.1.0"
 authors = []
 edition = "2021"
@@ -48,6 +48,7 @@ urlencoding = { workspace = true }
 uuid = { workspace = true }
 validator = { workspace = true }
 ed25519-dalek = { workspace = true }
+edgezero-core = { workspace = true }
 once_cell = { workspace = true }
 
 [build-dependencies]
diff --git a/crates/common/README.md b/crates/trusted-server-core/README.md
similarity index 96%
rename from crates/common/README.md
rename to crates/trusted-server-core/README.md
index 6e40e99c..e31712c8 100644
--- a/crates/common/README.md
+++ b/crates/trusted-server-core/README.md
@@ -1,4 +1,4 @@
-# trusted-server-common
+# trusted-server-core
 
 Utilities shared by Trusted Server components. This crate contains HTML/CSS rewriting helpers used to normalize ad creative assets to first‑party proxy endpoints.
 
@@ -45,7 +45,7 @@ JS bundles (served by publisher module):
   - At runtime, the server concatenates `tsjs-core.js` + enabled integration modules based on `IntegrationRegistry` config
   - The URL filename is fixed for backward compatibility; the `?v=` hash changes when modules change
 
-Behavior is covered by an extensive test suite in `crates/common/src/creative.rs`.
+Behavior is covered by an extensive test suite in `crates/trusted-server-core/src/creative.rs`.
 
 ## Synthetic Identifier Propagation
 
diff --git a/crates/common/build.rs b/crates/trusted-server-core/build.rs
similarity index 100%
rename from crates/common/build.rs
rename to crates/trusted-server-core/build.rs
diff --git a/crates/common/src/auction/README.md b/crates/trusted-server-core/src/auction/README.md
similarity index 99%
rename from crates/common/src/auction/README.md
rename to crates/trusted-server-core/src/auction/README.md
index 64877d22..64c24e4c 100644
--- a/crates/common/src/auction/README.md
+++ b/crates/trusted-server-core/src/auction/README.md
@@ -52,7 +52,7 @@ When a request arrives at the `/auction` endpoint, it goes through the following
                               │
                               ▼
 ┌──────────────────────────────────────────────────────────────────────┐
-│  2. Route Matching (crates/fastly/src/main.rs:84)                    │
+│  2. Route Matching (crates/trusted-server-adapter-fastly/src/main.rs:84)                    │
 │     - Pattern: (Method::POST, "/auction")                            │
 │     - Handler: handle_auction(settings, &orchestrator, &storage, req)│
 └──────────────────────────────────────────────────────────────────────┘
@@ -252,7 +252,7 @@ Note that creative HTML is rewritten to use the first-party proxy (`/first-party
 
 ### Auction-Related Routes
 
-The trusted-server handles several types of routes defined in `crates/fastly/src/main.rs`:
+The trusted-server handles several types of routes defined in `crates/trusted-server-adapter-fastly/src/main.rs`:
 
 | Route                     | Method | Handler                        | Purpose                                          | Line |
 |---------------------------|--------|--------------------------------|--------------------------------------------------|------|
diff --git a/crates/common/src/auction/config.rs b/crates/trusted-server-core/src/auction/config.rs
similarity index 100%
rename from crates/common/src/auction/config.rs
rename to crates/trusted-server-core/src/auction/config.rs
diff --git a/crates/common/src/auction/context.rs b/crates/trusted-server-core/src/auction/context.rs
similarity index 100%
rename from crates/common/src/auction/context.rs
rename to crates/trusted-server-core/src/auction/context.rs
diff --git a/crates/common/src/auction/endpoints.rs b/crates/trusted-server-core/src/auction/endpoints.rs
similarity index 100%
rename from crates/common/src/auction/endpoints.rs
rename to crates/trusted-server-core/src/auction/endpoints.rs
diff --git a/crates/common/src/auction/formats.rs b/crates/trusted-server-core/src/auction/formats.rs
similarity index 100%
rename from crates/common/src/auction/formats.rs
rename to crates/trusted-server-core/src/auction/formats.rs
diff --git a/crates/common/src/auction/mod.rs b/crates/trusted-server-core/src/auction/mod.rs
similarity index 100%
rename from crates/common/src/auction/mod.rs
rename to crates/trusted-server-core/src/auction/mod.rs
diff --git a/crates/common/src/auction/orchestrator.rs b/crates/trusted-server-core/src/auction/orchestrator.rs
similarity index 100%
rename from crates/common/src/auction/orchestrator.rs
rename to crates/trusted-server-core/src/auction/orchestrator.rs
diff --git a/crates/common/src/auction/provider.rs b/crates/trusted-server-core/src/auction/provider.rs
similarity index 100%
rename from crates/common/src/auction/provider.rs
rename to crates/trusted-server-core/src/auction/provider.rs
diff --git a/crates/common/src/auction/types.rs b/crates/trusted-server-core/src/auction/types.rs
similarity index 100%
rename from crates/common/src/auction/types.rs
rename to crates/trusted-server-core/src/auction/types.rs
diff --git a/crates/common/src/auction_config_types.rs b/crates/trusted-server-core/src/auction_config_types.rs
similarity index 100%
rename from crates/common/src/auction_config_types.rs
rename to crates/trusted-server-core/src/auction_config_types.rs
diff --git a/crates/common/src/auth.rs b/crates/trusted-server-core/src/auth.rs
similarity index 100%
rename from crates/common/src/auth.rs
rename to crates/trusted-server-core/src/auth.rs
diff --git a/crates/common/src/backend.rs b/crates/trusted-server-core/src/backend.rs
similarity index 100%
rename from crates/common/src/backend.rs
rename to crates/trusted-server-core/src/backend.rs
diff --git a/crates/common/src/constants.rs b/crates/trusted-server-core/src/constants.rs
similarity index 100%
rename from crates/common/src/constants.rs
rename to crates/trusted-server-core/src/constants.rs
diff --git a/crates/common/src/cookies.rs b/crates/trusted-server-core/src/cookies.rs
similarity index 100%
rename from crates/common/src/cookies.rs
rename to crates/trusted-server-core/src/cookies.rs
diff --git a/crates/common/src/creative.rs b/crates/trusted-server-core/src/creative.rs
similarity index 100%
rename from crates/common/src/creative.rs
rename to crates/trusted-server-core/src/creative.rs
diff --git a/crates/common/src/error.rs b/crates/trusted-server-core/src/error.rs
similarity index 100%
rename from crates/common/src/error.rs
rename to crates/trusted-server-core/src/error.rs
diff --git a/crates/common/src/fastly_storage.rs b/crates/trusted-server-core/src/fastly_storage.rs
similarity index 100%
rename from crates/common/src/fastly_storage.rs
rename to crates/trusted-server-core/src/fastly_storage.rs
diff --git a/crates/common/src/geo.rs b/crates/trusted-server-core/src/geo.rs
similarity index 100%
rename from crates/common/src/geo.rs
rename to crates/trusted-server-core/src/geo.rs
diff --git a/crates/common/src/host_rewrite.rs b/crates/trusted-server-core/src/host_rewrite.rs
similarity index 100%
rename from crates/common/src/host_rewrite.rs
rename to crates/trusted-server-core/src/host_rewrite.rs
diff --git a/crates/common/src/html_processor.rs b/crates/trusted-server-core/src/html_processor.rs
similarity index 100%
rename from crates/common/src/html_processor.rs
rename to crates/trusted-server-core/src/html_processor.rs
diff --git a/crates/common/src/html_processor.test.html b/crates/trusted-server-core/src/html_processor.test.html
similarity index 100%
rename from crates/common/src/html_processor.test.html
rename to crates/trusted-server-core/src/html_processor.test.html
diff --git a/crates/common/src/http_util.rs b/crates/trusted-server-core/src/http_util.rs
similarity index 100%
rename from crates/common/src/http_util.rs
rename to crates/trusted-server-core/src/http_util.rs
diff --git a/crates/common/src/integrations/adserver_mock.rs b/crates/trusted-server-core/src/integrations/adserver_mock.rs
similarity index 100%
rename from crates/common/src/integrations/adserver_mock.rs
rename to crates/trusted-server-core/src/integrations/adserver_mock.rs
diff --git a/crates/common/src/integrations/aps.rs b/crates/trusted-server-core/src/integrations/aps.rs
similarity index 100%
rename from crates/common/src/integrations/aps.rs
rename to crates/trusted-server-core/src/integrations/aps.rs
diff --git a/crates/common/src/integrations/datadome.rs b/crates/trusted-server-core/src/integrations/datadome.rs
similarity index 100%
rename from crates/common/src/integrations/datadome.rs
rename to crates/trusted-server-core/src/integrations/datadome.rs
diff --git a/crates/common/src/integrations/didomi.rs b/crates/trusted-server-core/src/integrations/didomi.rs
similarity index 100%
rename from crates/common/src/integrations/didomi.rs
rename to crates/trusted-server-core/src/integrations/didomi.rs
diff --git a/crates/common/src/integrations/google_tag_manager.rs b/crates/trusted-server-core/src/integrations/google_tag_manager.rs
similarity index 100%
rename from crates/common/src/integrations/google_tag_manager.rs
rename to crates/trusted-server-core/src/integrations/google_tag_manager.rs
diff --git a/crates/common/src/integrations/gpt.rs b/crates/trusted-server-core/src/integrations/gpt.rs
similarity index 100%
rename from crates/common/src/integrations/gpt.rs
rename to crates/trusted-server-core/src/integrations/gpt.rs
diff --git a/crates/common/src/integrations/lockr.rs b/crates/trusted-server-core/src/integrations/lockr.rs
similarity index 100%
rename from crates/common/src/integrations/lockr.rs
rename to crates/trusted-server-core/src/integrations/lockr.rs
diff --git a/crates/common/src/integrations/mod.rs b/crates/trusted-server-core/src/integrations/mod.rs
similarity index 100%
rename from crates/common/src/integrations/mod.rs
rename to crates/trusted-server-core/src/integrations/mod.rs
diff --git a/crates/common/src/integrations/nextjs/fixtures/inlined-data-escaped.html b/crates/trusted-server-core/src/integrations/nextjs/fixtures/inlined-data-escaped.html
similarity index 100%
rename from crates/common/src/integrations/nextjs/fixtures/inlined-data-escaped.html
rename to crates/trusted-server-core/src/integrations/nextjs/fixtures/inlined-data-escaped.html
diff --git a/crates/common/src/integrations/nextjs/fixtures/inlined-data-nonce.html b/crates/trusted-server-core/src/integrations/nextjs/fixtures/inlined-data-nonce.html
similarity index 100%
rename from crates/common/src/integrations/nextjs/fixtures/inlined-data-nonce.html
rename to crates/trusted-server-core/src/integrations/nextjs/fixtures/inlined-data-nonce.html
diff --git a/crates/common/src/integrations/nextjs/html_post_process.rs b/crates/trusted-server-core/src/integrations/nextjs/html_post_process.rs
similarity index 100%
rename from crates/common/src/integrations/nextjs/html_post_process.rs
rename to crates/trusted-server-core/src/integrations/nextjs/html_post_process.rs
diff --git a/crates/common/src/integrations/nextjs/mod.rs b/crates/trusted-server-core/src/integrations/nextjs/mod.rs
similarity index 100%
rename from crates/common/src/integrations/nextjs/mod.rs
rename to crates/trusted-server-core/src/integrations/nextjs/mod.rs
diff --git a/crates/common/src/integrations/nextjs/rsc.rs b/crates/trusted-server-core/src/integrations/nextjs/rsc.rs
similarity index 100%
rename from crates/common/src/integrations/nextjs/rsc.rs
rename to crates/trusted-server-core/src/integrations/nextjs/rsc.rs
diff --git a/crates/common/src/integrations/nextjs/rsc_placeholders.rs b/crates/trusted-server-core/src/integrations/nextjs/rsc_placeholders.rs
similarity index 100%
rename from crates/common/src/integrations/nextjs/rsc_placeholders.rs
rename to crates/trusted-server-core/src/integrations/nextjs/rsc_placeholders.rs
diff --git a/crates/common/src/integrations/nextjs/script_rewriter.rs b/crates/trusted-server-core/src/integrations/nextjs/script_rewriter.rs
similarity index 100%
rename from crates/common/src/integrations/nextjs/script_rewriter.rs
rename to crates/trusted-server-core/src/integrations/nextjs/script_rewriter.rs
diff --git a/crates/common/src/integrations/nextjs/shared.rs b/crates/trusted-server-core/src/integrations/nextjs/shared.rs
similarity index 100%
rename from crates/common/src/integrations/nextjs/shared.rs
rename to crates/trusted-server-core/src/integrations/nextjs/shared.rs
diff --git a/crates/common/src/integrations/permutive.rs b/crates/trusted-server-core/src/integrations/permutive.rs
similarity index 100%
rename from crates/common/src/integrations/permutive.rs
rename to crates/trusted-server-core/src/integrations/permutive.rs
diff --git a/crates/common/src/integrations/prebid.rs b/crates/trusted-server-core/src/integrations/prebid.rs
similarity index 100%
rename from crates/common/src/integrations/prebid.rs
rename to crates/trusted-server-core/src/integrations/prebid.rs
diff --git a/crates/common/src/integrations/registry.rs b/crates/trusted-server-core/src/integrations/registry.rs
similarity index 100%
rename from crates/common/src/integrations/registry.rs
rename to crates/trusted-server-core/src/integrations/registry.rs
diff --git a/crates/common/src/integrations/testlight.rs b/crates/trusted-server-core/src/integrations/testlight.rs
similarity index 100%
rename from crates/common/src/integrations/testlight.rs
rename to crates/trusted-server-core/src/integrations/testlight.rs
diff --git a/crates/common/src/lib.rs b/crates/trusted-server-core/src/lib.rs
similarity index 100%
rename from crates/common/src/lib.rs
rename to crates/trusted-server-core/src/lib.rs
diff --git a/crates/common/src/models.rs b/crates/trusted-server-core/src/models.rs
similarity index 100%
rename from crates/common/src/models.rs
rename to crates/trusted-server-core/src/models.rs
diff --git a/crates/common/src/openrtb.rs b/crates/trusted-server-core/src/openrtb.rs
similarity index 100%
rename from crates/common/src/openrtb.rs
rename to crates/trusted-server-core/src/openrtb.rs
diff --git a/crates/common/src/proxy.rs b/crates/trusted-server-core/src/proxy.rs
similarity index 100%
rename from crates/common/src/proxy.rs
rename to crates/trusted-server-core/src/proxy.rs
diff --git a/crates/common/src/publisher.rs b/crates/trusted-server-core/src/publisher.rs
similarity index 100%
rename from crates/common/src/publisher.rs
rename to crates/trusted-server-core/src/publisher.rs
diff --git a/crates/common/src/request_signing/discovery.rs b/crates/trusted-server-core/src/request_signing/discovery.rs
similarity index 100%
rename from crates/common/src/request_signing/discovery.rs
rename to crates/trusted-server-core/src/request_signing/discovery.rs
diff --git a/crates/common/src/request_signing/endpoints.rs b/crates/trusted-server-core/src/request_signing/endpoints.rs
similarity index 100%
rename from crates/common/src/request_signing/endpoints.rs
rename to crates/trusted-server-core/src/request_signing/endpoints.rs
diff --git a/crates/common/src/request_signing/jwks.rs b/crates/trusted-server-core/src/request_signing/jwks.rs
similarity index 100%
rename from crates/common/src/request_signing/jwks.rs
rename to crates/trusted-server-core/src/request_signing/jwks.rs
diff --git a/crates/common/src/request_signing/mod.rs b/crates/trusted-server-core/src/request_signing/mod.rs
similarity index 100%
rename from crates/common/src/request_signing/mod.rs
rename to crates/trusted-server-core/src/request_signing/mod.rs
diff --git a/crates/common/src/request_signing/rotation.rs b/crates/trusted-server-core/src/request_signing/rotation.rs
similarity index 100%
rename from crates/common/src/request_signing/rotation.rs
rename to crates/trusted-server-core/src/request_signing/rotation.rs
diff --git a/crates/common/src/request_signing/signing.rs b/crates/trusted-server-core/src/request_signing/signing.rs
similarity index 100%
rename from crates/common/src/request_signing/signing.rs
rename to crates/trusted-server-core/src/request_signing/signing.rs
diff --git a/crates/common/src/rsc_flight.rs b/crates/trusted-server-core/src/rsc_flight.rs
similarity index 100%
rename from crates/common/src/rsc_flight.rs
rename to crates/trusted-server-core/src/rsc_flight.rs
diff --git a/crates/common/src/settings.rs b/crates/trusted-server-core/src/settings.rs
similarity index 99%
rename from crates/common/src/settings.rs
rename to crates/trusted-server-core/src/settings.rs
index 536cfcdc..c36892ed 100644
--- a/crates/common/src/settings.rs
+++ b/crates/trusted-server-core/src/settings.rs
@@ -32,7 +32,7 @@ impl Publisher {
     /// # Examples
     ///
     /// ```
-    /// # use trusted_server_common::settings::Publisher;
+    /// # use trusted_server_core::settings::Publisher;
     /// let publisher = Publisher {
     ///     domain: "example.com".to_string(),
     ///     cookie_domain: ".example.com".to_string(),
@@ -394,7 +394,7 @@ impl Settings {
     /// where any of these paths lack a matching handler, ensuring admin
     /// endpoints are always protected by authentication.
     /// Update [`ADMIN_ENDPOINTS`](Self::ADMIN_ENDPOINTS) when adding new
-    /// admin routes to `crates/fastly/src/main.rs`.
+    /// admin routes to `crates/trusted-server-adapter-fastly/src/main.rs`.
     pub(crate) const ADMIN_ENDPOINTS: &[&str] = &["/admin/keys/rotate", "/admin/keys/deactivate"];
 
     /// Returns admin endpoint paths that no configured handler covers.
@@ -1355,19 +1355,19 @@ mod tests {
     }
 
     /// Verifies that [`Settings::ADMIN_ENDPOINTS`] stays in sync with the
-    /// admin route table in `crates/fastly/src/main.rs`.
+    /// admin route table in `crates/trusted-server-adapter-fastly/src/main.rs`.
     ///
     /// If this test fails, a route was added or removed in the Fastly
     /// router without updating `ADMIN_ENDPOINTS` (or vice versa).
     #[test]
     fn admin_endpoints_match_fastly_router() {
-        let router_source = include_str!("../../fastly/src/main.rs");
+        let router_source = include_str!("../../trusted-server-adapter-fastly/src/main.rs");
 
         for endpoint in Settings::ADMIN_ENDPOINTS {
             assert!(
                 router_source.contains(endpoint),
                 "ADMIN_ENDPOINTS lists \"{endpoint}\" but it was not found in \
-                 crates/fastly/src/main.rs — remove it from ADMIN_ENDPOINTS or \
+                 crates/trusted-server-adapter-fastly/src/main.rs — remove it from ADMIN_ENDPOINTS or \
                  add the route back to the router"
             );
         }
diff --git a/crates/common/src/settings_data.rs b/crates/trusted-server-core/src/settings_data.rs
similarity index 100%
rename from crates/common/src/settings_data.rs
rename to crates/trusted-server-core/src/settings_data.rs
diff --git a/crates/common/src/streaming_processor.rs b/crates/trusted-server-core/src/streaming_processor.rs
similarity index 100%
rename from crates/common/src/streaming_processor.rs
rename to crates/trusted-server-core/src/streaming_processor.rs
diff --git a/crates/common/src/streaming_replacer.rs b/crates/trusted-server-core/src/streaming_replacer.rs
similarity index 100%
rename from crates/common/src/streaming_replacer.rs
rename to crates/trusted-server-core/src/streaming_replacer.rs
diff --git a/crates/common/src/synthetic.rs b/crates/trusted-server-core/src/synthetic.rs
similarity index 100%
rename from crates/common/src/synthetic.rs
rename to crates/trusted-server-core/src/synthetic.rs
diff --git a/crates/common/src/test_support.rs b/crates/trusted-server-core/src/test_support.rs
similarity index 100%
rename from crates/common/src/test_support.rs
rename to crates/trusted-server-core/src/test_support.rs
diff --git a/crates/common/src/tsjs.rs b/crates/trusted-server-core/src/tsjs.rs
similarity index 100%
rename from crates/common/src/tsjs.rs
rename to crates/trusted-server-core/src/tsjs.rs
diff --git a/docs/guide/architecture.md b/docs/guide/architecture.md
index 5d875976..76922248 100644
--- a/docs/guide/architecture.md
+++ b/docs/guide/architecture.md
@@ -25,7 +25,7 @@ flowchart TD
 
 ## Core Components
 
-### trusted-server-common
+### trusted-server-core
 
 Core library containing shared functionality:
 
@@ -35,7 +35,7 @@ Core library containing shared functionality:
 - GDPR consent management
 - Ad server integrations
 
-### trusted-server-fastly
+### trusted-server-adapter-fastly
 
 Fastly-specific implementation:
 
diff --git a/docs/guide/auction-orchestration.md b/docs/guide/auction-orchestration.md
index 5c3ca8dd..666872d4 100644
--- a/docs/guide/auction-orchestration.md
+++ b/docs/guide/auction-orchestration.md
@@ -202,14 +202,14 @@ Convert OrchestrationResult → OpenRTB 2.x Response
 
 The orchestrator is composed of several modules:
 
-| Module            | Path                         | Purpose                                     |
-| ----------------- | ---------------------------- | ------------------------------------------- |
-| `orchestrator.rs` | `crates/common/src/auction/` | Core parallel execution and bid selection   |
-| `provider.rs`     | `crates/common/src/auction/` | `AuctionProvider` trait definition          |
-| `types.rs`        | `crates/common/src/auction/` | Data structures (AuctionRequest, Bid, etc.) |
-| `formats.rs`      | `crates/common/src/auction/` | Format conversions (TSJS ↔ OpenRTB)         |
-| `endpoints.rs`    | `crates/common/src/auction/` | HTTP handler for `POST /auction`            |
-| `config.rs`       | `crates/common/src/auction/` | Auction configuration types                 |
+| Module            | Path                                      | Purpose                                     |
+| ----------------- | ----------------------------------------- | ------------------------------------------- |
+| `orchestrator.rs` | `crates/trusted-server-core/src/auction/` | Core parallel execution and bid selection   |
+| `provider.rs`     | `crates/trusted-server-core/src/auction/` | `AuctionProvider` trait definition          |
+| `types.rs`        | `crates/trusted-server-core/src/auction/` | Data structures (AuctionRequest, Bid, etc.) |
+| `formats.rs`      | `crates/trusted-server-core/src/auction/` | Format conversions (TSJS ↔ OpenRTB)         |
+| `endpoints.rs`    | `crates/trusted-server-core/src/auction/` | HTTP handler for `POST /auction`            |
+| `config.rs`       | `crates/trusted-server-core/src/auction/` | Auction configuration types                 |
 
 ### Provider Auto-Discovery
 
diff --git a/docs/guide/configuration.md b/docs/guide/configuration.md
index 7fa3cfdf..bee67a11 100644
--- a/docs/guide/configuration.md
+++ b/docs/guide/configuration.md
@@ -1067,7 +1067,7 @@ trusted-server.dev.toml      # Development overrides
 **Print Loaded Config** (test only):
 
 ```rust
-use trusted_server_common::settings_data::get_settings;
+use trusted_server_core::settings_data::get_settings;
 
 let settings = get_settings()?;
 println!("{:#?}", settings);
diff --git a/docs/guide/error-reference.md b/docs/guide/error-reference.md
index c75988e9..3117cb78 100644
--- a/docs/guide/error-reference.md
+++ b/docs/guide/error-reference.md
@@ -512,7 +512,7 @@ secret_store_id = "your-secret-store-id"
 **Error Message:**
 
 ```
-error: could not compile `trusted-server-fastly`
+error: could not compile `trusted-server-adapter-fastly`
 ```
 
 **Cause:** Rust compilation error or missing dependencies
@@ -668,7 +668,7 @@ curl http://localhost:7676/first-party/ad?slot=test&w=300&h=250
 
 ```bash
 # Test configuration load
-cargo run --bin trusted-server-fastly -- --validate-config
+cargo run --bin trusted-server-adapter-fastly -- --validate-config
 
 # Or check startup logs
 fastly compute serve 2>&1 | grep -i "settings"
diff --git a/docs/guide/integration-guide.md b/docs/guide/integration-guide.md
index f199db94..b1bfc43d 100644
--- a/docs/guide/integration-guide.md
+++ b/docs/guide/integration-guide.md
@@ -1,15 +1,15 @@
 # Integration Guide
 
-This document explains how to integrate a new integration module with the Trusted Server runtime. The workflow mirrors the built-in `testlight` sample in `crates/common/src/integrations/testlight.rs`.
+This document explains how to integrate a new integration module with the Trusted Server runtime. The workflow mirrors the built-in `testlight` sample in `crates/trusted-server-core/src/integrations/testlight.rs`.
 
 ## Architecture Overview
 
-| Component                                                  | Purpose                                                                                                                                                                                                                                                      |
-| ---------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ |
-| `crates/common/src/integrations/registry.rs`               | Defines the `IntegrationProxy`, `IntegrationAttributeRewriter`, `IntegrationScriptRewriter`, and `IntegrationHeadInjector` traits and hosts the `IntegrationRegistry`, which drives proxy routing, HTML/text rewrites, and head injection.                   |
-| `Settings::integrations` (`crates/common/src/settings.rs`) | Free-form JSON blob keyed by integration ID. Use `IntegrationSettings::insert_config` to seed configs; each module deserializes and validates (`validator::Validate`) its own config and exposes an `enabled` flag so the core settings schema stays stable. |
-| Fastly entrypoint (`crates/fastly/src/main.rs`)            | Instantiates the registry once per request, routes `/integrations/<id>/…` requests to the appropriate proxy, and passes the registry to the publisher origin proxy so HTML rewriting remains integration-aware.                                              |
-| `html_processor.rs`                                        | Applies first-party URL rewrites, injects the Trusted Server JS shim, and lets integrations override attribute values (for example to swap script URLs).                                                                                                     |
+| Component                                                               | Purpose                                                                                                                                                                                                                                                      |
+| ----------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ |
+| `crates/trusted-server-core/src/integrations/registry.rs`               | Defines the `IntegrationProxy`, `IntegrationAttributeRewriter`, `IntegrationScriptRewriter`, and `IntegrationHeadInjector` traits and hosts the `IntegrationRegistry`, which drives proxy routing, HTML/text rewrites, and head injection.                   |
+| `Settings::integrations` (`crates/trusted-server-core/src/settings.rs`) | Free-form JSON blob keyed by integration ID. Use `IntegrationSettings::insert_config` to seed configs; each module deserializes and validates (`validator::Validate`) its own config and exposes an `enabled` flag so the core settings schema stays stable. |
+| Fastly entrypoint (`crates/trusted-server-adapter-fastly/src/main.rs`)  | Instantiates the registry once per request, routes `/integrations/<id>/…` requests to the appropriate proxy, and passes the registry to the publisher origin proxy so HTML rewriting remains integration-aware.                                              |
+| `html_processor.rs`                                                     | Applies first-party URL rewrites, injects the Trusted Server JS shim, and lets integrations override attribute values (for example to swap script URLs).                                                                                                     |
 
 ## Step-by-Step Integration
 
@@ -26,7 +26,7 @@ rewrite_scripts = true
 
 ### 2. Create the Integration Module
 
-Add a module under `crates/common/src/integrations/<id>/mod.rs` (see `crates/common/src/integrations/testlight.rs` for reference) and expose it in `crates/common/src/integrations/mod.rs`.
+Add a module under `crates/trusted-server-core/src/integrations/<id>/mod.rs` (see `crates/trusted-server-core/src/integrations/testlight.rs` for reference) and expose it in `crates/trusted-server-core/src/integrations/mod.rs`.
 
 Key pieces:
 
@@ -87,7 +87,7 @@ pub fn register(settings: &Settings) -> Option<IntegrationRegistration> {
 }
 ```
 
-Any combination of the vectors may be populated. Modules that only need HTML rewrites can skip the `proxies` field altogether, and vice versa. The registry automatically iterates over the static builder list in `crates/common/src/integrations/mod.rs`, so adding the new `register` function is enough to make the integration discoverable.
+Any combination of the vectors may be populated. Modules that only need HTML rewrites can skip the `proxies` field altogether, and vice versa. The registry automatically iterates over the static builder list in `crates/trusted-server-core/src/integrations/mod.rs`, so adding the new `register` function is enough to make the integration discoverable.
 
 ### 4. Implement IntegrationProxy for Endpoints
 
@@ -121,13 +121,13 @@ impl IntegrationProxy for MyIntegration {
 Use the provided helper methods to automatically namespace your routes under `/integrations/{integration_name()}/`. Available helpers: `get()`, `post()`, `put()`, `delete()`, and `patch()`. This lets you define routes with just their relative paths (e.g., `self.post("/auction")` becomes `"/integrations/my_integration/auction"`).
 :::
 
-Routes are matched verbatim in `crates/fastly/src/main.rs`, so stick to stable paths and register whichever HTTP methods you need. **New integrations should namespace their routes under `/integrations/{INTEGRATION_NAME}/`** using the helper methods for consistency, but you can define routes manually if needed (e.g., for backwards compatibility).
+Routes are matched verbatim in `crates/trusted-server-adapter-fastly/src/main.rs`, so stick to stable paths and register whichever HTTP methods you need. **New integrations should namespace their routes under `/integrations/{INTEGRATION_NAME}/`** using the helper methods for consistency, but you can define routes manually if needed (e.g., for backwards compatibility).
 
 The shared context already injects Trusted Server logging, headers, and error handling; the handler only needs to deserialize the request, call the upstream endpoint, and stamp integration-specific headers.
 
 #### Proxying Upstream Requests
 
-Use the shared helper in `crates/common/src/proxy.rs` to forward requests so you automatically get the same header copying, redirect handling, HTML/CSS rewrite behavior, and synthetic ID handling the first-party proxy uses:
+Use the shared helper in `crates/trusted-server-core/src/proxy.rs` to forward requests so you automatically get the same header copying, redirect handling, HTML/CSS rewrite behavior, and synthetic ID handling the first-party proxy uses:
 
 ```rust
 use crate::proxy::{proxy_request, ProxyRequestConfig};
@@ -240,9 +240,9 @@ Use `IntegrationHeadInjector` when you need to emit configuration, inline script
 
 ### 6. Register the Module
 
-Add the module to `crates/common/src/integrations/mod.rs`'s builder list. The registry will call its `register` function automatically. Once registered:
+Add the module to `crates/trusted-server-core/src/integrations/mod.rs`'s builder list. The registry will call its `register` function automatically. Once registered:
 
-- `crates/fastly/src/main.rs` automatically exposes the declared route(s).
+- `crates/trusted-server-adapter-fastly/src/main.rs` automatically exposes the declared route(s).
 - `handle_publisher_request` receives the same registry so HTML responses get integration shims without further code changes.
 - `IntegrationRegistry::registered_integrations()` exposes a machine-readable summary of hooks for tests, tooling, or diagnostics.
 - Declared assets are injected automatically into `<head>`; the runtime emits `<script async data-tsjs-integration="<name>">` tags for every bundle discovered through `.with_asset(...)`.
@@ -256,8 +256,8 @@ Integrations that ship additional JS (such as Testlight) typically expose a `shi
 ### 8. Test Locally
 
 1. Add minimal config (`trusted-server.toml` + `.env.*` overrides).
-2. Run `cargo fmt && cargo clippy --all-targets --all-features`.
-3. Execute targeted tests, e.g. `cargo test -p trusted-server-common html_processor`.
+2. Run `cargo fmt --all -- --check` and `cargo clippy --workspace --all-targets --all-features -- -D warnings`.
+3. Execute targeted tests, e.g. `cargo test -p trusted-server-core html_processor`.
 4. Use `fastly compute serve` (with Viceroy installed) to hit `/integrations/<id>/…` and fetch HTML from your origin to confirm rewrites are applied.
 
 ::: tip Testing Strategy
@@ -283,7 +283,7 @@ Integrations are loaded in one of two ways:
 
 **Key files**:
 
-- `crates/common/src/integrations/testlight.rs` - Rust implementation
+- `crates/trusted-server-core/src/integrations/testlight.rs` - Rust implementation
 - `crates/js/lib/src/integrations/testlight.ts` - TypeScript shim
 
 ### Prebid
@@ -294,7 +294,7 @@ Integrations are loaded in one of two ways:
 
 **Key files**:
 
-- `crates/common/src/integrations/prebid.rs` - Rust implementation
+- `crates/trusted-server-core/src/integrations/prebid.rs` - Rust implementation
 - `crates/js/lib/src/integrations/prebid/index.ts` - TypeScript NPM integration
 
 #### Prebid Integration Details
@@ -303,7 +303,7 @@ Prebid applies the same steps outlined above with a few notable patterns:
 
 **1. Typed Configuration**
 
-`PrebidIntegrationConfig` lives alongside the integration module (`crates/common/src/integrations/prebid.rs`), implements `IntegrationConfig + Validate`, and exposes an `enabled` flag so operators can toggle it without code changes. Configuration lives under `[integrations.prebid]`:
+`PrebidIntegrationConfig` lives alongside the integration module (`crates/trusted-server-core/src/integrations/prebid.rs`), implements `IntegrationConfig + Validate`, and exposes an `enabled` flag so operators can toggle it without code changes. Configuration lives under `[integrations.prebid]`:
 
 ```toml
 [integrations.prebid]
diff --git a/docs/guide/integrations/aps.md b/docs/guide/integrations/aps.md
index 3ebaf788..87876176 100644
--- a/docs/guide/integrations/aps.md
+++ b/docs/guide/integrations/aps.md
@@ -242,7 +242,7 @@ The integration automatically transforms this to unified `Bid` format.
 ### Unit Tests
 
 ```bash
-cargo test -p trusted-server-common aps::tests
+cargo test -p trusted-server-core aps::tests
 ```
 
 ### Local Testing
@@ -270,7 +270,7 @@ timeout_ms = 800
 Run unit tests:
 
 ```bash
-cargo test -p trusted-server-common aps
+cargo test -p trusted-server-core aps
 ```
 
 ## Monitoring
@@ -392,8 +392,8 @@ Potential additions for complete APS TAM parity:
 ## Reference
 
 - **APS TAM Docs**: https://aps.amazon.com/aps/transparent-ad-marketplace-api/
-- **Integration Code**: `crates/common/src/integrations/aps.rs`
-- **Tests**: `crates/common/src/integrations/aps.rs#tests`
+- **Integration Code**: `crates/trusted-server-core/src/integrations/aps.rs`
+- **Tests**: `crates/trusted-server-core/src/integrations/aps.rs#tests`
 - **Example Config**: `trusted-server.toml`
 
 ## Support
diff --git a/docs/guide/integrations/didomi.md b/docs/guide/integrations/didomi.md
index a68ab2da..d60540a2 100644
--- a/docs/guide/integrations/didomi.md
+++ b/docs/guide/integrations/didomi.md
@@ -181,7 +181,7 @@ Didomi integration supports IAB's Transparency & Consent Framework 2.2:
 
 ## Implementation
 
-The Didomi integration is implemented in [crates/common/src/integrations/didomi.rs](https://github.com/IABTechLab/trusted-server/blob/main/crates/common/src/integrations/didomi.rs).
+The Didomi integration is implemented in [crates/trusted-server-core/src/integrations/didomi.rs](https://github.com/IABTechLab/trusted-server/blob/main/crates/trusted-server-core/src/integrations/didomi.rs).
 
 ### Key Components
 
diff --git a/docs/guide/integrations/google_tag_manager.md b/docs/guide/integrations/google_tag_manager.md
index 074c7a88..3bce2523 100644
--- a/docs/guide/integrations/google_tag_manager.md
+++ b/docs/guide/integrations/google_tag_manager.md
@@ -225,7 +225,7 @@ _Expected_: `200 OK` (or 204).
 
 ## Implementation Details
 
-See [crates/common/src/integrations/google_tag_manager.rs](https://github.com/IABTechLab/trusted-server/blob/main/crates/common/src/integrations/google_tag_manager.rs).
+See [crates/trusted-server-core/src/integrations/google_tag_manager.rs](https://github.com/IABTechLab/trusted-server/blob/main/crates/trusted-server-core/src/integrations/google_tag_manager.rs).
 
 ## Next Steps
 
diff --git a/docs/guide/integrations/gpt.md b/docs/guide/integrations/gpt.md
index 181bb942..bcffebc7 100644
--- a/docs/guide/integrations/gpt.md
+++ b/docs/guide/integrations/gpt.md
@@ -147,7 +147,7 @@ Takes over `googletag.cmd` so every queued callback is wrapped before GPT execut
 
 ## Implementation
 
-- **Rust**: [crates/common/src/integrations/gpt.rs](https://github.com/IABTechLab/trusted-server/blob/main/crates/common/src/integrations/gpt.rs)
+- **Rust**: [crates/trusted-server-core/src/integrations/gpt.rs](https://github.com/IABTechLab/trusted-server/blob/main/crates/trusted-server-core/src/integrations/gpt.rs)
 - **TypeScript**: [crates/js/lib/src/integrations/gpt/](https://github.com/IABTechLab/trusted-server/blob/main/crates/js/lib/src/integrations/gpt/)
 
 ## Next Steps
diff --git a/docs/guide/integrations/lockr.md b/docs/guide/integrations/lockr.md
index 27af48cc..ab765084 100644
--- a/docs/guide/integrations/lockr.md
+++ b/docs/guide/integrations/lockr.md
@@ -138,7 +138,7 @@ Lockr identities are injected into OpenRTB bid requests as Extended Identifiers:
 
 ## Implementation Details
 
-The Lockr integration is implemented in [crates/common/src/integrations/lockr.rs](https://github.com/IABTechLab/trusted-server/blob/main/crates/common/src/integrations/lockr.rs).
+The Lockr integration is implemented in [crates/trusted-server-core/src/integrations/lockr.rs](https://github.com/IABTechLab/trusted-server/blob/main/crates/trusted-server-core/src/integrations/lockr.rs).
 
 ### Key Components
 
diff --git a/docs/guide/integrations/nextjs.md b/docs/guide/integrations/nextjs.md
index 455a495e..fc085b43 100644
--- a/docs/guide/integrations/nextjs.md
+++ b/docs/guide/integrations/nextjs.md
@@ -91,9 +91,9 @@ Next.js Pages Router embeds data in `__NEXT_DATA__` script:
 
 The Next.js integration is implemented across multiple files:
 
-- [crates/common/src/integrations/nextjs/mod.rs](https://github.com/IABTechLab/trusted-server/blob/main/crates/common/src/integrations/nextjs/mod.rs) - Main integration
-- [crates/common/src/integrations/nextjs/rsc.rs](https://github.com/IABTechLab/trusted-server/blob/main/crates/common/src/integrations/nextjs/rsc.rs) - RSC parsing
-- [crates/common/src/integrations/nextjs/script_rewriter.rs](https://github.com/IABTechLab/trusted-server/blob/main/crates/common/src/integrations/nextjs/script_rewriter.rs) - Script rewriting
+- [crates/trusted-server-core/src/integrations/nextjs/mod.rs](https://github.com/IABTechLab/trusted-server/blob/main/crates/trusted-server-core/src/integrations/nextjs/mod.rs) - Main integration
+- [crates/trusted-server-core/src/integrations/nextjs/rsc.rs](https://github.com/IABTechLab/trusted-server/blob/main/crates/trusted-server-core/src/integrations/nextjs/rsc.rs) - RSC parsing
+- [crates/trusted-server-core/src/integrations/nextjs/script_rewriter.rs](https://github.com/IABTechLab/trusted-server/blob/main/crates/trusted-server-core/src/integrations/nextjs/script_rewriter.rs) - Script rewriting
 
 ### Key Components
 
diff --git a/docs/guide/integrations/permutive.md b/docs/guide/integrations/permutive.md
index 0a4e14a2..63ab8d41 100644
--- a/docs/guide/integrations/permutive.md
+++ b/docs/guide/integrations/permutive.md
@@ -59,7 +59,7 @@ Aggregate audience data across your property portfolio.
 
 ## Implementation
 
-See [crates/common/src/integrations/permutive.rs](https://github.com/IABTechLab/trusted-server/blob/main/crates/common/src/integrations/permutive.rs) for implementation details.
+See [crates/trusted-server-core/src/integrations/permutive.rs](https://github.com/IABTechLab/trusted-server/blob/main/crates/trusted-server-core/src/integrations/permutive.rs) for implementation details.
 
 ## Next Steps
 
diff --git a/docs/guide/integrations/prebid.md b/docs/guide/integrations/prebid.md
index 2612b397..2036cbf2 100644
--- a/docs/guide/integrations/prebid.md
+++ b/docs/guide/integrations/prebid.md
@@ -273,7 +273,7 @@ Optimize mobile ad serving with reduced JavaScript overhead.
 
 ## Implementation
 
-See [crates/common/src/integrations/prebid.rs](https://github.com/IABTechLab/trusted-server/blob/main/crates/common/src/integrations/prebid.rs) for full implementation.
+See [crates/trusted-server-core/src/integrations/prebid.rs](https://github.com/IABTechLab/trusted-server/blob/main/crates/trusted-server-core/src/integrations/prebid.rs) for full implementation.
 
 ### Key Components
 
diff --git a/docs/guide/key-rotation.md b/docs/guide/key-rotation.md
index dc8baad3..d4467bc8 100644
--- a/docs/guide/key-rotation.md
+++ b/docs/guide/key-rotation.md
@@ -297,7 +297,7 @@ curl -X POST https://your-domain/admin/keys/rotate \
 ### Using the Rust API
 
 ```rust
-use trusted_server_common::request_signing::KeyRotationManager;
+use trusted_server_core::request_signing::KeyRotationManager;
 
 // Initialize rotation manager
 let manager = KeyRotationManager::new("jwks_store", "signing_keys")?;
@@ -510,7 +510,7 @@ Immediate switchover with rollback capability:
 ### Track Current Key
 
 ```rust
-use trusted_server_common::request_signing::get_current_key_id;
+use trusted_server_core::request_signing::get_current_key_id;
 
 let current_kid = get_current_key_id()?;
 println!("Current signing key: {}", current_kid);
diff --git a/docs/guide/onboarding.md b/docs/guide/onboarding.md
index a25afe7e..8d334b81 100644
--- a/docs/guide/onboarding.md
+++ b/docs/guide/onboarding.md
@@ -35,14 +35,14 @@ Welcome to the Trusted Server project! This guide keeps internal onboarding note
 
 ## Codebase Pointers
 
-| File                                         | Purpose                          |
-| -------------------------------------------- | -------------------------------- |
-| `crates/fastly/src/main.rs`                  | Request routing entry point      |
-| `crates/common/src/publisher.rs`             | Publisher origin handling        |
-| `crates/common/src/proxy.rs`                 | First-party proxy implementation |
-| `crates/common/src/synthetic.rs`             | Synthetic ID generation          |
-| `crates/common/src/integrations/registry.rs` | Integration module pattern       |
-| `trusted-server.toml`                        | Application configuration        |
+| File                                                      | Purpose                          |
+| --------------------------------------------------------- | -------------------------------- |
+| `crates/trusted-server-adapter-fastly/src/main.rs`        | Request routing entry point      |
+| `crates/trusted-server-core/src/publisher.rs`             | Publisher origin handling        |
+| `crates/trusted-server-core/src/proxy.rs`                 | First-party proxy implementation |
+| `crates/trusted-server-core/src/synthetic.rs`             | Synthetic ID generation          |
+| `crates/trusted-server-core/src/integrations/registry.rs` | Integration module pattern       |
+| `trusted-server.toml`                                     | Application configuration        |
 
 ## Development Workflow
 
diff --git a/docs/guide/request-signing.md b/docs/guide/request-signing.md
index 15e521a6..ecb6de9f 100644
--- a/docs/guide/request-signing.md
+++ b/docs/guide/request-signing.md
@@ -57,7 +57,7 @@ Keys are stored in two separate Fastly stores:
 ### Basic Usage
 
 ```rust
-use trusted_server_common::request_signing::RequestSigner;
+use trusted_server_core::request_signing::RequestSigner;
 
 // Initialize signer (loads current key from config)
 let signer = RequestSigner::from_config()?;
@@ -96,7 +96,7 @@ request.set_header("X-Signature-Kid", signer.kid);
 ### Basic Verification
 
 ```rust
-use trusted_server_common::request_signing::verify_signature;
+use trusted_server_core::request_signing::verify_signature;
 
 // Extract signature and kid from request
 let signature = request.get_header("X-Signature")?;
diff --git a/docs/guide/rsc-hydration.md b/docs/guide/rsc-hydration.md
index 4d8e23d4..d6c9708d 100644
--- a/docs/guide/rsc-hydration.md
+++ b/docs/guide/rsc-hydration.md
@@ -177,8 +177,8 @@ The rewrite logic handles multiple URL formats in RSC content:
 
 The current implementation lives in:
 
-- `crates/common/src/integrations/nextjs/rsc.rs`
-- `crates/common/src/rsc_flight.rs`
+- `crates/trusted-server-core/src/integrations/nextjs/rsc.rs`
+- `crates/trusted-server-core/src/rsc_flight.rs`
 
 ## Related Docs
 
diff --git a/docs/guide/testing.md b/docs/guide/testing.md
index 96fee697..eac0801d 100644
--- a/docs/guide/testing.md
+++ b/docs/guide/testing.md
@@ -21,7 +21,7 @@ cargo test
 Tests are organized alongside source code in `#[cfg(test)]` modules:
 
 ```rust
-// crates/common/src/synthetic.rs
+// crates/trusted-server-core/src/synthetic.rs
 #[cfg(test)]
 mod tests {
     use super::*;
@@ -57,7 +57,7 @@ cargo test test_generate_synthetic_id
 cargo test -- --nocapture
 
 # Run tests for specific crate
-cargo test -p trusted-server-common
+cargo test -p trusted-server-core
 
 # Run tests matching a pattern
 cargo test synthetic
@@ -88,7 +88,7 @@ curl http://localhost:7676/.well-known/trusted-server.json
 
 ### Synthetic ID Tests
 
-From `crates/common/src/synthetic.rs`:
+From `crates/trusted-server-core/src/synthetic.rs`:
 
 ```rust
 #[test]
@@ -127,7 +127,7 @@ fn test_get_synthetic_id_none() {
 
 ### Creative Rewriting Tests
 
-From `crates/common/src/creative.rs`:
+From `crates/trusted-server-core/src/creative.rs`:
 
 ```rust
 #[test]
@@ -172,7 +172,7 @@ fn rewrite_style_urls_handles_absolute_and_relative() {
 
 ### Proxy Tests
 
-From `crates/common/src/proxy.rs`:
+From `crates/trusted-server-core/src/proxy.rs`:
 
 ```rust
 #[test]
@@ -209,7 +209,7 @@ fn header_copy_copies_curated_set() {
 
 ## Test Helpers
 
-The codebase provides test utilities in `crates/common/src/test_support.rs`:
+The codebase provides test utilities in `crates/trusted-server-core/src/test_support.rs`:
 
 ```rust
 use crate::test_support::tests::{create_test_settings, create_test_request};
@@ -240,7 +240,7 @@ cargo fmt
 
 ```bash
 # Run clippy with all checks
-cargo clippy --all-targets --all-features -- -D warnings
+cargo clippy --workspace --all-targets --all-features -- -D warnings
 
 # Fix clippy warnings automatically
 cargo clippy --fix --allow-dirty
@@ -274,7 +274,7 @@ jobs:
       - name: Run tests
         run: cargo test
       - name: Run clippy
-        run: cargo clippy --all-targets --all-features -- -D warnings
+        run: cargo clippy --workspace --all-targets --all-features -- -D warnings
 ```
 
 ## Debugging Tests
diff --git a/fastly.toml b/fastly.toml
index d63815d9..7f03efa0 100644
--- a/fastly.toml
+++ b/fastly.toml
@@ -6,12 +6,12 @@ cloned_from = "https://github.com/fastly/compute-starter-kit-rust-default"
 description = "EdgePubs - Trusted Server"
 language = "rust"
 manifest_version = 3
-name = "trusted-server-fastly"
+name = "trusted-server-adapter-fastly"
 service_id = "dysUw6h73VzeomD61eal85"
 
 [scripts]
 build = """
-    cargo build --bin trusted-server-fastly --release --target wasm32-wasip1 --color always
+    cargo build --bin trusted-server-adapter-fastly --release --target wasm32-wasip1 --color always
 """
 
 # Direct integrations will be initialized as dynamic backends and don't need to be declared here.
diff --git a/scripts/integration-tests-browser.sh b/scripts/integration-tests-browser.sh
index 3d2c7ede..d6a52aaa 100755
--- a/scripts/integration-tests-browser.sh
+++ b/scripts/integration-tests-browser.sh
@@ -32,7 +32,7 @@ echo "==> Validating shared integration-test dependency versions..."
 echo "==> Building WASM binary (origin=http://127.0.0.1:$ORIGIN_PORT)..."
 TRUSTED_SERVER__PUBLISHER__ORIGIN_URL="http://127.0.0.1:$ORIGIN_PORT" \
 TRUSTED_SERVER__PROXY__CERTIFICATE_CHECK=false \
-    cargo build --bin trusted-server-fastly --release --target wasm32-wasip1
+    cargo build --package trusted-server-adapter-fastly --release --target wasm32-wasip1
 
 # --- Build Docker images ---
 echo "==> Building WordPress test container..."
@@ -52,7 +52,7 @@ npm ci
 npx playwright install chromium
 
 # --- Export env vars for global-setup.ts ---
-export WASM_BINARY_PATH="$REPO_ROOT/target/wasm32-wasip1/release/trusted-server-fastly.wasm"
+export WASM_BINARY_PATH="$REPO_ROOT/target/wasm32-wasip1/release/trusted-server-adapter-fastly.wasm"
 export INTEGRATION_ORIGIN_PORT="$ORIGIN_PORT"
 export VICEROY_CONFIG_PATH="$REPO_ROOT/crates/integration-tests/fixtures/configs/viceroy-template.toml"
 
diff --git a/scripts/integration-tests.sh b/scripts/integration-tests.sh
index c7b64cde..efbbdf8c 100755
--- a/scripts/integration-tests.sh
+++ b/scripts/integration-tests.sh
@@ -53,7 +53,7 @@ fi
 echo "==> Building WASM binary (origin=http://127.0.0.1:$ORIGIN_PORT)..."
 TRUSTED_SERVER__PUBLISHER__ORIGIN_URL="http://127.0.0.1:$ORIGIN_PORT" \
 TRUSTED_SERVER__PROXY__CERTIFICATE_CHECK=false \
-    cargo build --bin trusted-server-fastly --release --target wasm32-wasip1
+    cargo build --package trusted-server-adapter-fastly --release --target wasm32-wasip1
 
 echo "==> Building WordPress test container..."
 docker build -t test-wordpress:latest \
@@ -66,7 +66,7 @@ docker build \
     crates/integration-tests/fixtures/frameworks/nextjs/
 
 echo "==> Running integration tests (target: $TARGET, origin port: $ORIGIN_PORT)..."
-WASM_BINARY_PATH="$REPO_ROOT/target/wasm32-wasip1/release/trusted-server-fastly.wasm" \
+WASM_BINARY_PATH="$REPO_ROOT/target/wasm32-wasip1/release/trusted-server-adapter-fastly.wasm" \
 INTEGRATION_ORIGIN_PORT="$ORIGIN_PORT" \
 RUST_LOG=info \
     cargo test \