dir names refactoring