US25-Code Review for all packages

Updating config file xml module