Add client controller and model, and house cleaing