diff --git a/build.gradle b/build.gradle
index fcf189c4b6..b167e3afc7 100644
--- a/build.gradle
+++ b/build.gradle
@@ -5,6 +5,8 @@ buildscript {
     dependencies {
         classpath 'com.google.protobuf:protobuf-gradle-plugin:0.8.5'
         classpath 'com.google.gradle:osdetector-gradle-plugin:1.6.0'
+        classpath 'com.github.jengelman.gradle.plugins:shadow:2.0.4'
+        classpath files('gradle/witness/gradle-witness.jar')
     }
 }
 
@@ -159,3 +161,55 @@ configure(project(':core')) {
         jvmArgs "-javaagent:$jmockit"
     }
 }
+
+configure(project(':desktop')) {
+    apply plugin: 'com.github.johnrengelman.shadow'
+    apply plugin: 'witness'
+    apply from: '../gradle/witness/gradle-witness.gradle'
+
+    version = '0.8.0-SNAPSHOT'
+
+    mainClassName = 'bisq.desktop.app.BisqAppMain'
+
+    tasks.withType(AbstractArchiveTask) {
+        preserveFileTimestamps = false
+        reproducibleFileOrder = true
+    }
+
+    sourceSets.main.resources.srcDirs += ['src/main/java'] // to copy fxml and css files
+
+    dependencies {
+        compile project(':p2p')
+        compile project(':core')
+        compile project(':common')
+        compile 'org.controlsfx:controlsfx:8.0.6_20'
+        compile 'org.reactfx:reactfx:2.0-M3'
+        compile 'net.glxn:qrgen:1.3'
+        compile 'de.jensd:fontawesomefx:8.0.0'
+        compile 'de.jensd:fontawesomefx-commons:9.1.2'
+        compile 'de.jensd:fontawesomefx-materialdesignfont:2.0.26-9.1.2'
+        compile 'com.googlecode.jcsv:jcsv:1.4.0'
+        compile 'com.github.sarxos:webcam-capture:0.3.12'
+
+        compileOnly 'org.projectlombok:lombok:1.18.2'
+        annotationProcessor 'org.projectlombok:lombok:1.18.2'
+
+        testCompile 'org.jmockit:jmockit:1.42'
+        testCompile('org.mockito:mockito-core:2.21.0') {
+            exclude(module: 'objenesis')
+        }
+        testCompile 'org.powermock:powermock-module-junit4:2.0.0-beta.5'
+        testCompile 'org.powermock:powermock-api-mockito2:2.0.0-beta.5'
+        testCompile 'org.springframework:spring-test:4.3.6.RELEASE'
+        testCompile 'com.natpryce:make-it-easy:4.0.1'
+        testCompileOnly 'org.projectlombok:lombok:1.18.2'
+        testAnnotationProcessor 'org.projectlombok:lombok:1.18.2'
+    }
+
+    test {
+        systemProperty 'jdk.attach.allowAttachSelf', true
+
+        def jmockit = configurations.testCompile.files.find { it.name.contains("jmockit") }.absolutePath
+        jvmArgs "-javaagent:$jmockit"
+    }
+}
diff --git a/desktop/build.gradle b/desktop/build.gradle
deleted file mode 100644
index a4b4d4a593..0000000000
--- a/desktop/build.gradle
+++ /dev/null
@@ -1,61 +0,0 @@
-buildscript {
-    repositories {
-        jcenter()
-    }
-    dependencies {
-        classpath 'com.github.jengelman.gradle.plugins:shadow:2.0.4'
-        classpath files('gradle-witness.jar')
-    }
-}
-
-apply plugin: 'com.github.johnrengelman.shadow'
-apply plugin: 'witness'
-apply from: 'gradle-witness.gradle'
-
-version = '0.8.0-SNAPSHOT'
-
-mainClassName = 'bisq.desktop.app.BisqAppMain'
-
-tasks.withType(AbstractArchiveTask) {
-    preserveFileTimestamps = false
-    reproducibleFileOrder = true
-}
-
-sourceSets.main.resources.srcDirs += ['src/main/java'] // to copy fxml and css files
-
-dependencies {
-    // fixme(chirhonul): currently 'gradle install' using system gradle 4.9 fails with:
-    // A POM cannot have multiple artifacts with the same type and classifier. Already have MavenArtifact bisq:zip:zip:null, trying to add MavenArtifact bisq:zip:zip:null.
-    compile project(':p2p')
-    compile project(':core')
-    compile project(':common')
-    compile 'org.controlsfx:controlsfx:8.0.6_20'
-    compile 'org.reactfx:reactfx:2.0-M3'
-    compile 'net.glxn:qrgen:1.3'
-    compile 'de.jensd:fontawesomefx:8.0.0'
-    compile 'de.jensd:fontawesomefx-commons:9.1.2'
-    compile 'de.jensd:fontawesomefx-materialdesignfont:2.0.26-9.1.2'
-    compile 'com.googlecode.jcsv:jcsv:1.4.0'
-    compile 'com.github.sarxos:webcam-capture:0.3.12'
-
-    compileOnly 'org.projectlombok:lombok:1.18.2'
-    annotationProcessor 'org.projectlombok:lombok:1.18.2'
-
-    testCompile 'org.jmockit:jmockit:1.42'
-    testCompile('org.mockito:mockito-core:2.21.0') {
-        exclude(module: 'objenesis')
-    }
-    testCompile 'org.powermock:powermock-module-junit4:2.0.0-beta.5'
-    testCompile 'org.powermock:powermock-api-mockito2:2.0.0-beta.5'
-    testCompile 'org.springframework:spring-test:4.3.6.RELEASE'
-    testCompile 'com.natpryce:make-it-easy:4.0.1'
-    testCompileOnly 'org.projectlombok:lombok:1.18.2'
-    testAnnotationProcessor 'org.projectlombok:lombok:1.18.2'
-}
-
-test {
-    systemProperty 'jdk.attach.allowAttachSelf', true
-
-    def jmockit = configurations.testCompile.files.find { it.name.contains("jmockit") }.absolutePath
-    jvmArgs "-javaagent:$jmockit"
-}
diff --git a/desktop/gradle-witness.gradle b/gradle/witness/gradle-witness.gradle
similarity index 99%
rename from desktop/gradle-witness.gradle
rename to gradle/witness/gradle-witness.gradle
index 0ff9b938f3..35725cd558 100644
--- a/desktop/gradle-witness.gradle
+++ b/gradle/witness/gradle-witness.gradle
@@ -3,7 +3,7 @@
 // 1. Remove the block entirely
 // 2. Replace the block with the following command:
 //
-//    ./gradlew -q calculateChecksums | grep -v network.bisq >> desktop/gradle-witness.gradle
+//    ./gradlew -q calculateChecksums | grep -v network.bisq >> gradle/witness/gradle-witness.gradle
 //
 // 3. Run `git diff` to verify that expected hashes have changed
 // 4. Commit the changes
diff --git a/desktop/gradle-witness.jar b/gradle/witness/gradle-witness.jar
similarity index 100%
rename from desktop/gradle-witness.jar
rename to gradle/witness/gradle-witness.jar