Rework classes to match naming convention, and to have correct inheritance so we can make (for example) vectors of these things.
c++11 means we don't have to do this weird spacing thing anymore (yeah!)