Updated project for gradle