Changes to cpf organization in ivy.xml, project revision for core-refactor