[INTERNAL] Tree: Refactoring 1

Change-Id: I044adc6a683075e563df5f615ed22fac51681470
Merge "[INTERNAL] Tree: Refactoring 1"