diff --git a/.gitignore b/.gitignore
index 140053fc2c..a733bb3bb7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,6 +3,6 @@
 .DS_Store
 /script/node_modules
 /styles/node_modules
-/crates/server/.env.toml
-/crates/server/static/styles.css
+/crates/collab/.env.toml
+/crates/collab/static/styles.css
 /vendor/bin
diff --git a/Cargo.lock b/Cargo.lock
index 92aaa62c6e..7e74f4c964 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1067,6 +1067,59 @@ dependencies = [
  "objc",
 ]
 
+[[package]]
+name = "collab"
+version = "0.1.0"
+dependencies = [
+ "anyhow",
+ "async-io",
+ "async-sqlx-session",
+ "async-std",
+ "async-trait",
+ "async-tungstenite",
+ "base64 0.13.0",
+ "clap 3.0.0-beta.2",
+ "client",
+ "collections",
+ "comrak",
+ "ctor",
+ "editor",
+ "either",
+ "env_logger 0.8.3",
+ "envy",
+ "futures",
+ "gpui",
+ "handlebars",
+ "http-auth-basic",
+ "json_env_logger",
+ "jwt-simple",
+ "language",
+ "lazy_static",
+ "lipsum",
+ "log",
+ "lsp",
+ "oauth2",
+ "oauth2-surf",
+ "parking_lot",
+ "project",
+ "rand 0.8.3",
+ "rpc",
+ "rust-embed",
+ "scrypt",
+ "serde",
+ "serde_json",
+ "settings",
+ "sha-1 0.9.6",
+ "sqlx 0.5.5",
+ "surf",
+ "tide",
+ "tide-compress",
+ "time 0.2.27",
+ "toml",
+ "util",
+ "workspace",
+]
+
 [[package]]
 name = "collections"
 version = "0.1.0"
@@ -6136,59 +6189,6 @@ dependencies = [
  "workspace",
 ]
 
-[[package]]
-name = "zed-server"
-version = "0.1.0"
-dependencies = [
- "anyhow",
- "async-io",
- "async-sqlx-session",
- "async-std",
- "async-trait",
- "async-tungstenite",
- "base64 0.13.0",
- "clap 3.0.0-beta.2",
- "client",
- "collections",
- "comrak",
- "ctor",
- "editor",
- "either",
- "env_logger 0.8.3",
- "envy",
- "futures",
- "gpui",
- "handlebars",
- "http-auth-basic",
- "json_env_logger",
- "jwt-simple",
- "language",
- "lazy_static",
- "lipsum",
- "log",
- "lsp",
- "oauth2",
- "oauth2-surf",
- "parking_lot",
- "project",
- "rand 0.8.3",
- "rpc",
- "rust-embed",
- "scrypt",
- "serde",
- "serde_json",
- "settings",
- "sha-1 0.9.6",
- "sqlx 0.5.5",
- "surf",
- "tide",
- "tide-compress",
- "time 0.2.27",
- "toml",
- "util",
- "workspace",
-]
-
 [[package]]
 name = "zeroize"
 version = "1.3.0"
diff --git a/Dockerfile b/Dockerfile
index af4365649f..544d9eae86 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -14,20 +14,20 @@ RUN --mount=type=cache,target=./script/node_modules \
 RUN --mount=type=cache,target=./script/node_modules \
     script/build-css --release
 
-# Compile server
+# Compile collab server
 RUN --mount=type=cache,target=./script/node_modules \
     --mount=type=cache,target=/usr/local/cargo/registry \
     --mount=type=cache,target=./target \
-    cargo build --release --package zed-server --bin zed-server
+    cargo build --release --package collab --bin collab
 
-# Copy server binary out of cached directory
+# Copy collab server binary out of cached directory
 RUN --mount=type=cache,target=./target \
-    cp /app/target/release/zed-server /app/zed-server
+    cp /app/target/release/collab /app/collab
 
-# Copy server binary to the runtime image
+# Copy collab server binary to the runtime image
 FROM debian:bullseye-slim as runtime
 RUN apt-get update; \
     apt-get install -y --no-install-recommends libcurl4-openssl-dev ca-certificates
 WORKDIR app
-COPY --from=builder /app/zed-server /app
-ENTRYPOINT ["/app/zed-server"]
+COPY --from=builder /app/collab /app
+ENTRYPOINT ["/app/collab"]
diff --git a/Dockerfile.migrator b/Dockerfile.migrator
index 1b7a0adf3a..72e4e41d27 100644
--- a/Dockerfile.migrator
+++ b/Dockerfile.migrator
@@ -11,5 +11,5 @@ RUN apt-get update; \
     apt-get install -y --no-install-recommends libssl1.1
 WORKDIR app
 COPY --from=builder /app/bin/sqlx /app
-COPY ./server/migrations /app/migrations
+COPY ./collab/migrations /app/migrations
 ENTRYPOINT ["/app/sqlx", "migrate", "run"]
diff --git a/Procfile b/Procfile
index 08bff5acc2..a64b411ef3 100644
--- a/Procfile
+++ b/Procfile
@@ -1,2 +1,2 @@
 web: cd ../zed.dev && PORT=3000 npx next dev
-collab: cd crates/server && cargo run
+collab: cd crates/collab && cargo run
diff --git a/README.md b/README.md
index c380115100..1bac43b694 100644
--- a/README.md
+++ b/README.md
@@ -23,7 +23,7 @@ script/sqlx migrate run
 script/seed-db
 ```
 
-Run `zed.dev` and the collaboration server.
+Run the web frontend and the collaboration server.
 
 ```
 brew install foreman
diff --git a/crates/server/.env.template.toml b/crates/collab/.env.template.toml
similarity index 100%
rename from crates/server/.env.template.toml
rename to crates/collab/.env.template.toml
diff --git a/crates/server/Cargo.toml b/crates/collab/Cargo.toml
similarity index 96%
rename from crates/server/Cargo.toml
rename to crates/collab/Cargo.toml
index e0834b76c5..96df2ae4ec 100644
--- a/crates/server/Cargo.toml
+++ b/crates/collab/Cargo.toml
@@ -1,12 +1,12 @@
 [package]
 authors = ["Nathan Sobo <nathan@warp.dev>"]
-default-run = "zed-server"
+default-run = "collab"
 edition = "2021"
-name = "zed-server"
+name = "collab"
 version = "0.1.0"
 
 [[bin]]
-name = "zed-server"
+name = "collab"
 
 [[bin]]
 name = "seed"
diff --git a/crates/server/Procfile b/crates/collab/Procfile
similarity index 56%
rename from crates/server/Procfile
rename to crates/collab/Procfile
index 74cb9a094b..ef8914fcc0 100644
--- a/crates/server/Procfile
+++ b/crates/collab/Procfile
@@ -1,2 +1,2 @@
-web: ./target/release/zed-server
+collab: ./target/release/collab
 release: ./target/release/sqlx migrate run
diff --git a/crates/server/README.md b/crates/collab/README.md
similarity index 100%
rename from crates/server/README.md
rename to crates/collab/README.md
diff --git a/crates/server/basic.conf b/crates/collab/basic.conf
similarity index 100%
rename from crates/server/basic.conf
rename to crates/collab/basic.conf
diff --git a/crates/server/favicon.ico b/crates/collab/favicon.ico
similarity index 100%
rename from crates/server/favicon.ico
rename to crates/collab/favicon.ico
diff --git a/crates/server/k8s/environments/production.sh b/crates/collab/k8s/environments/production.sh
similarity index 100%
rename from crates/server/k8s/environments/production.sh
rename to crates/collab/k8s/environments/production.sh
diff --git a/crates/server/k8s/environments/staging.sh b/crates/collab/k8s/environments/staging.sh
similarity index 100%
rename from crates/server/k8s/environments/staging.sh
rename to crates/collab/k8s/environments/staging.sh
diff --git a/crates/server/k8s/manifest.template.yml b/crates/collab/k8s/manifest.template.yml
similarity index 100%
rename from crates/server/k8s/manifest.template.yml
rename to crates/collab/k8s/manifest.template.yml
diff --git a/crates/server/k8s/migrate.template.yml b/crates/collab/k8s/migrate.template.yml
similarity index 100%
rename from crates/server/k8s/migrate.template.yml
rename to crates/collab/k8s/migrate.template.yml
diff --git a/crates/server/migrations/20210527024318_initial_schema.sql b/crates/collab/migrations/20210527024318_initial_schema.sql
similarity index 100%
rename from crates/server/migrations/20210527024318_initial_schema.sql
rename to crates/collab/migrations/20210527024318_initial_schema.sql
diff --git a/crates/server/migrations/20210607190313_create_access_tokens.sql b/crates/collab/migrations/20210607190313_create_access_tokens.sql
similarity index 100%
rename from crates/server/migrations/20210607190313_create_access_tokens.sql
rename to crates/collab/migrations/20210607190313_create_access_tokens.sql
diff --git a/crates/server/migrations/20210805175147_create_chat_tables.sql b/crates/collab/migrations/20210805175147_create_chat_tables.sql
similarity index 100%
rename from crates/server/migrations/20210805175147_create_chat_tables.sql
rename to crates/collab/migrations/20210805175147_create_chat_tables.sql
diff --git a/crates/server/migrations/20210916123647_add_nonce_to_channel_messages.sql b/crates/collab/migrations/20210916123647_add_nonce_to_channel_messages.sql
similarity index 100%
rename from crates/server/migrations/20210916123647_add_nonce_to_channel_messages.sql
rename to crates/collab/migrations/20210916123647_add_nonce_to_channel_messages.sql
diff --git a/crates/server/migrations/20210920192001_add_interests_to_signups.sql b/crates/collab/migrations/20210920192001_add_interests_to_signups.sql
similarity index 100%
rename from crates/server/migrations/20210920192001_add_interests_to_signups.sql
rename to crates/collab/migrations/20210920192001_add_interests_to_signups.sql
diff --git a/crates/server/src/admin.rs b/crates/collab/src/admin.rs
similarity index 100%
rename from crates/server/src/admin.rs
rename to crates/collab/src/admin.rs
diff --git a/crates/server/src/api.rs b/crates/collab/src/api.rs
similarity index 100%
rename from crates/server/src/api.rs
rename to crates/collab/src/api.rs
diff --git a/crates/server/src/assets.rs b/crates/collab/src/assets.rs
similarity index 100%
rename from crates/server/src/assets.rs
rename to crates/collab/src/assets.rs
diff --git a/crates/server/src/auth.rs b/crates/collab/src/auth.rs
similarity index 100%
rename from crates/server/src/auth.rs
rename to crates/collab/src/auth.rs
diff --git a/crates/server/src/bin/dotenv.rs b/crates/collab/src/bin/dotenv.rs
similarity index 100%
rename from crates/server/src/bin/dotenv.rs
rename to crates/collab/src/bin/dotenv.rs
diff --git a/crates/server/src/bin/seed.rs b/crates/collab/src/bin/seed.rs
similarity index 100%
rename from crates/server/src/bin/seed.rs
rename to crates/collab/src/bin/seed.rs
diff --git a/crates/server/src/careers.rs b/crates/collab/src/careers.rs
similarity index 100%
rename from crates/server/src/careers.rs
rename to crates/collab/src/careers.rs
diff --git a/crates/server/src/community.rs b/crates/collab/src/community.rs
similarity index 100%
rename from crates/server/src/community.rs
rename to crates/collab/src/community.rs
diff --git a/crates/server/src/db.rs b/crates/collab/src/db.rs
similarity index 100%
rename from crates/server/src/db.rs
rename to crates/collab/src/db.rs
diff --git a/crates/server/src/env.rs b/crates/collab/src/env.rs
similarity index 100%
rename from crates/server/src/env.rs
rename to crates/collab/src/env.rs
diff --git a/crates/server/src/errors.rs b/crates/collab/src/errors.rs
similarity index 100%
rename from crates/server/src/errors.rs
rename to crates/collab/src/errors.rs
diff --git a/crates/server/src/expiring.rs b/crates/collab/src/expiring.rs
similarity index 100%
rename from crates/server/src/expiring.rs
rename to crates/collab/src/expiring.rs
diff --git a/crates/server/src/github.rs b/crates/collab/src/github.rs
similarity index 100%
rename from crates/server/src/github.rs
rename to crates/collab/src/github.rs
diff --git a/crates/server/src/home.rs b/crates/collab/src/home.rs
similarity index 100%
rename from crates/server/src/home.rs
rename to crates/collab/src/home.rs
diff --git a/crates/server/src/main.rs b/crates/collab/src/main.rs
similarity index 100%
rename from crates/server/src/main.rs
rename to crates/collab/src/main.rs
diff --git a/crates/server/src/releases.rs b/crates/collab/src/releases.rs
similarity index 100%
rename from crates/server/src/releases.rs
rename to crates/collab/src/releases.rs
diff --git a/crates/server/src/rpc.rs b/crates/collab/src/rpc.rs
similarity index 100%
rename from crates/server/src/rpc.rs
rename to crates/collab/src/rpc.rs
diff --git a/crates/server/src/rpc/store.rs b/crates/collab/src/rpc/store.rs
similarity index 100%
rename from crates/server/src/rpc/store.rs
rename to crates/collab/src/rpc/store.rs
diff --git a/crates/server/src/team.rs b/crates/collab/src/team.rs
similarity index 100%
rename from crates/server/src/team.rs
rename to crates/collab/src/team.rs
diff --git a/crates/server/static/browserconfig.xml b/crates/collab/static/browserconfig.xml
similarity index 100%
rename from crates/server/static/browserconfig.xml
rename to crates/collab/static/browserconfig.xml
diff --git a/crates/server/static/fonts/VisbyCF-Bold.eot b/crates/collab/static/fonts/VisbyCF-Bold.eot
similarity index 100%
rename from crates/server/static/fonts/VisbyCF-Bold.eot
rename to crates/collab/static/fonts/VisbyCF-Bold.eot
diff --git a/crates/server/static/fonts/VisbyCF-Bold.woff b/crates/collab/static/fonts/VisbyCF-Bold.woff
similarity index 100%
rename from crates/server/static/fonts/VisbyCF-Bold.woff
rename to crates/collab/static/fonts/VisbyCF-Bold.woff
diff --git a/crates/server/static/fonts/VisbyCF-Bold.woff2 b/crates/collab/static/fonts/VisbyCF-Bold.woff2
similarity index 100%
rename from crates/server/static/fonts/VisbyCF-Bold.woff2
rename to crates/collab/static/fonts/VisbyCF-Bold.woff2
diff --git a/crates/server/static/fonts/VisbyCF-BoldOblique.eot b/crates/collab/static/fonts/VisbyCF-BoldOblique.eot
similarity index 100%
rename from crates/server/static/fonts/VisbyCF-BoldOblique.eot
rename to crates/collab/static/fonts/VisbyCF-BoldOblique.eot
diff --git a/crates/server/static/fonts/VisbyCF-BoldOblique.woff b/crates/collab/static/fonts/VisbyCF-BoldOblique.woff
similarity index 100%
rename from crates/server/static/fonts/VisbyCF-BoldOblique.woff
rename to crates/collab/static/fonts/VisbyCF-BoldOblique.woff
diff --git a/crates/server/static/fonts/VisbyCF-BoldOblique.woff2 b/crates/collab/static/fonts/VisbyCF-BoldOblique.woff2
similarity index 100%
rename from crates/server/static/fonts/VisbyCF-BoldOblique.woff2
rename to crates/collab/static/fonts/VisbyCF-BoldOblique.woff2
diff --git a/crates/server/static/fonts/VisbyCF-DemiBold.eot b/crates/collab/static/fonts/VisbyCF-DemiBold.eot
similarity index 100%
rename from crates/server/static/fonts/VisbyCF-DemiBold.eot
rename to crates/collab/static/fonts/VisbyCF-DemiBold.eot
diff --git a/crates/server/static/fonts/VisbyCF-DemiBold.woff b/crates/collab/static/fonts/VisbyCF-DemiBold.woff
similarity index 100%
rename from crates/server/static/fonts/VisbyCF-DemiBold.woff
rename to crates/collab/static/fonts/VisbyCF-DemiBold.woff
diff --git a/crates/server/static/fonts/VisbyCF-DemiBold.woff2 b/crates/collab/static/fonts/VisbyCF-DemiBold.woff2
similarity index 100%
rename from crates/server/static/fonts/VisbyCF-DemiBold.woff2
rename to crates/collab/static/fonts/VisbyCF-DemiBold.woff2
diff --git a/crates/server/static/fonts/VisbyCF-DemiBoldOblique.eot b/crates/collab/static/fonts/VisbyCF-DemiBoldOblique.eot
similarity index 100%
rename from crates/server/static/fonts/VisbyCF-DemiBoldOblique.eot
rename to crates/collab/static/fonts/VisbyCF-DemiBoldOblique.eot
diff --git a/crates/server/static/fonts/VisbyCF-DemiBoldOblique.woff b/crates/collab/static/fonts/VisbyCF-DemiBoldOblique.woff
similarity index 100%
rename from crates/server/static/fonts/VisbyCF-DemiBoldOblique.woff
rename to crates/collab/static/fonts/VisbyCF-DemiBoldOblique.woff
diff --git a/crates/server/static/fonts/VisbyCF-DemiBoldOblique.woff2 b/crates/collab/static/fonts/VisbyCF-DemiBoldOblique.woff2
similarity index 100%
rename from crates/server/static/fonts/VisbyCF-DemiBoldOblique.woff2
rename to crates/collab/static/fonts/VisbyCF-DemiBoldOblique.woff2
diff --git a/crates/server/static/fonts/VisbyCF-ExtraBold.eot b/crates/collab/static/fonts/VisbyCF-ExtraBold.eot
similarity index 100%
rename from crates/server/static/fonts/VisbyCF-ExtraBold.eot
rename to crates/collab/static/fonts/VisbyCF-ExtraBold.eot
diff --git a/crates/server/static/fonts/VisbyCF-ExtraBold.woff b/crates/collab/static/fonts/VisbyCF-ExtraBold.woff
similarity index 100%
rename from crates/server/static/fonts/VisbyCF-ExtraBold.woff
rename to crates/collab/static/fonts/VisbyCF-ExtraBold.woff
diff --git a/crates/server/static/fonts/VisbyCF-ExtraBold.woff2 b/crates/collab/static/fonts/VisbyCF-ExtraBold.woff2
similarity index 100%
rename from crates/server/static/fonts/VisbyCF-ExtraBold.woff2
rename to crates/collab/static/fonts/VisbyCF-ExtraBold.woff2
diff --git a/crates/server/static/fonts/VisbyCF-ExtraBoldOblique.eot b/crates/collab/static/fonts/VisbyCF-ExtraBoldOblique.eot
similarity index 100%
rename from crates/server/static/fonts/VisbyCF-ExtraBoldOblique.eot
rename to crates/collab/static/fonts/VisbyCF-ExtraBoldOblique.eot
diff --git a/crates/server/static/fonts/VisbyCF-ExtraBoldOblique.woff b/crates/collab/static/fonts/VisbyCF-ExtraBoldOblique.woff
similarity index 100%
rename from crates/server/static/fonts/VisbyCF-ExtraBoldOblique.woff
rename to crates/collab/static/fonts/VisbyCF-ExtraBoldOblique.woff
diff --git a/crates/server/static/fonts/VisbyCF-ExtraBoldOblique.woff2 b/crates/collab/static/fonts/VisbyCF-ExtraBoldOblique.woff2
similarity index 100%
rename from crates/server/static/fonts/VisbyCF-ExtraBoldOblique.woff2
rename to crates/collab/static/fonts/VisbyCF-ExtraBoldOblique.woff2
diff --git a/crates/server/static/fonts/VisbyCF-Heavy.eot b/crates/collab/static/fonts/VisbyCF-Heavy.eot
similarity index 100%
rename from crates/server/static/fonts/VisbyCF-Heavy.eot
rename to crates/collab/static/fonts/VisbyCF-Heavy.eot
diff --git a/crates/server/static/fonts/VisbyCF-Heavy.woff b/crates/collab/static/fonts/VisbyCF-Heavy.woff
similarity index 100%
rename from crates/server/static/fonts/VisbyCF-Heavy.woff
rename to crates/collab/static/fonts/VisbyCF-Heavy.woff
diff --git a/crates/server/static/fonts/VisbyCF-Heavy.woff2 b/crates/collab/static/fonts/VisbyCF-Heavy.woff2
similarity index 100%
rename from crates/server/static/fonts/VisbyCF-Heavy.woff2
rename to crates/collab/static/fonts/VisbyCF-Heavy.woff2
diff --git a/crates/server/static/fonts/VisbyCF-HeavyOblique.eot b/crates/collab/static/fonts/VisbyCF-HeavyOblique.eot
similarity index 100%
rename from crates/server/static/fonts/VisbyCF-HeavyOblique.eot
rename to crates/collab/static/fonts/VisbyCF-HeavyOblique.eot
diff --git a/crates/server/static/fonts/VisbyCF-HeavyOblique.woff b/crates/collab/static/fonts/VisbyCF-HeavyOblique.woff
similarity index 100%
rename from crates/server/static/fonts/VisbyCF-HeavyOblique.woff
rename to crates/collab/static/fonts/VisbyCF-HeavyOblique.woff
diff --git a/crates/server/static/fonts/VisbyCF-HeavyOblique.woff2 b/crates/collab/static/fonts/VisbyCF-HeavyOblique.woff2
similarity index 100%
rename from crates/server/static/fonts/VisbyCF-HeavyOblique.woff2
rename to crates/collab/static/fonts/VisbyCF-HeavyOblique.woff2
diff --git a/crates/server/static/fonts/VisbyCF-Light.eot b/crates/collab/static/fonts/VisbyCF-Light.eot
similarity index 100%
rename from crates/server/static/fonts/VisbyCF-Light.eot
rename to crates/collab/static/fonts/VisbyCF-Light.eot
diff --git a/crates/server/static/fonts/VisbyCF-Light.woff b/crates/collab/static/fonts/VisbyCF-Light.woff
similarity index 100%
rename from crates/server/static/fonts/VisbyCF-Light.woff
rename to crates/collab/static/fonts/VisbyCF-Light.woff
diff --git a/crates/server/static/fonts/VisbyCF-Light.woff2 b/crates/collab/static/fonts/VisbyCF-Light.woff2
similarity index 100%
rename from crates/server/static/fonts/VisbyCF-Light.woff2
rename to crates/collab/static/fonts/VisbyCF-Light.woff2
diff --git a/crates/server/static/fonts/VisbyCF-LightOblique.eot b/crates/collab/static/fonts/VisbyCF-LightOblique.eot
similarity index 100%
rename from crates/server/static/fonts/VisbyCF-LightOblique.eot
rename to crates/collab/static/fonts/VisbyCF-LightOblique.eot
diff --git a/crates/server/static/fonts/VisbyCF-LightOblique.woff b/crates/collab/static/fonts/VisbyCF-LightOblique.woff
similarity index 100%
rename from crates/server/static/fonts/VisbyCF-LightOblique.woff
rename to crates/collab/static/fonts/VisbyCF-LightOblique.woff
diff --git a/crates/server/static/fonts/VisbyCF-LightOblique.woff2 b/crates/collab/static/fonts/VisbyCF-LightOblique.woff2
similarity index 100%
rename from crates/server/static/fonts/VisbyCF-LightOblique.woff2
rename to crates/collab/static/fonts/VisbyCF-LightOblique.woff2
diff --git a/crates/server/static/fonts/VisbyCF-Medium.eot b/crates/collab/static/fonts/VisbyCF-Medium.eot
similarity index 100%
rename from crates/server/static/fonts/VisbyCF-Medium.eot
rename to crates/collab/static/fonts/VisbyCF-Medium.eot
diff --git a/crates/server/static/fonts/VisbyCF-Medium.woff b/crates/collab/static/fonts/VisbyCF-Medium.woff
similarity index 100%
rename from crates/server/static/fonts/VisbyCF-Medium.woff
rename to crates/collab/static/fonts/VisbyCF-Medium.woff
diff --git a/crates/server/static/fonts/VisbyCF-Medium.woff2 b/crates/collab/static/fonts/VisbyCF-Medium.woff2
similarity index 100%
rename from crates/server/static/fonts/VisbyCF-Medium.woff2
rename to crates/collab/static/fonts/VisbyCF-Medium.woff2
diff --git a/crates/server/static/fonts/VisbyCF-MediumOblique.eot b/crates/collab/static/fonts/VisbyCF-MediumOblique.eot
similarity index 100%
rename from crates/server/static/fonts/VisbyCF-MediumOblique.eot
rename to crates/collab/static/fonts/VisbyCF-MediumOblique.eot
diff --git a/crates/server/static/fonts/VisbyCF-MediumOblique.woff b/crates/collab/static/fonts/VisbyCF-MediumOblique.woff
similarity index 100%
rename from crates/server/static/fonts/VisbyCF-MediumOblique.woff
rename to crates/collab/static/fonts/VisbyCF-MediumOblique.woff
diff --git a/crates/server/static/fonts/VisbyCF-MediumOblique.woff2 b/crates/collab/static/fonts/VisbyCF-MediumOblique.woff2
similarity index 100%
rename from crates/server/static/fonts/VisbyCF-MediumOblique.woff2
rename to crates/collab/static/fonts/VisbyCF-MediumOblique.woff2
diff --git a/crates/server/static/fonts/VisbyCF-Regular.eot b/crates/collab/static/fonts/VisbyCF-Regular.eot
similarity index 100%
rename from crates/server/static/fonts/VisbyCF-Regular.eot
rename to crates/collab/static/fonts/VisbyCF-Regular.eot
diff --git a/crates/server/static/fonts/VisbyCF-Regular.woff b/crates/collab/static/fonts/VisbyCF-Regular.woff
similarity index 100%
rename from crates/server/static/fonts/VisbyCF-Regular.woff
rename to crates/collab/static/fonts/VisbyCF-Regular.woff
diff --git a/crates/server/static/fonts/VisbyCF-Regular.woff2 b/crates/collab/static/fonts/VisbyCF-Regular.woff2
similarity index 100%
rename from crates/server/static/fonts/VisbyCF-Regular.woff2
rename to crates/collab/static/fonts/VisbyCF-Regular.woff2
diff --git a/crates/server/static/fonts/VisbyCF-RegularOblique.eot b/crates/collab/static/fonts/VisbyCF-RegularOblique.eot
similarity index 100%
rename from crates/server/static/fonts/VisbyCF-RegularOblique.eot
rename to crates/collab/static/fonts/VisbyCF-RegularOblique.eot
diff --git a/crates/server/static/fonts/VisbyCF-RegularOblique.woff b/crates/collab/static/fonts/VisbyCF-RegularOblique.woff
similarity index 100%
rename from crates/server/static/fonts/VisbyCF-RegularOblique.woff
rename to crates/collab/static/fonts/VisbyCF-RegularOblique.woff
diff --git a/crates/server/static/fonts/VisbyCF-RegularOblique.woff2 b/crates/collab/static/fonts/VisbyCF-RegularOblique.woff2
similarity index 100%
rename from crates/server/static/fonts/VisbyCF-RegularOblique.woff2
rename to crates/collab/static/fonts/VisbyCF-RegularOblique.woff2
diff --git a/crates/server/static/fonts/VisbyCF-Thin.eot b/crates/collab/static/fonts/VisbyCF-Thin.eot
similarity index 100%
rename from crates/server/static/fonts/VisbyCF-Thin.eot
rename to crates/collab/static/fonts/VisbyCF-Thin.eot
diff --git a/crates/server/static/fonts/VisbyCF-Thin.woff b/crates/collab/static/fonts/VisbyCF-Thin.woff
similarity index 100%
rename from crates/server/static/fonts/VisbyCF-Thin.woff
rename to crates/collab/static/fonts/VisbyCF-Thin.woff
diff --git a/crates/server/static/fonts/VisbyCF-Thin.woff2 b/crates/collab/static/fonts/VisbyCF-Thin.woff2
similarity index 100%
rename from crates/server/static/fonts/VisbyCF-Thin.woff2
rename to crates/collab/static/fonts/VisbyCF-Thin.woff2
diff --git a/crates/server/static/fonts/VisbyCF-ThinOblique.eot b/crates/collab/static/fonts/VisbyCF-ThinOblique.eot
similarity index 100%
rename from crates/server/static/fonts/VisbyCF-ThinOblique.eot
rename to crates/collab/static/fonts/VisbyCF-ThinOblique.eot
diff --git a/crates/server/static/fonts/VisbyCF-ThinOblique.woff b/crates/collab/static/fonts/VisbyCF-ThinOblique.woff
similarity index 100%
rename from crates/server/static/fonts/VisbyCF-ThinOblique.woff
rename to crates/collab/static/fonts/VisbyCF-ThinOblique.woff
diff --git a/crates/server/static/fonts/VisbyCF-ThinOblique.woff2 b/crates/collab/static/fonts/VisbyCF-ThinOblique.woff2
similarity index 100%
rename from crates/server/static/fonts/VisbyCF-ThinOblique.woff2
rename to crates/collab/static/fonts/VisbyCF-ThinOblique.woff2
diff --git a/crates/server/static/images/android-chrome-192x192.png b/crates/collab/static/images/android-chrome-192x192.png
similarity index 100%
rename from crates/server/static/images/android-chrome-192x192.png
rename to crates/collab/static/images/android-chrome-192x192.png
diff --git a/crates/server/static/images/android-chrome-512x512.png b/crates/collab/static/images/android-chrome-512x512.png
similarity index 100%
rename from crates/server/static/images/android-chrome-512x512.png
rename to crates/collab/static/images/android-chrome-512x512.png
diff --git a/crates/server/static/images/apple-touch-icon.png b/crates/collab/static/images/apple-touch-icon.png
similarity index 100%
rename from crates/server/static/images/apple-touch-icon.png
rename to crates/collab/static/images/apple-touch-icon.png
diff --git a/crates/server/static/images/favicon-16x16.png b/crates/collab/static/images/favicon-16x16.png
similarity index 100%
rename from crates/server/static/images/favicon-16x16.png
rename to crates/collab/static/images/favicon-16x16.png
diff --git a/crates/server/static/images/favicon-32x32.png b/crates/collab/static/images/favicon-32x32.png
similarity index 100%
rename from crates/server/static/images/favicon-32x32.png
rename to crates/collab/static/images/favicon-32x32.png
diff --git a/crates/server/static/images/favicon.png b/crates/collab/static/images/favicon.png
similarity index 100%
rename from crates/server/static/images/favicon.png
rename to crates/collab/static/images/favicon.png
diff --git a/crates/server/static/images/favicon.svg b/crates/collab/static/images/favicon.svg
similarity index 100%
rename from crates/server/static/images/favicon.svg
rename to crates/collab/static/images/favicon.svg
diff --git a/crates/server/static/images/mstile-144x144.png b/crates/collab/static/images/mstile-144x144.png
similarity index 100%
rename from crates/server/static/images/mstile-144x144.png
rename to crates/collab/static/images/mstile-144x144.png
diff --git a/crates/server/static/images/mstile-150x150.png b/crates/collab/static/images/mstile-150x150.png
similarity index 100%
rename from crates/server/static/images/mstile-150x150.png
rename to crates/collab/static/images/mstile-150x150.png
diff --git a/crates/server/static/images/mstile-310x150.png b/crates/collab/static/images/mstile-310x150.png
similarity index 100%
rename from crates/server/static/images/mstile-310x150.png
rename to crates/collab/static/images/mstile-310x150.png
diff --git a/crates/server/static/images/mstile-310x310.png b/crates/collab/static/images/mstile-310x310.png
similarity index 100%
rename from crates/server/static/images/mstile-310x310.png
rename to crates/collab/static/images/mstile-310x310.png
diff --git a/crates/server/static/images/mstile-70x70.png b/crates/collab/static/images/mstile-70x70.png
similarity index 100%
rename from crates/server/static/images/mstile-70x70.png
rename to crates/collab/static/images/mstile-70x70.png
diff --git a/crates/server/static/images/safari-pinned-tab.svg b/crates/collab/static/images/safari-pinned-tab.svg
similarity index 100%
rename from crates/server/static/images/safari-pinned-tab.svg
rename to crates/collab/static/images/safari-pinned-tab.svg
diff --git a/crates/server/static/images/zed-og-image.png b/crates/collab/static/images/zed-og-image.png
similarity index 100%
rename from crates/server/static/images/zed-og-image.png
rename to crates/collab/static/images/zed-og-image.png
diff --git a/crates/server/static/images/zed-twitter-image.png b/crates/collab/static/images/zed-twitter-image.png
similarity index 100%
rename from crates/server/static/images/zed-twitter-image.png
rename to crates/collab/static/images/zed-twitter-image.png
diff --git a/crates/server/static/prism.js b/crates/collab/static/prism.js
similarity index 100%
rename from crates/server/static/prism.js
rename to crates/collab/static/prism.js
diff --git a/crates/server/static/prose.css b/crates/collab/static/prose.css
similarity index 100%
rename from crates/server/static/prose.css
rename to crates/collab/static/prose.css
diff --git a/crates/server/static/prose.css.map b/crates/collab/static/prose.css.map
similarity index 100%
rename from crates/server/static/prose.css.map
rename to crates/collab/static/prose.css.map
diff --git a/crates/server/static/prose.scss b/crates/collab/static/prose.scss
similarity index 100%
rename from crates/server/static/prose.scss
rename to crates/collab/static/prose.scss
diff --git a/crates/server/static/site.webmanifest b/crates/collab/static/site.webmanifest
similarity index 100%
rename from crates/server/static/site.webmanifest
rename to crates/collab/static/site.webmanifest
diff --git a/crates/server/static/svg/hero.svg b/crates/collab/static/svg/hero.svg
similarity index 100%
rename from crates/server/static/svg/hero.svg
rename to crates/collab/static/svg/hero.svg
diff --git a/crates/server/styles.css b/crates/collab/styles.css
similarity index 100%
rename from crates/server/styles.css
rename to crates/collab/styles.css
diff --git a/crates/server/templates/admin.hbs b/crates/collab/templates/admin.hbs
similarity index 100%
rename from crates/server/templates/admin.hbs
rename to crates/collab/templates/admin.hbs
diff --git a/crates/server/templates/careers.hbs b/crates/collab/templates/careers.hbs
similarity index 100%
rename from crates/server/templates/careers.hbs
rename to crates/collab/templates/careers.hbs
diff --git a/crates/server/templates/community.hbs b/crates/collab/templates/community.hbs
similarity index 100%
rename from crates/server/templates/community.hbs
rename to crates/collab/templates/community.hbs
diff --git a/crates/server/templates/docs.hbs b/crates/collab/templates/docs.hbs
similarity index 100%
rename from crates/server/templates/docs.hbs
rename to crates/collab/templates/docs.hbs
diff --git a/crates/server/templates/error.hbs b/crates/collab/templates/error.hbs
similarity index 100%
rename from crates/server/templates/error.hbs
rename to crates/collab/templates/error.hbs
diff --git a/crates/server/templates/home.hbs b/crates/collab/templates/home.hbs
similarity index 100%
rename from crates/server/templates/home.hbs
rename to crates/collab/templates/home.hbs
diff --git a/crates/server/templates/partials/layout.hbs b/crates/collab/templates/partials/layout.hbs
similarity index 100%
rename from crates/server/templates/partials/layout.hbs
rename to crates/collab/templates/partials/layout.hbs
diff --git a/crates/server/templates/releases.hbs b/crates/collab/templates/releases.hbs
similarity index 100%
rename from crates/server/templates/releases.hbs
rename to crates/collab/templates/releases.hbs
diff --git a/crates/server/templates/signup.hbs b/crates/collab/templates/signup.hbs
similarity index 100%
rename from crates/server/templates/signup.hbs
rename to crates/collab/templates/signup.hbs
diff --git a/crates/server/templates/team.hbs b/crates/collab/templates/team.hbs
similarity index 100%
rename from crates/server/templates/team.hbs
rename to crates/collab/templates/team.hbs
diff --git a/crates/server/.env.toml b/crates/server/.env.toml
deleted file mode 100644
index 931f7c4df2..0000000000
--- a/crates/server/.env.toml
+++ /dev/null
@@ -1,42 +0,0 @@
-# Prod database: CAREFUL!
-# DATABASE_URL = "postgres://postgres:f71db7645055488d666f3c26392113104706af1f24d2cf15@zed-db.internal:5432/zed"
-
-HTTP_PORT = 8080
-
-DATABASE_URL = "postgres://postgres@localhost/zed"
-SESSION_SECRET = "6E1GS6IQNOLIBKWMEVWF1AFO4H78KNU8"
-API_TOKEN = "secret"
-
-# Available at https://github.com/organizations/zed-industries/settings/apps/zed-local-development
-GITHUB_APP_ID = 115633
-GITHUB_CLIENT_ID = "Iv1.768076c9becc75c4"
-GITHUB_CLIENT_SECRET = "3592ffff1ecda9773a3df7b0e75375bfbe7992fc"
-GITHUB_PRIVATE_KEY = """\
------BEGIN RSA PRIVATE KEY-----
-MIIEowIBAAKCAQEAtt0O2t69ksn2zX5ucHpflNRoqdh342OOwrazLA6GS8Kp2hWM
-NwLzymm2s8k1e2F7sAVYNHJvUPZCvM/xYuVMNpx33fVr00Tni2ATNJKS2lvCEBC0
-nTUKxXQImF82IQadg41o+81gofR3zt2UM7iDRMPbmn/aZe7K8vvFEERawSfKEMv3
-RqAzqt0fBDYvwHonje0Y7/5IAO5GDMd9kDE3w034ckwtyFAJDjRGYN5kVoRlua+Q
-aIHoBkJ/jUAsS4kWqZt/r6hbrAcgok7Iv2RoapfgNTPeJKEe0pAagz1orqbrm9Qk
-WBeAToTXl4YTfQruMNVyN2/5azqLnS8Urg2jHQIDAQABAoIBAF9TVY8bVk/TIOl2
-4zOXV4RKRlVkFvtexukSPMzWtYOA8vJREUsMKvJ1sVx/o3WyF7xmzNhqX0UhWyD6
-dadMSTKe1o3Khm8YGGw7pUdesVdLRhsB2mWpZPgRyPlFiP4maK5PZU7+fUVwH5Sj
-RcLAiQ2r3CrqQ3unw/xu6wfT2kueBMJz6DBCx3y5wwEyrR7b+8ZGrjUy9BelzKti
-yIT3OLWhilwho8l03Dg72SCSskotVMcywtc7SMr5PCILL7QANdJDhEO8FP4BysHx
-6wlFwpfIPnNHN/RN1Dnnut5F64nPu//6vUs9DR9c34FzDp0SR2hJ98PLYn3uyD5b
-6oOcZrECgYEA3QXrezpLwkZN2wS6r6vmNyEKSIevjpQpuFEzGSapJRJbGiP5/C+l
-DfTmYud6Ld5YrL7xIQuf6SQWyO8WZkKA6D15VBdsFzM0pzhNGNGUgZYiTQ6rdh83
-5mL8l9IqzT5LD5RRXTj2CO7SB5iuyp8PrPyGCCVhILYJP+a4e4kHwEsCgYEA0803
-oF/QBhfKC3n/7xbRTeT4PcAHra+X84rY+KkyP1/qJXMRbCumpvTL6kZg7Jv2I3hG
-SaRK7mGhi0/omVn9aEgn4E7UKmE2ZhVbigTiqnPdYoH/hmrbQ5Z7SVaT/MNzGuKQ
-QZOmASgsZEjqSX7extXDzKOGD/AzMp3iWElUGTcCgYAOoT+vDnLJT0IEB1IcIrLA
-X22A04ppU6FXU/if55E2pPpmxo7bhIPWYqmFTnEl7BvOg20OlOhm1D612i2PY0OJ
-G9iWGl7LQlZv4ygnRmggE8H9e8UZsoNOuqqhmgW/RCpPw6+HDigq+zPn0NFxFApD
-lwuAKok9Uw9VrX30n2Nl9QKBgAG7c/ED15e1Khnd7ZHvBdc1QDKBF478GKoNQKkH
-+Tk7d5bG0iWoVbyX0/MekDxfKiwwF6MSjOpWMhQJm0VlzwTDUlArVODj2qYLFqyS
-TahHOlBL7+MRjKmI2YlIA/3VO2PE5pkitADeaz6GuiPPvdKyfN93lukaddC8KdW/
-A8kRAoGBAJdU+sTC1zfP+tbgArzf4rU5qEknserAH+GE6C/Otn134WBEyqSgd2Jb
-JpJsl2l/X/8Wfwh+SJQbhvDoY4ApMKlgLFBAIY/p2UcpEdUL2juec/F6+qGnBncQ
-4I+MKiVfixBM9p66Afybiskh3a/RvXK+/6NNOVtVYaSd7aSIrq9W
------END RSA PRIVATE KEY-----
-"""
diff --git a/script/deploy b/script/deploy
index ca32576281..4ba674766b 100755
--- a/script/deploy
+++ b/script/deploy
@@ -28,7 +28,7 @@ if [[ $ZED_KUBE_NAMESPACE == "production" && -n $(git status --short) ]]; then
 fi
 
 git_sha=$(git rev-parse HEAD)
-export ZED_IMAGE_ID="registry.digitalocean.com/zed/zed-server:${ZED_KUBE_NAMESPACE}-${git_sha}"
+export ZED_IMAGE_ID="registry.digitalocean.com/zed/collab:${ZED_KUBE_NAMESPACE}-${git_sha}"
 export $(cat $ENV_FILE)
 
 docker build . --tag "$ZED_IMAGE_ID"
diff --git a/script/seed-db b/script/seed-db
index 437d1bcac8..9da6ba2933 100755
--- a/script/seed-db
+++ b/script/seed-db
@@ -6,4 +6,4 @@ cd crates/server
 # Export contents of .env.toml
 eval "$(cargo run --bin dotenv)"
 
-cargo run --package=zed-server --features seed-support --bin seed
+cargo run --package=collab --features seed-support --bin seed