Renamed files to remove folder