Rearrange struct