Some changes to the interface.
Renaming directory - -> _