Clean up the maven configuration

This allows everything to be built with a simple "mvn package" from the root
4 files changed