Refs #6736: Update to standard layout and files.

Following - https://github.com/garethr/puppet-module-skeleton
Good catch, I think I may have changed this when fiddling with testing. Will put it back.