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

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