Added subfolders to file paths