diff --git a/.gitignore b/.gitignore
index 140ca39150..d8960aaea4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,10 +6,8 @@ node_modules
 # intellij stuff
 .idea/
 *.pdf
-demo/index.html
-demo/starter.md
-demo/public
-demo/*-export
-demo/build.md
+*-export
+demo/starter/slides.md
 assets/demo
 packages/slidev/README.md
+composable-vue-cn
diff --git a/demo/components/Connections.vue b/demo/composable-vue/components/Connections.vue
similarity index 100%
rename from demo/components/Connections.vue
rename to demo/composable-vue/components/Connections.vue
diff --git a/demo/components/DarkToggle.vue b/demo/composable-vue/components/DarkToggle.vue
similarity index 100%
rename from demo/components/DarkToggle.vue
rename to demo/composable-vue/components/DarkToggle.vue
diff --git a/demo/components/Marker.vue b/demo/composable-vue/components/Marker.vue
similarity index 100%
rename from demo/components/Marker.vue
rename to demo/composable-vue/components/Marker.vue
diff --git a/demo/components/MarkerCore.vue b/demo/composable-vue/components/MarkerCore.vue
similarity index 100%
rename from demo/components/MarkerCore.vue
rename to demo/composable-vue/components/MarkerCore.vue
diff --git a/demo/components/MarkerPattern.vue b/demo/composable-vue/components/MarkerPattern.vue
similarity index 100%
rename from demo/components/MarkerPattern.vue
rename to demo/composable-vue/components/MarkerPattern.vue
diff --git a/demo/components/MarkerTips.vue b/demo/composable-vue/components/MarkerTips.vue
similarity index 100%
rename from demo/components/MarkerTips.vue
rename to demo/composable-vue/components/MarkerTips.vue
diff --git a/demo/components/NumBox.vue b/demo/composable-vue/components/NumBox.vue
similarity index 100%
rename from demo/components/NumBox.vue
rename to demo/composable-vue/components/NumBox.vue
diff --git a/demo/components/VueUse.vue b/demo/composable-vue/components/VueUse.vue
similarity index 100%
rename from demo/components/VueUse.vue
rename to demo/composable-vue/components/VueUse.vue
diff --git a/demo/package.json b/demo/composable-vue/package.json
similarity index 53%
rename from demo/package.json
rename to demo/composable-vue/package.json
index 39f587db6b..2d4bc29af6 100644
--- a/demo/package.json
+++ b/demo/composable-vue/package.json
@@ -1,8 +1,7 @@
 {
   "private": true,
   "scripts": {
-    "dev": "nodemon -w '../packages/slidev/dist/*.js' --exec 'slidev --open=false --log=info'",
-    "starter": "ln -sF ../packages/create-app/template/slides.md starter.md && nodemon -w '../packages/slidev/dist/*.js' --exec 'slidev ./starter.md --open=false --log=info'",
+    "dev": "nodemon -w '../../packages/slidev/dist/*.js' --exec 'slidev --log=info'",
     "build": "slidev build",
     "export": "slidev export"
   },
diff --git a/demo/setup/monaco.ts b/demo/composable-vue/setup/monaco.ts
similarity index 100%
rename from demo/setup/monaco.ts
rename to demo/composable-vue/setup/monaco.ts
diff --git a/demo/slides.md b/demo/composable-vue/slides.md
similarity index 100%
rename from demo/slides.md
rename to demo/composable-vue/slides.md
diff --git a/demo/starter/README.md b/demo/starter/README.md
new file mode 100644
index 0000000000..a15c9aebd2
--- /dev/null
+++ b/demo/starter/README.md
@@ -0,0 +1 @@
+See [../../packages/create-app/template/slides.md](../../packages/create-app/template/slides.md)
diff --git a/demo/components/Counter.vue b/demo/starter/components/Counter.vue
similarity index 100%
rename from demo/components/Counter.vue
rename to demo/starter/components/Counter.vue
diff --git a/demo/starter/package.json b/demo/starter/package.json
new file mode 100644
index 0000000000..ce49617d5f
--- /dev/null
+++ b/demo/starter/package.json
@@ -0,0 +1,15 @@
+{
+  "private": true,
+  "scripts": {
+    "dev": "ln -sF ../../packages/create-app/template/slides.md slides.md && nodemon -w '../../packages/slidev/dist/*.js' --exec 'slidev ./slides.md --open=false --log=info'",
+    "build": "slidev build",
+    "export": "slidev export"
+  },
+  "devDependencies": {
+    "@slidev/cli": "workspace:*",
+    "@slidev/theme-default": "workspace:*",
+    "@slidev/theme-seriph": "workspace:*",
+    "@slidev/types": "workspace:*",
+    "nodemon": "^2.0.7"
+  }
+}
diff --git a/package.json b/package.json
index b61ce033b2..5d532885bd 100644
--- a/package.json
+++ b/package.json
@@ -9,9 +9,8 @@
     "build": "pnpm -r --filter ./packages run build",
     "docs": "vitepress dev docs",
     "docs:build": "esno ./scripts/docs.ts",
-    "demo:dev": "pnpm -C demo run dev",
-    "demo:build": "pnpm -C demo run build",
-    "demo:starter": "pnpm -C demo run starter",
+    "demo:dev": "pnpm -C demo/starter run dev",
+    "demo:compoable-vue": "pnpm -C demo/compoable-vue run dev",
     "lint": "eslint '**/*.{js,ts,vue,json}'",
     "lint:fix": "nr lint --fix",
     "test": "jest",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 8523745cdb..ffeffbdd93 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -80,7 +80,7 @@ importers:
       vite-plugin-windicss: 0.16.0-beta.14
       vitepress: 0.13.2
 
-  demo:
+  demo/composable-vue:
     specifiers:
       '@slidev/cli': workspace:*
       '@slidev/theme-default': workspace:*
@@ -88,10 +88,36 @@ importers:
       '@slidev/types': workspace:*
       nodemon: ^2.0.7
     devDependencies:
-      '@slidev/cli': link:../packages/slidev
-      '@slidev/theme-default': link:../packages/theme-default
-      '@slidev/theme-seriph': link:../packages/theme-seriph
-      '@slidev/types': link:../packages/types
+      '@slidev/cli': link:../../packages/slidev
+      '@slidev/theme-default': link:../../packages/theme-default
+      '@slidev/theme-seriph': link:../../packages/theme-seriph
+      '@slidev/types': link:../../packages/types
+      nodemon: 2.0.7
+
+  demo/composable-vue-cn:
+    specifiers:
+      '@slidev/cli': workspace:*
+      '@slidev/theme-default': workspace:*
+      '@slidev/theme-seriph': workspace:*
+      '@slidev/types': workspace:*
+    dependencies:
+      '@slidev/cli': link:../../packages/slidev
+      '@slidev/theme-default': link:../../packages/theme-default
+      '@slidev/theme-seriph': link:../../packages/theme-seriph
+      '@slidev/types': link:../../packages/types
+
+  demo/starter:
+    specifiers:
+      '@slidev/cli': workspace:*
+      '@slidev/theme-default': workspace:*
+      '@slidev/theme-seriph': workspace:*
+      '@slidev/types': workspace:*
+      nodemon: ^2.0.7
+    devDependencies:
+      '@slidev/cli': link:../../packages/slidev
+      '@slidev/theme-default': link:../../packages/theme-default
+      '@slidev/theme-seriph': link:../../packages/theme-seriph
+      '@slidev/types': link:../../packages/types
       nodemon: 2.0.7
 
   packages/client:
diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml
index 266962d5ba..82ff0c1d87 100644
--- a/pnpm-workspace.yaml
+++ b/pnpm-workspace.yaml
@@ -1,3 +1,3 @@
 packages:
   - packages/*
-  - demo
+  - demo/*