Improve layout of struct fields
Improve layout of struct fields

xapi-project/message-switch,djs55/message-switch-1,djs55/message-switch,xapi-project/message-switch,xapi-project/message-switch,djs55/message-switch-1,djs55/message-switch-1,djs55/message-switch,djs55/message-switch