Shuffled some classes around