Rename and relocate some files