Change names of and moved files; corrected URIs in other files