Minor cleanup of PMD warnings.
Some package restructuring

Combine the discovery sub-packages. Create a package for utils/xml