Renamed classes and added BoxingClass