Re-organize pom