Redo directories, somewhat.