Move client code to a separate dir
Fix pathes broken after the client code was moved to a separate dir