Converted to use Gradle build system