Made a few files commonjs compliant
Made a few files commonjs compliant
Merged with remote