Fix some issues with paths in the moved files.