Repackaged all classes into separate common, client and service subpackage each with version 1 and 2 subpackages.