Major fix of tree-structure.