Switched to gradle build system