re-org of tree source cleanup