Changed to Gradle based building