diff --git a/Cargo.toml b/Cargo.toml
index 60d1ac4..f4df5ae 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -26,7 +26,7 @@ caretta-sync-macros = { path="macros", optional = true}
 caretta-sync-core = {workspace = true, features = ["test"]}
 
 [workspace]
-members = [ ".", "core", "macros", "cli", "mobile", "examples/demo/*" , "bevy"]
+members = [ ".", "core", "macros", "cli", "mobile", "examples/*" , "bevy"]
 resolver = "3"
 
 [workspace.package]
diff --git a/examples/demo/core/Cargo.toml b/examples/core/Cargo.toml
similarity index 77%
rename from examples/demo/core/Cargo.toml
rename to examples/core/Cargo.toml
index af7d124..7e93a70 100644
--- a/examples/demo/core/Cargo.toml
+++ b/examples/core/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "caretta-sync-demo-core"
+name = "caretta-sync-example-core"
 edition.workspace = true
 version.workspace = true
 description.workspace = true
@@ -8,7 +8,7 @@ repository.workspace = true
 
 [dependencies]
 bevy.workspace = true
-caretta-sync = { path = "../../..", features = ["bevy"] }
+caretta-sync = { path = "../..", features = ["bevy"] }
 libp2p.workspace = true
 tokio.workspace = true
 tokio-stream = { version = "0.1.17", features = ["net"] }
diff --git a/examples/core/src/global.rs b/examples/core/src/global.rs
new file mode 100644
index 0000000..4556605
--- /dev/null
+++ b/examples/core/src/global.rs
@@ -0,0 +1 @@
+pub const APP_NAME: &str = "caretta_sync_example";
diff --git a/examples/demo/core/src/gui.rs b/examples/core/src/gui.rs
similarity index 100%
rename from examples/demo/core/src/gui.rs
rename to examples/core/src/gui.rs
diff --git a/examples/demo/core/src/lib.rs b/examples/core/src/lib.rs
similarity index 100%
rename from examples/demo/core/src/lib.rs
rename to examples/core/src/lib.rs
diff --git a/examples/demo/core/src/rpc/mod.rs b/examples/core/src/rpc/mod.rs
similarity index 100%
rename from examples/demo/core/src/rpc/mod.rs
rename to examples/core/src/rpc/mod.rs
diff --git a/examples/demo/core/src/rpc/server.rs b/examples/core/src/rpc/server.rs
similarity index 100%
rename from examples/demo/core/src/rpc/server.rs
rename to examples/core/src/rpc/server.rs
diff --git a/examples/demo/core/src/server.rs b/examples/core/src/server.rs
similarity index 100%
rename from examples/demo/core/src/server.rs
rename to examples/core/src/server.rs
diff --git a/examples/demo/core/src/global.rs b/examples/demo/core/src/global.rs
deleted file mode 100644
index 918f245..0000000
--- a/examples/demo/core/src/global.rs
+++ /dev/null
@@ -1 +0,0 @@
-pub const APP_NAME: &str = "caretta_sync_demo";
diff --git a/examples/demo/mobile/src/main.rs b/examples/demo/mobile/src/main.rs
deleted file mode 100644
index 9939e5a..0000000
--- a/examples/demo/mobile/src/main.rs
+++ /dev/null
@@ -1,3 +0,0 @@
-fn main() {
-    dioxus::launch(caretta_sync_examples_core::ui::plain::App);
-}
\ No newline at end of file
diff --git a/examples/demo/desktop/Cargo.toml b/examples/desktop/Cargo.toml
similarity index 68%
rename from examples/demo/desktop/Cargo.toml
rename to examples/desktop/Cargo.toml
index a845263..a5943e1 100644
--- a/examples/demo/desktop/Cargo.toml
+++ b/examples/desktop/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "caretta-sync-demo-desktop"
+name = "caretta-sync-example-desktop"
 edition.workspace = true
 version.workspace = true
 description.workspace = true
@@ -10,7 +10,7 @@ repository.workspace = true
 
 [dependencies]
 clap.workspace = true
-caretta-sync = { path = "../../..", features = ["cli", "bevy", "test"] }
-caretta-sync-demo-core.path = "../core"
+caretta-sync = { path = "../..", features = ["cli", "bevy", "test"] }
+caretta-sync-example-core.path = "../core"
 libp2p.workspace = true
 tokio.workspace = true
diff --git a/examples/demo/desktop/Dioxus.toml b/examples/desktop/Dioxus.toml
similarity index 100%
rename from examples/demo/desktop/Dioxus.toml
rename to examples/desktop/Dioxus.toml
diff --git a/examples/demo/desktop/README.md b/examples/desktop/README.md
similarity index 100%
rename from examples/demo/desktop/README.md
rename to examples/desktop/README.md
diff --git a/examples/demo/desktop/clippy.toml b/examples/desktop/clippy.toml
similarity index 100%
rename from examples/demo/desktop/clippy.toml
rename to examples/desktop/clippy.toml
diff --git a/examples/demo/desktop/src/cli/mod.rs b/examples/desktop/src/cli/mod.rs
similarity index 95%
rename from examples/demo/desktop/src/cli/mod.rs
rename to examples/desktop/src/cli/mod.rs
index fe70c32..5bc84e0 100644
--- a/examples/demo/desktop/src/cli/mod.rs
+++ b/examples/desktop/src/cli/mod.rs
@@ -1,4 +1,4 @@
-use caretta_sync_demo_core::{gui::Gui, server::Server};
+use caretta_sync_example_core::{gui::Gui, server::Server};
 use clap::{Parser, Subcommand};
 use caretta_sync::{cli::*, config::Config, data::migration::DataMigrator, global::{CONFIG, DATABASE_CONNECTIONS}, utils::Runnable};
 
diff --git a/examples/demo/desktop/src/ipc.rs b/examples/desktop/src/ipc.rs
similarity index 100%
rename from examples/demo/desktop/src/ipc.rs
rename to examples/desktop/src/ipc.rs
diff --git a/examples/demo/desktop/src/main.rs b/examples/desktop/src/main.rs
similarity index 76%
rename from examples/demo/desktop/src/main.rs
rename to examples/desktop/src/main.rs
index 4b697f4..9132165 100644
--- a/examples/demo/desktop/src/main.rs
+++ b/examples/desktop/src/main.rs
@@ -1,5 +1,5 @@
 use caretta_sync::utils::Runnable;
-use caretta_sync_demo_core::global::APP_NAME;
+use caretta_sync_example_core::global::APP_NAME;
 use clap::Parser;
 
 use crate::cli::Cli;
diff --git a/examples/demo/desktop/src/message.rs b/examples/desktop/src/message.rs
similarity index 100%
rename from examples/demo/desktop/src/message.rs
rename to examples/desktop/src/message.rs
diff --git a/examples/demo/mobile/Cargo.toml b/examples/mobile/Cargo.toml
similarity index 66%
rename from examples/demo/mobile/Cargo.toml
rename to examples/mobile/Cargo.toml
index 52c98cd..a5f75a3 100644
--- a/examples/demo/mobile/Cargo.toml
+++ b/examples/mobile/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "caretta-sync-demo-mobile"
+name = "caretta-sync-example-mobile"
 edition.workspace = true
 version.workspace = true
 description.workspace = true
@@ -7,4 +7,4 @@ license.workspace = true
 repository.workspace = true
 
 [dependencies]
-caretta-sync-demo-core.path = "../core"
+caretta-sync-example-core.path = "../core"
diff --git a/examples/demo/mobile/Dioxus.toml b/examples/mobile/Dioxus.toml
similarity index 100%
rename from examples/demo/mobile/Dioxus.toml
rename to examples/mobile/Dioxus.toml
diff --git a/examples/demo/mobile/README.md b/examples/mobile/README.md
similarity index 100%
rename from examples/demo/mobile/README.md
rename to examples/mobile/README.md
diff --git a/examples/demo/mobile/clippy.toml b/examples/mobile/clippy.toml
similarity index 100%
rename from examples/demo/mobile/clippy.toml
rename to examples/mobile/clippy.toml
diff --git a/examples/mobile/src/main.rs b/examples/mobile/src/main.rs
new file mode 100644
index 0000000..e830a8c
--- /dev/null
+++ b/examples/mobile/src/main.rs
@@ -0,0 +1,3 @@
+fn main() {
+    dioxus::launch(caretta_sync_example_core::ui::plain::App);
+}
\ No newline at end of file