Added support for assets in subfolders