refactor dir tree
refactor dir tree