Refactor affiliations as people.

Less complicated and should make for some simpler objects.