diff --git a/Cargo.lock b/Cargo.lock
index ec74551..d592846 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -294,7 +294,7 @@ version = "0.1.0"
 dependencies = [
  "library",
  "mimalloc",
- "system",
+ "server",
  "tokio",
 ]
 
@@ -2008,6 +2008,31 @@ dependencies = [
  "serde",
 ]
 
+[[package]]
+name = "server"
+version = "0.1.0"
+dependencies = [
+ "axum",
+ "axum-extra",
+ "chrono",
+ "derive",
+ "domain",
+ "error-stack",
+ "futures-executor",
+ "i18n",
+ "lazy_static",
+ "library",
+ "moka",
+ "reqwest",
+ "sqlx",
+ "tokio",
+ "tokio-cron-scheduler",
+ "tower 0.5.1",
+ "tower-http",
+ "tracing",
+ "validator",
+]
+
 [[package]]
 name = "sha1"
 version = "0.10.6"
@@ -2390,31 +2415,6 @@ version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a7065abeca94b6a8a577f9bd45aa0867a2238b74e8eb67cf10d492bc39351394"
 
-[[package]]
-name = "system"
-version = "0.1.0"
-dependencies = [
- "axum",
- "axum-extra",
- "chrono",
- "derive",
- "domain",
- "error-stack",
- "futures-executor",
- "i18n",
- "lazy_static",
- "library",
- "moka",
- "reqwest",
- "sqlx",
- "tokio",
- "tokio-cron-scheduler",
- "tower 0.5.1",
- "tower-http",
- "tracing",
- "validator",
-]
-
 [[package]]
 name = "system-configuration"
 version = "0.5.1"
diff --git a/Cargo.toml b/Cargo.toml
index aa552c4..ccf9001 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -4,7 +4,7 @@ version = "0.1.0"
 edition = "2021"
 
 [workspace]
-members = [".", "system", "domain", "i18n","library", "derive"]
+members = [".", "server", "domain", "i18n","library", "derive"]
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
@@ -12,7 +12,7 @@ members = [".", "system", "domain", "i18n","library", "derive"]
 tokio = { workspace = true, features = ["full"]}
 mimalloc = { workspace = true }
 
-system = { path = "system" }
+server = { path = "server" }
 library = { path = "library" }
 
 [workspace.dependencies]
diff --git a/system/Cargo.toml b/server/Cargo.toml
similarity index 94%
rename from system/Cargo.toml
rename to server/Cargo.toml
index 71df540..b608e53 100644
--- a/system/Cargo.toml
+++ b/server/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "system"
+name = "server"
 version = "0.1.0"
 edition = "2021"
 
diff --git a/system/src/controller/account_controller.rs b/server/src/controller/account_controller.rs
similarity index 100%
rename from system/src/controller/account_controller.rs
rename to server/src/controller/account_controller.rs
diff --git a/system/src/controller/feedback_controller.rs b/server/src/controller/feedback_controller.rs
similarity index 100%
rename from system/src/controller/feedback_controller.rs
rename to server/src/controller/feedback_controller.rs
diff --git a/system/src/controller/mod.rs b/server/src/controller/mod.rs
similarity index 100%
rename from system/src/controller/mod.rs
rename to server/src/controller/mod.rs
diff --git a/system/src/lib.rs b/server/src/lib.rs
similarity index 100%
rename from system/src/lib.rs
rename to server/src/lib.rs
diff --git a/system/src/service/account_service.rs b/server/src/service/account_service.rs
similarity index 100%
rename from system/src/service/account_service.rs
rename to server/src/service/account_service.rs
diff --git a/system/src/service/feedback_service.rs b/server/src/service/feedback_service.rs
similarity index 100%
rename from system/src/service/feedback_service.rs
rename to server/src/service/feedback_service.rs
diff --git a/system/src/service/mod.rs b/server/src/service/mod.rs
similarity index 100%
rename from system/src/service/mod.rs
rename to server/src/service/mod.rs
diff --git a/system/src/service/social_service.rs b/server/src/service/social_service.rs
similarity index 100%
rename from system/src/service/social_service.rs
rename to server/src/service/social_service.rs
diff --git a/system/src/service/sys_account_service.rs b/server/src/service/sys_account_service.rs
similarity index 100%
rename from system/src/service/sys_account_service.rs
rename to server/src/service/sys_account_service.rs
diff --git a/system/src/tasks/google_iap.rs b/server/src/tasks/google_iap.rs
similarity index 100%
rename from system/src/tasks/google_iap.rs
rename to server/src/tasks/google_iap.rs
diff --git a/system/src/tasks/mod.rs b/server/src/tasks/mod.rs
similarity index 100%
rename from system/src/tasks/mod.rs
rename to server/src/tasks/mod.rs