Update package names, update POM