Moved a few more things around in MassSpec.java