Refactoring assisted by intellij
Updated parent pom