Refacto PuppetClass -> GroupClass