Project restructured to be more conducive to subtree embedding
fixup! Project restructured to be more conducive to subtree embedding