Move client code to a separate dir