Updated db and npc folder