adapted scripts to take result subfolders into account