5 - fixing support for subfolders