diff --git a/wallets/bitcoind/bitcoind/build.gradle.kts b/wallets/bitcoind/bitcoind/build.gradle.kts
index ed53d74049..b2af4646c1 100644
--- a/wallets/bitcoind/bitcoind/build.gradle.kts
+++ b/wallets/bitcoind/bitcoind/build.gradle.kts
@@ -1,16 +1,12 @@
 plugins {
     id("bisq.java-library")
     id("bisq.java-integration-tests")
-    id("bisq.protobuf")
 }
 
 dependencies {
-    implementation("bisq:persistence")
-
     implementation(project(":core"))
     implementation(project(":json-rpc"))
 
-    implementation(libs.typesafe.config)
     implementation(libs.jeromq)
 
     integrationTestImplementation(project(":regtest"))
diff --git a/wallets/settings.gradle.kts b/wallets/settings.gradle.kts
index b069bd6200..2d4f3fe6d2 100644
--- a/wallets/settings.gradle.kts
+++ b/wallets/settings.gradle.kts
@@ -20,5 +20,6 @@ include("electrum")
 include("elementsd")
 
 include("process")
+include("wallet")
 
-rootProject.name = "wallets"
\ No newline at end of file
+rootProject.name = "wallets"
diff --git a/wallets/wallet/build.gradle.kts b/wallets/wallet/build.gradle.kts
new file mode 100644
index 0000000000..70c9aa80a9
--- /dev/null
+++ b/wallets/wallet/build.gradle.kts
@@ -0,0 +1,15 @@
+plugins {
+    id("bisq.java-library")
+    id("bisq.java-integration-tests")
+    id("bisq.protobuf")
+}
+
+dependencies {
+    implementation("bisq:persistence")
+
+    implementation("bitcoind:core")
+    implementation("bitcoind:bitcoind")
+    implementation("bitcoind:json-rpc")
+
+    implementation(libs.typesafe.config)
+}
\ No newline at end of file
diff --git a/wallets/bitcoind/bitcoind/src/main/java/bisq/wallets/bitcoind/AbstractBitcoindWalletService.java b/wallets/wallet/src/main/java/bisq/wallets/bitcoind/AbstractBitcoindWalletService.java
similarity index 100%
rename from wallets/bitcoind/bitcoind/src/main/java/bisq/wallets/bitcoind/AbstractBitcoindWalletService.java
rename to wallets/wallet/src/main/java/bisq/wallets/bitcoind/AbstractBitcoindWalletService.java
diff --git a/wallets/bitcoind/bitcoind/src/main/java/bisq/wallets/bitcoind/BitcoinWallet.java b/wallets/wallet/src/main/java/bisq/wallets/bitcoind/BitcoinWallet.java
similarity index 100%
rename from wallets/bitcoind/bitcoind/src/main/java/bisq/wallets/bitcoind/BitcoinWallet.java
rename to wallets/wallet/src/main/java/bisq/wallets/bitcoind/BitcoinWallet.java
diff --git a/wallets/bitcoind/bitcoind/src/main/java/bisq/wallets/bitcoind/BitcoinWalletService.java b/wallets/wallet/src/main/java/bisq/wallets/bitcoind/BitcoinWalletService.java
similarity index 100%
rename from wallets/bitcoind/bitcoind/src/main/java/bisq/wallets/bitcoind/BitcoinWalletService.java
rename to wallets/wallet/src/main/java/bisq/wallets/bitcoind/BitcoinWalletService.java
diff --git a/wallets/bitcoind/bitcoind/src/main/java/bisq/wallets/bitcoind/BitcoinWalletStore.java b/wallets/wallet/src/main/java/bisq/wallets/bitcoind/BitcoinWalletStore.java
similarity index 100%
rename from wallets/bitcoind/bitcoind/src/main/java/bisq/wallets/bitcoind/BitcoinWalletStore.java
rename to wallets/wallet/src/main/java/bisq/wallets/bitcoind/BitcoinWalletStore.java
diff --git a/wallets/bitcoind/bitcoind/src/main/java/bisq/wallets/bitcoind/WalletFactory.java b/wallets/wallet/src/main/java/bisq/wallets/bitcoind/WalletFactory.java
similarity index 100%
rename from wallets/bitcoind/bitcoind/src/main/java/bisq/wallets/bitcoind/WalletFactory.java
rename to wallets/wallet/src/main/java/bisq/wallets/bitcoind/WalletFactory.java
diff --git a/wallets/bitcoind/bitcoind/src/main/proto/wallets.bitcoind.proto b/wallets/wallet/src/main/proto/wallets.bitcoind.proto
similarity index 100%
rename from wallets/bitcoind/bitcoind/src/main/proto/wallets.bitcoind.proto
rename to wallets/wallet/src/main/proto/wallets.bitcoind.proto