More NPCS and Enemies, reorganized