Rearrange the folder structure