Global POM and package refactoring