Rework on Maven pom.xml configuration