Move client code into correct dir
Merge remote-tracking branch 'bernilsson/master'