Refactoring directory