Refactoring POM as per tidy:pom