diff --git a/build.gradle b/build.gradle
index 8645b5368..a7778b5fa 100644
--- a/build.gradle
+++ b/build.gradle
@@ -399,7 +399,6 @@ subprojects {
 	apply plugin: 'org.kordamp.gradle.clirr'
 
 	checkstyle {
-		configFile = new File(rootConfigDir, 'checkstyle.xml')
 		toolVersion = '8.10'
 	}
 	task sourcesJar(type: Jar, dependsOn: classes) {
diff --git a/config/checkstyle.xml b/config/checkstyle/checkstyle.xml
similarity index 97%
rename from config/checkstyle.xml
rename to config/checkstyle/checkstyle.xml
index 8d539f725..b6025f979 100644
--- a/config/checkstyle.xml
+++ b/config/checkstyle/checkstyle.xml
@@ -4,7 +4,7 @@
      "http://www.puppycrawl.com/dtds/configuration_1_3.dtd">
 <module name="Checker">
 	<module name="SuppressionFilter">
-		<property name="file" value="config/suppressions.xml"/>
+		<property name="file" value="${config_loc}/suppressions.xml"/>
 	</module>
 	<module name="SuppressWithPlainTextCommentFilter">
 		<property name="offCommentFormat" value="CHECKSTYLE\:OFF\:(\w+)"/>
@@ -12,7 +12,7 @@
 		<property name="checkFormat" value="$1"/>
 	</module>
 	<module name="Header">
-		<property name="headerFile" value="config/${checkstyleLicenseHeader}.txt"/>
+		<property name="headerFile" value="${config_loc}/${checkstyleLicenseHeader}.txt"/>
 		<property name="ignoreLines" value="3"/>
 		<property name="fileExtensions" value="java"/>
 	</module>
diff --git a/config/header.txt b/config/checkstyle/header.txt
similarity index 100%
rename from config/header.txt
rename to config/checkstyle/header.txt
diff --git a/config/smack-omemo-signal-gplv3-license-header.txt b/config/checkstyle/smack-omemo-signal-gplv3-license-header.txt
similarity index 100%
rename from config/smack-omemo-signal-gplv3-license-header.txt
rename to config/checkstyle/smack-omemo-signal-gplv3-license-header.txt
diff --git a/config/smack-omemo-signal-integration-test-gplv3-license-header.txt b/config/checkstyle/smack-omemo-signal-integration-test-gplv3-license-header.txt
similarity index 100%
rename from config/smack-omemo-signal-integration-test-gplv3-license-header.txt
rename to config/checkstyle/smack-omemo-signal-integration-test-gplv3-license-header.txt
diff --git a/config/suppressions.xml b/config/checkstyle/suppressions.xml
similarity index 100%
rename from config/suppressions.xml
rename to config/checkstyle/suppressions.xml