Structure reorg