Updated the tree organisation for 3.0