Moved a bunch of stuff around.  Simplified some classes, added others