Upgrade pom structure