Reorganised map heirarchy