Rearrange Java building for Maven.  :-(