More structure reorg