Revert "Clean-up pom.xml layout"