Baisc moving and renaming.  Made tests in own groupings and better names for the ta's.
merge Jeremy's branch to master
Merge pull request #13 from reedcwilson/Jeremy

Baisc moving and renaming.