Rename files. Add some puppet comments.
Add new erb template conf files.