refactored-names of classes and xml changed