great directory refactoring