Config/State reorg.