upgrade to latest headless branch stuff

including api/core package split