Reorganize files to follow instructions