added support for subfolders