Clean-up pom.xml layout