layouts reorg