Moved things around a bit.
Merge pull request #1 from stroud109/master

Moved things around a bit.