Refactor dirs.