maven pom.xml re-organized