Refactoring puppet module