Refactoring pom and configurations