Moved Tree to new class