Modified files to work in new directories