Modify construction of directory;