Update and rename DOLL/npc.h to DOLL/NPC/npc.h