cancro: restructure the tree to match CM standards (2/2)