Convert npcs to new format