Further work on Directory class.