Move client code into client/ folder

Change-Id: I07ff72bec3188ae67035e6a6e9b13a5150d3ade9