Rename files
Rework source data