Rearrange IOP fields (resolves #86)