added more classes
refractored class name
refractored
adding classes