diff --git a/Cargo.lock b/Cargo.lock
index d2cb279..221c1f0 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1243,7 +1243,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d6790f58c7ff633d8771f42965289203411a5e5c68388703c06e14f24770b41e"
 
 [[package]]
-name = "otter"
+name = "otterd"
 version = "0.1.0"
 dependencies = [
  "axum",
diff --git a/Cargo.toml b/Cargo.toml
index c7f23d6..7957462 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,30 +1,12 @@
 [workspace]
+resolver = '2'
 members = [
+    'server',
     'gpodder',
     'gpodder_sqlite'
 ]
 
-[package]
-name = "otter"
-version = "0.1.0"
-edition = "2021"
-
-[dependencies]
-gpodder = { path = "./gpodder" }
-gpodder_sqlite = { path = "./gpodder_sqlite" }
-
-axum = { version = "0.8.1", features = ["macros"] }
-axum-extra = { version = "0.10", features = ["cookie", "typed-header"] }
-chrono = { version = "0.4.39", features = ["serde"] }
-clap = { version = "4.5.30", features = ["derive", "env"] }
-cookie = "0.18.1"
-figment = { version = "0.10.19", features = ["env", "toml"] }
-http-body-util = "0.1.3"
+[workspace.dependencies]
 rand = "0.8.5"
-serde = { version = "1.0.218", features = ["derive"] }
-tokio = { version = "1.43.0", features = ["full"] }
-tower-http = { version = "0.6.2", features = ["set-header", "trace"] }
 tracing = "0.1.41"
-tracing-subscriber = "0.3.19"
-tera = "1.20.0"
-axum-range = "0.5.0"
+chrono = "0.4.39"
diff --git a/gpodder/Cargo.toml b/gpodder/Cargo.toml
index 650529a..d7a178e 100644
--- a/gpodder/Cargo.toml
+++ b/gpodder/Cargo.toml
@@ -4,6 +4,7 @@ version = "0.1.0"
 edition = "2021"
 
 [dependencies]
-chrono = { version = "0.4.39", features = ["serde"] }
+rand = { workspace = true }
+chrono = { workspace = true }
+
 argon2 = "0.5.3"
-rand = "0.8.5"
diff --git a/gpodder_sqlite/Cargo.toml b/gpodder_sqlite/Cargo.toml
index 87ee613..75832d5 100644
--- a/gpodder_sqlite/Cargo.toml
+++ b/gpodder_sqlite/Cargo.toml
@@ -9,12 +9,14 @@ harness = false
 
 [dependencies]
 gpodder = { path = "../gpodder" }
+
+rand = { workspace = true }
+tracing = { workspace = true }
+chrono = { workspace = true, features = ["serde"] }
+
+libsqlite3-sys = { version = "0.31.0", features = ["bundled"] }
 diesel = { version = "2.2.7", features = ["r2d2", "sqlite", "returning_clauses_for_sqlite_3_35"] }
 diesel_migrations = { version = "2.2.0", features = ["sqlite"] }
-tracing = "0.1.41"
-chrono = { version = "0.4.39", features = ["serde"] }
-rand = "0.8.5"
-libsqlite3-sys = { version = "0.31.0", features = ["bundled"] }
 
 [dev-dependencies]
 criterion = "0.5.1"
diff --git a/server/Cargo.toml b/server/Cargo.toml
new file mode 100644
index 0000000..0bfb343
--- /dev/null
+++ b/server/Cargo.toml
@@ -0,0 +1,27 @@
+[package]
+name = "otterd"
+version = "0.1.0"
+edition = "2021"
+
+[dependencies]
+gpodder = { path = "../gpodder" }
+gpodder_sqlite = { path = "../gpodder_sqlite" }
+
+chrono = { workspace = true, features = ["serde"] }
+rand = { workspace = true }
+tracing = { workspace = true }
+
+serde = { version = "1.0.218", features = ["derive"] }
+figment = { version = "0.10.19", features = ["env", "toml"] }
+clap = { version = "4.5.30", features = ["derive", "env"] }
+
+tower-http = { version = "0.6.2", features = ["set-header", "trace"] }
+axum = { version = "0.8.1", features = ["macros"] }
+axum-extra = { version = "0.10", features = ["cookie", "typed-header"] }
+axum-range = "0.5.0"
+
+cookie = "0.18.1"
+http-body-util = "0.1.3"
+tokio = { version = "1.43.0", features = ["full"] }
+tracing-subscriber = "0.3.19"
+tera = "1.20.0"
diff --git a/src/cli/db.rs b/server/src/cli/db.rs
similarity index 100%
rename from src/cli/db.rs
rename to server/src/cli/db.rs
diff --git a/src/cli/gpo.rs b/server/src/cli/gpo.rs
similarity index 100%
rename from src/cli/gpo.rs
rename to server/src/cli/gpo.rs
diff --git a/src/cli/mod.rs b/server/src/cli/mod.rs
similarity index 100%
rename from src/cli/mod.rs
rename to server/src/cli/mod.rs
diff --git a/src/cli/serve.rs b/server/src/cli/serve.rs
similarity index 100%
rename from src/cli/serve.rs
rename to server/src/cli/serve.rs
diff --git a/src/config.rs b/server/src/config.rs
similarity index 100%
rename from src/config.rs
rename to server/src/config.rs
diff --git a/src/main.rs b/server/src/main.rs
similarity index 100%
rename from src/main.rs
rename to server/src/main.rs
diff --git a/src/server/error.rs b/server/src/server/error.rs
similarity index 100%
rename from src/server/error.rs
rename to server/src/server/error.rs
diff --git a/src/server/gpodder/advanced/auth.rs b/server/src/server/gpodder/advanced/auth.rs
similarity index 100%
rename from src/server/gpodder/advanced/auth.rs
rename to server/src/server/gpodder/advanced/auth.rs
diff --git a/src/server/gpodder/advanced/devices.rs b/server/src/server/gpodder/advanced/devices.rs
similarity index 100%
rename from src/server/gpodder/advanced/devices.rs
rename to server/src/server/gpodder/advanced/devices.rs
diff --git a/src/server/gpodder/advanced/episodes.rs b/server/src/server/gpodder/advanced/episodes.rs
similarity index 100%
rename from src/server/gpodder/advanced/episodes.rs
rename to server/src/server/gpodder/advanced/episodes.rs
diff --git a/src/server/gpodder/advanced/mod.rs b/server/src/server/gpodder/advanced/mod.rs
similarity index 100%
rename from src/server/gpodder/advanced/mod.rs
rename to server/src/server/gpodder/advanced/mod.rs
diff --git a/src/server/gpodder/advanced/subscriptions.rs b/server/src/server/gpodder/advanced/subscriptions.rs
similarity index 100%
rename from src/server/gpodder/advanced/subscriptions.rs
rename to server/src/server/gpodder/advanced/subscriptions.rs
diff --git a/src/server/gpodder/advanced/sync.rs b/server/src/server/gpodder/advanced/sync.rs
similarity index 100%
rename from src/server/gpodder/advanced/sync.rs
rename to server/src/server/gpodder/advanced/sync.rs
diff --git a/src/server/gpodder/format.rs b/server/src/server/gpodder/format.rs
similarity index 100%
rename from src/server/gpodder/format.rs
rename to server/src/server/gpodder/format.rs
diff --git a/src/server/gpodder/mod.rs b/server/src/server/gpodder/mod.rs
similarity index 100%
rename from src/server/gpodder/mod.rs
rename to server/src/server/gpodder/mod.rs
diff --git a/src/server/gpodder/models.rs b/server/src/server/gpodder/models.rs
similarity index 100%
rename from src/server/gpodder/models.rs
rename to server/src/server/gpodder/models.rs
diff --git a/src/server/gpodder/simple/mod.rs b/server/src/server/gpodder/simple/mod.rs
similarity index 100%
rename from src/server/gpodder/simple/mod.rs
rename to server/src/server/gpodder/simple/mod.rs
diff --git a/src/server/gpodder/simple/subscriptions.rs b/server/src/server/gpodder/simple/subscriptions.rs
similarity index 100%
rename from src/server/gpodder/simple/subscriptions.rs
rename to server/src/server/gpodder/simple/subscriptions.rs
diff --git a/src/server/mod.rs b/server/src/server/mod.rs
similarity index 100%
rename from src/server/mod.rs
rename to server/src/server/mod.rs
diff --git a/src/server/static/htmx_2.0.4.min.js b/server/src/server/static/htmx_2.0.4.min.js
similarity index 100%
rename from src/server/static/htmx_2.0.4.min.js
rename to server/src/server/static/htmx_2.0.4.min.js
diff --git a/src/server/static/mod.rs b/server/src/server/static/mod.rs
similarity index 100%
rename from src/server/static/mod.rs
rename to server/src/server/static/mod.rs
diff --git a/src/server/static/pico_2.1.1.classless.jade.min.css b/server/src/server/static/pico_2.1.1.classless.jade.min.css
similarity index 100%
rename from src/server/static/pico_2.1.1.classless.jade.min.css
rename to server/src/server/static/pico_2.1.1.classless.jade.min.css
diff --git a/src/server/web/mod.rs b/server/src/server/web/mod.rs
similarity index 99%
rename from src/server/web/mod.rs
rename to server/src/server/web/mod.rs
index 6b93f6c..98f5d1e 100644
--- a/src/server/web/mod.rs
+++ b/server/src/server/web/mod.rs
@@ -61,7 +61,6 @@ struct LoginForm {
 async fn post_login(
     State(ctx): State<Context>,
     user_agent: Option<TypedHeader<UserAgent>>,
-    _headers: HeaderMap,
     jar: CookieJar,
     Form(login): Form<LoginForm>,
 ) -> AppResult<Response> {
diff --git a/src/web/mod.rs b/server/src/web/mod.rs
similarity index 100%
rename from src/web/mod.rs
rename to server/src/web/mod.rs
diff --git a/src/web/page.rs b/server/src/web/page.rs
similarity index 100%
rename from src/web/page.rs
rename to server/src/web/page.rs
diff --git a/src/web/templates/base.html b/server/src/web/templates/base.html
similarity index 100%
rename from src/web/templates/base.html
rename to server/src/web/templates/base.html
diff --git a/src/web/templates/views/index.html b/server/src/web/templates/views/index.html
similarity index 100%
rename from src/web/templates/views/index.html
rename to server/src/web/templates/views/index.html
diff --git a/src/web/templates/views/login.html b/server/src/web/templates/views/login.html
similarity index 100%
rename from src/web/templates/views/login.html
rename to server/src/web/templates/views/login.html
diff --git a/src/web/view.rs b/server/src/web/view.rs
similarity index 100%
rename from src/web/view.rs
rename to server/src/web/view.rs