Changes to solve browserify module conflicts

Changes to solve browserify module conflicts