Reorg the folder structure