Tidying Up

General house cleaning, sorting, and consolidation.

First gfx incorporated as well.
Merge pull request #10 from aphillips915/master

Tidying up