Renamed and Reorganized files and folders