Separated the Demo from the Client

Separated the client from the demo for easier maintnance and
integration.