Refactor project arbo