I think we should separate house from team. So you could have a team of players of different houses, still having an alliance for instance. (you already see this in Dune 2, where Atreides and Fremen are the same side). Perhaps we can add a team flag for this? 

I like the refactor of house btw