Many changes in an attempt to make more streamlined

Trying to develop a suite of samples that is both comprehensive and easy
to understand and copy.