Move more stuff to people models.

Change-Id: I0bcc4fd11dad77cd32381b0589a2ebf22620c4d7