diff --git a/package.json b/package.json
index 2027d9b..b53d6f7 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vite-plugin-earth",
-  "version": "2.1.2",
+  "version": "2.2.0",
   "description": "Cesium & Mars3D library plugin for Vite",
   "main": "./dist/index.js",
   "module": "./dist/index.mjs",
@@ -17,7 +17,11 @@
   },
   "scripts": {
     "dev": "tsup --watch",
+    "dev:cesium": "pnpm run --filter cesium-demo dev",
+    "dev:mars3d": "pnpm run --filter mars3d-demo dev",
     "build": "tsup",
+    "build:cesium": "pnpm run --filter cesium-demo build",
+    "build:mars3d": "pnpm run --filter mars3d-demo build",
     "prepare": "npm run build"
   },
   "keywords": [
diff --git a/demo-cesium/index.html b/packages/cesium/index.html
similarity index 100%
rename from demo-cesium/index.html
rename to packages/cesium/index.html
diff --git a/demo-cesium/package.json b/packages/cesium/package.json
similarity index 87%
rename from demo-cesium/package.json
rename to packages/cesium/package.json
index d0334fb..cc32f51 100644
--- a/demo-cesium/package.json
+++ b/packages/cesium/package.json
@@ -11,6 +11,6 @@
   "devDependencies": {
     "cesium": "^1.105.0",
     "vite": "^4.3.4",
-    "vite-plugin-earth": "link:.."
+    "vite-plugin-earth": "workspace:*"
   }
 }
diff --git a/demo-cesium/src/css/main.css b/packages/cesium/src/css/main.css
similarity index 100%
rename from demo-cesium/src/css/main.css
rename to packages/cesium/src/css/main.css
diff --git a/demo-cesium/src/index.ts b/packages/cesium/src/index.ts
similarity index 100%
rename from demo-cesium/src/index.ts
rename to packages/cesium/src/index.ts
diff --git a/demo-cesium/vite.config.ts b/packages/cesium/vite.config.ts
similarity index 73%
rename from demo-cesium/vite.config.ts
rename to packages/cesium/vite.config.ts
index 655dd1a..956630b 100644
--- a/demo-cesium/vite.config.ts
+++ b/packages/cesium/vite.config.ts
@@ -2,5 +2,5 @@ import { defineConfig } from 'vite';
 import { cesiumPlugin } from 'vite-plugin-earth';
 
 export default defineConfig({
-  plugins: [cesiumPlugin()]
+  plugins: [cesiumPlugin({ useCDN: true })]
 });
diff --git a/demo-mars3d/index.html b/packages/mars3d/index.html
similarity index 100%
rename from demo-mars3d/index.html
rename to packages/mars3d/index.html
diff --git a/demo-mars3d/package.json b/packages/mars3d/package.json
similarity index 90%
rename from demo-mars3d/package.json
rename to packages/mars3d/package.json
index ea61b0d..ffecb4c 100644
--- a/demo-mars3d/package.json
+++ b/packages/mars3d/package.json
@@ -10,7 +10,7 @@
   },
   "devDependencies": {
     "vite": "^4.3.4",
-    "vite-plugin-earth": "link:.."
+    "vite-plugin-earth": "workspace:*"
   },
   "dependencies": {
     "@turf/turf": "^6.5.0",
diff --git a/demo-mars3d/src/css/main.css b/packages/mars3d/src/css/main.css
similarity index 100%
rename from demo-mars3d/src/css/main.css
rename to packages/mars3d/src/css/main.css
diff --git a/demo-mars3d/src/index.ts b/packages/mars3d/src/index.ts
similarity index 100%
rename from demo-mars3d/src/index.ts
rename to packages/mars3d/src/index.ts
diff --git a/demo-mars3d/vite.config.ts b/packages/mars3d/vite.config.ts
similarity index 66%
rename from demo-mars3d/vite.config.ts
rename to packages/mars3d/vite.config.ts
index 961e168..0fbc473 100644
--- a/demo-mars3d/vite.config.ts
+++ b/packages/mars3d/vite.config.ts
@@ -2,5 +2,9 @@ import { defineConfig } from 'vite';
 import { mars3dPlugin } from 'vite-plugin-earth';
 
 export default defineConfig({
-  plugins: [mars3dPlugin()]
+  plugins: [
+    mars3dPlugin({
+      useCDN: true
+    })
+  ]
 });
diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml
new file mode 100644
index 0000000..067a01b
--- /dev/null
+++ b/pnpm-workspace.yaml
@@ -0,0 +1,3 @@
+packages:
+  # all packages in direct subdirs of packages/
+  - 'packages/*'