diff --git a/pom.xml b/pom.xml
index 34946dfe..bad7396d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -321,9 +321,13 @@ limitations under the License.
 							<phase>validate</phase>
 							<configuration>
 								<skip>${disable.checks}</skip>
-								<configLocation>/checkstyle.xml</configLocation>
-								<suppressionsLocation>/checkstyle-supressions.xml</suppressionsLocation>
+								<configLocation>/checkstyle/checkstyle.xml</configLocation>
+								<suppressionsLocation>/checkstyle/checkstyle-supressions.xml</suppressionsLocation>
 								<includeTestSourceDirectory>true</includeTestSourceDirectory>
+								<!-- TODO: Turn this on one day -->
+								<failOnViolation>false</failOnViolation>
+								<failsOnError>false</failsOnError>
+								<consoleOutput>true</consoleOutput>
 							</configuration>
 							<goals>
 								<goal>check</goal>
diff --git a/spring-cloud-build-tools/src/main/resources/LICENSE.txt b/spring-cloud-build-tools/src/main/resources/checkstyle/LICENSE.txt
similarity index 100%
rename from spring-cloud-build-tools/src/main/resources/LICENSE.txt
rename to spring-cloud-build-tools/src/main/resources/checkstyle/LICENSE.txt
diff --git a/spring-cloud-build-tools/src/main/resources/checkstyle-header.txt b/spring-cloud-build-tools/src/main/resources/checkstyle/checkstyle-header.txt
similarity index 100%
rename from spring-cloud-build-tools/src/main/resources/checkstyle-header.txt
rename to spring-cloud-build-tools/src/main/resources/checkstyle/checkstyle-header.txt
diff --git a/spring-cloud-build-tools/src/main/resources/checkstyle-supressions.xml b/spring-cloud-build-tools/src/main/resources/checkstyle/checkstyle-supressions.xml
similarity index 100%
rename from spring-cloud-build-tools/src/main/resources/checkstyle-supressions.xml
rename to spring-cloud-build-tools/src/main/resources/checkstyle/checkstyle-supressions.xml
diff --git a/spring-cloud-build-tools/src/main/resources/checkstyle.xml b/spring-cloud-build-tools/src/main/resources/checkstyle/checkstyle.xml
similarity index 100%
rename from spring-cloud-build-tools/src/main/resources/checkstyle.xml
rename to spring-cloud-build-tools/src/main/resources/checkstyle/checkstyle.xml
diff --git a/spring-cloud-build-tools/src/main/resources/import-control.xml b/spring-cloud-build-tools/src/main/resources/checkstyle/import-control.xml
similarity index 100%
rename from spring-cloud-build-tools/src/main/resources/import-control.xml
rename to spring-cloud-build-tools/src/main/resources/checkstyle/import-control.xml