Rearranged class locations to separate inherited structures. Cleaned up some test files.
Merge pull request #8 from MSeal/master

Rearranged file contents and removed some whitespacing