Add back Aircraft/Generic/ from 9534c8ff5b9350d8763fd4a0233c0cb2c79a43fe