Update Spell.java

Organization improvements.