Move Client to its own project