Air India CMD to be aviation secretary in top-level rejig