More specific classes
Renamed a few files to follow the class names