Fix Eclipse
Start to move all npc logic to npc module