Merge pull request #155 from TekHus/big-edits-and-moves

Big edits and moves