reorg the folder structure