options structure reorg