Refactor Puppet files.