Switched to Gradle