Structured change to fit Gradle