Updated pom for package reorgs.