Final working copy of tree topology

Have also incorporated changes from BGD branch of MLSS repository. This
will be starting point for the merging into master