Rearrange the file structure