Reworked to use Maven repos