Super Refactor a Gradle!