Move to CommonJS style imports