Fixed issue with file names and folder.