Renamed and updated class files