Tidy up POMS and add OSS parent POM