Misc: Reorder scripts in some script files and some cosmetic stuff
Merge pull request #8903 from joschiwald/spellscripts_reorder

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