Applied new pom structure

Cherry-picked 1ddd059, and changed wrong 1.7.0-SNAPSHOT versions to 1.6.0-SNAPSHOT.

/cc @mattstep