Refactor s/Model/Client/