Organized the classes a bit.