DroneController refactoring