[airframes] First Re-order, so they can be compared/merged
[airframes] Merged with TUDelft