Fixed client to support restructure
Merge remote-tracking branch 'origin/restructure' into restructure