added FlightController + some refactoring