adding subdir awareness