Tidied up the POMs for better integration into downstream projects