Add support for files in folders