Reorganize the file structure