Reorganized pom.xml