refactoring directories