added support for nested subfolders