Update struct-reorg.h