Fix noobish type
The great reorginization of Feb '14
Everything is much more organized with a more unified look.