Shuffled things around to make jar file happy.