working on subdir support