Put NetworkUser in its own little namespace. Put PersistentPerson in there too and renamed it to InhabitedEntityUser. Got a lot more sorting out to do, might rename things again.