reorg the dir structure