generator: separate the 'client' from the cmdliner code

Signed-off-by: David Scott <dave.scott@citrix.com>