Completely switched to Gradle