RM6785: Refactor trees

Change-Id: I632942ee6de5d2953bf83dc905d2e112d2060913
17 files changed