refactor some dirs