Configuration reorg