Shorten package names

.. makes maven command line nicer