Reorganizing pom.xml