Added support for subfolders.