Renamed files to new format