schema reorg 2