[Task] Tree arch Refactoring