refactor unicode handling of directories again