Move jars and update client
Update JARs, robustify client