re-organize pom.xml