Initial fix to tree. Need to introduce groups for Components, Connections and Materials.