Switch to commonjs module format