Add Directory::isEmpty
Refactor using Directory::isEmpty
Improve naming