Change the names of some classes in lab 2 and started to make classes in Lab 3