Refs #6736: Update to standard layout and files.
Merge pull request #17 from Katello/refs-6736

Refs #6736: Update to standard layout and files.