combine the two classes into one file