Switched to gradle based project