Changed organization for cpf dependency