Added CommonJS export, sorted out npm package