In order to keep with conventions around directory structure, add a puppetlabs directory and rename modules accordingly.
Hailee Kenney