Continued refactoring Aircraft and FlightPlan