Reorganized code
Merge pull request #887 from kaltura/IX-9.11.0-nodejs-client

Reorganized code