diff --git a/Cargo.toml b/Cargo.toml
index d79eb35..a960352 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -5,15 +5,15 @@
 [workspace]
 members = [
     "src/trx-server",
+    "src/trx-server/trx-backend",
+    "src/trx-server/trx-backend/trx-backend-ft817",
     "src/trx-client",
-    "src/trx-backend",
-    "src/trx-backend/src/trx-backend-ft817",
+    "src/trx-client/trx-frontend",
+    "src/trx-client/trx-frontend/trx-frontend-http",
+    "src/trx-client/trx-frontend/trx-frontend-http-json",
+    "src/trx-client/trx-frontend/trx-frontend-qt",
+    "src/trx-client/trx-frontend/trx-frontend-rigctl",
     "src/trx-core",
-    "src/trx-frontend",
-    "src/trx-frontend/src/trx-frontend-http",
-    "src/trx-frontend/src/trx-frontend-http-json",
-    "src/trx-frontend/src/trx-frontend-qt",
-    "src/trx-frontend/src/trx-frontend-rigctl",
 ]
 resolver = "2"
 
diff --git a/src/trx-client/Cargo.toml b/src/trx-client/Cargo.toml
index b3207ec..258a975 100644
--- a/src/trx-client/Cargo.toml
+++ b/src/trx-client/Cargo.toml
@@ -18,11 +18,11 @@ clap = { workspace = true, features = ["derive"] }
 dirs = "6"
 libloading = "0.8"
 trx-core = { path = "../trx-core" }
-trx-frontend = { path = "../trx-frontend" }
-trx-frontend-http = { path = "../trx-frontend/src/trx-frontend-http" }
-trx-frontend-http-json = { path = "../trx-frontend/src/trx-frontend-http-json" }
-trx-frontend-rigctl = { path = "../trx-frontend/src/trx-frontend-rigctl" }
-trx-frontend-qt = { path = "../trx-frontend/src/trx-frontend-qt", optional = true }
+trx-frontend = { path = "trx-frontend" }
+trx-frontend-http = { path = "trx-frontend/trx-frontend-http" }
+trx-frontend-http-json = { path = "trx-frontend/trx-frontend-http-json" }
+trx-frontend-rigctl = { path = "trx-frontend/trx-frontend-rigctl" }
+trx-frontend-qt = { path = "trx-frontend/trx-frontend-qt", optional = true }
 
 [features]
 default = []
diff --git a/src/trx-frontend/Cargo.toml b/src/trx-client/trx-frontend/Cargo.toml
similarity index 86%
rename from src/trx-frontend/Cargo.toml
rename to src/trx-client/trx-frontend/Cargo.toml
index 91f5058..b9bc996 100644
--- a/src/trx-frontend/Cargo.toml
+++ b/src/trx-client/trx-frontend/Cargo.toml
@@ -8,5 +8,5 @@ version = "0.1.0"
 edition = "2021"
 
 [dependencies]
-trx-core = { path = "../trx-core" }
+trx-core = { path = "../../trx-core" }
 tokio = { workspace = true, features = ["sync"] }
diff --git a/src/trx-frontend/src/lib.rs b/src/trx-client/trx-frontend/src/lib.rs
similarity index 100%
rename from src/trx-frontend/src/lib.rs
rename to src/trx-client/trx-frontend/src/lib.rs
diff --git a/src/trx-frontend/src/trx-frontend-http-json/Cargo.toml b/src/trx-client/trx-frontend/trx-frontend-http-json/Cargo.toml
similarity index 91%
rename from src/trx-frontend/src/trx-frontend-http-json/Cargo.toml
rename to src/trx-client/trx-frontend/trx-frontend-http-json/Cargo.toml
index d908f0f..d1ae922 100644
--- a/src/trx-frontend/src/trx-frontend-http-json/Cargo.toml
+++ b/src/trx-client/trx-frontend/trx-frontend-http-json/Cargo.toml
@@ -9,7 +9,7 @@ edition = "2021"
 
 [dependencies]
 trx-core = { path = "../../../trx-core" }
-trx-frontend = { path = "../.." }
+trx-frontend = { path = ".." }
 tokio = { workspace = true, features = ["full"] }
 serde_json = { workspace = true }
 tracing = { workspace = true }
diff --git a/src/trx-frontend/src/trx-frontend-http-json/src/lib.rs b/src/trx-client/trx-frontend/trx-frontend-http-json/src/lib.rs
similarity index 100%
rename from src/trx-frontend/src/trx-frontend-http-json/src/lib.rs
rename to src/trx-client/trx-frontend/trx-frontend-http-json/src/lib.rs
diff --git a/src/trx-frontend/src/trx-frontend-http-json/src/server.rs b/src/trx-client/trx-frontend/trx-frontend-http-json/src/server.rs
similarity index 100%
rename from src/trx-frontend/src/trx-frontend-http-json/src/server.rs
rename to src/trx-client/trx-frontend/trx-frontend-http-json/src/server.rs
diff --git a/src/trx-frontend/src/trx-frontend-http/Cargo.toml b/src/trx-client/trx-frontend/trx-frontend-http/Cargo.toml
similarity index 93%
rename from src/trx-frontend/src/trx-frontend-http/Cargo.toml
rename to src/trx-client/trx-frontend/trx-frontend-http/Cargo.toml
index 2730b13..0447dbe 100644
--- a/src/trx-frontend/src/trx-frontend-http/Cargo.toml
+++ b/src/trx-client/trx-frontend/trx-frontend-http/Cargo.toml
@@ -9,7 +9,7 @@ edition = "2021"
 
 [dependencies]
 trx-core = { path = "../../../trx-core" }
-trx-frontend = { path = "../.." }
+trx-frontend = { path = ".." }
 tokio = { workspace = true, features = ["full"] }
 serde = { workspace = true, features = ["derive"] }
 serde_json = { workspace = true }
diff --git a/src/trx-frontend/src/trx-frontend-http/assets/trx-favicon.png b/src/trx-client/trx-frontend/trx-frontend-http/assets/trx-favicon.png
similarity index 100%
rename from src/trx-frontend/src/trx-frontend-http/assets/trx-favicon.png
rename to src/trx-client/trx-frontend/trx-frontend-http/assets/trx-favicon.png
diff --git a/src/trx-frontend/src/trx-frontend-http/assets/trx-logo.png b/src/trx-client/trx-frontend/trx-frontend-http/assets/trx-logo.png
similarity index 100%
rename from src/trx-frontend/src/trx-frontend-http/assets/trx-logo.png
rename to src/trx-client/trx-frontend/trx-frontend-http/assets/trx-logo.png
diff --git a/src/trx-frontend/src/trx-frontend-http/src/api.rs b/src/trx-client/trx-frontend/trx-frontend-http/src/api.rs
similarity index 100%
rename from src/trx-frontend/src/trx-frontend-http/src/api.rs
rename to src/trx-client/trx-frontend/trx-frontend-http/src/api.rs
diff --git a/src/trx-frontend/src/trx-frontend-http/src/lib.rs b/src/trx-client/trx-frontend/trx-frontend-http/src/lib.rs
similarity index 100%
rename from src/trx-frontend/src/trx-frontend-http/src/lib.rs
rename to src/trx-client/trx-frontend/trx-frontend-http/src/lib.rs
diff --git a/src/trx-frontend/src/trx-frontend-http/src/server.rs b/src/trx-client/trx-frontend/trx-frontend-http/src/server.rs
similarity index 100%
rename from src/trx-frontend/src/trx-frontend-http/src/server.rs
rename to src/trx-client/trx-frontend/trx-frontend-http/src/server.rs
diff --git a/src/trx-frontend/src/trx-frontend-http/src/status.rs b/src/trx-client/trx-frontend/trx-frontend-http/src/status.rs
similarity index 100%
rename from src/trx-frontend/src/trx-frontend-http/src/status.rs
rename to src/trx-client/trx-frontend/trx-frontend-http/src/status.rs
diff --git a/src/trx-frontend/src/trx-frontend-qt/Cargo.toml b/src/trx-client/trx-frontend/trx-frontend-qt/Cargo.toml
similarity index 93%
rename from src/trx-frontend/src/trx-frontend-qt/Cargo.toml
rename to src/trx-client/trx-frontend/trx-frontend-qt/Cargo.toml
index d85ce16..7658b5a 100644
--- a/src/trx-frontend/src/trx-frontend-qt/Cargo.toml
+++ b/src/trx-client/trx-frontend/trx-frontend-qt/Cargo.toml
@@ -16,7 +16,7 @@ qt = ["dep:qmetaobject"]
 
 [dependencies]
 trx-core = { path = "../../../trx-core" }
-trx-frontend = { path = "../.." }
+trx-frontend = { path = ".." }
 tokio = { workspace = true, features = ["full"] }
 tracing = { workspace = true }
 
diff --git a/src/trx-frontend/src/trx-frontend-qt/REQUIREMENTS.md b/src/trx-client/trx-frontend/trx-frontend-qt/REQUIREMENTS.md
similarity index 100%
rename from src/trx-frontend/src/trx-frontend-qt/REQUIREMENTS.md
rename to src/trx-client/trx-frontend/trx-frontend-qt/REQUIREMENTS.md
diff --git a/src/trx-frontend/src/trx-frontend-qt/qml/Main.qml b/src/trx-client/trx-frontend/trx-frontend-qt/qml/Main.qml
similarity index 100%
rename from src/trx-frontend/src/trx-frontend-qt/qml/Main.qml
rename to src/trx-client/trx-frontend/trx-frontend-qt/qml/Main.qml
diff --git a/src/trx-frontend/src/trx-frontend-qt/src/lib.rs b/src/trx-client/trx-frontend/trx-frontend-qt/src/lib.rs
similarity index 100%
rename from src/trx-frontend/src/trx-frontend-qt/src/lib.rs
rename to src/trx-client/trx-frontend/trx-frontend-qt/src/lib.rs
diff --git a/src/trx-frontend/src/trx-frontend-qt/src/server.rs b/src/trx-client/trx-frontend/trx-frontend-qt/src/server.rs
similarity index 100%
rename from src/trx-frontend/src/trx-frontend-qt/src/server.rs
rename to src/trx-client/trx-frontend/trx-frontend-qt/src/server.rs
diff --git a/src/trx-frontend/src/trx-frontend-rigctl/Cargo.toml b/src/trx-client/trx-frontend/trx-frontend-rigctl/Cargo.toml
similarity index 90%
rename from src/trx-frontend/src/trx-frontend-rigctl/Cargo.toml
rename to src/trx-client/trx-frontend/trx-frontend-rigctl/Cargo.toml
index 00db285..bbab7c6 100644
--- a/src/trx-frontend/src/trx-frontend-rigctl/Cargo.toml
+++ b/src/trx-client/trx-frontend/trx-frontend-rigctl/Cargo.toml
@@ -11,4 +11,4 @@ edition = "2021"
 tokio = { workspace = true, features = ["full"] }
 tracing = { workspace = true }
 trx-core = { path = "../../../trx-core" }
-trx-frontend = { path = "../.." }
+trx-frontend = { path = ".." }
diff --git a/src/trx-frontend/src/trx-frontend-rigctl/src/lib.rs b/src/trx-client/trx-frontend/trx-frontend-rigctl/src/lib.rs
similarity index 100%
rename from src/trx-frontend/src/trx-frontend-rigctl/src/lib.rs
rename to src/trx-client/trx-frontend/trx-frontend-rigctl/src/lib.rs
diff --git a/src/trx-frontend/src/trx-frontend-rigctl/src/server.rs b/src/trx-client/trx-frontend/trx-frontend-rigctl/src/server.rs
similarity index 100%
rename from src/trx-frontend/src/trx-frontend-rigctl/src/server.rs
rename to src/trx-client/trx-frontend/trx-frontend-rigctl/src/server.rs
diff --git a/src/trx-server/Cargo.toml b/src/trx-server/Cargo.toml
index 4865381..36fe4fc 100644
--- a/src/trx-server/Cargo.toml
+++ b/src/trx-server/Cargo.toml
@@ -17,5 +17,5 @@ tracing-subscriber = { workspace = true }
 clap = { workspace = true, features = ["derive"] }
 dirs = "6"
 libloading = "0.8"
-trx-backend = { path = "../trx-backend" }
+trx-backend = { path = "trx-backend" }
 trx-core = { path = "../trx-core" }
diff --git a/src/trx-backend/Cargo.toml b/src/trx-server/trx-backend/Cargo.toml
similarity index 80%
rename from src/trx-backend/Cargo.toml
rename to src/trx-server/trx-backend/Cargo.toml
index e98231f..aea2cd6 100644
--- a/src/trx-backend/Cargo.toml
+++ b/src/trx-server/trx-backend/Cargo.toml
@@ -12,8 +12,8 @@ default = ["ft817"]
 ft817 = ["dep:trx-backend-ft817"]
 
 [dependencies]
-trx-core = { path = "../trx-core" }
-trx-backend-ft817 = { path = "src/trx-backend-ft817", optional = true }
+trx-core = { path = "../../trx-core" }
+trx-backend-ft817 = { path = "trx-backend-ft817", optional = true }
 tokio = { workspace = true, features = ["full"] }
 tokio-serial = { workspace = true }
 serde = { workspace = true, features = ["derive"] }
diff --git a/src/trx-backend/src/lib.rs b/src/trx-server/trx-backend/src/lib.rs
similarity index 100%
rename from src/trx-backend/src/lib.rs
rename to src/trx-server/trx-backend/src/lib.rs
diff --git a/src/trx-backend/src/trx-backend-ft817/Cargo.toml b/src/trx-server/trx-backend/trx-backend-ft817/Cargo.toml
similarity index 100%
rename from src/trx-backend/src/trx-backend-ft817/Cargo.toml
rename to src/trx-server/trx-backend/trx-backend-ft817/Cargo.toml
diff --git a/src/trx-backend/src/trx-backend-ft817/src/lib.rs b/src/trx-server/trx-backend/trx-backend-ft817/src/lib.rs
similarity index 100%
rename from src/trx-backend/src/trx-backend-ft817/src/lib.rs
rename to src/trx-server/trx-backend/trx-backend-ft817/src/lib.rs