Fixed packaging
Fixed POM inconsistencies