Finished Tree-Refactoring