added subfolder functionality