Move map-xy to top-level route