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

Should here be the recursive dependency?