Fixing dir name.
Fleshing out interface a bit more.