Rearrange the file structure and rename