Config reorg