Rearrange the file structure
Rearrange the file structure (should be submitted with the previous submission)