Organize the map configs in a sane way