Namespace fixes. Hierarchy for mapping/tilesets started.