Initial work to merge Directory and DirectoryListing classes.