Changed to the Gradle Setup