Bug 987898 - Refactor MakeAPI Client with prototypes and better data enc...

...apsulation