Move MapOverlay and MapMarker into Map