WIP: Tidy up pom.xml and add v2 client