Tidying up

General house cleaning, sorting, and consolidation.

First gfx incorporated as well.