diff --git a/apps/desktop/desktop-app/build.gradle.kts b/apps/desktop/desktop-app/build.gradle.kts
index 56ea822f46..4ba4a3d80f 100644
--- a/apps/desktop/desktop-app/build.gradle.kts
+++ b/apps/desktop/desktop-app/build.gradle.kts
@@ -54,7 +54,7 @@ dependencies {
     implementation(project(":desktop"))
 
     implementation("network:network")
-    implementation("wallets:core")
+    implementation("bitcoind:core")
     // implementation("wallets:electrum")
     // implementation("wallets:bitcoind")
 
diff --git a/apps/desktop/desktop/build.gradle.kts b/apps/desktop/desktop/build.gradle.kts
index e55458acc6..99ec9178b6 100644
--- a/apps/desktop/desktop/build.gradle.kts
+++ b/apps/desktop/desktop/build.gradle.kts
@@ -39,7 +39,7 @@ dependencies {
     implementation("network:network")
     implementation("network:network-identity")
 
-    implementation("wallets:core")
+    implementation("bitcoind:core")
     // implementation("wallets:electrum")
     // implementation("wallets:bitcoind")
 
diff --git a/apps/rest-api-app/build.gradle.kts b/apps/rest-api-app/build.gradle.kts
index 88739f3098..0790463035 100644
--- a/apps/rest-api-app/build.gradle.kts
+++ b/apps/rest-api-app/build.gradle.kts
@@ -27,7 +27,7 @@ dependencies {
 
     implementation("network:network-common")
     implementation("network:network")
-    implementation("wallets:core")
+    implementation("bitcoind:core")
 
     implementation(libs.typesafe.config)
     implementation(libs.bundles.glassfish.jersey)
diff --git a/bisq-easy/build.gradle.kts b/bisq-easy/build.gradle.kts
index f466b27585..0ece0bf1dc 100644
--- a/bisq-easy/build.gradle.kts
+++ b/bisq-easy/build.gradle.kts
@@ -20,7 +20,7 @@ dependencies {
 
     implementation("network:network")
     implementation("network:network-identity")
-    implementation("wallets:core")
+    implementation("bitcoind:core")
     // implementation("wallets:electrum")
     // implementation("wallets:bitcoind")
 
diff --git a/wallets/bitcoind/bitcoind/build.gradle.kts b/wallets/bitcoind/bitcoind/build.gradle.kts
new file mode 100644
index 0000000000..ed53d74049
--- /dev/null
+++ b/wallets/bitcoind/bitcoind/build.gradle.kts
@@ -0,0 +1,17 @@
+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"))
+}
\ No newline at end of file
diff --git a/wallets/bitcoind/src/integrationTest/java/bisq/wallets/bitcoind/BitcoindConnectionFailureIntegrationTests.java b/wallets/bitcoind/bitcoind/src/integrationTest/java/bisq/wallets/bitcoind/BitcoindConnectionFailureIntegrationTests.java
similarity index 100%
rename from wallets/bitcoind/src/integrationTest/java/bisq/wallets/bitcoind/BitcoindConnectionFailureIntegrationTests.java
rename to wallets/bitcoind/bitcoind/src/integrationTest/java/bisq/wallets/bitcoind/BitcoindConnectionFailureIntegrationTests.java
diff --git a/wallets/bitcoind/src/integrationTest/java/bisq/wallets/bitcoind/BitcoindCreateWalletNameDocumentationIntegrationTests.java b/wallets/bitcoind/bitcoind/src/integrationTest/java/bisq/wallets/bitcoind/BitcoindCreateWalletNameDocumentationIntegrationTests.java
similarity index 100%
rename from wallets/bitcoind/src/integrationTest/java/bisq/wallets/bitcoind/BitcoindCreateWalletNameDocumentationIntegrationTests.java
rename to wallets/bitcoind/bitcoind/src/integrationTest/java/bisq/wallets/bitcoind/BitcoindCreateWalletNameDocumentationIntegrationTests.java
diff --git a/wallets/bitcoind/src/integrationTest/java/bisq/wallets/bitcoind/BitcoindCreateWalletNameIntegrationTests.java b/wallets/bitcoind/bitcoind/src/integrationTest/java/bisq/wallets/bitcoind/BitcoindCreateWalletNameIntegrationTests.java
similarity index 100%
rename from wallets/bitcoind/src/integrationTest/java/bisq/wallets/bitcoind/BitcoindCreateWalletNameIntegrationTests.java
rename to wallets/bitcoind/bitcoind/src/integrationTest/java/bisq/wallets/bitcoind/BitcoindCreateWalletNameIntegrationTests.java
diff --git a/wallets/bitcoind/src/integrationTest/java/bisq/wallets/bitcoind/BitcoindListDescriptorsIntegrationTest.java b/wallets/bitcoind/bitcoind/src/integrationTest/java/bisq/wallets/bitcoind/BitcoindListDescriptorsIntegrationTest.java
similarity index 100%
rename from wallets/bitcoind/src/integrationTest/java/bisq/wallets/bitcoind/BitcoindListDescriptorsIntegrationTest.java
rename to wallets/bitcoind/bitcoind/src/integrationTest/java/bisq/wallets/bitcoind/BitcoindListDescriptorsIntegrationTest.java
diff --git a/wallets/bitcoind/src/integrationTest/java/bisq/wallets/bitcoind/BitcoindPsbtMultiSigIntegrationTests.java b/wallets/bitcoind/bitcoind/src/integrationTest/java/bisq/wallets/bitcoind/BitcoindPsbtMultiSigIntegrationTests.java
similarity index 100%
rename from wallets/bitcoind/src/integrationTest/java/bisq/wallets/bitcoind/BitcoindPsbtMultiSigIntegrationTests.java
rename to wallets/bitcoind/bitcoind/src/integrationTest/java/bisq/wallets/bitcoind/BitcoindPsbtMultiSigIntegrationTests.java
diff --git a/wallets/bitcoind/src/integrationTest/java/bisq/wallets/bitcoind/BitcoindReceiveAddrIntegrationTests.java b/wallets/bitcoind/bitcoind/src/integrationTest/java/bisq/wallets/bitcoind/BitcoindReceiveAddrIntegrationTests.java
similarity index 100%
rename from wallets/bitcoind/src/integrationTest/java/bisq/wallets/bitcoind/BitcoindReceiveAddrIntegrationTests.java
rename to wallets/bitcoind/bitcoind/src/integrationTest/java/bisq/wallets/bitcoind/BitcoindReceiveAddrIntegrationTests.java
diff --git a/wallets/bitcoind/src/integrationTest/java/bisq/wallets/bitcoind/BitcoindSendAndListTxsIntegrationTests.java b/wallets/bitcoind/bitcoind/src/integrationTest/java/bisq/wallets/bitcoind/BitcoindSendAndListTxsIntegrationTests.java
similarity index 100%
rename from wallets/bitcoind/src/integrationTest/java/bisq/wallets/bitcoind/BitcoindSendAndListTxsIntegrationTests.java
rename to wallets/bitcoind/bitcoind/src/integrationTest/java/bisq/wallets/bitcoind/BitcoindSendAndListTxsIntegrationTests.java
diff --git a/wallets/bitcoind/src/integrationTest/java/bisq/wallets/bitcoind/BitcoindSendAndListUnspentIntegrationTests.java b/wallets/bitcoind/bitcoind/src/integrationTest/java/bisq/wallets/bitcoind/BitcoindSendAndListUnspentIntegrationTests.java
similarity index 100%
rename from wallets/bitcoind/src/integrationTest/java/bisq/wallets/bitcoind/BitcoindSendAndListUnspentIntegrationTests.java
rename to wallets/bitcoind/bitcoind/src/integrationTest/java/bisq/wallets/bitcoind/BitcoindSendAndListUnspentIntegrationTests.java
diff --git a/wallets/bitcoind/src/integrationTest/java/bisq/wallets/bitcoind/BitcoindSendIntegrationTests.java b/wallets/bitcoind/bitcoind/src/integrationTest/java/bisq/wallets/bitcoind/BitcoindSendIntegrationTests.java
similarity index 100%
rename from wallets/bitcoind/src/integrationTest/java/bisq/wallets/bitcoind/BitcoindSendIntegrationTests.java
rename to wallets/bitcoind/bitcoind/src/integrationTest/java/bisq/wallets/bitcoind/BitcoindSendIntegrationTests.java
diff --git a/wallets/bitcoind/src/integrationTest/java/bisq/wallets/bitcoind/BitcoindSigningIntegrationTests.java b/wallets/bitcoind/bitcoind/src/integrationTest/java/bisq/wallets/bitcoind/BitcoindSigningIntegrationTests.java
similarity index 100%
rename from wallets/bitcoind/src/integrationTest/java/bisq/wallets/bitcoind/BitcoindSigningIntegrationTests.java
rename to wallets/bitcoind/bitcoind/src/integrationTest/java/bisq/wallets/bitcoind/BitcoindSigningIntegrationTests.java
diff --git a/wallets/bitcoind/src/integrationTest/java/bisq/wallets/bitcoind/BitcoindWalletCreationAndListIntegrationTests.java b/wallets/bitcoind/bitcoind/src/integrationTest/java/bisq/wallets/bitcoind/BitcoindWalletCreationAndListIntegrationTests.java
similarity index 100%
rename from wallets/bitcoind/src/integrationTest/java/bisq/wallets/bitcoind/BitcoindWalletCreationAndListIntegrationTests.java
rename to wallets/bitcoind/bitcoind/src/integrationTest/java/bisq/wallets/bitcoind/BitcoindWalletCreationAndListIntegrationTests.java
diff --git a/wallets/bitcoind/src/integrationTest/java/bisq/wallets/bitcoind/zmq/BitcoindZeroMqBlockHashIntegrationIntegrationTests.java b/wallets/bitcoind/bitcoind/src/integrationTest/java/bisq/wallets/bitcoind/zmq/BitcoindZeroMqBlockHashIntegrationIntegrationTests.java
similarity index 100%
rename from wallets/bitcoind/src/integrationTest/java/bisq/wallets/bitcoind/zmq/BitcoindZeroMqBlockHashIntegrationIntegrationTests.java
rename to wallets/bitcoind/bitcoind/src/integrationTest/java/bisq/wallets/bitcoind/zmq/BitcoindZeroMqBlockHashIntegrationIntegrationTests.java
diff --git a/wallets/bitcoind/src/integrationTest/java/bisq/wallets/bitcoind/zmq/BitcoindZeroMqConnectionInfoFinderIntegrationTests.java b/wallets/bitcoind/bitcoind/src/integrationTest/java/bisq/wallets/bitcoind/zmq/BitcoindZeroMqConnectionInfoFinderIntegrationTests.java
similarity index 100%
rename from wallets/bitcoind/src/integrationTest/java/bisq/wallets/bitcoind/zmq/BitcoindZeroMqConnectionInfoFinderIntegrationTests.java
rename to wallets/bitcoind/bitcoind/src/integrationTest/java/bisq/wallets/bitcoind/zmq/BitcoindZeroMqConnectionInfoFinderIntegrationTests.java
diff --git a/wallets/bitcoind/src/main/java/bisq/wallets/bitcoind/AbstractBitcoindWalletService.java b/wallets/bitcoind/bitcoind/src/main/java/bisq/wallets/bitcoind/AbstractBitcoindWalletService.java
similarity index 100%
rename from wallets/bitcoind/src/main/java/bisq/wallets/bitcoind/AbstractBitcoindWalletService.java
rename to wallets/bitcoind/bitcoind/src/main/java/bisq/wallets/bitcoind/AbstractBitcoindWalletService.java
diff --git a/wallets/bitcoind/src/main/java/bisq/wallets/bitcoind/BitcoinWallet.java b/wallets/bitcoind/bitcoind/src/main/java/bisq/wallets/bitcoind/BitcoinWallet.java
similarity index 100%
rename from wallets/bitcoind/src/main/java/bisq/wallets/bitcoind/BitcoinWallet.java
rename to wallets/bitcoind/bitcoind/src/main/java/bisq/wallets/bitcoind/BitcoinWallet.java
diff --git a/wallets/bitcoind/src/main/java/bisq/wallets/bitcoind/BitcoinWalletService.java b/wallets/bitcoind/bitcoind/src/main/java/bisq/wallets/bitcoind/BitcoinWalletService.java
similarity index 100%
rename from wallets/bitcoind/src/main/java/bisq/wallets/bitcoind/BitcoinWalletService.java
rename to wallets/bitcoind/bitcoind/src/main/java/bisq/wallets/bitcoind/BitcoinWalletService.java
diff --git a/wallets/bitcoind/src/main/java/bisq/wallets/bitcoind/BitcoinWalletStore.java b/wallets/bitcoind/bitcoind/src/main/java/bisq/wallets/bitcoind/BitcoinWalletStore.java
similarity index 100%
rename from wallets/bitcoind/src/main/java/bisq/wallets/bitcoind/BitcoinWalletStore.java
rename to wallets/bitcoind/bitcoind/src/main/java/bisq/wallets/bitcoind/BitcoinWalletStore.java
diff --git a/wallets/bitcoind/src/main/java/bisq/wallets/bitcoind/WalletFactory.java b/wallets/bitcoind/bitcoind/src/main/java/bisq/wallets/bitcoind/WalletFactory.java
similarity index 100%
rename from wallets/bitcoind/src/main/java/bisq/wallets/bitcoind/WalletFactory.java
rename to wallets/bitcoind/bitcoind/src/main/java/bisq/wallets/bitcoind/WalletFactory.java
diff --git a/wallets/bitcoind/src/main/java/bisq/wallets/bitcoind/rpc/BitcoindDaemon.java b/wallets/bitcoind/bitcoind/src/main/java/bisq/wallets/bitcoind/rpc/BitcoindDaemon.java
similarity index 100%
rename from wallets/bitcoind/src/main/java/bisq/wallets/bitcoind/rpc/BitcoindDaemon.java
rename to wallets/bitcoind/bitcoind/src/main/java/bisq/wallets/bitcoind/rpc/BitcoindDaemon.java
diff --git a/wallets/bitcoind/src/main/java/bisq/wallets/bitcoind/rpc/BitcoindWallet.java b/wallets/bitcoind/bitcoind/src/main/java/bisq/wallets/bitcoind/rpc/BitcoindWallet.java
similarity index 100%
rename from wallets/bitcoind/src/main/java/bisq/wallets/bitcoind/rpc/BitcoindWallet.java
rename to wallets/bitcoind/bitcoind/src/main/java/bisq/wallets/bitcoind/rpc/BitcoindWallet.java
diff --git a/wallets/bitcoind/src/main/java/bisq/wallets/bitcoind/rpc/calls/BitcoindAddMultiSigAddressRpcCall.java b/wallets/bitcoind/bitcoind/src/main/java/bisq/wallets/bitcoind/rpc/calls/BitcoindAddMultiSigAddressRpcCall.java
similarity index 100%
rename from wallets/bitcoind/src/main/java/bisq/wallets/bitcoind/rpc/calls/BitcoindAddMultiSigAddressRpcCall.java
rename to wallets/bitcoind/bitcoind/src/main/java/bisq/wallets/bitcoind/rpc/calls/BitcoindAddMultiSigAddressRpcCall.java
diff --git a/wallets/bitcoind/src/main/java/bisq/wallets/bitcoind/rpc/calls/BitcoindCombinePsbtRpcCall.java b/wallets/bitcoind/bitcoind/src/main/java/bisq/wallets/bitcoind/rpc/calls/BitcoindCombinePsbtRpcCall.java
similarity index 100%
rename from wallets/bitcoind/src/main/java/bisq/wallets/bitcoind/rpc/calls/BitcoindCombinePsbtRpcCall.java
rename to wallets/bitcoind/bitcoind/src/main/java/bisq/wallets/bitcoind/rpc/calls/BitcoindCombinePsbtRpcCall.java
diff --git a/wallets/bitcoind/src/main/java/bisq/wallets/bitcoind/rpc/calls/BitcoindCreateMultiSigRpcCall.java b/wallets/bitcoind/bitcoind/src/main/java/bisq/wallets/bitcoind/rpc/calls/BitcoindCreateMultiSigRpcCall.java
similarity index 100%
rename from wallets/bitcoind/src/main/java/bisq/wallets/bitcoind/rpc/calls/BitcoindCreateMultiSigRpcCall.java
rename to wallets/bitcoind/bitcoind/src/main/java/bisq/wallets/bitcoind/rpc/calls/BitcoindCreateMultiSigRpcCall.java
diff --git a/wallets/bitcoind/src/main/java/bisq/wallets/bitcoind/rpc/calls/BitcoindCreateWalletRpcCall.java b/wallets/bitcoind/bitcoind/src/main/java/bisq/wallets/bitcoind/rpc/calls/BitcoindCreateWalletRpcCall.java
similarity index 100%
rename from wallets/bitcoind/src/main/java/bisq/wallets/bitcoind/rpc/calls/BitcoindCreateWalletRpcCall.java
rename to wallets/bitcoind/bitcoind/src/main/java/bisq/wallets/bitcoind/rpc/calls/BitcoindCreateWalletRpcCall.java
diff --git a/wallets/bitcoind/src/main/java/bisq/wallets/bitcoind/rpc/calls/BitcoindDecodeRawTransactionRpcCall.java b/wallets/bitcoind/bitcoind/src/main/java/bisq/wallets/bitcoind/rpc/calls/BitcoindDecodeRawTransactionRpcCall.java
similarity index 100%
rename from wallets/bitcoind/src/main/java/bisq/wallets/bitcoind/rpc/calls/BitcoindDecodeRawTransactionRpcCall.java
rename to wallets/bitcoind/bitcoind/src/main/java/bisq/wallets/bitcoind/rpc/calls/BitcoindDecodeRawTransactionRpcCall.java
diff --git a/wallets/bitcoind/src/main/java/bisq/wallets/bitcoind/rpc/calls/BitcoindFinalizePsbtRpcCall.java b/wallets/bitcoind/bitcoind/src/main/java/bisq/wallets/bitcoind/rpc/calls/BitcoindFinalizePsbtRpcCall.java
similarity index 100%
rename from wallets/bitcoind/src/main/java/bisq/wallets/bitcoind/rpc/calls/BitcoindFinalizePsbtRpcCall.java
rename to wallets/bitcoind/bitcoind/src/main/java/bisq/wallets/bitcoind/rpc/calls/BitcoindFinalizePsbtRpcCall.java
diff --git a/wallets/bitcoind/src/main/java/bisq/wallets/bitcoind/rpc/calls/BitcoindGenerateToAddressRpcCall.java b/wallets/bitcoind/bitcoind/src/main/java/bisq/wallets/bitcoind/rpc/calls/BitcoindGenerateToAddressRpcCall.java
similarity index 100%
rename from wallets/bitcoind/src/main/java/bisq/wallets/bitcoind/rpc/calls/BitcoindGenerateToAddressRpcCall.java
rename to wallets/bitcoind/bitcoind/src/main/java/bisq/wallets/bitcoind/rpc/calls/BitcoindGenerateToAddressRpcCall.java
diff --git a/wallets/bitcoind/src/main/java/bisq/wallets/bitcoind/rpc/calls/BitcoindGetAddressInfoRpcCall.java b/wallets/bitcoind/bitcoind/src/main/java/bisq/wallets/bitcoind/rpc/calls/BitcoindGetAddressInfoRpcCall.java
similarity index 100%
rename from wallets/bitcoind/src/main/java/bisq/wallets/bitcoind/rpc/calls/BitcoindGetAddressInfoRpcCall.java
rename to wallets/bitcoind/bitcoind/src/main/java/bisq/wallets/bitcoind/rpc/calls/BitcoindGetAddressInfoRpcCall.java
diff --git a/wallets/bitcoind/src/main/java/bisq/wallets/bitcoind/rpc/calls/BitcoindGetBalancesRpcCall.java b/wallets/bitcoind/bitcoind/src/main/java/bisq/wallets/bitcoind/rpc/calls/BitcoindGetBalancesRpcCall.java
similarity index 100%
rename from wallets/bitcoind/src/main/java/bisq/wallets/bitcoind/rpc/calls/BitcoindGetBalancesRpcCall.java
rename to wallets/bitcoind/bitcoind/src/main/java/bisq/wallets/bitcoind/rpc/calls/BitcoindGetBalancesRpcCall.java
diff --git a/wallets/bitcoind/src/main/java/bisq/wallets/bitcoind/rpc/calls/BitcoindGetDescriptorInfoRpcCall.java b/wallets/bitcoind/bitcoind/src/main/java/bisq/wallets/bitcoind/rpc/calls/BitcoindGetDescriptorInfoRpcCall.java
similarity index 100%
rename from wallets/bitcoind/src/main/java/bisq/wallets/bitcoind/rpc/calls/BitcoindGetDescriptorInfoRpcCall.java
rename to wallets/bitcoind/bitcoind/src/main/java/bisq/wallets/bitcoind/rpc/calls/BitcoindGetDescriptorInfoRpcCall.java
diff --git a/wallets/bitcoind/src/main/java/bisq/wallets/bitcoind/rpc/calls/BitcoindGetNewAddressRpcCall.java b/wallets/bitcoind/bitcoind/src/main/java/bisq/wallets/bitcoind/rpc/calls/BitcoindGetNewAddressRpcCall.java
similarity index 100%
rename from wallets/bitcoind/src/main/java/bisq/wallets/bitcoind/rpc/calls/BitcoindGetNewAddressRpcCall.java
rename to wallets/bitcoind/bitcoind/src/main/java/bisq/wallets/bitcoind/rpc/calls/BitcoindGetNewAddressRpcCall.java
diff --git a/wallets/bitcoind/src/main/java/bisq/wallets/bitcoind/rpc/calls/BitcoindGetRawTransactionRpcCall.java b/wallets/bitcoind/bitcoind/src/main/java/bisq/wallets/bitcoind/rpc/calls/BitcoindGetRawTransactionRpcCall.java
similarity index 100%
rename from wallets/bitcoind/src/main/java/bisq/wallets/bitcoind/rpc/calls/BitcoindGetRawTransactionRpcCall.java
rename to wallets/bitcoind/bitcoind/src/main/java/bisq/wallets/bitcoind/rpc/calls/BitcoindGetRawTransactionRpcCall.java
diff --git a/wallets/bitcoind/src/main/java/bisq/wallets/bitcoind/rpc/calls/BitcoindGetTxOutProofRpcCall.java b/wallets/bitcoind/bitcoind/src/main/java/bisq/wallets/bitcoind/rpc/calls/BitcoindGetTxOutProofRpcCall.java
similarity index 100%
rename from wallets/bitcoind/src/main/java/bisq/wallets/bitcoind/rpc/calls/BitcoindGetTxOutProofRpcCall.java
rename to wallets/bitcoind/bitcoind/src/main/java/bisq/wallets/bitcoind/rpc/calls/BitcoindGetTxOutProofRpcCall.java
diff --git a/wallets/bitcoind/src/main/java/bisq/wallets/bitcoind/rpc/calls/BitcoindGetZmqNotificationsRpcCall.java b/wallets/bitcoind/bitcoind/src/main/java/bisq/wallets/bitcoind/rpc/calls/BitcoindGetZmqNotificationsRpcCall.java
similarity index 100%
rename from wallets/bitcoind/src/main/java/bisq/wallets/bitcoind/rpc/calls/BitcoindGetZmqNotificationsRpcCall.java
rename to wallets/bitcoind/bitcoind/src/main/java/bisq/wallets/bitcoind/rpc/calls/BitcoindGetZmqNotificationsRpcCall.java
diff --git a/wallets/bitcoind/src/main/java/bisq/wallets/bitcoind/rpc/calls/BitcoindImportAddressRpcCall.java b/wallets/bitcoind/bitcoind/src/main/java/bisq/wallets/bitcoind/rpc/calls/BitcoindImportAddressRpcCall.java
similarity index 100%
rename from wallets/bitcoind/src/main/java/bisq/wallets/bitcoind/rpc/calls/BitcoindImportAddressRpcCall.java
rename to wallets/bitcoind/bitcoind/src/main/java/bisq/wallets/bitcoind/rpc/calls/BitcoindImportAddressRpcCall.java
diff --git a/wallets/bitcoind/src/main/java/bisq/wallets/bitcoind/rpc/calls/BitcoindImportDescriptorsRpcCall.java b/wallets/bitcoind/bitcoind/src/main/java/bisq/wallets/bitcoind/rpc/calls/BitcoindImportDescriptorsRpcCall.java
similarity index 100%
rename from wallets/bitcoind/src/main/java/bisq/wallets/bitcoind/rpc/calls/BitcoindImportDescriptorsRpcCall.java
rename to wallets/bitcoind/bitcoind/src/main/java/bisq/wallets/bitcoind/rpc/calls/BitcoindImportDescriptorsRpcCall.java
diff --git a/wallets/bitcoind/src/main/java/bisq/wallets/bitcoind/rpc/calls/BitcoindImportMultiRpcCall.java b/wallets/bitcoind/bitcoind/src/main/java/bisq/wallets/bitcoind/rpc/calls/BitcoindImportMultiRpcCall.java
similarity index 100%
rename from wallets/bitcoind/src/main/java/bisq/wallets/bitcoind/rpc/calls/BitcoindImportMultiRpcCall.java
rename to wallets/bitcoind/bitcoind/src/main/java/bisq/wallets/bitcoind/rpc/calls/BitcoindImportMultiRpcCall.java
diff --git a/wallets/bitcoind/src/main/java/bisq/wallets/bitcoind/rpc/calls/BitcoindListAddressGroupingsRpcCall.java b/wallets/bitcoind/bitcoind/src/main/java/bisq/wallets/bitcoind/rpc/calls/BitcoindListAddressGroupingsRpcCall.java
similarity index 100%
rename from wallets/bitcoind/src/main/java/bisq/wallets/bitcoind/rpc/calls/BitcoindListAddressGroupingsRpcCall.java
rename to wallets/bitcoind/bitcoind/src/main/java/bisq/wallets/bitcoind/rpc/calls/BitcoindListAddressGroupingsRpcCall.java
diff --git a/wallets/bitcoind/src/main/java/bisq/wallets/bitcoind/rpc/calls/BitcoindListDescriptorsRpcCall.java b/wallets/bitcoind/bitcoind/src/main/java/bisq/wallets/bitcoind/rpc/calls/BitcoindListDescriptorsRpcCall.java
similarity index 100%
rename from wallets/bitcoind/src/main/java/bisq/wallets/bitcoind/rpc/calls/BitcoindListDescriptorsRpcCall.java
rename to wallets/bitcoind/bitcoind/src/main/java/bisq/wallets/bitcoind/rpc/calls/BitcoindListDescriptorsRpcCall.java
diff --git a/wallets/bitcoind/src/main/java/bisq/wallets/bitcoind/rpc/calls/BitcoindListTransactionsRpcCall.java b/wallets/bitcoind/bitcoind/src/main/java/bisq/wallets/bitcoind/rpc/calls/BitcoindListTransactionsRpcCall.java
similarity index 100%
rename from wallets/bitcoind/src/main/java/bisq/wallets/bitcoind/rpc/calls/BitcoindListTransactionsRpcCall.java
rename to wallets/bitcoind/bitcoind/src/main/java/bisq/wallets/bitcoind/rpc/calls/BitcoindListTransactionsRpcCall.java
diff --git a/wallets/bitcoind/src/main/java/bisq/wallets/bitcoind/rpc/calls/BitcoindListUnspentRpcCall.java b/wallets/bitcoind/bitcoind/src/main/java/bisq/wallets/bitcoind/rpc/calls/BitcoindListUnspentRpcCall.java
similarity index 100%
rename from wallets/bitcoind/src/main/java/bisq/wallets/bitcoind/rpc/calls/BitcoindListUnspentRpcCall.java
rename to wallets/bitcoind/bitcoind/src/main/java/bisq/wallets/bitcoind/rpc/calls/BitcoindListUnspentRpcCall.java
diff --git a/wallets/bitcoind/src/main/java/bisq/wallets/bitcoind/rpc/calls/BitcoindListWalletsRpcCall.java b/wallets/bitcoind/bitcoind/src/main/java/bisq/wallets/bitcoind/rpc/calls/BitcoindListWalletsRpcCall.java
similarity index 100%
rename from wallets/bitcoind/src/main/java/bisq/wallets/bitcoind/rpc/calls/BitcoindListWalletsRpcCall.java
rename to wallets/bitcoind/bitcoind/src/main/java/bisq/wallets/bitcoind/rpc/calls/BitcoindListWalletsRpcCall.java
diff --git a/wallets/bitcoind/src/main/java/bisq/wallets/bitcoind/rpc/calls/BitcoindLoadWalletRpcCall.java b/wallets/bitcoind/bitcoind/src/main/java/bisq/wallets/bitcoind/rpc/calls/BitcoindLoadWalletRpcCall.java
similarity index 100%
rename from wallets/bitcoind/src/main/java/bisq/wallets/bitcoind/rpc/calls/BitcoindLoadWalletRpcCall.java
rename to wallets/bitcoind/bitcoind/src/main/java/bisq/wallets/bitcoind/rpc/calls/BitcoindLoadWalletRpcCall.java
diff --git a/wallets/bitcoind/src/main/java/bisq/wallets/bitcoind/rpc/calls/BitcoindSendRawTransactionRpcCall.java b/wallets/bitcoind/bitcoind/src/main/java/bisq/wallets/bitcoind/rpc/calls/BitcoindSendRawTransactionRpcCall.java
similarity index 100%
rename from wallets/bitcoind/src/main/java/bisq/wallets/bitcoind/rpc/calls/BitcoindSendRawTransactionRpcCall.java
rename to wallets/bitcoind/bitcoind/src/main/java/bisq/wallets/bitcoind/rpc/calls/BitcoindSendRawTransactionRpcCall.java
diff --git a/wallets/bitcoind/src/main/java/bisq/wallets/bitcoind/rpc/calls/BitcoindSendToAddressRpcCall.java b/wallets/bitcoind/bitcoind/src/main/java/bisq/wallets/bitcoind/rpc/calls/BitcoindSendToAddressRpcCall.java
similarity index 100%
rename from wallets/bitcoind/src/main/java/bisq/wallets/bitcoind/rpc/calls/BitcoindSendToAddressRpcCall.java
rename to wallets/bitcoind/bitcoind/src/main/java/bisq/wallets/bitcoind/rpc/calls/BitcoindSendToAddressRpcCall.java
diff --git a/wallets/bitcoind/src/main/java/bisq/wallets/bitcoind/rpc/calls/BitcoindSignMessageRpcCall.java b/wallets/bitcoind/bitcoind/src/main/java/bisq/wallets/bitcoind/rpc/calls/BitcoindSignMessageRpcCall.java
similarity index 100%
rename from wallets/bitcoind/src/main/java/bisq/wallets/bitcoind/rpc/calls/BitcoindSignMessageRpcCall.java
rename to wallets/bitcoind/bitcoind/src/main/java/bisq/wallets/bitcoind/rpc/calls/BitcoindSignMessageRpcCall.java
diff --git a/wallets/bitcoind/src/main/java/bisq/wallets/bitcoind/rpc/calls/BitcoindStopRpcCall.java b/wallets/bitcoind/bitcoind/src/main/java/bisq/wallets/bitcoind/rpc/calls/BitcoindStopRpcCall.java
similarity index 100%
rename from wallets/bitcoind/src/main/java/bisq/wallets/bitcoind/rpc/calls/BitcoindStopRpcCall.java
rename to wallets/bitcoind/bitcoind/src/main/java/bisq/wallets/bitcoind/rpc/calls/BitcoindStopRpcCall.java
diff --git a/wallets/bitcoind/src/main/java/bisq/wallets/bitcoind/rpc/calls/BitcoindUnloadWalletRpcCall.java b/wallets/bitcoind/bitcoind/src/main/java/bisq/wallets/bitcoind/rpc/calls/BitcoindUnloadWalletRpcCall.java
similarity index 100%
rename from wallets/bitcoind/src/main/java/bisq/wallets/bitcoind/rpc/calls/BitcoindUnloadWalletRpcCall.java
rename to wallets/bitcoind/bitcoind/src/main/java/bisq/wallets/bitcoind/rpc/calls/BitcoindUnloadWalletRpcCall.java
diff --git a/wallets/bitcoind/src/main/java/bisq/wallets/bitcoind/rpc/calls/BitcoindVerifyMessageRpcCall.java b/wallets/bitcoind/bitcoind/src/main/java/bisq/wallets/bitcoind/rpc/calls/BitcoindVerifyMessageRpcCall.java
similarity index 100%
rename from wallets/bitcoind/src/main/java/bisq/wallets/bitcoind/rpc/calls/BitcoindVerifyMessageRpcCall.java
rename to wallets/bitcoind/bitcoind/src/main/java/bisq/wallets/bitcoind/rpc/calls/BitcoindVerifyMessageRpcCall.java
diff --git a/wallets/bitcoind/src/main/java/bisq/wallets/bitcoind/rpc/calls/BitcoindWalletCreateFundedPsbtRpcCall.java b/wallets/bitcoind/bitcoind/src/main/java/bisq/wallets/bitcoind/rpc/calls/BitcoindWalletCreateFundedPsbtRpcCall.java
similarity index 100%
rename from wallets/bitcoind/src/main/java/bisq/wallets/bitcoind/rpc/calls/BitcoindWalletCreateFundedPsbtRpcCall.java
rename to wallets/bitcoind/bitcoind/src/main/java/bisq/wallets/bitcoind/rpc/calls/BitcoindWalletCreateFundedPsbtRpcCall.java
diff --git a/wallets/bitcoind/src/main/java/bisq/wallets/bitcoind/rpc/calls/BitcoindWalletLockRpcCall.java b/wallets/bitcoind/bitcoind/src/main/java/bisq/wallets/bitcoind/rpc/calls/BitcoindWalletLockRpcCall.java
similarity index 100%
rename from wallets/bitcoind/src/main/java/bisq/wallets/bitcoind/rpc/calls/BitcoindWalletLockRpcCall.java
rename to wallets/bitcoind/bitcoind/src/main/java/bisq/wallets/bitcoind/rpc/calls/BitcoindWalletLockRpcCall.java
diff --git a/wallets/bitcoind/src/main/java/bisq/wallets/bitcoind/rpc/calls/BitcoindWalletPassphraseRpcCall.java b/wallets/bitcoind/bitcoind/src/main/java/bisq/wallets/bitcoind/rpc/calls/BitcoindWalletPassphraseRpcCall.java
similarity index 100%
rename from wallets/bitcoind/src/main/java/bisq/wallets/bitcoind/rpc/calls/BitcoindWalletPassphraseRpcCall.java
rename to wallets/bitcoind/bitcoind/src/main/java/bisq/wallets/bitcoind/rpc/calls/BitcoindWalletPassphraseRpcCall.java
diff --git a/wallets/bitcoind/src/main/java/bisq/wallets/bitcoind/rpc/calls/BitcoindWalletProcessPsbtRpcCall.java b/wallets/bitcoind/bitcoind/src/main/java/bisq/wallets/bitcoind/rpc/calls/BitcoindWalletProcessPsbtRpcCall.java
similarity index 100%
rename from wallets/bitcoind/src/main/java/bisq/wallets/bitcoind/rpc/calls/BitcoindWalletProcessPsbtRpcCall.java
rename to wallets/bitcoind/bitcoind/src/main/java/bisq/wallets/bitcoind/rpc/calls/BitcoindWalletProcessPsbtRpcCall.java
diff --git a/wallets/bitcoind/src/main/java/bisq/wallets/bitcoind/rpc/calls/requests/BitcoindImportDescriptorRequestEntry.java b/wallets/bitcoind/bitcoind/src/main/java/bisq/wallets/bitcoind/rpc/calls/requests/BitcoindImportDescriptorRequestEntry.java
similarity index 100%
rename from wallets/bitcoind/src/main/java/bisq/wallets/bitcoind/rpc/calls/requests/BitcoindImportDescriptorRequestEntry.java
rename to wallets/bitcoind/bitcoind/src/main/java/bisq/wallets/bitcoind/rpc/calls/requests/BitcoindImportDescriptorRequestEntry.java
diff --git a/wallets/bitcoind/src/main/java/bisq/wallets/bitcoind/rpc/calls/requests/BitcoindImportMultiRequest.java b/wallets/bitcoind/bitcoind/src/main/java/bisq/wallets/bitcoind/rpc/calls/requests/BitcoindImportMultiRequest.java
similarity index 100%
rename from wallets/bitcoind/src/main/java/bisq/wallets/bitcoind/rpc/calls/requests/BitcoindImportMultiRequest.java
rename to wallets/bitcoind/bitcoind/src/main/java/bisq/wallets/bitcoind/rpc/calls/requests/BitcoindImportMultiRequest.java
diff --git a/wallets/bitcoind/src/main/java/bisq/wallets/bitcoind/rpc/psbt/BitcoindPsbtInput.java b/wallets/bitcoind/bitcoind/src/main/java/bisq/wallets/bitcoind/rpc/psbt/BitcoindPsbtInput.java
similarity index 100%
rename from wallets/bitcoind/src/main/java/bisq/wallets/bitcoind/rpc/psbt/BitcoindPsbtInput.java
rename to wallets/bitcoind/bitcoind/src/main/java/bisq/wallets/bitcoind/rpc/psbt/BitcoindPsbtInput.java
diff --git a/wallets/bitcoind/src/main/java/bisq/wallets/bitcoind/rpc/responses/AbstractDecodeRawTransactionResponse.java b/wallets/bitcoind/bitcoind/src/main/java/bisq/wallets/bitcoind/rpc/responses/AbstractDecodeRawTransactionResponse.java
similarity index 100%
rename from wallets/bitcoind/src/main/java/bisq/wallets/bitcoind/rpc/responses/AbstractDecodeRawTransactionResponse.java
rename to wallets/bitcoind/bitcoind/src/main/java/bisq/wallets/bitcoind/rpc/responses/AbstractDecodeRawTransactionResponse.java
diff --git a/wallets/bitcoind/src/main/java/bisq/wallets/bitcoind/rpc/responses/AbstractVin.java b/wallets/bitcoind/bitcoind/src/main/java/bisq/wallets/bitcoind/rpc/responses/AbstractVin.java
similarity index 100%
rename from wallets/bitcoind/src/main/java/bisq/wallets/bitcoind/rpc/responses/AbstractVin.java
rename to wallets/bitcoind/bitcoind/src/main/java/bisq/wallets/bitcoind/rpc/responses/AbstractVin.java
diff --git a/wallets/bitcoind/src/main/java/bisq/wallets/bitcoind/rpc/responses/AbstractVout.java b/wallets/bitcoind/bitcoind/src/main/java/bisq/wallets/bitcoind/rpc/responses/AbstractVout.java
similarity index 100%
rename from wallets/bitcoind/src/main/java/bisq/wallets/bitcoind/rpc/responses/AbstractVout.java
rename to wallets/bitcoind/bitcoind/src/main/java/bisq/wallets/bitcoind/rpc/responses/AbstractVout.java
diff --git a/wallets/bitcoind/src/main/java/bisq/wallets/bitcoind/rpc/responses/BitcoinImportMultiEntryResponse.java b/wallets/bitcoind/bitcoind/src/main/java/bisq/wallets/bitcoind/rpc/responses/BitcoinImportMultiEntryResponse.java
similarity index 100%
rename from wallets/bitcoind/src/main/java/bisq/wallets/bitcoind/rpc/responses/BitcoinImportMultiEntryResponse.java
rename to wallets/bitcoind/bitcoind/src/main/java/bisq/wallets/bitcoind/rpc/responses/BitcoinImportMultiEntryResponse.java
diff --git a/wallets/bitcoind/src/main/java/bisq/wallets/bitcoind/rpc/responses/BitcoindAddOrCreateMultiSigAddressResponse.java b/wallets/bitcoind/bitcoind/src/main/java/bisq/wallets/bitcoind/rpc/responses/BitcoindAddOrCreateMultiSigAddressResponse.java
similarity index 100%
rename from wallets/bitcoind/src/main/java/bisq/wallets/bitcoind/rpc/responses/BitcoindAddOrCreateMultiSigAddressResponse.java
rename to wallets/bitcoind/bitcoind/src/main/java/bisq/wallets/bitcoind/rpc/responses/BitcoindAddOrCreateMultiSigAddressResponse.java
diff --git a/wallets/bitcoind/src/main/java/bisq/wallets/bitcoind/rpc/responses/BitcoindCreateMultiSigResponse.java b/wallets/bitcoind/bitcoind/src/main/java/bisq/wallets/bitcoind/rpc/responses/BitcoindCreateMultiSigResponse.java
similarity index 100%
rename from wallets/bitcoind/src/main/java/bisq/wallets/bitcoind/rpc/responses/BitcoindCreateMultiSigResponse.java
rename to wallets/bitcoind/bitcoind/src/main/java/bisq/wallets/bitcoind/rpc/responses/BitcoindCreateMultiSigResponse.java
diff --git a/wallets/bitcoind/src/main/java/bisq/wallets/bitcoind/rpc/responses/BitcoindCreateOrLoadWalletResponse.java b/wallets/bitcoind/bitcoind/src/main/java/bisq/wallets/bitcoind/rpc/responses/BitcoindCreateOrLoadWalletResponse.java
similarity index 100%
rename from wallets/bitcoind/src/main/java/bisq/wallets/bitcoind/rpc/responses/BitcoindCreateOrLoadWalletResponse.java
rename to wallets/bitcoind/bitcoind/src/main/java/bisq/wallets/bitcoind/rpc/responses/BitcoindCreateOrLoadWalletResponse.java
diff --git a/wallets/bitcoind/src/main/java/bisq/wallets/bitcoind/rpc/responses/BitcoindDecodeRawTransactionResponse.java b/wallets/bitcoind/bitcoind/src/main/java/bisq/wallets/bitcoind/rpc/responses/BitcoindDecodeRawTransactionResponse.java
similarity index 100%
rename from wallets/bitcoind/src/main/java/bisq/wallets/bitcoind/rpc/responses/BitcoindDecodeRawTransactionResponse.java
rename to wallets/bitcoind/bitcoind/src/main/java/bisq/wallets/bitcoind/rpc/responses/BitcoindDecodeRawTransactionResponse.java
diff --git a/wallets/bitcoind/src/main/java/bisq/wallets/bitcoind/rpc/responses/BitcoindDescriptor.java b/wallets/bitcoind/bitcoind/src/main/java/bisq/wallets/bitcoind/rpc/responses/BitcoindDescriptor.java
similarity index 100%
rename from wallets/bitcoind/src/main/java/bisq/wallets/bitcoind/rpc/responses/BitcoindDescriptor.java
rename to wallets/bitcoind/bitcoind/src/main/java/bisq/wallets/bitcoind/rpc/responses/BitcoindDescriptor.java
diff --git a/wallets/bitcoind/src/main/java/bisq/wallets/bitcoind/rpc/responses/BitcoindFinalizePsbtResponse.java b/wallets/bitcoind/bitcoind/src/main/java/bisq/wallets/bitcoind/rpc/responses/BitcoindFinalizePsbtResponse.java
similarity index 100%
rename from wallets/bitcoind/src/main/java/bisq/wallets/bitcoind/rpc/responses/BitcoindFinalizePsbtResponse.java
rename to wallets/bitcoind/bitcoind/src/main/java/bisq/wallets/bitcoind/rpc/responses/BitcoindFinalizePsbtResponse.java
diff --git a/wallets/bitcoind/src/main/java/bisq/wallets/bitcoind/rpc/responses/BitcoindGetAddressInfoResponse.java b/wallets/bitcoind/bitcoind/src/main/java/bisq/wallets/bitcoind/rpc/responses/BitcoindGetAddressInfoResponse.java
similarity index 100%
rename from wallets/bitcoind/src/main/java/bisq/wallets/bitcoind/rpc/responses/BitcoindGetAddressInfoResponse.java
rename to wallets/bitcoind/bitcoind/src/main/java/bisq/wallets/bitcoind/rpc/responses/BitcoindGetAddressInfoResponse.java
diff --git a/wallets/bitcoind/src/main/java/bisq/wallets/bitcoind/rpc/responses/BitcoindGetBalancesResponse.java b/wallets/bitcoind/bitcoind/src/main/java/bisq/wallets/bitcoind/rpc/responses/BitcoindGetBalancesResponse.java
similarity index 100%
rename from wallets/bitcoind/src/main/java/bisq/wallets/bitcoind/rpc/responses/BitcoindGetBalancesResponse.java
rename to wallets/bitcoind/bitcoind/src/main/java/bisq/wallets/bitcoind/rpc/responses/BitcoindGetBalancesResponse.java
diff --git a/wallets/bitcoind/src/main/java/bisq/wallets/bitcoind/rpc/responses/BitcoindGetDescriptorInfoResponse.java b/wallets/bitcoind/bitcoind/src/main/java/bisq/wallets/bitcoind/rpc/responses/BitcoindGetDescriptorInfoResponse.java
similarity index 100%
rename from wallets/bitcoind/src/main/java/bisq/wallets/bitcoind/rpc/responses/BitcoindGetDescriptorInfoResponse.java
rename to wallets/bitcoind/bitcoind/src/main/java/bisq/wallets/bitcoind/rpc/responses/BitcoindGetDescriptorInfoResponse.java
diff --git a/wallets/bitcoind/src/main/java/bisq/wallets/bitcoind/rpc/responses/BitcoindGetLastProcessedBlockBalancesResponse.java b/wallets/bitcoind/bitcoind/src/main/java/bisq/wallets/bitcoind/rpc/responses/BitcoindGetLastProcessedBlockBalancesResponse.java
similarity index 100%
rename from wallets/bitcoind/src/main/java/bisq/wallets/bitcoind/rpc/responses/BitcoindGetLastProcessedBlockBalancesResponse.java
rename to wallets/bitcoind/bitcoind/src/main/java/bisq/wallets/bitcoind/rpc/responses/BitcoindGetLastProcessedBlockBalancesResponse.java
diff --git a/wallets/bitcoind/src/main/java/bisq/wallets/bitcoind/rpc/responses/BitcoindGetMineBalancesResponse.java b/wallets/bitcoind/bitcoind/src/main/java/bisq/wallets/bitcoind/rpc/responses/BitcoindGetMineBalancesResponse.java
similarity index 100%
rename from wallets/bitcoind/src/main/java/bisq/wallets/bitcoind/rpc/responses/BitcoindGetMineBalancesResponse.java
rename to wallets/bitcoind/bitcoind/src/main/java/bisq/wallets/bitcoind/rpc/responses/BitcoindGetMineBalancesResponse.java
diff --git a/wallets/bitcoind/src/main/java/bisq/wallets/bitcoind/rpc/responses/BitcoindGetZmqNotificationsResponse.java b/wallets/bitcoind/bitcoind/src/main/java/bisq/wallets/bitcoind/rpc/responses/BitcoindGetZmqNotificationsResponse.java
similarity index 100%
rename from wallets/bitcoind/src/main/java/bisq/wallets/bitcoind/rpc/responses/BitcoindGetZmqNotificationsResponse.java
rename to wallets/bitcoind/bitcoind/src/main/java/bisq/wallets/bitcoind/rpc/responses/BitcoindGetZmqNotificationsResponse.java
diff --git a/wallets/bitcoind/src/main/java/bisq/wallets/bitcoind/rpc/responses/BitcoindImportDescriptorResponse.java b/wallets/bitcoind/bitcoind/src/main/java/bisq/wallets/bitcoind/rpc/responses/BitcoindImportDescriptorResponse.java
similarity index 100%
rename from wallets/bitcoind/src/main/java/bisq/wallets/bitcoind/rpc/responses/BitcoindImportDescriptorResponse.java
rename to wallets/bitcoind/bitcoind/src/main/java/bisq/wallets/bitcoind/rpc/responses/BitcoindImportDescriptorResponse.java
diff --git a/wallets/bitcoind/src/main/java/bisq/wallets/bitcoind/rpc/responses/BitcoindListAddressGroupingsResponse.java b/wallets/bitcoind/bitcoind/src/main/java/bisq/wallets/bitcoind/rpc/responses/BitcoindListAddressGroupingsResponse.java
similarity index 100%
rename from wallets/bitcoind/src/main/java/bisq/wallets/bitcoind/rpc/responses/BitcoindListAddressGroupingsResponse.java
rename to wallets/bitcoind/bitcoind/src/main/java/bisq/wallets/bitcoind/rpc/responses/BitcoindListAddressGroupingsResponse.java
diff --git a/wallets/bitcoind/src/main/java/bisq/wallets/bitcoind/rpc/responses/BitcoindListDescriptorResponse.java b/wallets/bitcoind/bitcoind/src/main/java/bisq/wallets/bitcoind/rpc/responses/BitcoindListDescriptorResponse.java
similarity index 100%
rename from wallets/bitcoind/src/main/java/bisq/wallets/bitcoind/rpc/responses/BitcoindListDescriptorResponse.java
rename to wallets/bitcoind/bitcoind/src/main/java/bisq/wallets/bitcoind/rpc/responses/BitcoindListDescriptorResponse.java
diff --git a/wallets/bitcoind/src/main/java/bisq/wallets/bitcoind/rpc/responses/BitcoindListTransactionsResponse.java b/wallets/bitcoind/bitcoind/src/main/java/bisq/wallets/bitcoind/rpc/responses/BitcoindListTransactionsResponse.java
similarity index 100%
rename from wallets/bitcoind/src/main/java/bisq/wallets/bitcoind/rpc/responses/BitcoindListTransactionsResponse.java
rename to wallets/bitcoind/bitcoind/src/main/java/bisq/wallets/bitcoind/rpc/responses/BitcoindListTransactionsResponse.java
diff --git a/wallets/bitcoind/src/main/java/bisq/wallets/bitcoind/rpc/responses/BitcoindListUnspentResponse.java b/wallets/bitcoind/bitcoind/src/main/java/bisq/wallets/bitcoind/rpc/responses/BitcoindListUnspentResponse.java
similarity index 100%
rename from wallets/bitcoind/src/main/java/bisq/wallets/bitcoind/rpc/responses/BitcoindListUnspentResponse.java
rename to wallets/bitcoind/bitcoind/src/main/java/bisq/wallets/bitcoind/rpc/responses/BitcoindListUnspentResponse.java
diff --git a/wallets/bitcoind/src/main/java/bisq/wallets/bitcoind/rpc/responses/BitcoindScriptPubKey.java b/wallets/bitcoind/bitcoind/src/main/java/bisq/wallets/bitcoind/rpc/responses/BitcoindScriptPubKey.java
similarity index 100%
rename from wallets/bitcoind/src/main/java/bisq/wallets/bitcoind/rpc/responses/BitcoindScriptPubKey.java
rename to wallets/bitcoind/bitcoind/src/main/java/bisq/wallets/bitcoind/rpc/responses/BitcoindScriptPubKey.java
diff --git a/wallets/bitcoind/src/main/java/bisq/wallets/bitcoind/rpc/responses/BitcoindScriptSig.java b/wallets/bitcoind/bitcoind/src/main/java/bisq/wallets/bitcoind/rpc/responses/BitcoindScriptSig.java
similarity index 100%
rename from wallets/bitcoind/src/main/java/bisq/wallets/bitcoind/rpc/responses/BitcoindScriptSig.java
rename to wallets/bitcoind/bitcoind/src/main/java/bisq/wallets/bitcoind/rpc/responses/BitcoindScriptSig.java
diff --git a/wallets/bitcoind/src/main/java/bisq/wallets/bitcoind/rpc/responses/BitcoindVin.java b/wallets/bitcoind/bitcoind/src/main/java/bisq/wallets/bitcoind/rpc/responses/BitcoindVin.java
similarity index 100%
rename from wallets/bitcoind/src/main/java/bisq/wallets/bitcoind/rpc/responses/BitcoindVin.java
rename to wallets/bitcoind/bitcoind/src/main/java/bisq/wallets/bitcoind/rpc/responses/BitcoindVin.java
diff --git a/wallets/bitcoind/src/main/java/bisq/wallets/bitcoind/rpc/responses/BitcoindVout.java b/wallets/bitcoind/bitcoind/src/main/java/bisq/wallets/bitcoind/rpc/responses/BitcoindVout.java
similarity index 100%
rename from wallets/bitcoind/src/main/java/bisq/wallets/bitcoind/rpc/responses/BitcoindVout.java
rename to wallets/bitcoind/bitcoind/src/main/java/bisq/wallets/bitcoind/rpc/responses/BitcoindVout.java
diff --git a/wallets/bitcoind/src/main/java/bisq/wallets/bitcoind/rpc/responses/BitcoindWalletCreateFundedPsbtResponse.java b/wallets/bitcoind/bitcoind/src/main/java/bisq/wallets/bitcoind/rpc/responses/BitcoindWalletCreateFundedPsbtResponse.java
similarity index 100%
rename from wallets/bitcoind/src/main/java/bisq/wallets/bitcoind/rpc/responses/BitcoindWalletCreateFundedPsbtResponse.java
rename to wallets/bitcoind/bitcoind/src/main/java/bisq/wallets/bitcoind/rpc/responses/BitcoindWalletCreateFundedPsbtResponse.java
diff --git a/wallets/bitcoind/src/main/java/bisq/wallets/bitcoind/rpc/responses/BitcoindWalletProcessPsbtResponse.java b/wallets/bitcoind/bitcoind/src/main/java/bisq/wallets/bitcoind/rpc/responses/BitcoindWalletProcessPsbtResponse.java
similarity index 100%
rename from wallets/bitcoind/src/main/java/bisq/wallets/bitcoind/rpc/responses/BitcoindWalletProcessPsbtResponse.java
rename to wallets/bitcoind/bitcoind/src/main/java/bisq/wallets/bitcoind/rpc/responses/BitcoindWalletProcessPsbtResponse.java
diff --git a/wallets/bitcoind/src/main/java/bisq/wallets/bitcoind/rpc/responses/BitcoindWarningResponse.java b/wallets/bitcoind/bitcoind/src/main/java/bisq/wallets/bitcoind/rpc/responses/BitcoindWarningResponse.java
similarity index 100%
rename from wallets/bitcoind/src/main/java/bisq/wallets/bitcoind/rpc/responses/BitcoindWarningResponse.java
rename to wallets/bitcoind/bitcoind/src/main/java/bisq/wallets/bitcoind/rpc/responses/BitcoindWarningResponse.java
diff --git a/wallets/bitcoind/src/main/java/bisq/wallets/bitcoind/zmq/BitcoindRawTxProcessor.java b/wallets/bitcoind/bitcoind/src/main/java/bisq/wallets/bitcoind/zmq/BitcoindRawTxProcessor.java
similarity index 100%
rename from wallets/bitcoind/src/main/java/bisq/wallets/bitcoind/zmq/BitcoindRawTxProcessor.java
rename to wallets/bitcoind/bitcoind/src/main/java/bisq/wallets/bitcoind/zmq/BitcoindRawTxProcessor.java
diff --git a/wallets/bitcoind/src/main/java/bisq/wallets/bitcoind/zmq/BitcoindZmqMessage.java b/wallets/bitcoind/bitcoind/src/main/java/bisq/wallets/bitcoind/zmq/BitcoindZmqMessage.java
similarity index 100%
rename from wallets/bitcoind/src/main/java/bisq/wallets/bitcoind/zmq/BitcoindZmqMessage.java
rename to wallets/bitcoind/bitcoind/src/main/java/bisq/wallets/bitcoind/zmq/BitcoindZmqMessage.java
diff --git a/wallets/bitcoind/src/main/java/bisq/wallets/bitcoind/zmq/BitcoindZmqTopic.java b/wallets/bitcoind/bitcoind/src/main/java/bisq/wallets/bitcoind/zmq/BitcoindZmqTopic.java
similarity index 100%
rename from wallets/bitcoind/src/main/java/bisq/wallets/bitcoind/zmq/BitcoindZmqTopic.java
rename to wallets/bitcoind/bitcoind/src/main/java/bisq/wallets/bitcoind/zmq/BitcoindZmqTopic.java
diff --git a/wallets/bitcoind/src/main/java/bisq/wallets/bitcoind/zmq/ZmqConnection.java b/wallets/bitcoind/bitcoind/src/main/java/bisq/wallets/bitcoind/zmq/ZmqConnection.java
similarity index 100%
rename from wallets/bitcoind/src/main/java/bisq/wallets/bitcoind/zmq/ZmqConnection.java
rename to wallets/bitcoind/bitcoind/src/main/java/bisq/wallets/bitcoind/zmq/ZmqConnection.java
diff --git a/wallets/bitcoind/src/main/java/bisq/wallets/bitcoind/zmq/ZmqConnectionFactory.java b/wallets/bitcoind/bitcoind/src/main/java/bisq/wallets/bitcoind/zmq/ZmqConnectionFactory.java
similarity index 100%
rename from wallets/bitcoind/src/main/java/bisq/wallets/bitcoind/zmq/ZmqConnectionFactory.java
rename to wallets/bitcoind/bitcoind/src/main/java/bisq/wallets/bitcoind/zmq/ZmqConnectionFactory.java
diff --git a/wallets/bitcoind/src/main/java/bisq/wallets/bitcoind/zmq/ZmqListeners.java b/wallets/bitcoind/bitcoind/src/main/java/bisq/wallets/bitcoind/zmq/ZmqListeners.java
similarity index 100%
rename from wallets/bitcoind/src/main/java/bisq/wallets/bitcoind/zmq/ZmqListeners.java
rename to wallets/bitcoind/bitcoind/src/main/java/bisq/wallets/bitcoind/zmq/ZmqListeners.java
diff --git a/wallets/bitcoind/src/main/java/bisq/wallets/bitcoind/zmq/ZmqRawTxProcessor.java b/wallets/bitcoind/bitcoind/src/main/java/bisq/wallets/bitcoind/zmq/ZmqRawTxProcessor.java
similarity index 100%
rename from wallets/bitcoind/src/main/java/bisq/wallets/bitcoind/zmq/ZmqRawTxProcessor.java
rename to wallets/bitcoind/bitcoind/src/main/java/bisq/wallets/bitcoind/zmq/ZmqRawTxProcessor.java
diff --git a/wallets/bitcoind/src/main/java/bisq/wallets/bitcoind/zmq/ZmqTopicProcessors.java b/wallets/bitcoind/bitcoind/src/main/java/bisq/wallets/bitcoind/zmq/ZmqTopicProcessors.java
similarity index 100%
rename from wallets/bitcoind/src/main/java/bisq/wallets/bitcoind/zmq/ZmqTopicProcessors.java
rename to wallets/bitcoind/bitcoind/src/main/java/bisq/wallets/bitcoind/zmq/ZmqTopicProcessors.java
diff --git a/wallets/bitcoind/src/main/java/bisq/wallets/bitcoind/zmq/ZmqWallet.java b/wallets/bitcoind/bitcoind/src/main/java/bisq/wallets/bitcoind/zmq/ZmqWallet.java
similarity index 100%
rename from wallets/bitcoind/src/main/java/bisq/wallets/bitcoind/zmq/ZmqWallet.java
rename to wallets/bitcoind/bitcoind/src/main/java/bisq/wallets/bitcoind/zmq/ZmqWallet.java
diff --git a/wallets/bitcoind/src/main/java/bisq/wallets/bitcoind/zmq/exceptions/CannotFindZmqAddressException.java b/wallets/bitcoind/bitcoind/src/main/java/bisq/wallets/bitcoind/zmq/exceptions/CannotFindZmqAddressException.java
similarity index 100%
rename from wallets/bitcoind/src/main/java/bisq/wallets/bitcoind/zmq/exceptions/CannotFindZmqAddressException.java
rename to wallets/bitcoind/bitcoind/src/main/java/bisq/wallets/bitcoind/zmq/exceptions/CannotFindZmqAddressException.java
diff --git a/wallets/bitcoind/src/main/java/bisq/wallets/bitcoind/zmq/exceptions/CannotFindZmqTopicException.java b/wallets/bitcoind/bitcoind/src/main/java/bisq/wallets/bitcoind/zmq/exceptions/CannotFindZmqTopicException.java
similarity index 100%
rename from wallets/bitcoind/src/main/java/bisq/wallets/bitcoind/zmq/exceptions/CannotFindZmqTopicException.java
rename to wallets/bitcoind/bitcoind/src/main/java/bisq/wallets/bitcoind/zmq/exceptions/CannotFindZmqTopicException.java
diff --git a/wallets/bitcoind/src/main/java/bisq/wallets/bitcoind/zmq/listeners/NewBlockMinedListener.java b/wallets/bitcoind/bitcoind/src/main/java/bisq/wallets/bitcoind/zmq/listeners/NewBlockMinedListener.java
similarity index 100%
rename from wallets/bitcoind/src/main/java/bisq/wallets/bitcoind/zmq/listeners/NewBlockMinedListener.java
rename to wallets/bitcoind/bitcoind/src/main/java/bisq/wallets/bitcoind/zmq/listeners/NewBlockMinedListener.java
diff --git a/wallets/bitcoind/src/main/java/bisq/wallets/bitcoind/zmq/listeners/TransactionOutputAddressesListener.java b/wallets/bitcoind/bitcoind/src/main/java/bisq/wallets/bitcoind/zmq/listeners/TransactionOutputAddressesListener.java
similarity index 100%
rename from wallets/bitcoind/src/main/java/bisq/wallets/bitcoind/zmq/listeners/TransactionOutputAddressesListener.java
rename to wallets/bitcoind/bitcoind/src/main/java/bisq/wallets/bitcoind/zmq/listeners/TransactionOutputAddressesListener.java
diff --git a/wallets/bitcoind/src/main/java/bisq/wallets/bitcoind/zmq/listeners/TxIdInInputListener.java b/wallets/bitcoind/bitcoind/src/main/java/bisq/wallets/bitcoind/zmq/listeners/TxIdInInputListener.java
similarity index 100%
rename from wallets/bitcoind/src/main/java/bisq/wallets/bitcoind/zmq/listeners/TxIdInInputListener.java
rename to wallets/bitcoind/bitcoind/src/main/java/bisq/wallets/bitcoind/zmq/listeners/TxIdInInputListener.java
diff --git a/wallets/bitcoind/src/main/proto/wallets.bitcoind.proto b/wallets/bitcoind/bitcoind/src/main/proto/wallets.bitcoind.proto
similarity index 100%
rename from wallets/bitcoind/src/main/proto/wallets.bitcoind.proto
rename to wallets/bitcoind/bitcoind/src/main/proto/wallets.bitcoind.proto
diff --git a/wallets/bitcoind/src/test/java/bisq/wallets/bitcoind/WalletNotRunningTest.java b/wallets/bitcoind/bitcoind/src/test/java/bisq/wallets/bitcoind/WalletNotRunningTest.java
similarity index 100%
rename from wallets/bitcoind/src/test/java/bisq/wallets/bitcoind/WalletNotRunningTest.java
rename to wallets/bitcoind/bitcoind/src/test/java/bisq/wallets/bitcoind/WalletNotRunningTest.java
diff --git a/wallets/bitcoind/build.gradle.kts b/wallets/bitcoind/build.gradle.kts
index ed53d74049..8e31e0f340 100644
--- a/wallets/bitcoind/build.gradle.kts
+++ b/wallets/bitcoind/build.gradle.kts
@@ -1,17 +1,4 @@
-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"))
+extensions.findByName("buildScan")?.withGroovyBuilder {
+    setProperty("termsOfServiceUrl", "https://gradle.com/terms-of-service")
+    setProperty("termsOfServiceAgree", "yes")
 }
\ No newline at end of file
diff --git a/wallets/core/build.gradle.kts b/wallets/bitcoind/core/build.gradle.kts
similarity index 100%
rename from wallets/core/build.gradle.kts
rename to wallets/bitcoind/core/build.gradle.kts
diff --git a/wallets/core/src/main/java/bisq/wallets/core/BitcoinWalletSelection.java b/wallets/bitcoind/core/src/main/java/bisq/wallets/core/BitcoinWalletSelection.java
similarity index 100%
rename from wallets/core/src/main/java/bisq/wallets/core/BitcoinWalletSelection.java
rename to wallets/bitcoind/core/src/main/java/bisq/wallets/core/BitcoinWalletSelection.java
diff --git a/wallets/core/src/main/java/bisq/wallets/core/Wallet.java b/wallets/bitcoind/core/src/main/java/bisq/wallets/core/Wallet.java
similarity index 100%
rename from wallets/core/src/main/java/bisq/wallets/core/Wallet.java
rename to wallets/bitcoind/core/src/main/java/bisq/wallets/core/Wallet.java
diff --git a/wallets/core/src/main/java/bisq/wallets/core/WalletService.java b/wallets/bitcoind/core/src/main/java/bisq/wallets/core/WalletService.java
similarity index 100%
rename from wallets/core/src/main/java/bisq/wallets/core/WalletService.java
rename to wallets/bitcoind/core/src/main/java/bisq/wallets/core/WalletService.java
diff --git a/wallets/core/src/main/java/bisq/wallets/core/exceptions/WalletNotInitializedException.java b/wallets/bitcoind/core/src/main/java/bisq/wallets/core/exceptions/WalletNotInitializedException.java
similarity index 100%
rename from wallets/core/src/main/java/bisq/wallets/core/exceptions/WalletNotInitializedException.java
rename to wallets/bitcoind/core/src/main/java/bisq/wallets/core/exceptions/WalletNotInitializedException.java
diff --git a/wallets/core/src/main/java/bisq/wallets/core/model/AddressType.java b/wallets/bitcoind/core/src/main/java/bisq/wallets/core/model/AddressType.java
similarity index 100%
rename from wallets/core/src/main/java/bisq/wallets/core/model/AddressType.java
rename to wallets/bitcoind/core/src/main/java/bisq/wallets/core/model/AddressType.java
diff --git a/wallets/core/src/main/java/bisq/wallets/core/model/Transaction.java b/wallets/bitcoind/core/src/main/java/bisq/wallets/core/model/Transaction.java
similarity index 100%
rename from wallets/core/src/main/java/bisq/wallets/core/model/Transaction.java
rename to wallets/bitcoind/core/src/main/java/bisq/wallets/core/model/Transaction.java
diff --git a/wallets/core/src/main/java/bisq/wallets/core/model/TransactionInfo.java b/wallets/bitcoind/core/src/main/java/bisq/wallets/core/model/TransactionInfo.java
similarity index 100%
rename from wallets/core/src/main/java/bisq/wallets/core/model/TransactionInfo.java
rename to wallets/bitcoind/core/src/main/java/bisq/wallets/core/model/TransactionInfo.java
diff --git a/wallets/core/src/main/java/bisq/wallets/core/model/TransactionInput.java b/wallets/bitcoind/core/src/main/java/bisq/wallets/core/model/TransactionInput.java
similarity index 100%
rename from wallets/core/src/main/java/bisq/wallets/core/model/TransactionInput.java
rename to wallets/bitcoind/core/src/main/java/bisq/wallets/core/model/TransactionInput.java
diff --git a/wallets/core/src/main/java/bisq/wallets/core/model/TransactionOutput.java b/wallets/bitcoind/core/src/main/java/bisq/wallets/core/model/TransactionOutput.java
similarity index 100%
rename from wallets/core/src/main/java/bisq/wallets/core/model/TransactionOutput.java
rename to wallets/bitcoind/core/src/main/java/bisq/wallets/core/model/TransactionOutput.java
diff --git a/wallets/core/src/main/java/bisq/wallets/core/model/Utxo.java b/wallets/bitcoind/core/src/main/java/bisq/wallets/core/model/Utxo.java
similarity index 100%
rename from wallets/core/src/main/java/bisq/wallets/core/model/Utxo.java
rename to wallets/bitcoind/core/src/main/java/bisq/wallets/core/model/Utxo.java
diff --git a/wallets/bitcoind/gradle.properties b/wallets/bitcoind/gradle.properties
new file mode 100644
index 0000000000..5f1ed7bbe0
--- /dev/null
+++ b/wallets/bitcoind/gradle.properties
@@ -0,0 +1 @@
+org.gradle.caching=true
\ No newline at end of file
diff --git a/wallets/json-rpc/build.gradle.kts b/wallets/bitcoind/json-rpc/build.gradle.kts
similarity index 100%
rename from wallets/json-rpc/build.gradle.kts
rename to wallets/bitcoind/json-rpc/build.gradle.kts
diff --git a/wallets/json-rpc/src/main/java/bisq/wallets/json_rpc/DaemonRpcCall.java b/wallets/bitcoind/json-rpc/src/main/java/bisq/wallets/json_rpc/DaemonRpcCall.java
similarity index 100%
rename from wallets/json-rpc/src/main/java/bisq/wallets/json_rpc/DaemonRpcCall.java
rename to wallets/bitcoind/json-rpc/src/main/java/bisq/wallets/json_rpc/DaemonRpcCall.java
diff --git a/wallets/json-rpc/src/main/java/bisq/wallets/json_rpc/JsonRpcCall.java b/wallets/bitcoind/json-rpc/src/main/java/bisq/wallets/json_rpc/JsonRpcCall.java
similarity index 100%
rename from wallets/json-rpc/src/main/java/bisq/wallets/json_rpc/JsonRpcCall.java
rename to wallets/bitcoind/json-rpc/src/main/java/bisq/wallets/json_rpc/JsonRpcCall.java
diff --git a/wallets/json-rpc/src/main/java/bisq/wallets/json_rpc/JsonRpcClient.java b/wallets/bitcoind/json-rpc/src/main/java/bisq/wallets/json_rpc/JsonRpcClient.java
similarity index 100%
rename from wallets/json-rpc/src/main/java/bisq/wallets/json_rpc/JsonRpcClient.java
rename to wallets/bitcoind/json-rpc/src/main/java/bisq/wallets/json_rpc/JsonRpcClient.java
diff --git a/wallets/json-rpc/src/main/java/bisq/wallets/json_rpc/JsonRpcEndpointSpec.java b/wallets/bitcoind/json-rpc/src/main/java/bisq/wallets/json_rpc/JsonRpcEndpointSpec.java
similarity index 100%
rename from wallets/json-rpc/src/main/java/bisq/wallets/json_rpc/JsonRpcEndpointSpec.java
rename to wallets/bitcoind/json-rpc/src/main/java/bisq/wallets/json_rpc/JsonRpcEndpointSpec.java
diff --git a/wallets/json-rpc/src/main/java/bisq/wallets/json_rpc/JsonRpcError.java b/wallets/bitcoind/json-rpc/src/main/java/bisq/wallets/json_rpc/JsonRpcError.java
similarity index 100%
rename from wallets/json-rpc/src/main/java/bisq/wallets/json_rpc/JsonRpcError.java
rename to wallets/bitcoind/json-rpc/src/main/java/bisq/wallets/json_rpc/JsonRpcError.java
diff --git a/wallets/json-rpc/src/main/java/bisq/wallets/json_rpc/JsonRpcResponse.java b/wallets/bitcoind/json-rpc/src/main/java/bisq/wallets/json_rpc/JsonRpcResponse.java
similarity index 100%
rename from wallets/json-rpc/src/main/java/bisq/wallets/json_rpc/JsonRpcResponse.java
rename to wallets/bitcoind/json-rpc/src/main/java/bisq/wallets/json_rpc/JsonRpcResponse.java
diff --git a/wallets/json-rpc/src/main/java/bisq/wallets/json_rpc/RpcCall.java b/wallets/bitcoind/json-rpc/src/main/java/bisq/wallets/json_rpc/RpcCall.java
similarity index 100%
rename from wallets/json-rpc/src/main/java/bisq/wallets/json_rpc/RpcCall.java
rename to wallets/bitcoind/json-rpc/src/main/java/bisq/wallets/json_rpc/RpcCall.java
diff --git a/wallets/json-rpc/src/main/java/bisq/wallets/json_rpc/RpcCallFailureException.java b/wallets/bitcoind/json-rpc/src/main/java/bisq/wallets/json_rpc/RpcCallFailureException.java
similarity index 100%
rename from wallets/json-rpc/src/main/java/bisq/wallets/json_rpc/RpcCallFailureException.java
rename to wallets/bitcoind/json-rpc/src/main/java/bisq/wallets/json_rpc/RpcCallFailureException.java
diff --git a/wallets/json-rpc/src/main/java/bisq/wallets/json_rpc/RpcClientFactory.java b/wallets/bitcoind/json-rpc/src/main/java/bisq/wallets/json_rpc/RpcClientFactory.java
similarity index 100%
rename from wallets/json-rpc/src/main/java/bisq/wallets/json_rpc/RpcClientFactory.java
rename to wallets/bitcoind/json-rpc/src/main/java/bisq/wallets/json_rpc/RpcClientFactory.java
diff --git a/wallets/json-rpc/src/main/java/bisq/wallets/json_rpc/RpcConfig.java b/wallets/bitcoind/json-rpc/src/main/java/bisq/wallets/json_rpc/RpcConfig.java
similarity index 100%
rename from wallets/json-rpc/src/main/java/bisq/wallets/json_rpc/RpcConfig.java
rename to wallets/bitcoind/json-rpc/src/main/java/bisq/wallets/json_rpc/RpcConfig.java
diff --git a/wallets/json-rpc/src/main/java/bisq/wallets/json_rpc/VoidJsonRpcResponse.java b/wallets/bitcoind/json-rpc/src/main/java/bisq/wallets/json_rpc/VoidJsonRpcResponse.java
similarity index 100%
rename from wallets/json-rpc/src/main/java/bisq/wallets/json_rpc/VoidJsonRpcResponse.java
rename to wallets/bitcoind/json-rpc/src/main/java/bisq/wallets/json_rpc/VoidJsonRpcResponse.java
diff --git a/wallets/json-rpc/src/main/java/bisq/wallets/json_rpc/exceptions/InvalidRpcCredentialsException.java b/wallets/bitcoind/json-rpc/src/main/java/bisq/wallets/json_rpc/exceptions/InvalidRpcCredentialsException.java
similarity index 100%
rename from wallets/json-rpc/src/main/java/bisq/wallets/json_rpc/exceptions/InvalidRpcCredentialsException.java
rename to wallets/bitcoind/json-rpc/src/main/java/bisq/wallets/json_rpc/exceptions/InvalidRpcCredentialsException.java
diff --git a/wallets/json-rpc/src/main/java/bisq/wallets/json_rpc/reponses/JsonRpcBooleanResponse.java b/wallets/bitcoind/json-rpc/src/main/java/bisq/wallets/json_rpc/reponses/JsonRpcBooleanResponse.java
similarity index 100%
rename from wallets/json-rpc/src/main/java/bisq/wallets/json_rpc/reponses/JsonRpcBooleanResponse.java
rename to wallets/bitcoind/json-rpc/src/main/java/bisq/wallets/json_rpc/reponses/JsonRpcBooleanResponse.java
diff --git a/wallets/json-rpc/src/main/java/bisq/wallets/json_rpc/reponses/JsonRpcStringListResponse.java b/wallets/bitcoind/json-rpc/src/main/java/bisq/wallets/json_rpc/reponses/JsonRpcStringListResponse.java
similarity index 100%
rename from wallets/json-rpc/src/main/java/bisq/wallets/json_rpc/reponses/JsonRpcStringListResponse.java
rename to wallets/bitcoind/json-rpc/src/main/java/bisq/wallets/json_rpc/reponses/JsonRpcStringListResponse.java
diff --git a/wallets/json-rpc/src/main/java/bisq/wallets/json_rpc/reponses/JsonRpcStringResponse.java b/wallets/bitcoind/json-rpc/src/main/java/bisq/wallets/json_rpc/reponses/JsonRpcStringResponse.java
similarity index 100%
rename from wallets/json-rpc/src/main/java/bisq/wallets/json_rpc/reponses/JsonRpcStringResponse.java
rename to wallets/bitcoind/json-rpc/src/main/java/bisq/wallets/json_rpc/reponses/JsonRpcStringResponse.java
diff --git a/wallets/json-rpc/src/main/java/bisq/wallets/json_rpc/reponses/VoidJsonRpcResponse.java b/wallets/bitcoind/json-rpc/src/main/java/bisq/wallets/json_rpc/reponses/VoidJsonRpcResponse.java
similarity index 100%
rename from wallets/json-rpc/src/main/java/bisq/wallets/json_rpc/reponses/VoidJsonRpcResponse.java
rename to wallets/bitcoind/json-rpc/src/main/java/bisq/wallets/json_rpc/reponses/VoidJsonRpcResponse.java
diff --git a/wallets/json-rpc/src/main/proto/wallets.core.proto b/wallets/bitcoind/json-rpc/src/main/proto/wallets.core.proto
similarity index 100%
rename from wallets/json-rpc/src/main/proto/wallets.core.proto
rename to wallets/bitcoind/json-rpc/src/main/proto/wallets.core.proto
diff --git a/wallets/json-rpc/src/test/java/bisq/wallets/json_rpc/DummyGetBlockChainInfoRpcCall.java b/wallets/bitcoind/json-rpc/src/test/java/bisq/wallets/json_rpc/DummyGetBlockChainInfoRpcCall.java
similarity index 100%
rename from wallets/json-rpc/src/test/java/bisq/wallets/json_rpc/DummyGetBlockChainInfoRpcCall.java
rename to wallets/bitcoind/json-rpc/src/test/java/bisq/wallets/json_rpc/DummyGetBlockChainInfoRpcCall.java
diff --git a/wallets/json-rpc/src/test/java/bisq/wallets/json_rpc/DummyJsonRpcResponse.java b/wallets/bitcoind/json-rpc/src/test/java/bisq/wallets/json_rpc/DummyJsonRpcResponse.java
similarity index 100%
rename from wallets/json-rpc/src/test/java/bisq/wallets/json_rpc/DummyJsonRpcResponse.java
rename to wallets/bitcoind/json-rpc/src/test/java/bisq/wallets/json_rpc/DummyJsonRpcResponse.java
diff --git a/wallets/json-rpc/src/test/java/bisq/wallets/json_rpc/JsonRpcClientTest.java b/wallets/bitcoind/json-rpc/src/test/java/bisq/wallets/json_rpc/JsonRpcClientTest.java
similarity index 100%
rename from wallets/json-rpc/src/test/java/bisq/wallets/json_rpc/JsonRpcClientTest.java
rename to wallets/bitcoind/json-rpc/src/test/java/bisq/wallets/json_rpc/JsonRpcClientTest.java
diff --git a/wallets/regtest/build.gradle.kts b/wallets/bitcoind/regtest/build.gradle.kts
similarity index 100%
rename from wallets/regtest/build.gradle.kts
rename to wallets/bitcoind/regtest/build.gradle.kts
diff --git a/wallets/regtest/src/main/java/bisq/wallets/regtest/AbstractRegtestSetup.java b/wallets/bitcoind/regtest/src/main/java/bisq/wallets/regtest/AbstractRegtestSetup.java
similarity index 100%
rename from wallets/regtest/src/main/java/bisq/wallets/regtest/AbstractRegtestSetup.java
rename to wallets/bitcoind/regtest/src/main/java/bisq/wallets/regtest/AbstractRegtestSetup.java
diff --git a/wallets/regtest/src/main/java/bisq/wallets/regtest/AbstractSharedRegtestInstanceTests.java b/wallets/bitcoind/regtest/src/main/java/bisq/wallets/regtest/AbstractSharedRegtestInstanceTests.java
similarity index 100%
rename from wallets/regtest/src/main/java/bisq/wallets/regtest/AbstractSharedRegtestInstanceTests.java
rename to wallets/bitcoind/regtest/src/main/java/bisq/wallets/regtest/AbstractSharedRegtestInstanceTests.java
diff --git a/wallets/regtest/src/main/java/bisq/wallets/regtest/BitcoindExtension.java b/wallets/bitcoind/regtest/src/main/java/bisq/wallets/regtest/BitcoindExtension.java
similarity index 100%
rename from wallets/regtest/src/main/java/bisq/wallets/regtest/BitcoindExtension.java
rename to wallets/bitcoind/regtest/src/main/java/bisq/wallets/regtest/BitcoindExtension.java
diff --git a/wallets/regtest/src/main/java/bisq/wallets/regtest/ConnectionFailureIntegrationTests.java b/wallets/bitcoind/regtest/src/main/java/bisq/wallets/regtest/ConnectionFailureIntegrationTests.java
similarity index 100%
rename from wallets/regtest/src/main/java/bisq/wallets/regtest/ConnectionFailureIntegrationTests.java
rename to wallets/bitcoind/regtest/src/main/java/bisq/wallets/regtest/ConnectionFailureIntegrationTests.java
diff --git a/wallets/regtest/src/main/java/bisq/wallets/regtest/Os.java b/wallets/bitcoind/regtest/src/main/java/bisq/wallets/regtest/Os.java
similarity index 100%
rename from wallets/regtest/src/main/java/bisq/wallets/regtest/Os.java
rename to wallets/bitcoind/regtest/src/main/java/bisq/wallets/regtest/Os.java
diff --git a/wallets/regtest/src/main/java/bisq/wallets/regtest/WalletStartupTests.java b/wallets/bitcoind/regtest/src/main/java/bisq/wallets/regtest/WalletStartupTests.java
similarity index 100%
rename from wallets/regtest/src/main/java/bisq/wallets/regtest/WalletStartupTests.java
rename to wallets/bitcoind/regtest/src/main/java/bisq/wallets/regtest/WalletStartupTests.java
diff --git a/wallets/regtest/src/main/java/bisq/wallets/regtest/bitcoind/BitcoindRegtestProcess.java b/wallets/bitcoind/regtest/src/main/java/bisq/wallets/regtest/bitcoind/BitcoindRegtestProcess.java
similarity index 100%
rename from wallets/regtest/src/main/java/bisq/wallets/regtest/bitcoind/BitcoindRegtestProcess.java
rename to wallets/bitcoind/regtest/src/main/java/bisq/wallets/regtest/bitcoind/BitcoindRegtestProcess.java
diff --git a/wallets/regtest/src/main/java/bisq/wallets/regtest/bitcoind/BitcoindRegtestSetup.java b/wallets/bitcoind/regtest/src/main/java/bisq/wallets/regtest/bitcoind/BitcoindRegtestSetup.java
similarity index 100%
rename from wallets/regtest/src/main/java/bisq/wallets/regtest/bitcoind/BitcoindRegtestSetup.java
rename to wallets/bitcoind/regtest/src/main/java/bisq/wallets/regtest/bitcoind/BitcoindRegtestSetup.java
diff --git a/wallets/regtest/src/main/java/bisq/wallets/regtest/bitcoind/RemoteBitcoind.java b/wallets/bitcoind/regtest/src/main/java/bisq/wallets/regtest/bitcoind/RemoteBitcoind.java
similarity index 100%
rename from wallets/regtest/src/main/java/bisq/wallets/regtest/bitcoind/RemoteBitcoind.java
rename to wallets/bitcoind/regtest/src/main/java/bisq/wallets/regtest/bitcoind/RemoteBitcoind.java
diff --git a/wallets/regtest/src/main/java/bisq/wallets/regtest/process/BisqProcess.java b/wallets/bitcoind/regtest/src/main/java/bisq/wallets/regtest/process/BisqProcess.java
similarity index 100%
rename from wallets/regtest/src/main/java/bisq/wallets/regtest/process/BisqProcess.java
rename to wallets/bitcoind/regtest/src/main/java/bisq/wallets/regtest/process/BisqProcess.java
diff --git a/wallets/regtest/src/main/java/bisq/wallets/regtest/process/CannotStartProcessException.java b/wallets/bitcoind/regtest/src/main/java/bisq/wallets/regtest/process/CannotStartProcessException.java
similarity index 100%
rename from wallets/regtest/src/main/java/bisq/wallets/regtest/process/CannotStartProcessException.java
rename to wallets/bitcoind/regtest/src/main/java/bisq/wallets/regtest/process/CannotStartProcessException.java
diff --git a/wallets/regtest/src/main/java/bisq/wallets/regtest/process/DaemonProcess.java b/wallets/bitcoind/regtest/src/main/java/bisq/wallets/regtest/process/DaemonProcess.java
similarity index 100%
rename from wallets/regtest/src/main/java/bisq/wallets/regtest/process/DaemonProcess.java
rename to wallets/bitcoind/regtest/src/main/java/bisq/wallets/regtest/process/DaemonProcess.java
diff --git a/wallets/regtest/src/main/java/bisq/wallets/regtest/process/MultiProcessCoordinator.java b/wallets/bitcoind/regtest/src/main/java/bisq/wallets/regtest/process/MultiProcessCoordinator.java
similarity index 100%
rename from wallets/regtest/src/main/java/bisq/wallets/regtest/process/MultiProcessCoordinator.java
rename to wallets/bitcoind/regtest/src/main/java/bisq/wallets/regtest/process/MultiProcessCoordinator.java
diff --git a/wallets/regtest/src/main/java/bisq/wallets/regtest/process/ProcessConfig.java b/wallets/bitcoind/regtest/src/main/java/bisq/wallets/regtest/process/ProcessConfig.java
similarity index 100%
rename from wallets/regtest/src/main/java/bisq/wallets/regtest/process/ProcessConfig.java
rename to wallets/bitcoind/regtest/src/main/java/bisq/wallets/regtest/process/ProcessConfig.java
diff --git a/wallets/regtest/src/main/java/bisq/wallets/regtest/process/WalletStartupFailedException.java b/wallets/bitcoind/regtest/src/main/java/bisq/wallets/regtest/process/WalletStartupFailedException.java
similarity index 100%
rename from wallets/regtest/src/main/java/bisq/wallets/regtest/process/WalletStartupFailedException.java
rename to wallets/bitcoind/regtest/src/main/java/bisq/wallets/regtest/process/WalletStartupFailedException.java
diff --git a/wallets/bitcoind/settings.gradle.kts b/wallets/bitcoind/settings.gradle.kts
new file mode 100644
index 0000000000..62a7cccf8d
--- /dev/null
+++ b/wallets/bitcoind/settings.gradle.kts
@@ -0,0 +1,21 @@
+pluginManagement {
+    repositories {
+        gradlePluginPortal()
+    }
+    includeBuild("../../build-logic")
+}
+
+dependencyResolutionManagement {
+    versionCatalogs {
+        create("libs") {
+            from(files("../../gradle/libs.versions.toml"))
+        }
+    }
+}
+
+include("core")
+include("bitcoind")
+include("json-rpc")
+include("regtest")
+
+rootProject.name = "bitcoind"
\ No newline at end of file
diff --git a/wallets/electrum/build.gradle.kts b/wallets/electrum/build.gradle.kts
index bd00b58c9c..8b2b89b196 100644
--- a/wallets/electrum/build.gradle.kts
+++ b/wallets/electrum/build.gradle.kts
@@ -18,16 +18,14 @@ sourceSets {
 }
 
 dependencies {
-    api(project(":core"))
+    api("bitcoind:core")
+    implementation("bitcoind:json-rpc")
+    implementation("bitcoind:regtest")
 
-    implementation("bisq:persistence")
-    implementation(project(":json-rpc"))
     implementation(project(":process"))
-    implementation(project(":regtest"))
-
     implementation(libs.typesafe.config)
     implementation(libs.bundles.glassfish.jersey)
 
-    integrationTestImplementation(project(":bitcoind"))
-    integrationTestImplementation(project(":regtest"))
+    integrationTestImplementation("bitcoind:bitcoind")
+    integrationTestImplementation("bitcoind:regtest")
 }
\ No newline at end of file
diff --git a/wallets/elementsd/build.gradle.kts b/wallets/elementsd/build.gradle.kts
index 320dd2db7b..ba32f8f5eb 100644
--- a/wallets/elementsd/build.gradle.kts
+++ b/wallets/elementsd/build.gradle.kts
@@ -7,9 +7,9 @@ plugins {
 dependencies {
     implementation("bisq:persistence")
 
-    implementation(project(":core"))
-    implementation(project(":bitcoind"))
-    implementation(project(":json-rpc"))
+    implementation("bitcoind:core")
+    implementation("bitcoind:bitcoind")
+    implementation("bitcoind:json-rpc")
 
-    integrationTestImplementation(project(":regtest"))
+    integrationTestImplementation("bitcoind:regtest")
 }
\ No newline at end of file
diff --git a/wallets/process/build.gradle.kts b/wallets/process/build.gradle.kts
index 01d2a14052..2d53f1f7e2 100644
--- a/wallets/process/build.gradle.kts
+++ b/wallets/process/build.gradle.kts
@@ -3,8 +3,8 @@ plugins {
 }
 
 dependencies {
-    implementation(project(":core"))
-    implementation(project(":bitcoind"))
+    implementation("bitcoind:core")
+    implementation("bitcoind:bitcoind")
 
     implementation(libs.assertj.core)
     implementation(libs.junit.jupiter)
diff --git a/wallets/settings.gradle.kts b/wallets/settings.gradle.kts
index 0a91b18a2c..b069bd6200 100644
--- a/wallets/settings.gradle.kts
+++ b/wallets/settings.gradle.kts
@@ -14,14 +14,11 @@ dependencyResolutionManagement {
 }
 
 includeBuild("..")
-include("core")
+includeBuild("bitcoind")
 
-include("bitcoind")
 include("electrum")
 include("elementsd")
 
-include("json-rpc")
 include("process")
-include("regtest")
 
 rootProject.name = "wallets"
\ No newline at end of file