Tidy up order of configuration blocks

This was done using:

    mvn tidy:pom