Upgrade Npc folder and other things