diff --git a/build.gradle b/build.gradle
index 58789b631cf267ced01c200a28fbe056f1312b83..c93c8d3589c3738b39c1a0238c3fbd863ae689a1 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,4 +1,3 @@
-apply plugin: 'findbugs'
 apply plugin: "com.github.psxpaul.execfork"
 apply plugin: 'jacoco'
 apply plugin: 'com.github.johnrengelman.shadow'
@@ -40,10 +39,17 @@ allprojects {
 	          url "https://nexus.informatik.uni-goettingen.de/content/repositories/rwm/"
 	    }
 	}
+	
+	javadoc {
+    	source = sourceSets.main.allJava
+   	 	classpath = configurations.compile
+    	failOnError = true
+	}
 }
 
 configure([project(':de.ugoe.cs.rwm.mocci.connector'), project(':de.ugoe.cs.rwm.mocci.connector.dummy'), rootProject]) {
     apply plugin: 'checkstyle'
+    apply plugin: 'findbugs'
     	
    	checkstyle {
         toolVersion = '8.2'
@@ -54,6 +60,18 @@ configure([project(':de.ugoe.cs.rwm.mocci.connector'), project(':de.ugoe.cs.rwm.
         ignoreFailures = false
         showViolations = true
     }
+    
+    findbugs {
+    	sourceSets = [sourceSets.main]
+    	ignoreFailures = true
+	}
+
+	tasks.withType(FindBugs) {
+	    reports {
+	        xml.enabled false
+	        html.enabled true
+	    }
+	}
 }
 
 sourceSets {
@@ -127,7 +145,6 @@ project(':de.ugoe.cs.rwm.mocci.connector.dummy') {
   }
 }
 
-
 jar {
     manifest {
         attributes 'Main-Class': 'de.ugoe.cs.rwm.mocci.MAPE'
@@ -137,16 +154,9 @@ jar {
 tasks.shadowJar.dependsOn("build")
 
 configurations.all {
-    // Check for updates every build
-    //resolutionStrategy.cacheChangingModulesFor 0, 'seconds'
     resolutionStrategy.preferProjectModules()
 }
 
-javadoc {
-    source = sourceSets.main.allJava
-    classpath = configurations.compile
-    failOnError = true
-}
 test {
     exclude 'de/ugoe/cs/rwm/mocci/live/**'
     //exclude 'de/ugoe/cs/rwm/mocci/**'
@@ -168,27 +178,6 @@ jacocoTestReport {
         csv.enabled false
         html.destination file("${buildDir}/reports/jacoco")
     }
-}
-
-findbugs {
-    sourceSets = [sourceSets.main]
-    ignoreFailures = true
-}
-
-checkstyle {
-    toolVersion = "8.7"
-    sourceSets = [sourceSets.main]
-}
-
-checkstyleMain {
-    ignoreFailures = true
-}
-
-tasks.withType(FindBugs) {
-    reports {
-        xml.enabled false
-        html.enabled true
-    }
 } 
  
 task startMartServer(type: com.github.psxpaul.task.JavaExecFork) {