Ajit, Prasanth| config.xml is deleted and test, classes are refactered accordingly.