Spells refactoring2

Massive changes in spells configuration need review and testing.