reorg the file layout