diff --git a/build.gradle b/build.gradle
index ca91122645..5945bacdd7 100644
--- a/build.gradle
+++ b/build.gradle
@@ -40,6 +40,8 @@ repositories {
 
 dependencies {
     compile 'network.bisq:bisq-core:-SNAPSHOT'
+    compile 'network.bisq:bisq-p2p:-SNAPSHOT'
+    compile 'network.bisq:bisq-common:-SNAPSHOT'
     compile 'org.controlsfx:controlsfx:8.0.6_20'
     compile 'org.reactfx:reactfx:2.0-M3'
     compile 'net.glxn:qrgen:1.3'
@@ -74,8 +76,8 @@ dependencyVerification {
         'org.bouncycastle:bcprov-jdk15on:963e1ee14f808ffb99897d848ddcdb28fa91ddda867eb18d303e82728f878349',
         'org.bouncycastle:bcpg-jdk16:4da048d7338677f87331d215a59382f77a5afc10cd82127aa9c550a227afb09b',
         'net.sf.jopt-simple:jopt-simple:6f45c00908265947c39221035250024f2caec9a15c1c8cf553ebeecee289f342',
-        'com.github.bisq-network.btcd-cli4j:btcd-cli4j-daemon:f72a1252ad9efd510e544ab6e7dd8f80ec744500b004d1c9848e223806dd087a',
-        'com.github.bisq-network.btcd-cli4j:btcd-cli4j-core:1207fb62d6520e9644eb3e3978281b25e110583e6e18686e5b66366b7adc83b7',
+        //'com.github.bisq-network.btcd-cli4j:btcd-cli4j-daemon:f72a1252ad9efd510e544ab6e7dd8f80ec744500b004d1c9848e223806dd087a',
+        //'com.github.bisq-network.btcd-cli4j:btcd-cli4j-core:1207fb62d6520e9644eb3e3978281b25e110583e6e18686e5b66366b7adc83b7',
         'com.fasterxml.jackson.core:jackson-databind:fcf3c2b0c332f5f54604f7e27fa7ee502378a2cc5df6a944bbfae391872c32ff',
         'com.fasterxml.jackson.core:jackson-core:39a74610521d7fb9eb3f437bb8739bbf47f6435be12d17bf954c731a0c6352bb',
         'com.fasterxml.jackson.core:jackson-annotations:2566b3a6662afa3c6af4f5b25006cb46be2efc68f1b5116291d6998a8cdf7ed3',
@@ -85,8 +87,8 @@ dependencyVerification {
         'org.apache.httpcomponents:httpclient:db3d1b6c2d6a5e5ad47577ad61854e2f0e0936199b8e05eb541ed52349263135',
         'org.fxmisc.easybind:easybind:666af296dda6de68751668a62661571b5238ac6f1c07c8a204fc6f902b222aaf',
         'com.google.zxing:core:11aae8fd974ab25faa8208be50468eb12349cd239e93e7c797377fa13e381729',
-        'com.google.protobuf:protobuf-java-util:4547f6d1ea08ff8d92513e1d80b91652f0e158d0a64e9402cb44507789eb3106',
-        'com.google.protobuf:protobuf-java:f3411ade77523d5f0d013d4f25c36879e66f0c5e1e4310f7096d54d0d2553554',
+        //'com.google.protobuf:protobuf-java-util:4547f6d1ea08ff8d92513e1d80b91652f0e158d0a64e9402cb44507789eb3106',
+        //'com.google.protobuf:protobuf-java:f3411ade77523d5f0d013d4f25c36879e66f0c5e1e4310f7096d54d0d2553554',
         'com.google.code.gson:gson:2d43eb5ea9e133d2ee2405cc14f5ee08951b8361302fdd93494a3a997b508d32',
         'com.googlecode.json-simple:json-simple:4e69696892b88b41c55d49ab2fdcc21eead92bf54acc588c0050596c3b75199c',
         'org.springframework:spring-core:c451e8417adb2ffb2445636da5e44a2f59307c4100037a1fe387c3fba4f29b52',
@@ -96,7 +98,7 @@ dependencyVerification {
         'com.google.code.findbugs:jsr305:c885ce34249682bc0236b4a7d56efcc12048e6135a5baf7a9cde8ad8cda13fcd',
         'com.google.guava:guava:36a666e3b71ae7f0f0dca23654b67e086e6c93d192f60ba5dfd5519db6c288c8',
         'com.google.inject:guice:9b9df27a5b8c7864112b4137fd92b36c3f1395bfe57be42fedf2f520ead1a93e',
-        'com.github.bisq-network.libdohj:libdohj-core:a991f1a99b5ae417cb8221b23e86eef1d37be21d981004dad809f86a18c69598',
+        //'com.github.bisq-network.libdohj:libdohj-core:a991f1a99b5ae417cb8221b23e86eef1d37be21d981004dad809f86a18c69598',
         'com.github.JesusMcCloud.netlayer:tor:47421f908c4f60f3f4843eae8caae457dbbf8ea85bce8b040904794eb7cca91e',
         'org.jetbrains.kotlin:kotlin-stdlib-jre8:9a99cb0d26aa3a8edb0916c41a7be6ca93b9534c2c227f4e098c0e6c1a4bf1f3',
         'com.github.MicroUtils:kotlin-logging:7dbd501cc210d721f730d480c53ee2a6e3c154ae89b07dc7dee224b9c5aca9eb',