diff --git a/apps/demo-desktop/package.json b/apps/demo-desktop/package.json
new file mode 100644
index 0000000..778fe89
--- /dev/null
+++ b/apps/demo-desktop/package.json
@@ -0,0 +1,13 @@
+{
+  "name": "@furtherverse/demo-desktop",
+  "private": true,
+  "type": "module",
+  "version": "1.0.0",
+  "scripts": {
+    "build": "tauri build",
+    "dev": "tauri dev"
+  },
+  "devDependencies": {
+    "@tauri-apps/cli": "catalog:"
+  }
+}
diff --git a/apps/demo-server/src-tauri/.gitignore b/apps/demo-desktop/src-tauri/.gitignore
similarity index 100%
rename from apps/demo-server/src-tauri/.gitignore
rename to apps/demo-desktop/src-tauri/.gitignore
diff --git a/apps/demo-server/src-tauri/AGENTS.md b/apps/demo-desktop/src-tauri/AGENTS.md
similarity index 100%
rename from apps/demo-server/src-tauri/AGENTS.md
rename to apps/demo-desktop/src-tauri/AGENTS.md
diff --git a/apps/demo-server/src-tauri/Cargo.lock b/apps/demo-desktop/src-tauri/Cargo.lock
similarity index 100%
rename from apps/demo-server/src-tauri/Cargo.lock
rename to apps/demo-desktop/src-tauri/Cargo.lock
diff --git a/apps/demo-server/src-tauri/Cargo.toml b/apps/demo-desktop/src-tauri/Cargo.toml
similarity index 100%
rename from apps/demo-server/src-tauri/Cargo.toml
rename to apps/demo-desktop/src-tauri/Cargo.toml
diff --git a/apps/demo-server/src-tauri/build.rs b/apps/demo-desktop/src-tauri/build.rs
similarity index 100%
rename from apps/demo-server/src-tauri/build.rs
rename to apps/demo-desktop/src-tauri/build.rs
diff --git a/apps/demo-server/src-tauri/capabilities/default.json b/apps/demo-desktop/src-tauri/capabilities/default.json
similarity index 100%
rename from apps/demo-server/src-tauri/capabilities/default.json
rename to apps/demo-desktop/src-tauri/capabilities/default.json
diff --git a/apps/demo-server/src-tauri/icons/128x128.png b/apps/demo-desktop/src-tauri/icons/128x128.png
similarity index 100%
rename from apps/demo-server/src-tauri/icons/128x128.png
rename to apps/demo-desktop/src-tauri/icons/128x128.png
diff --git a/apps/demo-server/src-tauri/icons/128x128@2x.png b/apps/demo-desktop/src-tauri/icons/128x128@2x.png
similarity index 100%
rename from apps/demo-server/src-tauri/icons/128x128@2x.png
rename to apps/demo-desktop/src-tauri/icons/128x128@2x.png
diff --git a/apps/demo-server/src-tauri/icons/32x32.png b/apps/demo-desktop/src-tauri/icons/32x32.png
similarity index 100%
rename from apps/demo-server/src-tauri/icons/32x32.png
rename to apps/demo-desktop/src-tauri/icons/32x32.png
diff --git a/apps/demo-server/src-tauri/icons/Square107x107Logo.png b/apps/demo-desktop/src-tauri/icons/Square107x107Logo.png
similarity index 100%
rename from apps/demo-server/src-tauri/icons/Square107x107Logo.png
rename to apps/demo-desktop/src-tauri/icons/Square107x107Logo.png
diff --git a/apps/demo-server/src-tauri/icons/Square142x142Logo.png b/apps/demo-desktop/src-tauri/icons/Square142x142Logo.png
similarity index 100%
rename from apps/demo-server/src-tauri/icons/Square142x142Logo.png
rename to apps/demo-desktop/src-tauri/icons/Square142x142Logo.png
diff --git a/apps/demo-server/src-tauri/icons/Square150x150Logo.png b/apps/demo-desktop/src-tauri/icons/Square150x150Logo.png
similarity index 100%
rename from apps/demo-server/src-tauri/icons/Square150x150Logo.png
rename to apps/demo-desktop/src-tauri/icons/Square150x150Logo.png
diff --git a/apps/demo-server/src-tauri/icons/Square284x284Logo.png b/apps/demo-desktop/src-tauri/icons/Square284x284Logo.png
similarity index 100%
rename from apps/demo-server/src-tauri/icons/Square284x284Logo.png
rename to apps/demo-desktop/src-tauri/icons/Square284x284Logo.png
diff --git a/apps/demo-server/src-tauri/icons/Square30x30Logo.png b/apps/demo-desktop/src-tauri/icons/Square30x30Logo.png
similarity index 100%
rename from apps/demo-server/src-tauri/icons/Square30x30Logo.png
rename to apps/demo-desktop/src-tauri/icons/Square30x30Logo.png
diff --git a/apps/demo-server/src-tauri/icons/Square310x310Logo.png b/apps/demo-desktop/src-tauri/icons/Square310x310Logo.png
similarity index 100%
rename from apps/demo-server/src-tauri/icons/Square310x310Logo.png
rename to apps/demo-desktop/src-tauri/icons/Square310x310Logo.png
diff --git a/apps/demo-server/src-tauri/icons/Square44x44Logo.png b/apps/demo-desktop/src-tauri/icons/Square44x44Logo.png
similarity index 100%
rename from apps/demo-server/src-tauri/icons/Square44x44Logo.png
rename to apps/demo-desktop/src-tauri/icons/Square44x44Logo.png
diff --git a/apps/demo-server/src-tauri/icons/Square71x71Logo.png b/apps/demo-desktop/src-tauri/icons/Square71x71Logo.png
similarity index 100%
rename from apps/demo-server/src-tauri/icons/Square71x71Logo.png
rename to apps/demo-desktop/src-tauri/icons/Square71x71Logo.png
diff --git a/apps/demo-server/src-tauri/icons/Square89x89Logo.png b/apps/demo-desktop/src-tauri/icons/Square89x89Logo.png
similarity index 100%
rename from apps/demo-server/src-tauri/icons/Square89x89Logo.png
rename to apps/demo-desktop/src-tauri/icons/Square89x89Logo.png
diff --git a/apps/demo-server/src-tauri/icons/StoreLogo.png b/apps/demo-desktop/src-tauri/icons/StoreLogo.png
similarity index 100%
rename from apps/demo-server/src-tauri/icons/StoreLogo.png
rename to apps/demo-desktop/src-tauri/icons/StoreLogo.png
diff --git a/apps/demo-server/src-tauri/icons/icon.icns b/apps/demo-desktop/src-tauri/icons/icon.icns
similarity index 100%
rename from apps/demo-server/src-tauri/icons/icon.icns
rename to apps/demo-desktop/src-tauri/icons/icon.icns
diff --git a/apps/demo-server/src-tauri/icons/icon.ico b/apps/demo-desktop/src-tauri/icons/icon.ico
similarity index 100%
rename from apps/demo-server/src-tauri/icons/icon.ico
rename to apps/demo-desktop/src-tauri/icons/icon.ico
diff --git a/apps/demo-server/src-tauri/icons/icon.png b/apps/demo-desktop/src-tauri/icons/icon.png
similarity index 100%
rename from apps/demo-server/src-tauri/icons/icon.png
rename to apps/demo-desktop/src-tauri/icons/icon.png
diff --git a/apps/demo-server/src-tauri/src/commands/mod.rs b/apps/demo-desktop/src-tauri/src/commands/mod.rs
similarity index 100%
rename from apps/demo-server/src-tauri/src/commands/mod.rs
rename to apps/demo-desktop/src-tauri/src/commands/mod.rs
diff --git a/apps/demo-server/src-tauri/src/lib.rs b/apps/demo-desktop/src-tauri/src/lib.rs
similarity index 100%
rename from apps/demo-server/src-tauri/src/lib.rs
rename to apps/demo-desktop/src-tauri/src/lib.rs
diff --git a/apps/demo-server/src-tauri/src/main.rs b/apps/demo-desktop/src-tauri/src/main.rs
similarity index 100%
rename from apps/demo-server/src-tauri/src/main.rs
rename to apps/demo-desktop/src-tauri/src/main.rs
diff --git a/apps/demo-server/src-tauri/src/sidecar.rs b/apps/demo-desktop/src-tauri/src/sidecar.rs
similarity index 100%
rename from apps/demo-server/src-tauri/src/sidecar.rs
rename to apps/demo-desktop/src-tauri/src/sidecar.rs
diff --git a/apps/demo-server/src-tauri/tauri.conf.json b/apps/demo-desktop/src-tauri/tauri.conf.json
similarity index 100%
rename from apps/demo-server/src-tauri/tauri.conf.json
rename to apps/demo-desktop/src-tauri/tauri.conf.json
diff --git a/apps/demo-server/package.json b/apps/demo-server/package.json
index 237fd44..4db0ba9 100644
--- a/apps/demo-server/package.json
+++ b/apps/demo-server/package.json
@@ -1,19 +1,16 @@
 {
   "name": "@furtherverse/demo-server",
   "private": true,
+  "version": "1.0.0",
   "type": "module",
   "scripts": {
-    "build": "turbo build:tauri",
-    "build:compile": "bun build.ts",
-    "build:tauri": "tauri build",
-    "build:vite": "vite build",
+    "compile": "bun build.ts",
+    "build": "vite build",
     "db:generate": "drizzle-kit generate",
     "db:migrate": "drizzle-kit migrate",
     "db:push": "drizzle-kit push",
     "db:studio": "drizzle-kit studio",
-    "dev": "turbo dev:tauri",
-    "dev:tauri": "tauri dev",
-    "dev:vite": "vite dev",
+    "dev": "vite dev",
     "fix": "biome check --write",
     "typecheck": "tsc -b"
   },
@@ -45,7 +42,6 @@
     "@tanstack/react-devtools": "catalog:",
     "@tanstack/react-query-devtools": "catalog:",
     "@tanstack/react-router-devtools": "catalog:",
-    "@tauri-apps/cli": "catalog:",
     "@types/bun": "catalog:",
     "@vitejs/plugin-react": "catalog:",
     "babel-plugin-react-compiler": "catalog:",