BRANCH 4.1: fixed Directory to handle depth better