Changed organization for cpf dependency on stub