pwm: Rearrange structures to group members by purpose