Moving embeds around to avoid submodule path conflicts during upcoming branching.