Package fixing and pom.xml prettying