Fix links due to file name changes and moving of files