Merge pull request #632 from NathanFrench/realign_struct_event Reorder fields in struct event for memory efficiency