Refactoring arborescence