Updated folder naming system to use original file name.