Adding in Puppet syntax and removing unnecessary layer of module indirection