diff --git a/packages/agents/src/keycardai/agents/server/app.py b/packages/agents/src/keycardai/agents/server/app.py
index 03d7710..e1e4823 100644
--- a/packages/agents/src/keycardai/agents/server/app.py
+++ b/packages/agents/src/keycardai/agents/server/app.py
@@ -22,7 +22,7 @@
     authorization_server_metadata,
     protected_resource_metadata,
 )
-from keycardai.mcp.server.middleware.bearer import BearerAuthMiddleware
+from keycardai.starlette.middleware.bearer import BearerAuthMiddleware
 
 from ..config import AgentServiceConfig
 from .executor_bridge import KeycardToA2AExecutorBridge
diff --git a/packages/mcp/src/keycardai/mcp/server/middleware/__init__.py b/packages/mcp/src/keycardai/mcp/server/middleware/__init__.py
deleted file mode 100644
index a1758a4..0000000
--- a/packages/mcp/src/keycardai/mcp/server/middleware/__init__.py
+++ /dev/null
@@ -1,5 +0,0 @@
-"""Backward-compatible re-export from keycardai.starlette.middleware."""
-
-from keycardai.starlette.middleware import BearerAuthMiddleware
-
-__all__ = ["BearerAuthMiddleware"]
diff --git a/packages/mcp/src/keycardai/mcp/server/middleware/bearer.py b/packages/mcp/src/keycardai/mcp/server/middleware/bearer.py
deleted file mode 100644
index def9e7b..0000000
--- a/packages/mcp/src/keycardai/mcp/server/middleware/bearer.py
+++ /dev/null
@@ -1,17 +0,0 @@
-"""Bearer token authentication middleware.
-
-Re-exported from keycardai.starlette.middleware.bearer for backward compatibility.
-Canonical import: ``from keycardai.starlette.middleware import BearerAuthMiddleware``
-"""
-
-from keycardai.starlette.middleware.bearer import (
-    BearerAuthMiddleware,
-    _get_bearer_token,
-    _get_oauth_protected_resource_url,
-)
-
-__all__ = [
-    "BearerAuthMiddleware",
-    "_get_bearer_token",
-    "_get_oauth_protected_resource_url",
-]
diff --git a/packages/mcp/tests/keycardai/mcp/server/middleware/__init__.py b/packages/mcp/tests/keycardai/mcp/server/middleware/__init__.py
deleted file mode 100644
index 2179fe9..0000000
--- a/packages/mcp/tests/keycardai/mcp/server/middleware/__init__.py
+++ /dev/null
@@ -1 +0,0 @@
-"""Tests for the keycardai.mcp.server.middleware module."""
diff --git a/packages/starlette/tests/keycardai/starlette/middleware/__init__.py b/packages/starlette/tests/keycardai/starlette/middleware/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/packages/mcp/tests/keycardai/mcp/server/middleware/test_bearer.py b/packages/starlette/tests/keycardai/starlette/middleware/test_bearer.py
similarity index 99%
rename from packages/mcp/tests/keycardai/mcp/server/middleware/test_bearer.py
rename to packages/starlette/tests/keycardai/starlette/middleware/test_bearer.py
index 3fd827f..8e827bb 100644
--- a/packages/mcp/tests/keycardai/mcp/server/middleware/test_bearer.py
+++ b/packages/starlette/tests/keycardai/starlette/middleware/test_bearer.py
@@ -5,7 +5,7 @@
 from starlette.datastructures import URL, Headers
 from starlette.requests import Request
 
-from keycardai.mcp.server.middleware.bearer import (
+from keycardai.starlette.middleware.bearer import (
     _get_bearer_token,
     _get_oauth_protected_resource_url,
 )