Use proper Segment::Overlay instead of Overlay.
Proper Overlay paths, branches and segments.