Reorganized files and renamed them