Reorganize file and folder structure