Tidy.
Rearrange Java building for Maven.  :-(
Add Maven deployment targets.