-Renaming a couple of classes
-Commenting