POM reorganization

No match.