Switch to CommonJS modules