Merge pull request #1026 from rustyswayne/Refactor/M-502

Starts porting js models to .Client project.