Major Structural Cleanup

Shuffled things around, fixed up headers, optimized colors and uv to
make less work for the rasterizer to have to perform.