Reverted breaking refactor of models.js and helpers.js
Merge pull request #24 from vboginskey/develop

Reverted breaking refactor of models.js and helpers.js