Rearrange structures to reduce padding