refactor arborescence