Move map creation into WorldMap and Map