changed package names to reflect removed XSD files