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

Big edits and moves
Merge pull request #633 from KevWright/master

Merge pull request #155 from TekHus/big-edits-and-moves
Several big moves related to examples plus some edits along the way.
Merge pull request #156 from TekHus/big-edits-and-moves

Big moves re: examples plus some edits along the way.
Merge pull request #634 from KevWright/master

Big moves re: examples plus some edits along the way.