Rename AircraftObjectFactory to AirspaceObjectFactory
Organize imports