Refs #6736: Updating to standard layout and basic tests.
Merge pull request #27 from ehelms/refs-6736

Refs #6736: Updating to standard layout and basic tests.