Core/Spells: Reorder more scripts in some script files and some cosmetic stuff