Move client into a seperate repository