Moves Client code under Models