Refactoring directory interface