reorganize structure of the maps