Reorganize Hyperdata and fix up support for map types

Can now successfully roundtrip all map types through the HyperDex API.