Reorganized the files in 3