Files reorg.