Converted to Gradle Build System