TDIS-82 - added subfolder support