Gradle refactor