can now handle subdirs