Changed the names and paths for some files