Renamed, refoldered, and reorganized files