Tweaks for core-refactor build and changes to cpf dependency organization