Refactor to puppetize reconfiguration