refactoring directory tree