updated the classes in packages and used naming convetntions
Merging