Changed modules to support 'module.exports' CommonJS modules pattern