XML reorg.