Project restructured to be more conducive to subtree embedding