Refactoring of pom.xml