Update package names, poms
POM additions