Fixing more include path after recent renaming
Moving things around, adding begin()/end()/size(), getting rid of nasty casts, improving serialization