Converted to gradle build system