diff --git a/dev-support/hippo4j_checkstyle.xml b/checkstyle/hippo4j_checkstyle.xml
similarity index 100%
rename from dev-support/hippo4j_checkstyle.xml
rename to checkstyle/hippo4j_checkstyle.xml
diff --git a/dev-support/hippo4j_checkstyle_suppression.xml b/checkstyle/hippo4j_checkstyle_suppression.xml
similarity index 100%
rename from dev-support/hippo4j_checkstyle_suppression.xml
rename to checkstyle/hippo4j_checkstyle_suppression.xml
diff --git a/dev-support/hippo4j_spotless_formatter.xml b/format/hippo4j_spotless_formatter.xml
similarity index 100%
rename from dev-support/hippo4j_spotless_formatter.xml
rename to format/hippo4j_spotless_formatter.xml
diff --git a/dev-support/license-header b/format/license-header
similarity index 100%
rename from dev-support/license-header
rename to format/license-header
diff --git a/pom.xml b/pom.xml
index 4f5f239a..1ff08d1e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -233,10 +233,10 @@
                     <applySkip>${skip.spotless.apply}</applySkip>
                     <java>
                         <eclipse>
-                            <file>${maven.multiModuleProjectDirectory}/dev-support/hippo4j_spotless_formatter.xml</file>
+                            <file>${maven.multiModuleProjectDirectory}/format/hippo4j_spotless_formatter.xml</file>
                         </eclipse>
                         <licenseHeader>
-                            <file>${maven.multiModuleProjectDirectory}/dev-support/license-header</file>
+                            <file>${maven.multiModuleProjectDirectory}/format/license-header</file>
                         </licenseHeader>
                     </java>
                 </configuration>
@@ -254,10 +254,10 @@
                 <artifactId>maven-checkstyle-plugin</artifactId>
                 <version>${maven-checkstyle-plugin.version}</version>
                 <configuration>
-                    <configLocation>${maven.multiModuleProjectDirectory}/dev-support/hippo4j_checkstyle.xml
+                    <configLocation>${maven.multiModuleProjectDirectory}/checkstyle/hippo4j_checkstyle.xml
                     </configLocation>
                     <suppressionsLocation>
-                        ${maven.multiModuleProjectDirectory}/dev-support/hippo4j_checkstyle_suppression.xml
+                        ${maven.multiModuleProjectDirectory}/checkstyle/hippo4j_checkstyle_suppression.xml
                     </suppressionsLocation>
                     <!-- Do not scan the test directory for now -->
                     <includeTestSourceDirectory>false</includeTestSourceDirectory>