Rearrange structs to avoid internal padding