Put everything in the proper class