Moving puppetmaster related stuff to a module