More refactoring around PlayerData and player-based friendship. Also, adding in migration of data from entity-based friendship to player-based.