Correct directories and file names