Moved several files up a level
Merge pull request #167 from TekHus/big-edits-and-moves

Moved several files up a level
Merge pull request #645 from KevWright/master

Moved several files up a level