Start refactoring tree into encapsulated parts