Refactored stuff, putting flightQueue in a separate module. WIP on tests fixing.