Changed tree organisation.