Reorg structures and validate