[spyro] Split Contact into its own branch.