Rearrange struct image to reflect usage of the fields