move Define out & retypesetting
reformat struct
mq test