Refactor to import json connector client and server

Change-Id: I5c14fd4319f281c9ba9bdee5aa522e4e91f1ca05