Rearrange Folder structure.