Rearrange the struct slightly