Rename Flight to FlightSegment. Now, Flight class groups FlightSegments.