refactoring of directories