reorg to straighten out missing libaio