Layout improvements in pom file