WIP - refactoring puppet files