Finished moving to commonjs