Moved more files into place
Merge pull request #161 from TekHus/big-edits-and-moves

Moved more files into place