refactored flight into /lib and fixed some git thingys