Changed the classes class into their own classes