Flattened host's and client's models
Next to come is flatten the control modules
and a little clean up in the view