Refactor CreatureNPC classes