I would like to refactor Cleave Spells as Keyword if possible

I think with adding conditions, like Cleave.1.0 it should be possible to update the existing spells

This would remove the last pieces of NonBasicSpell