Cleanup
Re-organized all airframes
Cleanup continued
not-used anymore