diff --git a/fedimint-clientd/Cargo.toml b/fedimint-clientd/Cargo.toml
index 254b1ce..2ddb589 100644
--- a/fedimint-clientd/Cargo.toml
+++ b/fedimint-clientd/Cargo.toml
@@ -4,11 +4,9 @@ version = "0.1.5"
 edition = "2021"
 description = "A fedimint client daemon for server side applications to hold, use, and manage Bitcoin"
 repository = "https://github.com/fedimint/fedimint-clientd"
-keywords = ["fedimint", "fedimint-cli"]
+keywords = ["fedimint", "bitcoin", "lightning", "ecash"]
 license = "MIT"
 
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
-
 [dependencies]
 anyhow = "1.0.75"
 axum = { version = "0.7.1", features = ["json", "ws"] }
diff --git a/fedimint-clientd/src/main.rs b/fedimint-clientd/src/main.rs
index cb514ad..8580520 100644
--- a/fedimint-clientd/src/main.rs
+++ b/fedimint-clientd/src/main.rs
@@ -244,13 +244,13 @@ fn fedimint_v2_rest() -> Router<AppState> {
     let wallet_router = Router::new()
         .route(
             "/deposit-address",
-            post(fedimint::wallet::deposit_address::handle_rest),
+            post(fedimint::onchain::deposit_address::handle_rest),
         )
         .route(
             "/await-deposit",
-            post(fedimint::wallet::await_deposit::handle_rest),
+            post(fedimint::onchain::await_deposit::handle_rest),
         )
-        .route("/withdraw", post(fedimint::wallet::withdraw::handle_rest));
+        .route("/withdraw", post(fedimint::onchain::withdraw::handle_rest));
 
     let admin_router = Router::new()
         .route("/backup", post(fedimint::admin::backup::handle_rest))
diff --git a/fedimint-clientd/src/router/handlers/fedimint/mod.rs b/fedimint-clientd/src/router/handlers/fedimint/mod.rs
index 5a88186..ba61bce 100644
--- a/fedimint-clientd/src/router/handlers/fedimint/mod.rs
+++ b/fedimint-clientd/src/router/handlers/fedimint/mod.rs
@@ -1,4 +1,4 @@
 pub mod admin;
 pub mod ln;
 pub mod mint;
-pub mod wallet;
+pub mod onchain;
diff --git a/fedimint-clientd/src/router/handlers/fedimint/wallet/await_deposit.rs b/fedimint-clientd/src/router/handlers/fedimint/onchain/await_deposit.rs
similarity index 100%
rename from fedimint-clientd/src/router/handlers/fedimint/wallet/await_deposit.rs
rename to fedimint-clientd/src/router/handlers/fedimint/onchain/await_deposit.rs
diff --git a/fedimint-clientd/src/router/handlers/fedimint/wallet/deposit_address.rs b/fedimint-clientd/src/router/handlers/fedimint/onchain/deposit_address.rs
similarity index 100%
rename from fedimint-clientd/src/router/handlers/fedimint/wallet/deposit_address.rs
rename to fedimint-clientd/src/router/handlers/fedimint/onchain/deposit_address.rs
diff --git a/fedimint-clientd/src/router/handlers/fedimint/wallet/mod.rs b/fedimint-clientd/src/router/handlers/fedimint/onchain/mod.rs
similarity index 100%
rename from fedimint-clientd/src/router/handlers/fedimint/wallet/mod.rs
rename to fedimint-clientd/src/router/handlers/fedimint/onchain/mod.rs
diff --git a/fedimint-clientd/src/router/handlers/fedimint/wallet/withdraw.rs b/fedimint-clientd/src/router/handlers/fedimint/onchain/withdraw.rs
similarity index 100%
rename from fedimint-clientd/src/router/handlers/fedimint/wallet/withdraw.rs
rename to fedimint-clientd/src/router/handlers/fedimint/onchain/withdraw.rs
diff --git a/fedimint-clientd/src/router/ws.rs b/fedimint-clientd/src/router/ws.rs
index 04da784..9aab34c 100644
--- a/fedimint-clientd/src/router/ws.rs
+++ b/fedimint-clientd/src/router/ws.rs
@@ -226,13 +226,13 @@ async fn match_method(req: JsonRpcRequest, state: AppState) -> Result<Value, App
             handlers::fedimint::ln::list_gateways::handle_ws(state.clone(), req.params).await
         }
         JsonRpcMethod::WalletDepositAddress => {
-            handlers::fedimint::wallet::deposit_address::handle_ws(state.clone(), req.params).await
+            handlers::fedimint::onchain::deposit_address::handle_ws(state.clone(), req.params).await
         }
         JsonRpcMethod::WalletAwaitDeposit => {
-            handlers::fedimint::wallet::await_deposit::handle_ws(state.clone(), req.params).await
+            handlers::fedimint::onchain::await_deposit::handle_ws(state.clone(), req.params).await
         }
         JsonRpcMethod::WalletWithdraw => {
-            handlers::fedimint::wallet::withdraw::handle_ws(state.clone(), req.params).await
+            handlers::fedimint::onchain::withdraw::handle_ws(state.clone(), req.params).await
         }
     }
 }