Updates from Xml file added. Refactored the classes in Xml namespace