Move several client classes into generic package