diff --git a/arch/tools/.vscode/settings.json b/arch/tools/.vscode/settings.json
new file mode 100644
index 00000000..3302ded8
--- /dev/null
+++ b/arch/tools/.vscode/settings.json
@@ -0,0 +1,3 @@
+{
+  "python.defaultInterpreterPath": "${workspaceFolder}/venv/bin/python",
+}
diff --git a/gateway.code-workspace b/archgw.code-workspace
similarity index 54%
rename from gateway.code-workspace
rename to archgw.code-workspace
index cc1b4efc..9148057d 100644
--- a/gateway.code-workspace
+++ b/archgw.code-workspace
@@ -5,19 +5,11 @@
 			"path": "."
 		},
     {
-      "name": "common",
-      "path": "crates/common"
+      "name": "crates",
+      "path": "crates"
     },
     {
-      "name": "prompt_gateway",
-      "path": "crates/prompt_gateway"
-    },
-    {
-      "name": "llm_gateway",
-      "path": "crates/llm_gateway"
-    },
-    {
-      "name": "arch/tools",
+      "name": "archgw_cli",
       "path": "arch/tools"
     },
     {
@@ -36,10 +28,15 @@
       "name": "demos/insurance_agent",
       "path": "./demos/insurance_agent",
     },
-    {
-      "name": "demos/function_calling/api_server",
-      "path": "./demos/function_calling/api_server",
-    },
   ],
-  "settings": {}
+  "settings": {
+  },
+  "extensions": {
+    "recommendations": [
+      "ms-python.python",
+      "ms-python.debugpy",
+      "rust-lang.rust-analyzer",
+      "humao.rest-client"
+      ]
+  }
 }
diff --git a/chatbot_ui/.vscode/settings.json b/chatbot_ui/.vscode/settings.json
new file mode 100644
index 00000000..3302ded8
--- /dev/null
+++ b/chatbot_ui/.vscode/settings.json
@@ -0,0 +1,3 @@
+{
+  "python.defaultInterpreterPath": "${workspaceFolder}/venv/bin/python",
+}
diff --git a/model_server/.vscode/settings.json b/model_server/.vscode/settings.json
new file mode 100644
index 00000000..3302ded8
--- /dev/null
+++ b/model_server/.vscode/settings.json
@@ -0,0 +1,3 @@
+{
+  "python.defaultInterpreterPath": "${workspaceFolder}/venv/bin/python",
+}