Improve handling of sub directories.