Moved Segment and SegmentManager back to model.map.