Reorganized files into folders