Reorganized the files in folders