Now not all in one file

Broke up Village, Faction, and Player levels of abstraction