Refactoring puppetlab manifests