diff --git a/Cargo.toml b/Cargo.toml
index 3fbb9b5..234b968 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "caretta"
+name = "caretta-sync"
 edition.workspace = true
 version.workspace = true
 description.workspace = true
@@ -7,21 +7,22 @@ license.workspace = true
 repository.workspace = true
 
 [features]
-default = []
-mobile = ["dep:caretta-mobile"]
-desktop = ["dep:caretta-desktop"]
-test = ["caretta-core/test"]
+default = ["dep:caretta-sync-macros"]
+mobile = ["dep:caretta-sync-mobile"]
+desktop = ["dep:caretta-sync-cli"]
+test = ["caretta-sync-core/test"]
 
 [dependencies]
-caretta-core.workspace = true
-caretta-desktop = { path="desktop", optional = true }
-caretta-mobile = { path = "mobile", optional = true }
+caretta-sync-core.workspace = true
+caretta-sync-cli = { path="cli", optional = true }
+caretta-sync-mobile = { path = "mobile", optional = true }
+caretta-sync-macros = { path="macros", optional = true}
 
 [dev-dependencies]
-caretta-core = {workspace = true, features = ["test"]}
+caretta-sync-core = {workspace = true, features = ["test"]}
 
 [workspace]
-members = [ ".", "core", "core/macros", "desktop", "mobile", "examples/*" ]
+members = [ ".", "core", "macros", "cli", "mobile", "examples/demo/*" ]
 resolver = "3"
 
 [workspace.package]
@@ -36,7 +37,7 @@ chrono = "0.4.41"
 ciborium = "0.2.2"
 clap = { version = "4.5.38", features = ["derive"] }
 dioxus = { version = "0.6.0", features = [] }
-caretta-core.path = "core"
+caretta-sync-core.path = "core"
 libp2p = { version = "0.55.0", features = ["macros", "mdns", "noise", "ping", "tcp", "tokio", "yamux" ] }
 sea-orm = { version = "1.1.11", features = ["sqlx-sqlite", "runtime-tokio-native-tls", "macros", "with-chrono", "with-uuid"] } 
 sea-orm-migration = { version = "1.1.0", features = ["runtime-tokio-rustls", "sqlx-postgres"] }
diff --git a/desktop/Cargo.toml b/cli/Cargo.toml
similarity index 66%
rename from desktop/Cargo.toml
rename to cli/Cargo.toml
index 4fa7c98..17007f8 100644
--- a/desktop/Cargo.toml
+++ b/cli/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "caretta-desktop"
+name = "caretta-sync-cli"
 edition.workspace = true
 version.workspace = true
 description.workspace = true
@@ -8,13 +8,13 @@ repository.workspace = true
 
 [features]
 default = []
-test = ["caretta-core/test"]
+test = ["caretta-sync-core/test"]
 
 [dependencies]
 ciborium.workspace = true
 clap.workspace = true
 dirs = "6.0.0"
-caretta-core = { workspace = true, features = ["desktop"] }
+caretta-sync-core = { workspace = true, features = ["cli"] }
 libp2p.workspace = true
 sea-orm.workspace = true
 serde.workspace = true
@@ -25,7 +25,5 @@ tonic.workspace = true
 uuid.workspace = true
 
 [dev-dependencies]
-caretta-core = {workspace = true, features = ["test"]}
+caretta-sync-core = {workspace = true, features = ["test"]}
 
-[build-dependencies]
-tonic-prost-build = "0.14.0"
diff --git a/desktop/src/cli/args/config.rs b/cli/src/cli/args/config.rs
similarity index 99%
rename from desktop/src/cli/args/config.rs
rename to cli/src/cli/args/config.rs
index f7ea178..515ebfa 100644
--- a/desktop/src/cli/args/config.rs
+++ b/cli/src/cli/args/config.rs
@@ -1,7 +1,7 @@
 use std::{net::IpAddr, path::PathBuf, sync::LazyLock};
 
 use clap::Args;
-use caretta_core::{
+use caretta_sync_core::{
     config::{Config, ConfigError, PartialConfig, PartialP2pConfig, PartialStorageConfig},
     utils::{emptiable::Emptiable, mergeable::Mergeable}
 };
diff --git a/desktop/src/cli/args/device.rs b/cli/src/cli/args/device.rs
similarity index 100%
rename from desktop/src/cli/args/device.rs
rename to cli/src/cli/args/device.rs
diff --git a/desktop/src/cli/args/mod.rs b/cli/src/cli/args/mod.rs
similarity index 100%
rename from desktop/src/cli/args/mod.rs
rename to cli/src/cli/args/mod.rs
diff --git a/desktop/src/cli/args/peer.rs b/cli/src/cli/args/peer.rs
similarity index 100%
rename from desktop/src/cli/args/peer.rs
rename to cli/src/cli/args/peer.rs
diff --git a/desktop/src/cli/config/check.rs b/cli/src/cli/config/check.rs
similarity index 86%
rename from desktop/src/cli/config/check.rs
rename to cli/src/cli/config/check.rs
index bd4c94d..302f20e 100644
--- a/desktop/src/cli/config/check.rs
+++ b/cli/src/cli/config/check.rs
@@ -1,5 +1,5 @@
 use clap::Args;
-use caretta_core::utils::runnable::Runnable;
+use caretta_sync_core::utils::runnable::Runnable;
 use crate::cli::ConfigArgs;
 
 #[derive(Debug, Args)]
diff --git a/desktop/src/cli/config/list.rs b/cli/src/cli/config/list.rs
similarity index 88%
rename from desktop/src/cli/config/list.rs
rename to cli/src/cli/config/list.rs
index 5cce721..e80bbac 100644
--- a/desktop/src/cli/config/list.rs
+++ b/cli/src/cli/config/list.rs
@@ -1,5 +1,5 @@
 use clap::Args;
-use caretta_core::{config::PartialConfig, utils::runnable::Runnable};
+use caretta_sync_core::{config::PartialConfig, utils::runnable::Runnable};
 use crate::cli::ConfigArgs;
 
 #[derive(Debug, Args)]
diff --git a/desktop/src/cli/config/mod.rs b/cli/src/cli/config/mod.rs
similarity index 93%
rename from desktop/src/cli/config/mod.rs
rename to cli/src/cli/config/mod.rs
index 6b740f8..09abbd0 100644
--- a/desktop/src/cli/config/mod.rs
+++ b/cli/src/cli/config/mod.rs
@@ -4,7 +4,7 @@ mod list;
 pub use check::*;
 pub use list::*;
 
-use caretta_core::utils::runnable::Runnable;
+use caretta_sync_core::utils::runnable::Runnable;
 use clap::{Args, Subcommand};
 
 
diff --git a/desktop/src/cli/device/add.rs b/cli/src/cli/device/add.rs
similarity index 88%
rename from desktop/src/cli/device/add.rs
rename to cli/src/cli/device/add.rs
index 105ef46..5663d65 100644
--- a/desktop/src/cli/device/add.rs
+++ b/cli/src/cli/device/add.rs
@@ -1,5 +1,5 @@
 use clap::Args;
-use caretta_core::utils::runnable::Runnable;
+use caretta_sync_core::utils::runnable::Runnable;
 
 use crate::cli::ConfigArgs;
 
diff --git a/desktop/src/cli/device/list.rs b/cli/src/cli/device/list.rs
similarity index 84%
rename from desktop/src/cli/device/list.rs
rename to cli/src/cli/device/list.rs
index 83d35ce..36f92ea 100644
--- a/desktop/src/cli/device/list.rs
+++ b/cli/src/cli/device/list.rs
@@ -1,5 +1,5 @@
 use clap::Args;
-use caretta_core::utils::runnable::Runnable;
+use caretta_sync_core::utils::runnable::Runnable;
 use crate::cli::ConfigArgs;
 
 #[derive(Debug, Args)]
diff --git a/desktop/src/cli/device/mod.rs b/cli/src/cli/device/mod.rs
similarity index 95%
rename from desktop/src/cli/device/mod.rs
rename to cli/src/cli/device/mod.rs
index 1cbfdf9..a8237b3 100644
--- a/desktop/src/cli/device/mod.rs
+++ b/cli/src/cli/device/mod.rs
@@ -5,7 +5,7 @@ mod remove;
 mod scan;
 
 pub use add::DeviceAddCommandArgs;
-use caretta_core::utils::runnable::Runnable;
+use caretta_sync_core::utils::runnable::Runnable;
 use libp2p::{Multiaddr, PeerId};
 pub use list::DeviceListCommandArgs;
 pub use ping::DevicePingCommandArgs;
diff --git a/desktop/src/cli/device/ping.rs b/cli/src/cli/device/ping.rs
similarity index 86%
rename from desktop/src/cli/device/ping.rs
rename to cli/src/cli/device/ping.rs
index f661765..3efe588 100644
--- a/desktop/src/cli/device/ping.rs
+++ b/cli/src/cli/device/ping.rs
@@ -1,5 +1,5 @@
 use clap::Args;
-use caretta_core::utils::runnable::Runnable;
+use caretta_sync_core::utils::runnable::Runnable;
 use crate::cli::{ConfigArgs, PeerArgs};
 
 #[derive(Debug, Args)]
diff --git a/desktop/src/cli/device/remove.rs b/cli/src/cli/device/remove.rs
similarity index 86%
rename from desktop/src/cli/device/remove.rs
rename to cli/src/cli/device/remove.rs
index 67d28a4..cebb145 100644
--- a/desktop/src/cli/device/remove.rs
+++ b/cli/src/cli/device/remove.rs
@@ -1,5 +1,5 @@
 use clap::Args;
-use caretta_core::utils::runnable::Runnable;
+use caretta_sync_core::utils::runnable::Runnable;
 use crate::cli::{ConfigArgs, DeviceArgs};
 
 #[derive(Debug, Args)]
diff --git a/desktop/src/cli/device/scan.rs b/cli/src/cli/device/scan.rs
similarity index 84%
rename from desktop/src/cli/device/scan.rs
rename to cli/src/cli/device/scan.rs
index b470f0d..adcd173 100644
--- a/desktop/src/cli/device/scan.rs
+++ b/cli/src/cli/device/scan.rs
@@ -1,5 +1,5 @@
 use clap::Args;
-use caretta_core::utils::runnable::Runnable;
+use caretta_sync_core::utils::runnable::Runnable;
 use crate::cli::ConfigArgs;
 
 #[derive(Debug, Args)]
diff --git a/desktop/src/cli/logs.rs b/cli/src/cli/logs.rs
similarity index 82%
rename from desktop/src/cli/logs.rs
rename to cli/src/cli/logs.rs
index 2392ec5..c0bfff0 100644
--- a/desktop/src/cli/logs.rs
+++ b/cli/src/cli/logs.rs
@@ -1,4 +1,4 @@
-use caretta_core::utils::runnable::Runnable;
+use caretta_sync_core::utils::runnable::Runnable;
 use clap::Args;
 
 #[derive(Args, Debug)]
diff --git a/desktop/src/cli/mod.rs b/cli/src/cli/mod.rs
similarity index 100%
rename from desktop/src/cli/mod.rs
rename to cli/src/cli/mod.rs
diff --git a/desktop/src/cli/peer/info.rs b/cli/src/cli/peer/info.rs
similarity index 86%
rename from desktop/src/cli/peer/info.rs
rename to cli/src/cli/peer/info.rs
index 14dc443..5ca2858 100644
--- a/desktop/src/cli/peer/info.rs
+++ b/cli/src/cli/peer/info.rs
@@ -1,5 +1,5 @@
 use clap::Args;
-use caretta_core::utils::runnable::Runnable;
+use caretta_sync_core::utils::runnable::Runnable;
 use crate::cli::{ConfigArgs, PeerArgs};
 
 #[derive(Debug, Args)]
diff --git a/desktop/src/cli/peer/list.rs b/cli/src/cli/peer/list.rs
similarity index 100%
rename from desktop/src/cli/peer/list.rs
rename to cli/src/cli/peer/list.rs
diff --git a/desktop/src/cli/peer/mod.rs b/cli/src/cli/peer/mod.rs
similarity index 100%
rename from desktop/src/cli/peer/mod.rs
rename to cli/src/cli/peer/mod.rs
diff --git a/desktop/src/cli/peer/ping.rs b/cli/src/cli/peer/ping.rs
similarity index 86%
rename from desktop/src/cli/peer/ping.rs
rename to cli/src/cli/peer/ping.rs
index f9dd95e..7f85ad0 100644
--- a/desktop/src/cli/peer/ping.rs
+++ b/cli/src/cli/peer/ping.rs
@@ -1,5 +1,5 @@
 use clap::Args;
-use caretta_core::utils::runnable::Runnable;
+use caretta_sync_core::utils::runnable::Runnable;
 use crate::cli::{ConfigArgs, PeerArgs};
 
 #[derive(Debug, Args)]
diff --git a/desktop/src/cli/serve.rs b/cli/src/cli/serve.rs
similarity index 81%
rename from desktop/src/cli/serve.rs
rename to cli/src/cli/serve.rs
index 132baf4..77d6e61 100644
--- a/desktop/src/cli/serve.rs
+++ b/cli/src/cli/serve.rs
@@ -1,7 +1,7 @@
 use std::marker::PhantomData;
 
 use clap::Args;
-use caretta_core::{config::Config, data::migration::DataMigrator, global::{CONFIG, DATABASE_CONNECTIONS}, server::ServerTrait, utils::runnable::Runnable};
+use caretta_sync_core::{config::Config, data::migration::DataMigrator, global::{CONFIG, DATABASE_CONNECTIONS}, server::ServerTrait, utils::runnable::Runnable};
 use libp2p::{noise, ping, swarm::{NetworkBehaviour, SwarmEvent}, tcp, yamux, Swarm};
 
 use super::ConfigArgs;
diff --git a/desktop/src/lib.rs b/cli/src/lib.rs
similarity index 100%
rename from desktop/src/lib.rs
rename to cli/src/lib.rs
diff --git a/core/Cargo.toml b/core/Cargo.toml
index d24fe1c..3a4e839 100644
--- a/core/Cargo.toml
+++ b/core/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "caretta-core"
+name = "caretta-sync-core"
 edition.workspace = true
 version.workspace = true
 description.workspace = true
@@ -8,14 +8,11 @@ repository.workspace = true
 
 [features]
 default = []
-desktop = ["dep:clap", "macros"]
-mobile = ["macros"]
-macros = ["dep:caretta-macros"]
-test = ["dep:tempfile", "macros"]
+cli = ["dep:clap"]
+test = ["dep:tempfile", ]
 
 [dependencies]
 base64 = "0.22.1"
-caretta-macros = { path = "macros", optional = true }
 chrono.workspace = true
 chrono-tz = "0.10.3"
 ciborium.workspace = true
diff --git a/core/build.rs b/core/build.rs
index 72633c6..c8a4f87 100644
--- a/core/build.rs
+++ b/core/build.rs
@@ -1,4 +1,4 @@
 fn main() -> Result<(), Box<dyn std::error::Error>> {
-    tonic_prost_build::compile_protos("proto/caretta.proto")?;
+    tonic_prost_build::compile_protos("proto/caretta_sync.proto")?;
     Ok(())
 }
\ No newline at end of file
diff --git a/core/proto/caretta.proto b/core/proto/caretta_sync.proto
similarity index 96%
rename from core/proto/caretta.proto
rename to core/proto/caretta_sync.proto
index 8058d4d..72dcec1 100644
--- a/core/proto/caretta.proto
+++ b/core/proto/caretta_sync.proto
@@ -1,5 +1,5 @@
 syntax = "proto3";
-package caretta;
+package caretta_sync;
 import "google/protobuf/timestamp.proto";
 
 enum PeerListOrderBy {
diff --git a/core/src/data/syncable.rs b/core/src/data/syncable.rs
index 6bdfa60..8096960 100644
--- a/core/src/data/syncable.rs
+++ b/core/src/data/syncable.rs
@@ -1,6 +1,6 @@
 use sea_orm::{prelude::*, query::*, sea_query::SimpleExpr, *};
 #[cfg(feature="macros")]
-pub use caretta_macros::SyncableModel;
+pub use caretta_sync_macros::SyncableModel;
 pub trait SyncableModel: ModelTrait<Entity = Self::SyncableEntity> {
     type SyncableEntity: SyncableEntity<SyncableModel = Self>;
     fn get_timestamp(&self) -> DateTimeUtc;
diff --git a/core/src/error.rs b/core/src/error.rs
index 6cd9e76..e1836cf 100644
--- a/core/src/error.rs
+++ b/core/src/error.rs
@@ -28,7 +28,7 @@ pub enum Error {
     Noise(#[from] libp2p::noise::Error),
     #[error("Parse OsString error: {0:?}")]
     OsStringConvert(std::ffi::OsString),
-    #[cfg(feature="desktop")]
+    #[cfg(feature="cli")]
     #[error("Parse args error: {0}")]
     ParseCommand(#[from] clap::Error),
     #[error("toml deserialization error: {0}")]
diff --git a/core/src/proto/mod.rs b/core/src/proto/mod.rs
index db05f66..6e7bbd4 100644
--- a/core/src/proto/mod.rs
+++ b/core/src/proto/mod.rs
@@ -1,5 +1,5 @@
 mod cached_address;
 mod cached_peer;
 
-tonic::include_proto!("caretta");
+tonic::include_proto!("caretta_sync");
 
diff --git a/core/src/utils/emptiable.rs b/core/src/utils/emptiable.rs
index a696e5e..6735242 100644
--- a/core/src/utils/emptiable.rs
+++ b/core/src/utils/emptiable.rs
@@ -1,6 +1,6 @@
 use std::collections::{HashMap, HashSet};
 #[cfg(feature="macros")]
-pub use caretta_macros::Emptiable;
+pub use caretta_sync_macros::Emptiable;
 
 pub trait Emptiable{
     fn empty() -> Self;
diff --git a/core/src/utils/mergeable.rs b/core/src/utils/mergeable.rs
index 3a9bfcc..c743a84 100644
--- a/core/src/utils/mergeable.rs
+++ b/core/src/utils/mergeable.rs
@@ -1,5 +1,5 @@
 #[cfg(feature="macros")]
-pub use caretta_macros::Mergeable;
+pub use caretta_sync_macros::Mergeable;
 pub trait Mergeable: Sized {
     fn merge(&mut self, other: Self);
 }
\ No newline at end of file
diff --git a/core/src/utils/mod.rs b/core/src/utils/mod.rs
index dab2f02..1f0e729 100644
--- a/core/src/utils/mod.rs
+++ b/core/src/utils/mod.rs
@@ -10,7 +10,7 @@ pub mod runnable;
 /// use chrono::Utc;
 /// use std::time::SystemTime;
 /// use prost_types::Timestamp;
-/// use caretta_core::utils::utc_to_timestamp;
+/// use caretta_sync_core::utils::utc_to_timestamp;
 /// 
 /// let now_utc = Utc::now();
 /// let now_timestamp = utc_to_timestamp(&now_utc);
@@ -27,7 +27,7 @@ pub fn utc_to_timestamp(utc: &DateTime<Utc>) -> Timestamp {
 /// ```
 /// use std::time::SystemTime;
 /// use prost_types::Timestamp;
-/// use caretta_core::utils::timestamp_to_utc;
+/// use caretta_sync_core::utils::timestamp_to_utc;
 ///  
 /// let now_timestamp = Timestamp::from(SystemTime::now());
 /// let now_utc = timestamp_to_utc(&now_timestamp);
diff --git a/core/src/utils/runnable.rs b/core/src/utils/runnable.rs
index 6c537a1..92486f5 100644
--- a/core/src/utils/runnable.rs
+++ b/core/src/utils/runnable.rs
@@ -1,5 +1,5 @@
 #[cfg(feature="macros")]
-pub use caretta_macros::Runnable;
+pub use caretta_sync_macros::Runnable;
 
 pub trait Runnable {
     async fn run(self, app_name: &'static str);
diff --git a/examples/core/src/global.rs b/examples/core/src/global.rs
deleted file mode 100644
index 14d3e83..0000000
--- a/examples/core/src/global.rs
+++ /dev/null
@@ -1 +0,0 @@
-pub const APP_NAME: &str = "caretta_demo";
diff --git a/examples/core/Cargo.toml b/examples/demo/core/Cargo.toml
similarity index 81%
rename from examples/core/Cargo.toml
rename to examples/demo/core/Cargo.toml
index 4eb11a1..86b5e96 100644
--- a/examples/core/Cargo.toml
+++ b/examples/demo/core/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "caretta-example-core"
+name = "caretta-sync-demo-core"
 edition.workspace = true
 version.workspace = true
 description.workspace = true
@@ -7,7 +7,7 @@ license.workspace = true
 repository.workspace = true
 
 [dependencies]
-caretta.path = "../.."
+caretta-sync.path = "../../.."
 libp2p.workspace = true
 tokio.workspace = true
 tokio-stream = { version = "0.1.17", features = ["net"] }
diff --git a/examples/demo/core/src/global.rs b/examples/demo/core/src/global.rs
new file mode 100644
index 0000000..918f245
--- /dev/null
+++ b/examples/demo/core/src/global.rs
@@ -0,0 +1 @@
+pub const APP_NAME: &str = "caretta_sync_demo";
diff --git a/examples/core/src/lib.rs b/examples/demo/core/src/lib.rs
similarity index 100%
rename from examples/core/src/lib.rs
rename to examples/demo/core/src/lib.rs
diff --git a/examples/core/src/rpc/mod.rs b/examples/demo/core/src/rpc/mod.rs
similarity index 100%
rename from examples/core/src/rpc/mod.rs
rename to examples/demo/core/src/rpc/mod.rs
diff --git a/examples/core/src/rpc/server.rs b/examples/demo/core/src/rpc/server.rs
similarity index 100%
rename from examples/core/src/rpc/server.rs
rename to examples/demo/core/src/rpc/server.rs
diff --git a/examples/core/src/server.rs b/examples/demo/core/src/server.rs
similarity index 100%
rename from examples/core/src/server.rs
rename to examples/demo/core/src/server.rs
diff --git a/examples/demo/desktop/Cargo.toml b/examples/demo/desktop/Cargo.toml
new file mode 100644
index 0000000..7e0f6c1
--- /dev/null
+++ b/examples/demo/desktop/Cargo.toml
@@ -0,0 +1,17 @@
+[package]
+name = "caretta-sync-demo-desktop"
+edition.workspace = true
+version.workspace = true
+description.workspace = true
+license.workspace = true
+repository.workspace = true
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[dependencies]
+clap.workspace = true
+caretta-sync = { path = "../../..", features = ["desktop", "test"] }
+caretta-sync-demo-core.path = "../core"
+libp2p.workspace = true
+tokio.workspace = true
+
diff --git a/examples/desktop/Dioxus.toml b/examples/demo/desktop/Dioxus.toml
similarity index 100%
rename from examples/desktop/Dioxus.toml
rename to examples/demo/desktop/Dioxus.toml
diff --git a/examples/desktop/README.md b/examples/demo/desktop/README.md
similarity index 100%
rename from examples/desktop/README.md
rename to examples/demo/desktop/README.md
diff --git a/examples/desktop/clippy.toml b/examples/demo/desktop/clippy.toml
similarity index 100%
rename from examples/desktop/clippy.toml
rename to examples/demo/desktop/clippy.toml
diff --git a/examples/desktop/src/cli/mod.rs b/examples/demo/desktop/src/cli/mod.rs
similarity index 89%
rename from examples/desktop/src/cli/mod.rs
rename to examples/demo/desktop/src/cli/mod.rs
index b4f8f08..e72870b 100644
--- a/examples/desktop/src/cli/mod.rs
+++ b/examples/demo/desktop/src/cli/mod.rs
@@ -1,4 +1,4 @@
-use caretta_example_core::server::Server;
+use caretta_sync_example_core::server::Server;
 use clap::{Parser, Subcommand};
 use caretta::{cli::*, utils::runnable::Runnable};
 
diff --git a/examples/desktop/src/ipc.rs b/examples/demo/desktop/src/ipc.rs
similarity index 100%
rename from examples/desktop/src/ipc.rs
rename to examples/demo/desktop/src/ipc.rs
diff --git a/examples/desktop/src/main.rs b/examples/demo/desktop/src/main.rs
similarity index 79%
rename from examples/desktop/src/main.rs
rename to examples/demo/desktop/src/main.rs
index 3162608..ad06129 100644
--- a/examples/desktop/src/main.rs
+++ b/examples/demo/desktop/src/main.rs
@@ -1,5 +1,5 @@
 use caretta::utils::runnable::Runnable;
-use caretta_example_core::global::APP_NAME;
+use caretta_sync_example_core::global::APP_NAME;
 use clap::Parser;
 
 use crate::cli::Cli;
diff --git a/examples/desktop/src/message.rs b/examples/demo/desktop/src/message.rs
similarity index 100%
rename from examples/desktop/src/message.rs
rename to examples/demo/desktop/src/message.rs
diff --git a/examples/demo/mobile/Cargo.toml b/examples/demo/mobile/Cargo.toml
new file mode 100644
index 0000000..52c98cd
--- /dev/null
+++ b/examples/demo/mobile/Cargo.toml
@@ -0,0 +1,10 @@
+[package]
+name = "caretta-sync-demo-mobile"
+edition.workspace = true
+version.workspace = true
+description.workspace = true
+license.workspace = true
+repository.workspace = true
+
+[dependencies]
+caretta-sync-demo-core.path = "../core"
diff --git a/examples/mobile/Dioxus.toml b/examples/demo/mobile/Dioxus.toml
similarity index 100%
rename from examples/mobile/Dioxus.toml
rename to examples/demo/mobile/Dioxus.toml
diff --git a/examples/mobile/README.md b/examples/demo/mobile/README.md
similarity index 100%
rename from examples/mobile/README.md
rename to examples/demo/mobile/README.md
diff --git a/examples/mobile/clippy.toml b/examples/demo/mobile/clippy.toml
similarity index 100%
rename from examples/mobile/clippy.toml
rename to examples/demo/mobile/clippy.toml
diff --git a/examples/demo/mobile/src/main.rs b/examples/demo/mobile/src/main.rs
new file mode 100644
index 0000000..9939e5a
--- /dev/null
+++ b/examples/demo/mobile/src/main.rs
@@ -0,0 +1,3 @@
+fn main() {
+    dioxus::launch(caretta_sync_examples_core::ui::plain::App);
+}
\ No newline at end of file
diff --git a/examples/desktop/Cargo.toml b/examples/desktop/Cargo.toml
deleted file mode 100644
index 2579344..0000000
--- a/examples/desktop/Cargo.toml
+++ /dev/null
@@ -1,14 +0,0 @@
-[package]
-name = "caretta-example-desktop"
-version = "0.1.0"
-edition = "2021"
-
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
-
-[dependencies]
-clap.workspace = true
-caretta = { path = "../..", features = ["desktop", "test"] }
-caretta-example-core.path = "../core"
-libp2p.workspace = true
-tokio.workspace = true
-
diff --git a/examples/mobile/Cargo.toml b/examples/mobile/Cargo.toml
deleted file mode 100644
index 9682ac8..0000000
--- a/examples/mobile/Cargo.toml
+++ /dev/null
@@ -1,9 +0,0 @@
-[package]
-name = "caretta-example-mobile"
-version = "0.1.0"
-authors = ["fluo10 <fluo10.dev@fireturtle.net>"]
-edition = "2021"
-
-[dependencies]
-dioxus.workspace = true
-caretta-example-core.path = "../core"
diff --git a/examples/mobile/src/main.rs b/examples/mobile/src/main.rs
deleted file mode 100644
index 9cd4fed..0000000
--- a/examples/mobile/src/main.rs
+++ /dev/null
@@ -1,3 +0,0 @@
-fn main() {
-    dioxus::launch(caretta_examples_core::ui::plain::App);
-}
\ No newline at end of file
diff --git a/core/macros/Cargo.toml b/macros/Cargo.toml
similarity index 86%
rename from core/macros/Cargo.toml
rename to macros/Cargo.toml
index 4389f32..56d0435 100644
--- a/core/macros/Cargo.toml
+++ b/macros/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "caretta-macros"
+name = "caretta-sync-macros"
 edition.workspace = true
 version.workspace = true
 description.workspace = true
@@ -17,7 +17,7 @@ syn = { version = "2.0.104", features = ["full"] }
 
 [dev-dependencies]
 chrono.workspace = true
-caretta-core.workspace = true
+caretta-sync-core.workspace = true
 sea-orm.workspace = true
 tokio.workspace = true
 uuid.workspace = true
\ No newline at end of file
diff --git a/core/macros/src/derive.rs b/macros/src/derive.rs
similarity index 100%
rename from core/macros/src/derive.rs
rename to macros/src/derive.rs
diff --git a/core/macros/src/lib.rs b/macros/src/lib.rs
similarity index 100%
rename from core/macros/src/lib.rs
rename to macros/src/lib.rs
diff --git a/core/macros/tests/derive_emptiable.rs b/macros/tests/derive_emptiable.rs
similarity index 84%
rename from core/macros/tests/derive_emptiable.rs
rename to macros/tests/derive_emptiable.rs
index 7bea266..6e94f1f 100644
--- a/core/macros/tests/derive_emptiable.rs
+++ b/macros/tests/derive_emptiable.rs
@@ -1,7 +1,7 @@
 use std::collections::{HashMap, HashSet};
 
-use caretta_core::utils::emptiable::Emptiable;
-use caretta_macros::Emptiable;
+use caretta_sync_core::utils::emptiable::Emptiable;
+use caretta_sync_macros::Emptiable;
 
 #[derive(Debug, PartialEq, Emptiable)]
 struct EmptiableStruct{
diff --git a/core/macros/tests/derive_mergeable.rs b/macros/tests/derive_mergeable.rs
similarity index 89%
rename from core/macros/tests/derive_mergeable.rs
rename to macros/tests/derive_mergeable.rs
index 7505306..0daf982 100644
--- a/core/macros/tests/derive_mergeable.rs
+++ b/macros/tests/derive_mergeable.rs
@@ -1,7 +1,7 @@
 use std::collections::{HashMap, HashSet};
 
-use caretta_core::utils::mergeable::Mergeable;
-use caretta_macros::Mergeable;
+use caretta_sync_core::utils::mergeable::Mergeable;
+use caretta_sync_macros::Mergeable;
 
 #[derive(Clone, Debug, PartialEq, Mergeable)]
 struct MergeableStruct {
diff --git a/core/macros/tests/derive_runnable.rs b/macros/tests/derive_runnable.rs
similarity index 86%
rename from core/macros/tests/derive_runnable.rs
rename to macros/tests/derive_runnable.rs
index cac6091..512ed71 100644
--- a/core/macros/tests/derive_runnable.rs
+++ b/macros/tests/derive_runnable.rs
@@ -1,5 +1,5 @@
-use caretta_core::utils::runnable::Runnable;
-use caretta_macros::Runnable;
+use caretta_sync_core::utils::runnable::Runnable;
+use caretta_sync_macros::Runnable;
 
 struct RunnableStruct1;
 
diff --git a/core/macros/tests/derive_syncable.rs b/macros/tests/derive_syncable.rs
similarity index 90%
rename from core/macros/tests/derive_syncable.rs
rename to macros/tests/derive_syncable.rs
index 2bdbb19..1278081 100644
--- a/core/macros/tests/derive_syncable.rs
+++ b/macros/tests/derive_syncable.rs
@@ -6,8 +6,8 @@ use sea_orm::{
         prelude::*
     }
 };
-use caretta_core::data::syncable::*;
-use caretta_macros::SyncableModel;
+use caretta_sync_core::data::syncable::*;
+use caretta_sync_macros::SyncableModel;
 
 #[derive(Clone, Debug, PartialEq, DeriveEntityModel, SyncableModel)]
 #[sea_orm(table_name = "syncable")]
diff --git a/mobile/Cargo.toml b/mobile/Cargo.toml
index 3e3cf00..eeb443e 100644
--- a/mobile/Cargo.toml
+++ b/mobile/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "caretta-mobile"
+name = "caretta-sync-mobile"
 edition.workspace = true
 version.workspace = true
 description.workspace = true
@@ -8,7 +8,7 @@ repository.workspace = true
 
 [features]
 default = []
-test = ["caretta-core/test"]
+test = ["caretta-sync-core/test"]
 
 [dependencies]
-caretta-core.workspace = true
\ No newline at end of file
+caretta-sync-core.workspace = true
\ No newline at end of file
diff --git a/src/lib.rs b/src/lib.rs
index ebb0f03..0641085 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -1,5 +1,5 @@
-pub use caretta_core::*;
+pub use caretta_sync_core::*;
 #[cfg(feature = "desktop")]
-pub use caretta_desktop::*;
+pub use caretta_sync_desktop::*;
 #[cfg(feature = "mobile")]
-pub use caretta_mobile::*;
\ No newline at end of file
+pub use caretta_sync_mobile::*;
\ No newline at end of file