Various moves, sorts and edits
Merge pull request #186 from TekHus/11th-hour-changes

Various moves, sorts and edits
Merge pull request #671 from KevWright/master

Various moves, sorts and edits