diff --git a/Cargo.lock b/Cargo.lock
index 1a399ad4ad..0e32c86091 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -817,16 +817,13 @@ dependencies = [
  "foreign-types",
  "futures 0.3.24",
  "gpui",
- "hmac 0.12.1",
- "jwt",
- "live_kit",
+ "live_kit_client",
+ "live_kit_server",
  "log",
  "media",
  "objc",
  "parking_lot 0.11.2",
  "postage",
- "serde",
- "sha2 0.10.6",
  "simplelog",
 ]
 
@@ -3187,7 +3184,7 @@ dependencies = [
 ]
 
 [[package]]
-name = "live_kit"
+name = "live_kit_client"
 version = "0.1.0"
 dependencies = [
  "anyhow",
@@ -3200,6 +3197,17 @@ dependencies = [
  "serde_json",
 ]
 
+[[package]]
+name = "live_kit_server"
+version = "0.1.0"
+dependencies = [
+ "anyhow",
+ "hmac 0.12.1",
+ "jwt",
+ "serde",
+ "sha2 0.10.6",
+]
+
 [[package]]
 name = "lock_api"
 version = "0.4.9"
diff --git a/crates/capture/Cargo.toml b/crates/capture/Cargo.toml
index f8ed31097a..a5ec131ff1 100644
--- a/crates/capture/Cargo.toml
+++ b/crates/capture/Cargo.toml
@@ -6,7 +6,8 @@ description = "An example of screen capture"
 
 [dependencies]
 gpui = { path = "../gpui" }
-live_kit = { path = "../live_kit" }
+live_kit_client = { path = "../live_kit_client" }
+live_kit_server = { path = "../live_kit_server" }
 media = { path = "../media" }
 
 anyhow = "1.0.38"
@@ -18,14 +19,10 @@ core-foundation = "0.9.3"
 core-graphics = "0.22.3"
 foreign-types = "0.3"
 futures = "0.3"
-hmac = "0.12"
-jwt = "0.16"
 log = { version = "0.4.16", features = ["kv_unstable_serde"] }
 objc = "0.2"
 parking_lot = "0.11.1"
 postage = { version = "0.4.1", features = ["futures-traits"] }
-serde = { version = "1.0", features = ["derive", "rc"] }
-sha2 = "0.10"
 simplelog = "0.9"
 
 [build-dependencies]
diff --git a/crates/capture/src/main.rs b/crates/capture/src/main.rs
index e56bdf8fea..00f3eac2df 100644
--- a/crates/capture/src/main.rs
+++ b/crates/capture/src/main.rs
@@ -1,5 +1,3 @@
-mod live_kit_token;
-
 use futures::StreamExt;
 use gpui::{
     actions,
@@ -8,7 +6,7 @@ use gpui::{
     platform::current::Surface,
     Menu, MenuItem, ViewContext,
 };
-use live_kit::{LocalVideoTrack, Room};
+use live_kit_client::{LocalVideoTrack, Room};
 use log::LevelFilter;
 use media::core_video::CVImageBuffer;
 use postage::watch;
@@ -38,7 +36,7 @@ fn main() {
         let live_kit_secret = std::env::var("LIVE_KIT_SECRET").unwrap();
 
         cx.spawn(|mut cx| async move {
-            let user1_token = live_kit_token::create_token(
+            let user1_token = live_kit_server::create_token(
                 &live_kit_key,
                 &live_kit_secret,
                 "test-room",
@@ -48,7 +46,7 @@ fn main() {
             let room1 = Room::new();
             room1.connect(&live_kit_url, &user1_token).await.unwrap();
 
-            let user2_token = live_kit_token::create_token(
+            let user2_token = live_kit_server::create_token(
                 &live_kit_key,
                 &live_kit_secret,
                 "test-room",
@@ -59,7 +57,7 @@ fn main() {
             room2.connect(&live_kit_url, &user2_token).await.unwrap();
             cx.add_window(Default::default(), |cx| ScreenCaptureView::new(room2, cx));
 
-            let display_sources = live_kit::display_sources().await.unwrap();
+            let display_sources = live_kit_client::display_sources().await.unwrap();
             let track = LocalVideoTrack::screen_share_for_display(display_sources.first().unwrap());
             room1.publish_video_track(&track).await.unwrap();
         })
diff --git a/crates/live_kit/Cargo.toml b/crates/live_kit_client/Cargo.toml
similarity index 88%
rename from crates/live_kit/Cargo.toml
rename to crates/live_kit_client/Cargo.toml
index e88d4f7b24..1344ecbcdb 100644
--- a/crates/live_kit/Cargo.toml
+++ b/crates/live_kit_client/Cargo.toml
@@ -1,11 +1,11 @@
 [package]
-name = "live_kit"
+name = "live_kit_client"
 version = "0.1.0"
 edition = "2021"
 description = "Bindings to LiveKit Swift client SDK"
 
 [lib]
-path = "src/live_kit.rs"
+path = "src/live_kit_client.rs"
 doctest = false
 
 [dependencies]
diff --git a/crates/live_kit/LiveKitBridge/.gitignore b/crates/live_kit_client/LiveKitBridge/.gitignore
similarity index 100%
rename from crates/live_kit/LiveKitBridge/.gitignore
rename to crates/live_kit_client/LiveKitBridge/.gitignore
diff --git a/crates/live_kit/LiveKitBridge/Package.resolved b/crates/live_kit_client/LiveKitBridge/Package.resolved
similarity index 100%
rename from crates/live_kit/LiveKitBridge/Package.resolved
rename to crates/live_kit_client/LiveKitBridge/Package.resolved
diff --git a/crates/live_kit/LiveKitBridge/Package.swift b/crates/live_kit_client/LiveKitBridge/Package.swift
similarity index 100%
rename from crates/live_kit/LiveKitBridge/Package.swift
rename to crates/live_kit_client/LiveKitBridge/Package.swift
diff --git a/crates/live_kit/LiveKitBridge/README.md b/crates/live_kit_client/LiveKitBridge/README.md
similarity index 100%
rename from crates/live_kit/LiveKitBridge/README.md
rename to crates/live_kit_client/LiveKitBridge/README.md
diff --git a/crates/live_kit/LiveKitBridge/Sources/LiveKitBridge/LiveKitBridge.swift b/crates/live_kit_client/LiveKitBridge/Sources/LiveKitBridge/LiveKitBridge.swift
similarity index 100%
rename from crates/live_kit/LiveKitBridge/Sources/LiveKitBridge/LiveKitBridge.swift
rename to crates/live_kit_client/LiveKitBridge/Sources/LiveKitBridge/LiveKitBridge.swift
diff --git a/crates/live_kit/build.rs b/crates/live_kit_client/build.rs
similarity index 100%
rename from crates/live_kit/build.rs
rename to crates/live_kit_client/build.rs
diff --git a/crates/live_kit/src/live_kit.rs b/crates/live_kit_client/src/live_kit_client.rs
similarity index 100%
rename from crates/live_kit/src/live_kit.rs
rename to crates/live_kit_client/src/live_kit_client.rs
diff --git a/crates/live_kit_server/Cargo.toml b/crates/live_kit_server/Cargo.toml
new file mode 100644
index 0000000000..dc9d56074e
--- /dev/null
+++ b/crates/live_kit_server/Cargo.toml
@@ -0,0 +1,16 @@
+[package]
+name = "live_kit_server"
+version = "0.1.0"
+edition = "2021"
+description = "SDK for the LiveKit server API"
+
+[lib]
+path = "src/live_kit_server.rs"
+doctest = false
+
+[dependencies]
+anyhow = "1.0.38"
+hmac = "0.12"
+jwt = "0.16"
+serde = { version = "1.0", features = ["derive", "rc"] }
+sha2 = "0.10"
\ No newline at end of file
diff --git a/crates/capture/src/live_kit_token.rs b/crates/live_kit_server/src/live_kit_server.rs
similarity index 100%
rename from crates/capture/src/live_kit_token.rs
rename to crates/live_kit_server/src/live_kit_server.rs