Reorganized map system