diff --git a/build.gradle b/build.gradle
index 4528a709a..ba6870f20 100644
--- a/build.gradle
+++ b/build.gradle
@@ -7,7 +7,7 @@ buildscript {
     }
     dependencies {
         classpath 'org.kordamp:markdown-gradle-plugin:1.0.0'
-		classpath 'org.kordamp.gradle:clirr-gradle-plugin:0.1.0'
+		classpath 'org.kordamp.gradle:clirr-gradle-plugin:0.2.0'
 		classpath "org.kt3k.gradle.plugin:coveralls-gradle-plugin:2.3.1"
     }
 }
@@ -313,8 +313,7 @@ subprojects {
 	}
 
 	clirr {
-		baseline = [group, name, clirrBaseline].join(':')
-		failOnErrors clirrFailOnErrors
+		semver false
 	}
 }
 
@@ -348,7 +347,7 @@ task jacocoRootReport(type: org.gradle.testing.jacoco.tasks.JacocoReport) {
 // Important to specify this task after the subprojects block
 task clirrRootReport(type: org.kordamp.gradle.clirr.ClirrReportTask) {
 	dependsOn = subprojects.tasks.clirr
-	reports = files(subprojects.tasks.clirr.xmlReport)
+	reports = files((subprojects.findAll { it.clirr.enabled == true }).tasks.clirr.xmlReport)
 }
 
 def getGitCommit() {
diff --git a/smack-debug/src/main/resources/message.png b/smack-debug/src/main/resources/images/message.png
similarity index 100%
rename from smack-debug/src/main/resources/message.png
rename to smack-debug/src/main/resources/images/message.png
diff --git a/smack-debug/src/main/resources/nav_left_blue.png b/smack-debug/src/main/resources/images/nav_left_blue.png
similarity index 100%
rename from smack-debug/src/main/resources/nav_left_blue.png
rename to smack-debug/src/main/resources/images/nav_left_blue.png
diff --git a/smack-debug/src/main/resources/nav_right_red.png b/smack-debug/src/main/resources/images/nav_right_red.png
similarity index 100%
rename from smack-debug/src/main/resources/nav_right_red.png
rename to smack-debug/src/main/resources/images/nav_right_red.png
diff --git a/smack-debug/src/main/resources/photo_portrait.png b/smack-debug/src/main/resources/images/photo_portrait.png
similarity index 100%
rename from smack-debug/src/main/resources/photo_portrait.png
rename to smack-debug/src/main/resources/images/photo_portrait.png
diff --git a/smack-debug/src/main/resources/question_and_answer.png b/smack-debug/src/main/resources/images/question_and_answer.png
similarity index 100%
rename from smack-debug/src/main/resources/question_and_answer.png
rename to smack-debug/src/main/resources/images/question_and_answer.png
diff --git a/smack-debug/src/main/resources/trafficlight_green.png b/smack-debug/src/main/resources/images/trafficlight_green.png
similarity index 100%
rename from smack-debug/src/main/resources/trafficlight_green.png
rename to smack-debug/src/main/resources/images/trafficlight_green.png
diff --git a/smack-debug/src/main/resources/trafficlight_off.png b/smack-debug/src/main/resources/images/trafficlight_off.png
similarity index 100%
rename from smack-debug/src/main/resources/trafficlight_off.png
rename to smack-debug/src/main/resources/images/trafficlight_off.png
diff --git a/smack-debug/src/main/resources/trafficlight_red.png b/smack-debug/src/main/resources/images/trafficlight_red.png
similarity index 100%
rename from smack-debug/src/main/resources/trafficlight_red.png
rename to smack-debug/src/main/resources/images/trafficlight_red.png
diff --git a/smack-debug/src/main/resources/unknown.png b/smack-debug/src/main/resources/images/unknown.png
similarity index 100%
rename from smack-debug/src/main/resources/unknown.png
rename to smack-debug/src/main/resources/images/unknown.png
diff --git a/smack-debug/src/main/resources/warning.png b/smack-debug/src/main/resources/images/warning.png
similarity index 100%
rename from smack-debug/src/main/resources/warning.png
rename to smack-debug/src/main/resources/images/warning.png
diff --git a/version.gradle b/version.gradle
index fe37fab3e..b6659c768 100644
--- a/version.gradle
+++ b/version.gradle
@@ -4,10 +4,5 @@ allprojects {
 		isSnapshot = true
 		jxmppVersion = '0.5.0-alpha2'
 		smackMinAndroidSdk = 8
-
-		// The baseline version to check the API's binary
-		// compatibility against with Clirr.
-		clirrBaseline = '4.1.0-rc2'
-		clirrFailOnErrors = false
 	}
 }