diff --git a/package-lock.json b/package-lock.json
index 42eb162..1aca130 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -8,17 +8,96 @@
       "name": "mcp-server-feature-reference",
       "version": "0.1.0",
       "workspaces": [
-        "integrated-mode",
-        "separate-mode/auth-server",
-        "separate-mode/mcp-server"
+        "embedded-oauth",
+        "external-oauth/auth-server",
+        "external-oauth/mcp-server"
       ],
       "devDependencies": {
         "concurrently": "^8.2.0"
       }
     },
+    "embedded-oauth": {
+      "name": "mcp-server-feature-reference-embedded-oauth",
+      "version": "0.1.0",
+      "dependencies": {
+        "@modelcontextprotocol/sdk": "^1.15.1",
+        "@redis/client": "^1.6.0",
+        "cors": "^2.8.5",
+        "dotenv": "^16.4.7",
+        "express": "^4.21.2",
+        "express-rate-limit": "^8.0.1",
+        "raw-body": "^3.0.0"
+      },
+      "devDependencies": {
+        "@eslint/js": "^9.15.0",
+        "@types/content-type": "^1.1.8",
+        "@types/cors": "^2.8.17",
+        "@types/express": "^5.0.0",
+        "@types/jest": "^29.5.14",
+        "@types/node": "^22.10.0",
+        "jest": "^29.7.0",
+        "ts-jest": "^29.2.5",
+        "tsx": "^4.19.2",
+        "typescript": "^5.7.2",
+        "typescript-eslint": "^8.18.0"
+      }
+    },
+    "external-oauth/auth-server": {
+      "name": "mcp-server-feature-reference-external-auth-server",
+      "version": "0.1.0",
+      "dependencies": {
+        "@modelcontextprotocol/sdk": "^1.15.1",
+        "@redis/client": "^1.6.0",
+        "cors": "^2.8.5",
+        "dotenv": "^16.4.7",
+        "express": "^4.21.2",
+        "express-rate-limit": "^8.0.1",
+        "raw-body": "^3.0.0"
+      },
+      "devDependencies": {
+        "@eslint/js": "^9.15.0",
+        "@types/content-type": "^1.1.8",
+        "@types/cors": "^2.8.17",
+        "@types/express": "^5.0.0",
+        "@types/jest": "^29.5.14",
+        "@types/node": "^22.10.0",
+        "jest": "^29.7.0",
+        "ts-jest": "^29.2.5",
+        "tsx": "^4.19.2",
+        "typescript": "^5.7.2",
+        "typescript-eslint": "^8.18.0"
+      }
+    },
+    "external-oauth/mcp-server": {
+      "name": "mcp-server-feature-reference-external-mcp-server",
+      "version": "0.1.0",
+      "dependencies": {
+        "@modelcontextprotocol/sdk": "^1.15.1",
+        "@redis/client": "^1.6.0",
+        "cors": "^2.8.5",
+        "dotenv": "^16.4.7",
+        "express": "^4.21.2",
+        "express-rate-limit": "^8.0.1",
+        "raw-body": "^3.0.0"
+      },
+      "devDependencies": {
+        "@eslint/js": "^9.15.0",
+        "@types/content-type": "^1.1.8",
+        "@types/cors": "^2.8.17",
+        "@types/express": "^5.0.0",
+        "@types/jest": "^29.5.14",
+        "@types/node": "^22.10.0",
+        "jest": "^29.7.0",
+        "ts-jest": "^29.2.5",
+        "tsx": "^4.19.2",
+        "typescript": "^5.7.2",
+        "typescript-eslint": "^8.18.0"
+      }
+    },
     "integrated-mode": {
       "name": "mcp-server-feature-reference-integrated",
       "version": "0.1.0",
+      "extraneous": true,
       "dependencies": {
         "@modelcontextprotocol/sdk": "^1.15.1",
         "@redis/client": "^1.6.0",
@@ -5500,16 +5579,16 @@
         "node": ">= 0.4"
       }
     },
-    "node_modules/mcp-server-feature-reference-auth-server": {
-      "resolved": "separate-mode/auth-server",
+    "node_modules/mcp-server-feature-reference-embedded-oauth": {
+      "resolved": "embedded-oauth",
       "link": true
     },
-    "node_modules/mcp-server-feature-reference-integrated": {
-      "resolved": "integrated-mode",
+    "node_modules/mcp-server-feature-reference-external-auth-server": {
+      "resolved": "external-oauth/auth-server",
       "link": true
     },
-    "node_modules/mcp-server-feature-reference-mcp-server": {
-      "resolved": "separate-mode/mcp-server",
+    "node_modules/mcp-server-feature-reference-external-mcp-server": {
+      "resolved": "external-oauth/mcp-server",
       "link": true
     },
     "node_modules/media-typer": {
@@ -7274,6 +7353,7 @@
     "separate-mode/auth-server": {
       "name": "mcp-server-feature-reference-auth-server",
       "version": "0.1.0",
+      "extraneous": true,
       "dependencies": {
         "@modelcontextprotocol/sdk": "^1.15.1",
         "@redis/client": "^1.6.0",
@@ -7300,6 +7380,7 @@
     "separate-mode/mcp-server": {
       "name": "mcp-server-feature-reference-mcp-server",
       "version": "0.1.0",
+      "extraneous": true,
       "dependencies": {
         "@modelcontextprotocol/sdk": "^1.15.1",
         "@redis/client": "^1.6.0",