Added npc.

Separated world entities.