Reorganized sections.

Figured I would go with the progression of the class.