Misc: Reorder more scripts in some script files and some cosmetic stuff
Merge pull request #8917 from joschiwald/spellscripts_reorder2

Misc: Reorder more scripts in some script files and some cosmetic stuff