Begin adding support for comparing single files
Renamed file
Partly-complete XML rewriting