Reorganize pom.xml