diff --git a/.babelrc b/.babelrc
index 812efc5966..4ab657393c 100644
--- a/.babelrc
+++ b/.babelrc
@@ -4,8 +4,6 @@
   ],
   "plugins": ["@babel/plugin-transform-object-assign"],
   "ignore": [
-    "dist/*.js",
-    "lib/**/*.js",
-    "es/**/*.js"
+    "lib/**/*.js"
   ]
-}
\ No newline at end of file
+}
diff --git a/.gitignore b/.gitignore
index 2a4257e2c3..e461c61285 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,13 +2,13 @@
 .vscode
 .c9
 _site
-coverage
 *swp
-node_modules
 *.log
-dist
-lib
-es
-.nyc_output
 *.bak
+
+node_modules
+.nyc_output
+/coverage
+
+lib
 *.generated.js
diff --git a/.travis.yml b/.travis.yml
index d210e781bb..87886bcaf7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,6 +1,5 @@
 language: node_js
 node_js:
-  - 10
   - 12
   - 14
 
@@ -12,6 +11,9 @@ jobs:
       script: npm run lint
       node_js: lts/*
       name: Lint
+    - script: npm run test:src:transpile
+      node_js: 10
+      name: Node 10
     - script: 'if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then npm run test:browserstack; else npm run test:browser; fi'
       node_js: lts/*
       name: Browser Test
diff --git a/HISTORY.md b/HISTORY.md
index 59a8bfded1..e28f5a76cf 100644
--- a/HISTORY.md
+++ b/HISTORY.md
@@ -2,6 +2,16 @@
 
 # not yet published, version 8.0.0
 
+!!! BE CAREFUL: BREAKING CHANGES !!!
+
+- You can now use mathjs directly in node.js using ES modules without need for 
+  a transpiler (see #1928, #1941, #1962). 
+  Automatically loading either commonjs code or ES modules code is improved.
+  All generated code is moved under `/lib`: the browser bundle is moved from 
+  `/dist` to `/lib/browser`, ES module files are moved to `/lib/esm`, 
+  and commonjs files are moved to `/lib/cjs`. Thanks @GreenImp.
+- Non-minified bundle `dist/math.js` is no longer provided. Either use the
+  minified bundle, or create a bundle yourself.
 - Replaced random library `seed-random` with `seedrandom`, see #1955. 
   Thanks @poppinlp.
 
diff --git a/README.md b/README.md
index 05da0f9ea8..b4cdeb0fb3 100644
--- a/README.md
+++ b/README.md
@@ -102,8 +102,8 @@ Then, the project can be build by executing the build script via npm:
 
     npm run build
 
-This will build the library math.js and math.min.js from the source files and
-put them in the folder dist.
+This will build ESM output, CommonJS output, and the bundle math.js 
+from the source files and put them in the folder lib.
 
 
 ## Test
diff --git a/bin/cli.js b/bin/cli.js
index a4bc4ff3c3..449a4d6272 100755
--- a/bin/cli.js
+++ b/bin/cli.js
@@ -58,7 +58,7 @@ const PRECISION = 14 // decimals
  * @return {*}
  */
 function getMath () {
-  return require('../lib/bundleAny')
+  return require('../lib/cjs/defaultInstance.js').default
 }
 
 /**
diff --git a/bin/package.json b/bin/package.json
new file mode 100644
index 0000000000..5bbefffbab
--- /dev/null
+++ b/bin/package.json
@@ -0,0 +1,3 @@
+{
+  "type": "commonjs"
+}
diff --git a/bin/repl.js b/bin/repl.js
index 0147448bae..21c9b1164a 100755
--- a/bin/repl.js
+++ b/bin/repl.js
@@ -4,7 +4,7 @@
  * This simply preloads mathjs and drops you into a REPL to
  * help interactive debugging.
  **/
-global.math = require('../lib/bundleAny')
+global.math = require('../lib/cjs/defaultInstance.js').default
 const repl = require('repl')
 
 repl.start({ useGlobal: true })
diff --git a/dist/math.js b/dist/math.js
new file mode 100644
index 0000000000..b01e410f9f
--- /dev/null
+++ b/dist/math.js
@@ -0,0 +1,3 @@
+// TODO: deprecated since v8, remove this deprecation warning in v9
+throw new Error('The non-minified file "mathjs/dist/math.js" has removed since mathjs@8.0.0. ' +
+  'Please use the minified bundle "mathjs/lib/browser/math.js" instead.')
diff --git a/dist/math.min.js b/dist/math.min.js
new file mode 100644
index 0000000000..2a2391f07b
--- /dev/null
+++ b/dist/math.min.js
@@ -0,0 +1,3 @@
+// TODO: deprecated since v8, remove this deprecation warning in v9
+throw new Error('The file "mathjs/dist/math.min.js" has been moved to "mathjs/lib/browser/math.js" since mathjs@8.0.0. ' +
+  'Please load the bundle via the new path.')
diff --git a/dist/package.json b/dist/package.json
new file mode 100644
index 0000000000..5bbefffbab
--- /dev/null
+++ b/dist/package.json
@@ -0,0 +1,3 @@
+{
+  "type": "commonjs"
+}
diff --git a/examples/browser/angle_configuration.html b/examples/browser/angle_configuration.html
index e377893e21..d5f66cde8d 100644
--- a/examples/browser/angle_configuration.html
+++ b/examples/browser/angle_configuration.html
@@ -15,7 +15,7 @@
     }
   </style>
 
-  <script src="../../dist/math.js"></script>
+  <script src="../../lib/browser/math.js"></script>
 </head>
 <body>
 
diff --git a/examples/browser/basic_usage.html b/examples/browser/basic_usage.html
index 90d496e2c8..28ecc06500 100644
--- a/examples/browser/basic_usage.html
+++ b/examples/browser/basic_usage.html
@@ -3,7 +3,7 @@
 <head>
   <meta charset="utf-8">
   <title>math.js | basic usage</title>
-  <script src="../../dist/math.js"></script>
+  <script src="../../lib/browser/math.js"></script>
 </head>
 <body>
 
diff --git a/examples/browser/currency_conversion.html b/examples/browser/currency_conversion.html
index 293e80baa0..4b826b8121 100644
--- a/examples/browser/currency_conversion.html
+++ b/examples/browser/currency_conversion.html
@@ -4,7 +4,7 @@
   <meta charset="utf-8">
   <title>math.js | currency conversion</title>
 
-  <script src="../../dist/math.js"></script>
+  <script src="../../lib/browser/math.js"></script>
 
   <style>
     body,
diff --git a/examples/browser/custom_separators.html b/examples/browser/custom_separators.html
index f771829167..e81a813cf6 100644
--- a/examples/browser/custom_separators.html
+++ b/examples/browser/custom_separators.html
@@ -15,7 +15,7 @@
     }
   </style>
 
-  <script src="../../dist/math.js"></script>
+  <script src="../../lib/browser/math.js"></script>
 </head>
 <body>
 
diff --git a/examples/browser/plot.html b/examples/browser/plot.html
index 61c9d2c296..eefc6bb8c2 100644
--- a/examples/browser/plot.html
+++ b/examples/browser/plot.html
@@ -3,7 +3,7 @@
 <head>
   <meta charset="utf-8">
   <title>math.js | plot</title>
-  <script src="../../dist/math.js"></script>
+  <script src="../../lib/browser/math.js"></script>
 
   <script src="https://cdn.plot.ly/plotly-1.35.2.min.js"></script>
 
diff --git a/examples/browser/pretty_printing_with_mathjax.html b/examples/browser/pretty_printing_with_mathjax.html
index f4427ea004..5d835d2e1a 100644
--- a/examples/browser/pretty_printing_with_mathjax.html
+++ b/examples/browser/pretty_printing_with_mathjax.html
@@ -4,7 +4,7 @@
   <meta charset="utf-8">
   <title>math.js | pretty printing with MathJax</title>
 
-  <script src="../../dist/math.js"></script>
+  <script src="../../lib/browser/math.js"></script>
   <script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.3/MathJax.js?config=TeX-AMS-MML_HTMLorMML.js"></script>
 
   <style>
diff --git a/examples/browser/printing_html.html b/examples/browser/printing_html.html
index db512b7d03..4cf2cdfa43 100644
--- a/examples/browser/printing_html.html
+++ b/examples/browser/printing_html.html
@@ -4,7 +4,7 @@
 	<meta charset="utf-8">
 	<title>math.js | printing HTML</title>
 
-	<script src="../../dist/math.js"></script>
+	<script src="../../lib/browser/math.js"></script>
 
 	<style>
 		body {
diff --git a/examples/browser/requirejs_loading.html b/examples/browser/requirejs_loading.html
index 9f644f4128..76a1bb98ff 100644
--- a/examples/browser/requirejs_loading.html
+++ b/examples/browser/requirejs_loading.html
@@ -9,7 +9,7 @@
 
 <script>
   // load math.js using require.js
-  require(['../../dist/math.js'], function (math) {
+  require(['../../lib/browser/math.js'], function (math) {
     // evaluate some expression
     const result = math.evaluate('1.2 * (2 + 4.5)')
     document.write(result)
diff --git a/examples/browser/rocket_trajectory_optimization.html b/examples/browser/rocket_trajectory_optimization.html
index 33dab117fa..7b4bfb969a 100644
--- a/examples/browser/rocket_trajectory_optimization.html
+++ b/examples/browser/rocket_trajectory_optimization.html
@@ -4,7 +4,7 @@
   <meta charset="utf-8">
   <title>math.js | rocket trajectory optimization</title>
 
-  <script src="../../dist/math.js"></script>
+  <script src="../../lib/browser/math.js"></script>
   <script src="https://cdnjs.cloudflare.com/ajax/libs/Chart.js/2.5.0/Chart.min.js"></script>
 
   <style>
diff --git a/examples/browser/webworkers/worker.js b/examples/browser/webworkers/worker.js
index 4abd330c20..0af5d85008 100644
--- a/examples/browser/webworkers/worker.js
+++ b/examples/browser/webworkers/worker.js
@@ -1,4 +1,4 @@
-importScripts('../../../dist/math.js')
+importScripts('../../../lib/browser/math.js')
 
 // create a parser
 const parser = self.math.parser()
diff --git a/examples/package.json b/examples/package.json
new file mode 100644
index 0000000000..5bbefffbab
--- /dev/null
+++ b/examples/package.json
@@ -0,0 +1,3 @@
+{
+  "type": "commonjs"
+}
diff --git a/gulpfile.js b/gulpfile.cjs
similarity index 67%
rename from gulpfile.js
rename to gulpfile.cjs
index c82fac85d9..e7e8dc1167 100644
--- a/gulpfile.js
+++ b/gulpfile.cjs
@@ -6,28 +6,35 @@ const del = require('del')
 const log = require('fancy-log')
 const webpack = require('webpack')
 const babel = require('gulp-babel')
-const uglify = require('uglify-js')
+const mkdirp = require('mkdirp')
 const docgenerator = require('./tools/docgenerator')
 const entryGenerator = require('./tools/entryGenerator')
 const validateAsciiChars = require('./tools/validateAsciiChars')
 
-const ENTRY = './src/bundleAny.js'
-const HEADER = './src/header.js'
-const VERSION = './src/version.js'
-const COMPILE_SRC = './src/**/*.js'
-const COMPILE_ENTRY_SRC = './src/entry/**/*.js'
-const COMPILE_LIB = './lib'
-const COMPILE_ES = './es' // es modules
-const COMPILE_ENTRY_LIB = './lib/entry'
+const SRC_DIR = path.join(__dirname, '/src')
+const BUNDLE_ENTRY = `${SRC_DIR}/defaultInstance.js`
+const HEADER = `${SRC_DIR}/header.js`
+const VERSION = `${SRC_DIR}/version.js`
+const COMPILE_SRC = `${SRC_DIR}/**/*.?(c)js`
+const COMPILE_ENTRY_SRC = `${SRC_DIR}/entry/**/*.js`
+
+const COMPILE_DIR = path.join(__dirname, '/lib')
+const COMPILE_BROWSER = `${COMPILE_DIR}/browser`
+const COMPILE_CJS = `${COMPILE_DIR}/cjs`
+const COMPILE_ESM = `${COMPILE_DIR}/esm` // es modules
+const COMPILE_ENTRY_LIB = `${COMPILE_CJS}/entry`
+
 const FILE = 'math.js'
-const FILE_MIN = 'math.min.js'
-const FILE_MAP = 'math.min.map'
-const DIST = path.join(__dirname, '/dist')
-const REF_SRC = './lib/'
-const REF_DEST = './docs/reference/functions'
-const REF_ROOT = './docs/reference'
-const MATH_JS = DIST + '/' + FILE
-const COMPILED_HEADER = COMPILE_LIB + '/header.js'
+
+const REF_SRC = `${COMPILE_CJS}/`
+const REF_DIR = path.join(__dirname, '/docs')
+const REF_DEST = `${REF_DIR}/reference/functions`
+const REF_ROOT = `${REF_DIR}/reference`
+
+const MATH_JS = `${COMPILE_BROWSER}/${FILE}`
+const COMPILED_HEADER = `${COMPILE_CJS}/header.js`
+
+const PACKAGE_JSON_COMMONJS = '{\n  "type": "commonjs"\n}\n'
 
 // read the version number from package.json
 function getVersion () {
@@ -48,9 +55,10 @@ function createBanner () {
 function updateVersionFile (done) {
   const version = getVersion()
 
-  fs.writeFileSync(VERSION, 'export const version = \'' + version + '\'\n' +
-    '// Note: This file is automatically generated when building math.js.\n' +
-    '// Changes made in this file will be overwritten.\n')
+  fs.writeFileSync(VERSION, `export const version = '${version}'
+// Note: This file is automatically generated when building math.js.
+// Changes made in this file will be overwritten.
+`)
 
   done()
 }
@@ -62,13 +70,14 @@ const bannerPlugin = new webpack.BannerPlugin({
 })
 
 const webpackConfig = {
-  entry: ENTRY,
+  entry: BUNDLE_ENTRY,
   mode: 'production',
   performance: { hints: false }, // to hide the "asset size limit" warning
   output: {
     library: 'math',
     libraryTarget: 'umd',
-    path: DIST,
+    libraryExport: 'default',
+    path: COMPILE_BROWSER,
     globalObject: 'this',
     filename: FILE
   },
@@ -89,22 +98,10 @@ const webpackConfig = {
       }
     ]
   },
-  optimization: {
-    minimize: false
-  },
+  devtool: 'source-map',
   cache: true
 }
 
-const uglifyConfig = {
-  sourceMap: {
-    filename: FILE,
-    url: FILE_MAP
-  },
-  output: {
-    comments: /@license/
-  }
-}
-
 // create a single instance of the compiler to allow caching
 const compiler = webpack(webpackConfig)
 
@@ -128,16 +125,23 @@ function bundle (done) {
       done(new Error('Compile failed'))
     }
 
-    log('bundled ' + MATH_JS)
+    // create commonjs package.json file
+    fs.writeFileSync(path.join(COMPILE_BROWSER, 'package.json'), PACKAGE_JSON_COMMONJS)
+
+    log(`bundled ${MATH_JS}`)
 
     done()
   })
 }
 
-function compile () {
+function compileCommonJs () {
+  // create a package.json file in the commonjs folder
+  mkdirp.sync(COMPILE_CJS)
+  fs.writeFileSync(path.join(COMPILE_CJS, 'package.json'), PACKAGE_JSON_COMMONJS)
+
   return gulp.src(COMPILE_SRC)
     .pipe(babel())
-    .pipe(gulp.dest(COMPILE_LIB))
+    .pipe(gulp.dest(COMPILE_CJS))
 }
 
 function compileESModules () {
@@ -148,11 +152,14 @@ function compileESModules () {
       ...babelOptions,
       presets: [
         ['@babel/preset-env', {
-          modules: false
+          modules: false,
+          targets: {
+            esmodules: true
+          }
         }]
       ]
     }))
-    .pipe(gulp.dest(COMPILE_ES))
+    .pipe(gulp.dest(COMPILE_ESM))
 }
 
 function compileEntryFiles () {
@@ -166,36 +173,11 @@ function writeCompiledHeader (cb) {
   cb()
 }
 
-function minify (done) {
-  const oldCwd = process.cwd()
-  process.chdir(DIST)
-
-  try {
-    const result = uglify.minify({
-      'math.js': fs.readFileSync(FILE, 'utf8')
-    }, uglifyConfig)
-
-    if (result.error) {
-      throw result.error
-    }
-
-    fs.writeFileSync(FILE_MIN, result.code)
-    fs.writeFileSync(FILE_MAP, result.map)
-
-    log('Minified ' + FILE_MIN)
-    log('Mapped ' + FILE_MAP)
-  } finally {
-    process.chdir(oldCwd)
-  }
-
-  done()
-}
-
 function validateAscii (done) {
   const Reset = '\x1b[0m'
   const BgRed = '\x1b[41m'
 
-  validateAsciiChars.getAllFiles('./src')
+  validateAsciiChars.getAllFiles(SRC_DIR)
     .map(validateAsciiChars.validateChars)
     .forEach(function (invalidChars) {
       invalidChars.forEach(function (res) {
@@ -215,7 +197,7 @@ function validateAscii (done) {
 }
 
 function generateDocs (done) {
-  const all = require(REF_SRC + 'bundleAny')
+  const all = require(REF_SRC + 'defaultInstance').default
   const functionNames = Object.keys(all)
     .filter(key => typeof all[key] === 'function')
 
@@ -231,22 +213,36 @@ function generateEntryFiles (done) {
   done()
 }
 
+/**
+ * Remove generated files
+ *
+ * @returns {Promise<string[]> | *}
+ */
 function clean () {
   return del([
-    'dist/**/*',
-    'es/**/*',
-    'lib/**/*',
+    // legacy compiled files
+    './es/',
+
+    // generated browser bundle, esm code, and commonjs code
+    './lib/',
+
+    // generated source files
     'src/**/*.generated.js'
   ])
 }
 
+gulp.task('browser', bundle)
+
+gulp.task('clean', clean)
+
+gulp.task('docs', generateDocs)
+
 // check whether any of the source files contains non-ascii characters
 gulp.task('validate:ascii', validateAscii)
 
 // The watch task (to automatically rebuild when the source code changes)
-// Does only generate math.js, not the minified math.min.js
 gulp.task('watch', function watch () {
-  const files = ['package.json', 'number.js.js', 'src/**/*.js']
+  const files = ['package.json', 'src/**/*.js']
   const options = {
     // ignore version.js else we get an infinite loop since it's updated during bundle
     ignored: /version\.js/,
@@ -254,19 +250,18 @@ gulp.task('watch', function watch () {
     delay: 100
   }
 
-  gulp.watch(files, options, gulp.parallel(bundle, compile))
+  gulp.watch(files, options, gulp.parallel(bundle, compileCommonJs))
 })
 
 // The default task (called when you run `gulp`)
 gulp.task('default', gulp.series(
   clean,
   updateVersionFile,
-  compile,
+  compileCommonJs,
   generateEntryFiles,
   compileEntryFiles,
   compileESModules, // Must be after generateEntryFiles
   writeCompiledHeader,
   bundle,
-  minify,
   generateDocs
 ))
diff --git a/main/es5/index.js b/main/es5/index.js
index e634b753d9..aabea94534 100644
--- a/main/es5/index.js
+++ b/main/es5/index.js
@@ -1 +1,3 @@
-module.exports = require('../../lib/entry/mainAny')
+// TODO: deprecated since v8, remove this deprecation warning in v9
+throw new Error('The file "mathjs/main/es5/index.js" has been moved since mathjs@8.0.0. ' +
+  'Please load "mathjs" or "mathjs/lib/cjs/index.js" instead.')
diff --git a/main/es5/number.js b/main/es5/number.js
index 91599f4faf..b0d18774fd 100644
--- a/main/es5/number.js
+++ b/main/es5/number.js
@@ -1 +1,3 @@
-module.exports = require('../../lib/entry/mainNumber')
+// TODO: deprecated since v8, remove this deprecation warning in v9
+throw new Error('The file "mathjs/main/es5/number.js" has been moved since mathjs@8.0.0. ' +
+  'Please load "mathjs/number" or "mathjs/lib/cjs/number.js" instead.')
diff --git a/main/es5/package.json b/main/es5/package.json
new file mode 100644
index 0000000000..5bbefffbab
--- /dev/null
+++ b/main/es5/package.json
@@ -0,0 +1,3 @@
+{
+  "type": "commonjs"
+}
diff --git a/main/esm/index.js b/main/esm/index.js
index 3ae25aab13..569d3b40e4 100644
--- a/main/esm/index.js
+++ b/main/esm/index.js
@@ -1 +1,3 @@
-export * from '../../es/entry/mainAny'
+// TODO: deprecated since v8, remove this deprecation warning in v9
+throw new Error('The file "mathjs/main/esm/index.js" has been moved since mathjs@8.0.0. ' +
+  'Please load "mathjs" or "mathjs/lib/esm/index.js" instead.')
diff --git a/main/esm/number.js b/main/esm/number.js
index e77688dcfb..cd2ef44172 100644
--- a/main/esm/number.js
+++ b/main/esm/number.js
@@ -1 +1,3 @@
-export * from '../../es/entry/mainNumber'
+// TODO: deprecated since v8, remove this deprecation warning in v9
+throw new Error('The file "mathjs/main/esm/number.js" has been moved since mathjs@8.0.0. ' +
+  'Please load "mathjs/number" or "mathjs/lib/esm/number.js" instead.')
diff --git a/main/esm/package.json b/main/esm/package.json
new file mode 100644
index 0000000000..3dbc1ca591
--- /dev/null
+++ b/main/esm/package.json
@@ -0,0 +1,3 @@
+{
+  "type": "module"
+}
diff --git a/number.cjs b/number.cjs
new file mode 100644
index 0000000000..4487738340
--- /dev/null
+++ b/number.cjs
@@ -0,0 +1,3 @@
+// TODO: deprecated since v8, remove this deprecation warning in v9
+throw new Error('The file "mathjs/number.js" has been moved since mathjs@8.0.0. ' +
+    'Please load "mathjs/number" or "mathjs/lib/esm/number.js" instead.')
diff --git a/number.js b/number.js
deleted file mode 100644
index 02be3d4cd3..0000000000
--- a/number.js
+++ /dev/null
@@ -1 +0,0 @@
-export * from './main/esm/number' // eslint-disable-line
diff --git a/package-lock.json b/package-lock.json
index e3ab172752..f157ba2ad5 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -6384,9 +6384,9 @@
       "dev": true
     },
     "karma": {
-      "version": "5.2.1",
-      "resolved": "https://registry.npmjs.org/karma/-/karma-5.2.1.tgz",
-      "integrity": "sha512-+/AO2fWL7kC3aWTx/lHjtKXfOqh0O+KLtTy4BLQ/b/eciHR4VTHHdPhdrn9sDBQskgDieaBZ+sAKzlldc4GW/Q==",
+      "version": "5.2.2",
+      "resolved": "https://registry.npmjs.org/karma/-/karma-5.2.2.tgz",
+      "integrity": "sha512-rB3Ua5yDxmIupTj67r3Q8itz7TxJzRE6DmVcOfV20D509Uu9AoBKlVwbZhND4kcm6BqLfbHtv4DZC9QJfrUY+w==",
       "dev": true,
       "requires": {
         "body-parser": "^1.19.0",
@@ -6408,7 +6408,7 @@
         "range-parser": "^1.2.1",
         "rimraf": "^3.0.2",
         "socket.io": "^2.3.0",
-        "source-map": "^0.7.3",
+        "source-map": "^0.6.1",
         "tmp": "0.2.1",
         "ua-parser-js": "0.7.21",
         "yargs": "^15.3.1"
@@ -6572,9 +6572,9 @@
           "dev": true
         },
         "source-map": {
-          "version": "0.7.3",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz",
-          "integrity": "sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==",
+          "version": "0.6.1",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
           "dev": true
         },
         "string-width": {
@@ -6890,6 +6890,12 @@
       "integrity": "sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA==",
       "dev": true
     },
+    "lodash-es": {
+      "version": "4.17.15",
+      "resolved": "https://registry.npmjs.org/lodash-es/-/lodash-es-4.17.15.tgz",
+      "integrity": "sha512-rlrc3yU3+JNOpZ9zj5pQtxnx2THmvRykwL4Xlxoa8I9lHBlVbbyPhgyPMioxVZ4NqyxaVVtaJnzsyOidQIhyyQ==",
+      "dev": true
+    },
     "lodash.flattendeep": {
       "version": "4.4.0",
       "resolved": "https://registry.npmjs.org/lodash.flattendeep/-/lodash.flattendeep-4.4.0.tgz",
@@ -7544,6 +7550,15 @@
           "integrity": "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==",
           "dev": true
         },
+        "serialize-javascript": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-4.0.0.tgz",
+          "integrity": "sha512-GaNA54380uFefWghODBWEGisLZFj00nS5ACs6yHa9nLqlLpVLO8ChDGeKRjZnV4Nh4n0Qi7nhYZD/9fCPzEqkw==",
+          "dev": true,
+          "requires": {
+            "randombytes": "^2.1.0"
+          }
+        },
         "string-width": {
           "version": "3.1.0",
           "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
@@ -7888,9 +7903,9 @@
       "dev": true
     },
     "node-fetch": {
-      "version": "2.6.0",
-      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.0.tgz",
-      "integrity": "sha512-8dG4H5ujfvFiqDmVu9fQ5bOHUC15JMjMY/Zumv26oOvvVJjM67KF8koCWIabKQ1GJIa9r2mMZscBq/TbdOcmNA==",
+      "version": "2.6.1",
+      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.1.tgz",
+      "integrity": "sha512-V4aYg89jEoVRxRb2fJdAg8FHvI7cEyYdVAh94HH0UIK8oJxUfkjlDQN9RbMx+bEjP7+ggMiFRprSti032Oipxw==",
       "dev": true
     },
     "node-libs-browser": {
@@ -9572,15 +9587,6 @@
         "sver-compat": "^1.5.0"
       }
     },
-    "serialize-javascript": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-4.0.0.tgz",
-      "integrity": "sha512-GaNA54380uFefWghODBWEGisLZFj00nS5ACs6yHa9nLqlLpVLO8ChDGeKRjZnV4Nh4n0Qi7nhYZD/9fCPzEqkw==",
-      "dev": true,
-      "requires": {
-        "randombytes": "^2.1.0"
-      }
-    },
     "set-blocking": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz",
diff --git a/package.json b/package.json
index b3496576de..9500f67f51 100644
--- a/package.json
+++ b/package.json
@@ -51,13 +51,12 @@
     "handlebars": "4.7.6",
     "istanbul": "0.4.5",
     "jsep": "0.3.5",
-    "karma": "5.2.1",
+    "karma": "5.2.2",
     "karma-browserstack-launcher": "1.6.0",
     "karma-firefox-launcher": "1.3.0",
     "karma-mocha": "2.0.1",
     "karma-mocha-reporter": "2.2.5",
     "karma-webpack": "4.0.2",
-    "lodash": "4.17.20",
     "math-expression-evaluator": "1.2.22",
     "mkdirp": "1.0.4",
     "mocha": "8.1.3",
@@ -71,26 +70,40 @@
     "pad-right": "0.2.2",
     "standard": "14.3.4",
     "sylvester": "0.0.21",
-    "uglify-js": "3.10.3",
     "webpack": "4.44.1",
     "zeros": "1.0.0"
   },
-  "main": "main/es5",
-  "module": "main/esm",
-  "unpkg": "dist/math.min.js",
-  "jsdelivr": "dist/math.min.js",
+  "type": "module",
+  "main": "./lib/cjs",
+  "module": "./lib/esm",
+  "unpkg": "./lib/browser/math.js",
+  "jsdelivr": "./lib/browser/math.js",
+  "exports": {
+    ".": {
+      "import": "./lib/esm/index.js",
+      "require": "./lib/cjs/index.js"
+    },
+    "./number": {
+      "import": "./lib/esm/number.js",
+      "require": "./lib/cjs/number.js"
+    },
+    "./package.json": "./package.json",
+    "./dist/math.js": "./dist/math.js",
+    "./dist/math.min.js": "./dist/math.min.js",
+    "./main/es5/index.js": "./main/es5/index.js",
+    "./main/es5/number.js": "./main/es5/number.js",
+    "./main/esm/index.js": "./main/esm/index.js",
+    "./main/esm/number.js": "./main/esm/number.js",
+    "./number.js": "./number.cjs"
+  },
   "files": [
     "bin",
     "dist",
     "docs",
-    "main",
-    "es",
     "lib",
-    "src",
-    "core.js",
-    "index.js",
-    "number.js",
     "examples",
+    "main",
+    "number.cjs",
     "LICENSE",
     "NOTICE",
     "README.md",
@@ -98,20 +111,23 @@
     "CONTRIBUTING.md"
   ],
   "scripts": {
-    "build": "gulp",
+    "build": "gulp --gulpfile gulpfile.cjs",
     "build-and-test": "npm run build && npm run test:all && npm run lint",
-    "compile": "gulp compile",
-    "watch": "gulp watch",
+    "build:clean": "gulp --gulpfile gulpfile.cjs clean",
+    "build:docs": "gulp --gulpfile gulpfile.cjs docs",
+    "compile": "gulp --gulpfile gulpfile.cjs compile",
+    "watch": "gulp --gulpfile gulpfile.cjs watch",
     "lint": "standard --env=mocha --env=worker",
-    "validate:ascii": "gulp validate:ascii",
+    "validate:ascii": "gulp --gulpfile gulpfile.cjs validate:ascii",
     "test": "npm run test:src && npm run lint",
-    "test:src": "mocha test/unit-tests --recursive --require @babel/register --forbid-only",
-    "test:generated": "mocha test/generated-code-tests --recursive --require @babel/register --forbid-only",
+    "test:src": "mocha test/unit-tests --recursive --forbid-only",
+    "test:src:transpile": "mocha test/unit-tests --require @babel/register --recursive --forbid-only",
+    "test:generated": "mocha test/generated-code-tests --recursive --forbid-only",
     "test:node": "mocha test/node-tests/*.test.js test/node-tests/**/*.test.js --recursive --forbid-only",
     "test:all": "npm run test:src && npm run test:generated && npm run test:node",
     "test:browser": "karma start test/browser-test-config/local-karma.js",
     "test:browserstack": "karma start test/browser-test-config/browserstack-karma.js",
-    "coverage": "nyc --reporter=lcov --reporter=text-summary mocha test/unit-tests --recursive --require @babel/register && echo \"\nDetailed coverage report is available at ./coverage/lcov-report/index.html\"",
+    "coverage": "nyc --reporter=lcov --reporter=text-summary mocha test/unit-tests --recursive && echo \"\nDetailed coverage report is available at ./coverage/lcov-report/index.html\"",
     "prepublishOnly": "npm run test:all && npm run lint",
     "prepare": "npm run build",
     "update-authors": "node ./tools/update-authors.js"
@@ -128,7 +144,6 @@
   "directories": {
     "doc": "./docs",
     "example": "./examples",
-    "es": "./es",
     "lib": "./lib",
     "src": "./src",
     "test": "./test"
diff --git a/src/bundleAny.js b/src/bundleAny.js
deleted file mode 100644
index 4fa43f7bb8..0000000000
--- a/src/bundleAny.js
+++ /dev/null
@@ -1,7 +0,0 @@
-const all = require('./factoriesAny')
-const { create } = require('./core/create')
-
-const defaultInstance = create(all)
-
-// TODO: not nice having to revert to CommonJS, find an ES6 solution
-module.exports = /* #__PURE__ */ defaultInstance
diff --git a/src/constants.js b/src/constants.js
index f8790de4c1..90b279d50a 100644
--- a/src/constants.js
+++ b/src/constants.js
@@ -1,12 +1,12 @@
-import { factory } from './utils/factory'
-import { version } from './version'
+import { factory } from './utils/factory.js'
+import { version } from './version.js'
 import {
   createBigNumberE,
   createBigNumberPhi,
   createBigNumberPi,
   createBigNumberTau
-} from './utils/bignumber/constants'
-import { pi, tau, e, phi } from './plain/number'
+} from './utils/bignumber/constants.js'
+import { pi, tau, e, phi } from './plain/number/index.js'
 
 export const createTrue = /* #__PURE__ */ factory('true', [], () => true)
 export const createFalse = /* #__PURE__ */ factory('false', [], () => false)
diff --git a/src/core/create.js b/src/core/create.js
index 0424ec99b9..dcb416fb0f 100644
--- a/src/core/create.js
+++ b/src/core/create.js
@@ -1,9 +1,9 @@
-import './../utils/polyfills'
-import { deepFlatten, isLegacyFactory, values } from '../utils/object'
-import * as emitter from './../utils/emitter'
-import { importFactory } from './function/import'
-import { configFactory } from './function/config'
-import { factory, isFactory } from '../utils/factory'
+import './../utils/polyfills.js'
+import { deepFlatten, isLegacyFactory, values } from '../utils/object.js'
+import * as emitter from './../utils/emitter.js'
+import { importFactory } from './function/import.js'
+import { configFactory } from './function/config.js'
+import { factory, isFactory } from '../utils/factory.js'
 import {
   isAccessorNode,
   isArray,
@@ -43,11 +43,11 @@ import {
   isSymbolNode,
   isUndefined,
   isUnit
-} from '../utils/is'
-import { ArgumentsError } from '../error/ArgumentsError'
-import { DimensionError } from '../error/DimensionError'
-import { IndexError } from '../error/IndexError'
-import { DEFAULT_CONFIG } from './config'
+} from '../utils/is.js'
+import { ArgumentsError } from '../error/ArgumentsError.js'
+import { DimensionError } from '../error/DimensionError.js'
+import { IndexError } from '../error/IndexError.js'
+import { DEFAULT_CONFIG } from './config.js'
 
 /**
  * Create a mathjs instance from given factory functions and optionally config
diff --git a/src/core/function/config.js b/src/core/function/config.js
index 4b0f1a9e06..b93f76fae1 100644
--- a/src/core/function/config.js
+++ b/src/core/function/config.js
@@ -1,5 +1,5 @@
-import { clone, mapObject, deepExtend } from '../../utils/object'
-import { DEFAULT_CONFIG } from '../config'
+import { clone, mapObject, deepExtend } from '../../utils/object.js'
+import { DEFAULT_CONFIG } from '../config.js'
 
 export const MATRIX_OPTIONS = ['Matrix', 'Array'] // valid values for option matrix
 export const NUMBER_OPTIONS = ['number', 'BigNumber', 'Fraction'] // valid values for option number
diff --git a/src/core/function/import.js b/src/core/function/import.js
index a3ed133f02..b4a6a02b05 100644
--- a/src/core/function/import.js
+++ b/src/core/function/import.js
@@ -1,8 +1,8 @@
-import { isBigNumber, isComplex, isFraction, isMatrix, isUnit } from '../../utils/is'
-import { isFactory, stripOptionalNotation } from '../../utils/factory'
-import { hasOwnProperty, lazy } from '../../utils/object'
-import { contains } from '../../utils/array'
-import { ArgumentsError } from '../../error/ArgumentsError'
+import { isBigNumber, isComplex, isFraction, isMatrix, isUnit } from '../../utils/is.js'
+import { isFactory, stripOptionalNotation } from '../../utils/factory.js'
+import { hasOwnProperty, lazy } from '../../utils/object.js'
+import { contains } from '../../utils/array.js'
+import { ArgumentsError } from '../../error/ArgumentsError.js'
 
 export function importFactory (typed, load, math, importedFactories) {
   /**
diff --git a/src/core/function/typed.js b/src/core/function/typed.js
index 883484aced..bedca7a904 100644
--- a/src/core/function/typed.js
+++ b/src/core/function/typed.js
@@ -74,10 +74,10 @@ import {
   isSymbolNode,
   isUndefined,
   isUnit
-} from '../../utils/is'
+} from '../../utils/is.js'
 import typedFunction from 'typed-function'
-import { digits } from '../../utils/number'
-import { factory } from '../../utils/factory'
+import { digits } from '../../utils/number.js'
+import { factory } from '../../utils/factory.js'
 
 // returns a new instance of typed-function
 let _createTyped = function () {
diff --git a/src/defaultInstance.js b/src/defaultInstance.js
new file mode 100644
index 0000000000..d5663df4d8
--- /dev/null
+++ b/src/defaultInstance.js
@@ -0,0 +1,4 @@
+import * as all from './factoriesAny.js'
+import { create } from './core/create.js'
+
+export default create(all)
diff --git a/src/entry/allFactoriesAny.js b/src/entry/allFactoriesAny.js
index 7eca7710c4..2d419aa96b 100644
--- a/src/entry/allFactoriesAny.js
+++ b/src/entry/allFactoriesAny.js
@@ -1,4 +1,4 @@
 // creating all factories here in a separate file is needed to get tree-shaking working
-import * as allFactories from '../factoriesAny'
+import * as allFactories from '../factoriesAny.js'
 
 export const all = allFactories
diff --git a/src/entry/allFactoriesNumber.js b/src/entry/allFactoriesNumber.js
index e935f2ca55..111199d79d 100644
--- a/src/entry/allFactoriesNumber.js
+++ b/src/entry/allFactoriesNumber.js
@@ -1,4 +1,4 @@
 // creating all factories here in a separate file is needed to get tree-shaking working
-import * as allFactories from '../factoriesNumber'
+import * as allFactories from '../factoriesNumber.js'
 
 export const all = allFactories
diff --git a/src/entry/configReadonly.js b/src/entry/configReadonly.js
index 4c950c45a6..47f8e61314 100644
--- a/src/entry/configReadonly.js
+++ b/src/entry/configReadonly.js
@@ -1,5 +1,5 @@
-import { DEFAULT_CONFIG } from '../core/config'
-import { MATRIX_OPTIONS, NUMBER_OPTIONS } from '../core/function/config'
+import { DEFAULT_CONFIG } from '../core/config.js'
+import { MATRIX_OPTIONS, NUMBER_OPTIONS } from '../core/function/config.js'
 
 // create a read-only version of config
 export const config = /* #__PURE__ */ function (options) {
diff --git a/src/entry/mainAny.js b/src/entry/mainAny.js
index 49c6a9cab4..ff1ce51495 100644
--- a/src/entry/mainAny.js
+++ b/src/entry/mainAny.js
@@ -1,22 +1,22 @@
 // configuration
-export { config } from './configReadonly'
+export { config } from './configReadonly.js'
 
 // functions and constants
-export * from './pureFunctionsAny.generated'
-export * from './impureFunctionsAny.generated'
-export * from './typeChecks'
+export * from './pureFunctionsAny.generated.js'
+export * from './impureFunctionsAny.generated.js'
+export * from './typeChecks.js'
 
 // error classes
-export { IndexError } from '../error/IndexError'
-export { DimensionError } from '../error/DimensionError'
-export { ArgumentsError } from '../error/ArgumentsError'
+export { IndexError } from '../error/IndexError.js'
+export { DimensionError } from '../error/DimensionError.js'
+export { ArgumentsError } from '../error/ArgumentsError.js'
 
 // dependency groups
-export * from './dependenciesAny.generated'
+export * from './dependenciesAny.generated.js'
 
 // factory functions
-export * from '../factoriesAny'
+export * from '../factoriesAny.js'
 
 // core
-export { create } from '../core/create'
-export { factory } from '../utils/factory'
+export { create } from '../core/create.js'
+export { factory } from '../utils/factory.js'
diff --git a/src/entry/mainNumber.js b/src/entry/mainNumber.js
index c8db5bee47..e54c4e5e23 100644
--- a/src/entry/mainNumber.js
+++ b/src/entry/mainNumber.js
@@ -1,22 +1,22 @@
 // configuration
-export { config } from './configReadonly'
+export { config } from './configReadonly.js'
 
 // functions and constants
-export * from './pureFunctionsNumber.generated'
-export * from './impureFunctionsNumber.generated'
-export * from './typeChecks'
+export * from './pureFunctionsNumber.generated.js'
+export * from './impureFunctionsNumber.generated.js'
+export * from './typeChecks.js'
 
 // error classes
-export { IndexError } from '../error/IndexError'
-export { DimensionError } from '../error/DimensionError'
-export { ArgumentsError } from '../error/ArgumentsError'
+export { IndexError } from '../error/IndexError.js'
+export { DimensionError } from '../error/DimensionError.js'
+export { ArgumentsError } from '../error/ArgumentsError.js'
 
 // dependency groups
-export * from './dependenciesNumber.generated'
+export * from './dependenciesNumber.generated.js'
 
 // factory functions
-export * from '../factoriesNumber'
+export * from '../factoriesNumber.js'
 
 // core
-export { create } from '../core/create'
-export { factory } from '../utils/factory'
+export { create } from '../core/create.js'
+export { factory } from '../utils/factory.js'
diff --git a/src/entry/typeChecks.js b/src/entry/typeChecks.js
index 19367db495..4b188d762e 100644
--- a/src/entry/typeChecks.js
+++ b/src/entry/typeChecks.js
@@ -39,4 +39,4 @@ export {
   isSparseMatrix,
   isSymbolNode,
   isUnit
-} from '../utils/is'
+} from '../utils/is.js'
diff --git a/src/expression/Help.js b/src/expression/Help.js
index f3b1ab92b2..5b7e7e2b6d 100644
--- a/src/expression/Help.js
+++ b/src/expression/Help.js
@@ -1,7 +1,7 @@
-import { isHelp } from '../utils/is'
-import { clone } from '../utils/object'
-import { format } from '../utils/string'
-import { factory } from '../utils/factory'
+import { isHelp } from '../utils/is.js'
+import { clone } from '../utils/object.js'
+import { format } from '../utils/string.js'
+import { factory } from '../utils/factory.js'
 
 const name = 'Help'
 const dependencies = ['parse']
diff --git a/src/expression/Parser.js b/src/expression/Parser.js
index e449a649e4..74a3d34464 100644
--- a/src/expression/Parser.js
+++ b/src/expression/Parser.js
@@ -1,6 +1,6 @@
-import { factory } from '../utils/factory'
-import { extend, hasOwnProperty } from '../utils/object'
-import { getSafeProperty, setSafeProperty } from '../utils/customs'
+import { factory } from '../utils/factory.js'
+import { extend, hasOwnProperty } from '../utils/object.js'
+import { getSafeProperty, setSafeProperty } from '../utils/customs.js'
 
 const name = 'Parser'
 const dependencies = ['parse']
diff --git a/src/expression/embeddedDocs/embeddedDocs.js b/src/expression/embeddedDocs/embeddedDocs.js
index 840555c970..151cc62c5c 100644
--- a/src/expression/embeddedDocs/embeddedDocs.js
+++ b/src/expression/embeddedDocs/embeddedDocs.js
@@ -1,216 +1,216 @@
-import { bignumberDocs } from './construction/bignumber'
-import { typeOfDocs } from './function/utils/typeOf'
-import { isZeroDocs } from './function/utils/isZero'
-import { isPrimeDocs } from './function/utils/isPrime'
-import { isPositiveDocs } from './function/utils/isPositive'
-import { isNumericDocs } from './function/utils/isNumeric'
-import { hasNumericValueDocs } from './function/utils/hasNumericValue'
-import { isNegativeDocs } from './function/utils/isNegative'
-import { isIntegerDocs } from './function/utils/isInteger'
-import { isNaNDocs } from './function/utils/isNaN'
-import { formatDocs } from './function/utils/format'
-import { cloneDocs } from './function/utils/clone'
-import { toDocs } from './function/units/to'
-import { tanhDocs } from './function/trigonometry/tanh'
-import { tanDocs } from './function/trigonometry/tan'
-import { sinhDocs } from './function/trigonometry/sinh'
-import { sechDocs } from './function/trigonometry/sech'
-import { secDocs } from './function/trigonometry/sec'
-import { cschDocs } from './function/trigonometry/csch'
-import { cscDocs } from './function/trigonometry/csc'
-import { cothDocs } from './function/trigonometry/coth'
-import { cotDocs } from './function/trigonometry/cot'
-import { coshDocs } from './function/trigonometry/cosh'
-import { cosDocs } from './function/trigonometry/cos'
-import { atan2Docs } from './function/trigonometry/atan2'
-import { atanhDocs } from './function/trigonometry/atanh'
-import { atanDocs } from './function/trigonometry/atan'
-import { asinhDocs } from './function/trigonometry/asinh'
-import { asinDocs } from './function/trigonometry/asin'
-import { asechDocs } from './function/trigonometry/asech'
-import { asecDocs } from './function/trigonometry/asec'
-import { acschDocs } from './function/trigonometry/acsch'
-import { acscDocs } from './function/trigonometry/acsc'
-import { acothDocs } from './function/trigonometry/acoth'
-import { acotDocs } from './function/trigonometry/acot'
-import { acoshDocs } from './function/trigonometry/acosh'
-import { acosDocs } from './function/trigonometry/acos'
-import { sumDocs } from './function/statistics/sum'
-import { stdDocs } from './function/statistics/std'
-import { quantileSeqDocs } from './function/statistics/quantileSeq'
-import { prodDocs } from './function/statistics/prod'
-import { modeDocs } from './function/statistics/mode'
-import { minDocs } from './function/statistics/min'
-import { medianDocs } from './function/statistics/median'
-import { meanDocs } from './function/statistics/mean'
-import { maxDocs } from './function/statistics/max'
-import { madDocs } from './function/statistics/mad'
-import { erfDocs } from './function/special/erf'
-import { setUnionDocs } from './function/set/setUnion'
-import { setSymDifferenceDocs } from './function/set/setSymDifference'
-import { setSizeDocs } from './function/set/setSize'
-import { setPowersetDocs } from './function/set/setPowerset'
-import { setMultiplicityDocs } from './function/set/setMultiplicity'
-import { setIsSubsetDocs } from './function/set/setIsSubset'
-import { setIntersectDocs } from './function/set/setIntersect'
-import { setDistinctDocs } from './function/set/setDistinct'
-import { setDifferenceDocs } from './function/set/setDifference'
-import { setCartesianDocs } from './function/set/setCartesian'
-import { unequalDocs } from './function/relational/unequal'
-import { smallerEqDocs } from './function/relational/smallerEq'
-import { smallerDocs } from './function/relational/smaller'
-import { largerEqDocs } from './function/relational/largerEq'
-import { largerDocs } from './function/relational/larger'
-import { equalTextDocs } from './function/relational/equalText'
-import { equalDocs } from './function/relational/equal'
-import { deepEqualDocs } from './function/relational/deepEqual'
-import { compareTextDocs } from './function/relational/compareText'
-import { compareNaturalDocs } from './function/relational/compareNatural'
-import { compareDocs } from './function/relational/compare'
-import { randomIntDocs } from './function/probability/randomInt'
-import { randomDocs } from './function/probability/random'
-import { pickRandomDocs } from './function/probability/pickRandom'
-import { permutationsDocs } from './function/probability/permutations'
-import { multinomialDocs } from './function/probability/multinomial'
-import { kldivergenceDocs } from './function/probability/kldivergence'
-import { gammaDocs } from './function/probability/gamma'
-import { factorialDocs } from './function/probability/factorial'
-import { combinationsDocs } from './function/probability/combinations'
-import { combinationsWithRepDocs } from './function/probability/combinationsWithRep'
-import { zerosDocs } from './function/matrix/zeros'
-import { transposeDocs } from './function/matrix/transpose'
-import { traceDocs } from './function/matrix/trace'
-import { subsetDocs } from './function/matrix/subset'
-import { squeezeDocs } from './function/matrix/squeeze'
-import { sortDocs } from './function/matrix/sort'
-import { sizeDocs } from './function/matrix/size'
-import { diffDocs } from './function/matrix/diff'
-import { reshapeDocs } from './function/matrix/reshape'
-import { resizeDocs } from './function/matrix/resize'
-import { rangeDocs } from './function/matrix/range'
-import { partitionSelectDocs } from './function/matrix/partitionSelect'
-import { onesDocs } from './function/matrix/ones'
-import { mapDocs } from './function/matrix/map'
-import { kronDocs } from './function/matrix/kron'
-import { invDocs } from './function/matrix/inv'
-import { forEachDocs } from './function/matrix/forEach'
-import { flattenDocs } from './function/matrix/flatten'
-import { filterDocs } from './function/matrix/filter'
-import { identityDocs } from './function/matrix/identity'
-import { getMatrixDataTypeDocs } from './function/matrix/getMatrixDataType'
-import { dotDocs } from './function/matrix/dot'
-import { diagDocs } from './function/matrix/diag'
-import { detDocs } from './function/matrix/det'
-import { ctransposeDocs } from './function/matrix/ctranspose'
-import { crossDocs } from './function/matrix/cross'
-import { concatDocs } from './function/matrix/concat'
-import { xorDocs } from './function/logical/xor'
-import { orDocs } from './function/logical/or'
-import { notDocs } from './function/logical/not'
-import { andDocs } from './function/logical/and'
-import { intersectDocs } from './function/geometry/intersect'
-import { distanceDocs } from './function/geometry/distance'
-import { helpDocs } from './function/expression/help'
-import { evaluateDocs } from './function/expression/evaluate'
-import { imDocs } from './function/complex/im'
-import { reDocs } from './function/complex/re'
-import { conjDocs } from './function/complex/conj'
-import { argDocs } from './function/complex/arg'
-import { typedDocs } from './core/typed'
-import { importDocs } from './core/import'
-import { configDocs } from './core/config'
-import { stirlingS2Docs } from './function/combinatorics/stirlingS2'
-import { compositionDocs } from './function/combinatorics/composition'
-import { catalanDocs } from './function/combinatorics/catalan'
-import { bellNumbersDocs } from './function/combinatorics/bellNumbers'
-import { rightLogShiftDocs } from './function/bitwise/rightLogShift'
-import { rightArithShiftDocs } from './function/bitwise/rightArithShift'
-import { leftShiftDocs } from './function/bitwise/leftShift'
-import { bitXorDocs } from './function/bitwise/bitXor'
-import { bitOrDocs } from './function/bitwise/bitOr'
-import { bitNotDocs } from './function/bitwise/bitNot'
-import { bitAndDocs } from './function/bitwise/bitAnd'
-import { xgcdDocs } from './function/arithmetic/xgcd'
-import { unaryPlusDocs } from './function/arithmetic/unaryPlus'
-import { unaryMinusDocs } from './function/arithmetic/unaryMinus'
-import { squareDocs } from './function/arithmetic/square'
-import { sqrtmDocs } from './function/arithmetic/sqrtm'
-import { sqrtDocs } from './function/arithmetic/sqrt'
-import { signDocs } from './function/arithmetic/sign'
-import { roundDocs } from './function/arithmetic/round'
-import { powDocs } from './function/arithmetic/pow'
-import { nthRootsDocs } from './function/arithmetic/nthRoots'
-import { nthRootDocs } from './function/arithmetic/nthRoot'
-import { normDocs } from './function/arithmetic/norm'
-import { multiplyDocs } from './function/arithmetic/multiply'
-import { modDocs } from './function/arithmetic/mod'
-import { log10Docs } from './function/arithmetic/log10'
-import { log1pDocs } from './function/arithmetic/log1p'
-import { log2Docs } from './function/arithmetic/log2'
-import { logDocs } from './function/arithmetic/log'
-import { lcmDocs } from './function/arithmetic/lcm'
-import { hypotDocs } from './function/arithmetic/hypot'
-import { gcdDocs } from './function/arithmetic/gcd'
-import { floorDocs } from './function/arithmetic/floor'
-import { fixDocs } from './function/arithmetic/fix'
-import { expm1Docs } from './function/arithmetic/expm1'
-import { expmDocs } from './function/arithmetic/expm'
-import { eigsDocs } from './function/matrix/eigs'
-import { expDocs } from './function/arithmetic/exp'
-import { dotMultiplyDocs } from './function/arithmetic/dotMultiply'
-import { dotDivideDocs } from './function/arithmetic/dotDivide'
-import { divideDocs } from './function/arithmetic/divide'
-import { cubeDocs } from './function/arithmetic/cube'
-import { ceilDocs } from './function/arithmetic/ceil'
-import { cbrtDocs } from './function/arithmetic/cbrt'
-import { addDocs } from './function/arithmetic/add'
-import { absDocs } from './function/arithmetic/abs'
-import { qrDocs } from './function/algebra/qr'
-import { usolveDocs } from './function/algebra/usolve'
-import { usolveAllDocs } from './function/algebra/usolveAll'
-import { sluDocs } from './function/algebra/slu'
-import { rationalizeDocs } from './function/algebra/rationalize'
-import { simplifyDocs } from './function/algebra/simplify'
-import { lupDocs } from './function/algebra/lup'
-import { lsolveDocs } from './function/algebra/lsolve'
-import { lsolveAllDocs } from './function/algebra/lsolveAll'
-import { derivativeDocs } from './function/algebra/derivative'
-import { versionDocs } from './constants/version'
-import { trueDocs } from './constants/true'
-import { tauDocs } from './constants/tau'
-import { SQRT2Docs } from './constants/SQRT2'
-import { SQRT12Docs } from './constants/SQRT1_2'
-import { phiDocs } from './constants/phi'
-import { piDocs } from './constants/pi'
-import { nullDocs } from './constants/null'
-import { NaNDocs } from './constants/NaN'
-import { LOG10EDocs } from './constants/LOG10E'
-import { LOG2EDocs } from './constants/LOG2E'
-import { LN10Docs } from './constants/LN10'
-import { LN2Docs } from './constants/LN2'
-import { InfinityDocs } from './constants/Infinity'
-import { iDocs } from './constants/i'
-import { falseDocs } from './constants/false'
-import { eDocs } from './constants/e'
-import { unitDocs } from './construction/unit'
-import { stringDocs } from './construction/string'
-import { splitUnitDocs } from './construction/splitUnit'
-import { sparseDocs } from './construction/sparse'
-import { numberDocs } from './construction/number'
-import { matrixDocs } from './construction/matrix'
-import { indexDocs } from './construction'
-import { fractionDocs } from './construction/fraction'
-import { createUnitDocs } from './construction/createUnit'
-import { complexDocs } from './construction/complex'
-import { booleanDocs } from './construction/boolean'
-import { dotPowDocs } from './function/arithmetic/dotPow'
-import { lusolveDocs } from './function/algebra/lusolve'
-import { subtractDocs } from './function/arithmetic/subtract'
-import { varianceDocs } from './function/statistics/variance'
-import { sinDocs } from './function/trigonometry/sin'
-import { numericDocs } from './function/utils/numeric'
-import { columnDocs } from './function/matrix/column'
-import { rowDocs } from './function/matrix/row'
+import { bignumberDocs } from './construction/bignumber.js'
+import { typeOfDocs } from './function/utils/typeOf.js'
+import { isZeroDocs } from './function/utils/isZero.js'
+import { isPrimeDocs } from './function/utils/isPrime.js'
+import { isPositiveDocs } from './function/utils/isPositive.js'
+import { isNumericDocs } from './function/utils/isNumeric.js'
+import { hasNumericValueDocs } from './function/utils/hasNumericValue.js'
+import { isNegativeDocs } from './function/utils/isNegative.js'
+import { isIntegerDocs } from './function/utils/isInteger.js'
+import { isNaNDocs } from './function/utils/isNaN.js'
+import { formatDocs } from './function/utils/format.js'
+import { cloneDocs } from './function/utils/clone.js'
+import { toDocs } from './function/units/to.js'
+import { tanhDocs } from './function/trigonometry/tanh.js'
+import { tanDocs } from './function/trigonometry/tan.js'
+import { sinhDocs } from './function/trigonometry/sinh.js'
+import { sechDocs } from './function/trigonometry/sech.js'
+import { secDocs } from './function/trigonometry/sec.js'
+import { cschDocs } from './function/trigonometry/csch.js'
+import { cscDocs } from './function/trigonometry/csc.js'
+import { cothDocs } from './function/trigonometry/coth.js'
+import { cotDocs } from './function/trigonometry/cot.js'
+import { coshDocs } from './function/trigonometry/cosh.js'
+import { cosDocs } from './function/trigonometry/cos.js'
+import { atan2Docs } from './function/trigonometry/atan2.js'
+import { atanhDocs } from './function/trigonometry/atanh.js'
+import { atanDocs } from './function/trigonometry/atan.js'
+import { asinhDocs } from './function/trigonometry/asinh.js'
+import { asinDocs } from './function/trigonometry/asin.js'
+import { asechDocs } from './function/trigonometry/asech.js'
+import { asecDocs } from './function/trigonometry/asec.js'
+import { acschDocs } from './function/trigonometry/acsch.js'
+import { acscDocs } from './function/trigonometry/acsc.js'
+import { acothDocs } from './function/trigonometry/acoth.js'
+import { acotDocs } from './function/trigonometry/acot.js'
+import { acoshDocs } from './function/trigonometry/acosh.js'
+import { acosDocs } from './function/trigonometry/acos.js'
+import { sumDocs } from './function/statistics/sum.js'
+import { stdDocs } from './function/statistics/std.js'
+import { quantileSeqDocs } from './function/statistics/quantileSeq.js'
+import { prodDocs } from './function/statistics/prod.js'
+import { modeDocs } from './function/statistics/mode.js'
+import { minDocs } from './function/statistics/min.js'
+import { medianDocs } from './function/statistics/median.js'
+import { meanDocs } from './function/statistics/mean.js'
+import { maxDocs } from './function/statistics/max.js'
+import { madDocs } from './function/statistics/mad.js'
+import { erfDocs } from './function/special/erf.js'
+import { setUnionDocs } from './function/set/setUnion.js'
+import { setSymDifferenceDocs } from './function/set/setSymDifference.js'
+import { setSizeDocs } from './function/set/setSize.js'
+import { setPowersetDocs } from './function/set/setPowerset.js'
+import { setMultiplicityDocs } from './function/set/setMultiplicity.js'
+import { setIsSubsetDocs } from './function/set/setIsSubset.js'
+import { setIntersectDocs } from './function/set/setIntersect.js'
+import { setDistinctDocs } from './function/set/setDistinct.js'
+import { setDifferenceDocs } from './function/set/setDifference.js'
+import { setCartesianDocs } from './function/set/setCartesian.js'
+import { unequalDocs } from './function/relational/unequal.js'
+import { smallerEqDocs } from './function/relational/smallerEq.js'
+import { smallerDocs } from './function/relational/smaller.js'
+import { largerEqDocs } from './function/relational/largerEq.js'
+import { largerDocs } from './function/relational/larger.js'
+import { equalTextDocs } from './function/relational/equalText.js'
+import { equalDocs } from './function/relational/equal.js'
+import { deepEqualDocs } from './function/relational/deepEqual.js'
+import { compareTextDocs } from './function/relational/compareText.js'
+import { compareNaturalDocs } from './function/relational/compareNatural.js'
+import { compareDocs } from './function/relational/compare.js'
+import { randomIntDocs } from './function/probability/randomInt.js'
+import { randomDocs } from './function/probability/random.js'
+import { pickRandomDocs } from './function/probability/pickRandom.js'
+import { permutationsDocs } from './function/probability/permutations.js'
+import { multinomialDocs } from './function/probability/multinomial.js'
+import { kldivergenceDocs } from './function/probability/kldivergence.js'
+import { gammaDocs } from './function/probability/gamma.js'
+import { factorialDocs } from './function/probability/factorial.js'
+import { combinationsDocs } from './function/probability/combinations.js'
+import { combinationsWithRepDocs } from './function/probability/combinationsWithRep.js'
+import { zerosDocs } from './function/matrix/zeros.js'
+import { transposeDocs } from './function/matrix/transpose.js'
+import { traceDocs } from './function/matrix/trace.js'
+import { subsetDocs } from './function/matrix/subset.js'
+import { squeezeDocs } from './function/matrix/squeeze.js'
+import { sortDocs } from './function/matrix/sort.js'
+import { sizeDocs } from './function/matrix/size.js'
+import { diffDocs } from './function/matrix/diff.js'
+import { reshapeDocs } from './function/matrix/reshape.js'
+import { resizeDocs } from './function/matrix/resize.js'
+import { rangeDocs } from './function/matrix/range.js'
+import { partitionSelectDocs } from './function/matrix/partitionSelect.js'
+import { onesDocs } from './function/matrix/ones.js'
+import { mapDocs } from './function/matrix/map.js'
+import { kronDocs } from './function/matrix/kron.js'
+import { invDocs } from './function/matrix/inv.js'
+import { forEachDocs } from './function/matrix/forEach.js'
+import { flattenDocs } from './function/matrix/flatten.js'
+import { filterDocs } from './function/matrix/filter.js'
+import { identityDocs } from './function/matrix/identity.js'
+import { getMatrixDataTypeDocs } from './function/matrix/getMatrixDataType.js'
+import { dotDocs } from './function/matrix/dot.js'
+import { diagDocs } from './function/matrix/diag.js'
+import { detDocs } from './function/matrix/det.js'
+import { ctransposeDocs } from './function/matrix/ctranspose.js'
+import { crossDocs } from './function/matrix/cross.js'
+import { concatDocs } from './function/matrix/concat.js'
+import { xorDocs } from './function/logical/xor.js'
+import { orDocs } from './function/logical/or.js'
+import { notDocs } from './function/logical/not.js'
+import { andDocs } from './function/logical/and.js'
+import { intersectDocs } from './function/geometry/intersect.js'
+import { distanceDocs } from './function/geometry/distance.js'
+import { helpDocs } from './function/expression/help.js'
+import { evaluateDocs } from './function/expression/evaluate.js'
+import { imDocs } from './function/complex/im.js'
+import { reDocs } from './function/complex/re.js'
+import { conjDocs } from './function/complex/conj.js'
+import { argDocs } from './function/complex/arg.js'
+import { typedDocs } from './core/typed.js'
+import { importDocs } from './core/import.js'
+import { configDocs } from './core/config.js'
+import { stirlingS2Docs } from './function/combinatorics/stirlingS2.js'
+import { compositionDocs } from './function/combinatorics/composition.js'
+import { catalanDocs } from './function/combinatorics/catalan.js'
+import { bellNumbersDocs } from './function/combinatorics/bellNumbers.js'
+import { rightLogShiftDocs } from './function/bitwise/rightLogShift.js'
+import { rightArithShiftDocs } from './function/bitwise/rightArithShift.js'
+import { leftShiftDocs } from './function/bitwise/leftShift.js'
+import { bitXorDocs } from './function/bitwise/bitXor.js'
+import { bitOrDocs } from './function/bitwise/bitOr.js'
+import { bitNotDocs } from './function/bitwise/bitNot.js'
+import { bitAndDocs } from './function/bitwise/bitAnd.js'
+import { xgcdDocs } from './function/arithmetic/xgcd.js'
+import { unaryPlusDocs } from './function/arithmetic/unaryPlus.js'
+import { unaryMinusDocs } from './function/arithmetic/unaryMinus.js'
+import { squareDocs } from './function/arithmetic/square.js'
+import { sqrtmDocs } from './function/arithmetic/sqrtm.js'
+import { sqrtDocs } from './function/arithmetic/sqrt.js'
+import { signDocs } from './function/arithmetic/sign.js'
+import { roundDocs } from './function/arithmetic/round.js'
+import { powDocs } from './function/arithmetic/pow.js'
+import { nthRootsDocs } from './function/arithmetic/nthRoots.js'
+import { nthRootDocs } from './function/arithmetic/nthRoot.js'
+import { normDocs } from './function/arithmetic/norm.js'
+import { multiplyDocs } from './function/arithmetic/multiply.js'
+import { modDocs } from './function/arithmetic/mod.js'
+import { log10Docs } from './function/arithmetic/log10.js'
+import { log1pDocs } from './function/arithmetic/log1p.js'
+import { log2Docs } from './function/arithmetic/log2.js'
+import { logDocs } from './function/arithmetic/log.js'
+import { lcmDocs } from './function/arithmetic/lcm.js'
+import { hypotDocs } from './function/arithmetic/hypot.js'
+import { gcdDocs } from './function/arithmetic/gcd.js'
+import { floorDocs } from './function/arithmetic/floor.js'
+import { fixDocs } from './function/arithmetic/fix.js'
+import { expm1Docs } from './function/arithmetic/expm1.js'
+import { expmDocs } from './function/arithmetic/expm.js'
+import { eigsDocs } from './function/matrix/eigs.js'
+import { expDocs } from './function/arithmetic/exp.js'
+import { dotMultiplyDocs } from './function/arithmetic/dotMultiply.js'
+import { dotDivideDocs } from './function/arithmetic/dotDivide.js'
+import { divideDocs } from './function/arithmetic/divide.js'
+import { cubeDocs } from './function/arithmetic/cube.js'
+import { ceilDocs } from './function/arithmetic/ceil.js'
+import { cbrtDocs } from './function/arithmetic/cbrt.js'
+import { addDocs } from './function/arithmetic/add.js'
+import { absDocs } from './function/arithmetic/abs.js'
+import { qrDocs } from './function/algebra/qr.js'
+import { usolveDocs } from './function/algebra/usolve.js'
+import { usolveAllDocs } from './function/algebra/usolveAll.js'
+import { sluDocs } from './function/algebra/slu.js'
+import { rationalizeDocs } from './function/algebra/rationalize.js'
+import { simplifyDocs } from './function/algebra/simplify.js'
+import { lupDocs } from './function/algebra/lup.js'
+import { lsolveDocs } from './function/algebra/lsolve.js'
+import { lsolveAllDocs } from './function/algebra/lsolveAll.js'
+import { derivativeDocs } from './function/algebra/derivative.js'
+import { versionDocs } from './constants/version.js'
+import { trueDocs } from './constants/true.js'
+import { tauDocs } from './constants/tau.js'
+import { SQRT2Docs } from './constants/SQRT2.js'
+import { SQRT12Docs } from './constants/SQRT1_2.js'
+import { phiDocs } from './constants/phi.js'
+import { piDocs } from './constants/pi.js'
+import { nullDocs } from './constants/null.js'
+import { NaNDocs } from './constants/NaN.js'
+import { LOG10EDocs } from './constants/LOG10E.js'
+import { LOG2EDocs } from './constants/LOG2E.js'
+import { LN10Docs } from './constants/LN10.js'
+import { LN2Docs } from './constants/LN2.js'
+import { InfinityDocs } from './constants/Infinity.js'
+import { iDocs } from './constants/i.js'
+import { falseDocs } from './constants/false.js'
+import { eDocs } from './constants/e.js'
+import { unitDocs } from './construction/unit.js'
+import { stringDocs } from './construction/string.js'
+import { splitUnitDocs } from './construction/splitUnit.js'
+import { sparseDocs } from './construction/sparse.js'
+import { numberDocs } from './construction/number.js'
+import { matrixDocs } from './construction/matrix.js'
+import { indexDocs } from './construction/index.js'
+import { fractionDocs } from './construction/fraction.js'
+import { createUnitDocs } from './construction/createUnit.js'
+import { complexDocs } from './construction/complex.js'
+import { booleanDocs } from './construction/boolean.js'
+import { dotPowDocs } from './function/arithmetic/dotPow.js'
+import { lusolveDocs } from './function/algebra/lusolve.js'
+import { subtractDocs } from './function/arithmetic/subtract.js'
+import { varianceDocs } from './function/statistics/variance.js'
+import { sinDocs } from './function/trigonometry/sin.js'
+import { numericDocs } from './function/utils/numeric.js'
+import { columnDocs } from './function/matrix/column.js'
+import { rowDocs } from './function/matrix/row.js'
 
 export const embeddedDocs = {
 
diff --git a/src/expression/function/compile.js b/src/expression/function/compile.js
index 9a8ec4a711..a0e1d2f074 100644
--- a/src/expression/function/compile.js
+++ b/src/expression/function/compile.js
@@ -1,5 +1,5 @@
-import { deepMap } from '../../utils/collection'
-import { factory } from '../../utils/factory'
+import { deepMap } from '../../utils/collection.js'
+import { factory } from '../../utils/factory.js'
 
 const name = 'compile'
 const dependencies = ['typed', 'parse']
diff --git a/src/expression/function/evaluate.js b/src/expression/function/evaluate.js
index 7ad053c190..645e763614 100644
--- a/src/expression/function/evaluate.js
+++ b/src/expression/function/evaluate.js
@@ -1,5 +1,5 @@
-import { deepMap } from '../../utils/collection'
-import { factory } from '../../utils/factory'
+import { deepMap } from '../../utils/collection.js'
+import { factory } from '../../utils/factory.js'
 
 const name = 'evaluate'
 const dependencies = ['typed', 'parse']
diff --git a/src/expression/function/help.js b/src/expression/function/help.js
index e82c7bc97d..a6d3f3c831 100644
--- a/src/expression/function/help.js
+++ b/src/expression/function/help.js
@@ -1,7 +1,7 @@
-import { factory } from '../../utils/factory'
-import { getSafeProperty } from '../../utils/customs'
-import { embeddedDocs } from '../embeddedDocs/embeddedDocs'
-import { hasOwnProperty } from '../../utils/object'
+import { factory } from '../../utils/factory.js'
+import { getSafeProperty } from '../../utils/customs.js'
+import { embeddedDocs } from '../embeddedDocs/embeddedDocs.js'
+import { hasOwnProperty } from '../../utils/object.js'
 
 const name = 'help'
 const dependencies = ['typed', 'mathWithTransform', 'Help']
diff --git a/src/expression/function/parser.js b/src/expression/function/parser.js
index 53b81aa66a..bfbcf61c77 100644
--- a/src/expression/function/parser.js
+++ b/src/expression/function/parser.js
@@ -1,4 +1,4 @@
-import { factory } from '../../utils/factory'
+import { factory } from '../../utils/factory.js'
 
 const name = 'parser'
 const dependencies = ['typed', 'Parser']
diff --git a/src/expression/node/AccessorNode.js b/src/expression/node/AccessorNode.js
index 990994b794..b5a63b9a37 100644
--- a/src/expression/node/AccessorNode.js
+++ b/src/expression/node/AccessorNode.js
@@ -8,10 +8,10 @@ import {
   isObjectNode,
   isParenthesisNode,
   isSymbolNode
-} from '../../utils/is'
-import { getSafeProperty } from '../../utils/customs'
-import { factory } from '../../utils/factory'
-import { accessFactory } from './utils/access'
+} from '../../utils/is.js'
+import { getSafeProperty } from '../../utils/customs.js'
+import { factory } from '../../utils/factory.js'
+import { accessFactory } from './utils/access.js'
 
 const name = 'AccessorNode'
 const dependencies = [
diff --git a/src/expression/node/ArrayNode.js b/src/expression/node/ArrayNode.js
index 03083b9c69..d9614b3875 100644
--- a/src/expression/node/ArrayNode.js
+++ b/src/expression/node/ArrayNode.js
@@ -1,6 +1,6 @@
-import { isNode } from '../../utils/is'
-import { map } from '../../utils/array'
-import { factory } from '../../utils/factory'
+import { isNode } from '../../utils/is.js'
+import { map } from '../../utils/array.js'
+import { factory } from '../../utils/factory.js'
 
 const name = 'ArrayNode'
 const dependencies = [
diff --git a/src/expression/node/AssignmentNode.js b/src/expression/node/AssignmentNode.js
index 2cd1173f33..139bdb6905 100644
--- a/src/expression/node/AssignmentNode.js
+++ b/src/expression/node/AssignmentNode.js
@@ -1,9 +1,9 @@
-import { isAccessorNode, isIndexNode, isNode, isSymbolNode } from '../../utils/is'
-import { getSafeProperty, setSafeProperty } from '../../utils/customs'
-import { factory } from '../../utils/factory'
-import { accessFactory } from './utils/access'
-import { assignFactory } from './utils/assign'
-import { getPrecedence } from '../operators'
+import { isAccessorNode, isIndexNode, isNode, isSymbolNode } from '../../utils/is.js'
+import { getSafeProperty, setSafeProperty } from '../../utils/customs.js'
+import { factory } from '../../utils/factory.js'
+import { accessFactory } from './utils/access.js'
+import { assignFactory } from './utils/assign.js'
+import { getPrecedence } from '../operators.js'
 
 const name = 'AssignmentNode'
 const dependencies = [
diff --git a/src/expression/node/BlockNode.js b/src/expression/node/BlockNode.js
index 32730a5dd7..02cc4336ae 100644
--- a/src/expression/node/BlockNode.js
+++ b/src/expression/node/BlockNode.js
@@ -1,6 +1,6 @@
-import { isNode } from '../../utils/is'
-import { forEach, map } from '../../utils/array'
-import { factory } from '../../utils/factory'
+import { isNode } from '../../utils/is.js'
+import { forEach, map } from '../../utils/array.js'
+import { factory } from '../../utils/factory.js'
 
 const name = 'BlockNode'
 const dependencies = [
diff --git a/src/expression/node/ConditionalNode.js b/src/expression/node/ConditionalNode.js
index 5637c40627..8f0ead9221 100644
--- a/src/expression/node/ConditionalNode.js
+++ b/src/expression/node/ConditionalNode.js
@@ -1,6 +1,6 @@
-import { isBigNumber, isComplex, isNode, isUnit, typeOf } from '../../utils/is'
-import { factory } from '../../utils/factory'
-import { getPrecedence } from '../operators'
+import { isBigNumber, isComplex, isNode, isUnit, typeOf } from '../../utils/is.js'
+import { factory } from '../../utils/factory.js'
+import { getPrecedence } from '../operators.js'
 
 const name = 'ConditionalNode'
 const dependencies = [
diff --git a/src/expression/node/ConstantNode.js b/src/expression/node/ConstantNode.js
index b462dff45a..df20ed1219 100644
--- a/src/expression/node/ConstantNode.js
+++ b/src/expression/node/ConstantNode.js
@@ -1,7 +1,7 @@
-import { format } from '../../utils/string'
-import { typeOf } from '../../utils/is'
-import { escapeLatex } from '../../utils/latex'
-import { factory } from '../../utils/factory'
+import { format } from '../../utils/string.js'
+import { typeOf } from '../../utils/is.js'
+import { escapeLatex } from '../../utils/latex.js'
+import { factory } from '../../utils/factory.js'
 
 const name = 'ConstantNode'
 const dependencies = [
diff --git a/src/expression/node/FunctionAssignmentNode.js b/src/expression/node/FunctionAssignmentNode.js
index 70f41e936e..5bc2a4e7ad 100644
--- a/src/expression/node/FunctionAssignmentNode.js
+++ b/src/expression/node/FunctionAssignmentNode.js
@@ -1,12 +1,12 @@
-import { isNode } from '../../utils/is'
-
-import { keywords } from '../keywords'
-import { escape } from '../../utils/string'
-import { forEach, join } from '../../utils/array'
-import { toSymbol } from '../../utils/latex'
-import { getPrecedence } from '../operators'
-import { setSafeProperty } from '../../utils/customs'
-import { factory } from '../../utils/factory'
+import { isNode } from '../../utils/is.js'
+
+import { keywords } from '../keywords.js'
+import { escape } from '../../utils/string.js'
+import { forEach, join } from '../../utils/array.js'
+import { toSymbol } from '../../utils/latex.js'
+import { getPrecedence } from '../operators.js'
+import { setSafeProperty } from '../../utils/customs.js'
+import { factory } from '../../utils/factory.js'
 
 const name = 'FunctionAssignmentNode'
 const dependencies = [
diff --git a/src/expression/node/FunctionNode.js b/src/expression/node/FunctionNode.js
index 60f0d0e150..d860bfbfea 100644
--- a/src/expression/node/FunctionNode.js
+++ b/src/expression/node/FunctionNode.js
@@ -1,11 +1,11 @@
-import { isAccessorNode, isFunctionAssignmentNode, isIndexNode, isNode, isSymbolNode } from '../../utils/is'
-
-import { escape } from '../../utils/string'
-import { hasOwnProperty } from '../../utils/object'
-import { map } from '../../utils/array'
-import { getSafeProperty, validateSafeMethod } from '../../utils/customs'
-import { factory } from '../../utils/factory'
-import { defaultTemplate, latexFunctions } from '../../utils/latex'
+import { isAccessorNode, isFunctionAssignmentNode, isIndexNode, isNode, isSymbolNode } from '../../utils/is.js'
+
+import { escape } from '../../utils/string.js'
+import { hasOwnProperty } from '../../utils/object.js'
+import { map } from '../../utils/array.js'
+import { getSafeProperty, validateSafeMethod } from '../../utils/customs.js'
+import { factory } from '../../utils/factory.js'
+import { defaultTemplate, latexFunctions } from '../../utils/latex.js'
 
 const name = 'FunctionNode'
 const dependencies = [
diff --git a/src/expression/node/IndexNode.js b/src/expression/node/IndexNode.js
index 3e5b21874f..9d3cd092c5 100644
--- a/src/expression/node/IndexNode.js
+++ b/src/expression/node/IndexNode.js
@@ -1,8 +1,8 @@
-import { isBigNumber, isConstantNode, isNode, isRangeNode, isSymbolNode } from '../../utils/is'
-import { map } from '../../utils/array'
-import { escape } from '../../utils/string'
-import { factory } from '../../utils/factory'
-import { getSafeProperty } from '../../utils/customs'
+import { isBigNumber, isConstantNode, isNode, isRangeNode, isSymbolNode } from '../../utils/is.js'
+import { map } from '../../utils/array.js'
+import { escape } from '../../utils/string.js'
+import { factory } from '../../utils/factory.js'
+import { getSafeProperty } from '../../utils/customs.js'
 
 const name = 'IndexNode'
 const dependencies = [
diff --git a/src/expression/node/Node.js b/src/expression/node/Node.js
index a8823ea953..254a6915d5 100644
--- a/src/expression/node/Node.js
+++ b/src/expression/node/Node.js
@@ -1,8 +1,8 @@
-import { isNode } from '../../utils/is'
+import { isNode } from '../../utils/is.js'
 
-import { keywords } from '../keywords'
-import { deepStrictEqual, hasOwnProperty } from '../../utils/object'
-import { factory } from '../../utils/factory'
+import { keywords } from '../keywords.js'
+import { deepStrictEqual, hasOwnProperty } from '../../utils/object.js'
+import { factory } from '../../utils/factory.js'
 
 const name = 'Node'
 const dependencies = ['mathWithTransform']
diff --git a/src/expression/node/ObjectNode.js b/src/expression/node/ObjectNode.js
index fcec7663d9..5d6168252e 100644
--- a/src/expression/node/ObjectNode.js
+++ b/src/expression/node/ObjectNode.js
@@ -1,8 +1,8 @@
-import { isNode } from '../../utils/is'
-import { escape, stringify } from '../../utils/string'
-import { isSafeProperty } from '../../utils/customs'
-import { hasOwnProperty } from '../../utils/object'
-import { factory } from '../../utils/factory'
+import { isNode } from '../../utils/is.js'
+import { escape, stringify } from '../../utils/string.js'
+import { isSafeProperty } from '../../utils/customs.js'
+import { hasOwnProperty } from '../../utils/object.js'
+import { factory } from '../../utils/factory.js'
 
 const name = 'ObjectNode'
 const dependencies = [
diff --git a/src/expression/node/OperatorNode.js b/src/expression/node/OperatorNode.js
index 03dec4d1a9..43f6f00d3e 100644
--- a/src/expression/node/OperatorNode.js
+++ b/src/expression/node/OperatorNode.js
@@ -1,10 +1,10 @@
-import { isNode } from '../../utils/is'
-import { map } from '../../utils/array'
-import { escape } from '../../utils/string'
-import { getSafeProperty, isSafeMethod } from '../../utils/customs'
-import { getAssociativity, getPrecedence, isAssociativeWith, properties } from '../operators'
-import { latexOperators } from '../../utils/latex'
-import { factory } from '../../utils/factory'
+import { isNode } from '../../utils/is.js'
+import { map } from '../../utils/array.js'
+import { escape } from '../../utils/string.js'
+import { getSafeProperty, isSafeMethod } from '../../utils/customs.js'
+import { getAssociativity, getPrecedence, isAssociativeWith, properties } from '../operators.js'
+import { latexOperators } from '../../utils/latex.js'
+import { factory } from '../../utils/factory.js'
 
 const name = 'OperatorNode'
 const dependencies = [
diff --git a/src/expression/node/ParenthesisNode.js b/src/expression/node/ParenthesisNode.js
index 68cbe08d51..c59d4243cd 100644
--- a/src/expression/node/ParenthesisNode.js
+++ b/src/expression/node/ParenthesisNode.js
@@ -1,5 +1,5 @@
-import { isNode } from '../../utils/is'
-import { factory } from '../../utils/factory'
+import { isNode } from '../../utils/is.js'
+import { factory } from '../../utils/factory.js'
 
 const name = 'ParenthesisNode'
 const dependencies = [
diff --git a/src/expression/node/RangeNode.js b/src/expression/node/RangeNode.js
index 2c91412494..849f7ba153 100644
--- a/src/expression/node/RangeNode.js
+++ b/src/expression/node/RangeNode.js
@@ -1,6 +1,6 @@
-import { isNode, isSymbolNode } from '../../utils/is'
-import { factory } from '../../utils/factory'
-import { getPrecedence } from '../operators'
+import { isNode, isSymbolNode } from '../../utils/is.js'
+import { factory } from '../../utils/factory.js'
+import { getPrecedence } from '../operators.js'
 
 const name = 'RangeNode'
 const dependencies = [
diff --git a/src/expression/node/RelationalNode.js b/src/expression/node/RelationalNode.js
index ad68647b3b..80af63bb3c 100644
--- a/src/expression/node/RelationalNode.js
+++ b/src/expression/node/RelationalNode.js
@@ -1,8 +1,8 @@
-import { getPrecedence } from '../operators'
-import { escape } from '../../utils/string'
-import { getSafeProperty } from '../../utils/customs'
-import { latexOperators } from '../../utils/latex'
-import { factory } from '../../utils/factory'
+import { getPrecedence } from '../operators.js'
+import { escape } from '../../utils/string.js'
+import { getSafeProperty } from '../../utils/customs.js'
+import { latexOperators } from '../../utils/latex.js'
+import { factory } from '../../utils/factory.js'
 
 const name = 'RelationalNode'
 const dependencies = [
diff --git a/src/expression/node/SymbolNode.js b/src/expression/node/SymbolNode.js
index 18b1facc54..b3cc888641 100644
--- a/src/expression/node/SymbolNode.js
+++ b/src/expression/node/SymbolNode.js
@@ -1,7 +1,7 @@
-import { escape } from '../../utils/string'
-import { getSafeProperty } from '../../utils/customs'
-import { factory } from '../../utils/factory'
-import { toSymbol } from '../../utils/latex'
+import { escape } from '../../utils/string.js'
+import { getSafeProperty } from '../../utils/customs.js'
+import { factory } from '../../utils/factory.js'
+import { toSymbol } from '../../utils/latex.js'
 
 const name = 'SymbolNode'
 const dependencies = [
diff --git a/src/expression/node/utils/access.js b/src/expression/node/utils/access.js
index 447b6e4d42..5c87041965 100644
--- a/src/expression/node/utils/access.js
+++ b/src/expression/node/utils/access.js
@@ -1,5 +1,5 @@
-import { errorTransform } from '../../transform/utils/errorTransform'
-import { getSafeProperty } from '../../../utils/customs'
+import { errorTransform } from '../../transform/utils/errorTransform.js'
+import { getSafeProperty } from '../../../utils/customs.js'
 
 export function accessFactory ({ subset }) {
   /**
diff --git a/src/expression/node/utils/assign.js b/src/expression/node/utils/assign.js
index 3629f49db8..b05c317818 100644
--- a/src/expression/node/utils/assign.js
+++ b/src/expression/node/utils/assign.js
@@ -1,5 +1,5 @@
-import { errorTransform } from '../../transform/utils/errorTransform'
-import { setSafeProperty } from '../../../utils/customs'
+import { errorTransform } from '../../transform/utils/errorTransform.js'
+import { setSafeProperty } from '../../../utils/customs.js'
 
 export function assignFactory ({ subset, matrix }) {
   /**
diff --git a/src/expression/operators.js b/src/expression/operators.js
index 547abe8aac..4a3e380486 100644
--- a/src/expression/operators.js
+++ b/src/expression/operators.js
@@ -16,7 +16,7 @@
 //                  left argument doesn't need to be enclosed
 //                  in parentheses
 // latexRightParens: the same for the right argument
-import { hasOwnProperty } from '../utils/object'
+import { hasOwnProperty } from '../utils/object.js'
 
 export const properties = [
   { // assignment
@@ -239,7 +239,7 @@ export function getPrecedence (_node, parenthesis) {
  * Returns a string containing 'left' or 'right' or null if
  * the associativity is not defined.
  *
- * @param {Node}
+ * @param {Node} _node
  * @param {string} parenthesis
  * @return {string|null}
  * @throws {Error}
diff --git a/src/expression/parse.js b/src/expression/parse.js
index 24963dfc88..2349048060 100644
--- a/src/expression/parse.js
+++ b/src/expression/parse.js
@@ -1,7 +1,7 @@
-import { factory } from '../utils/factory'
-import { isAccessorNode, isConstantNode, isFunctionNode, isOperatorNode, isSymbolNode } from '../utils/is'
-import { deepMap } from '../utils/collection'
-import { hasOwnProperty } from '../utils/object'
+import { factory } from '../utils/factory.js'
+import { isAccessorNode, isConstantNode, isFunctionNode, isOperatorNode, isSymbolNode } from '../utils/is.js'
+import { deepMap } from '../utils/collection.js'
+import { hasOwnProperty } from '../utils/object.js'
 
 const name = 'parse'
 const dependencies = [
diff --git a/src/expression/transform/apply.transform.js b/src/expression/transform/apply.transform.js
index 64acb605c7..49dcf88493 100644
--- a/src/expression/transform/apply.transform.js
+++ b/src/expression/transform/apply.transform.js
@@ -1,7 +1,7 @@
-import { errorTransform } from './utils/errorTransform'
-import { factory } from '../../utils/factory'
-import { createApply } from '../../function/matrix/apply'
-import { isBigNumber, isNumber } from '../../utils/is'
+import { errorTransform } from './utils/errorTransform.js'
+import { factory } from '../../utils/factory.js'
+import { createApply } from '../../function/matrix/apply.js'
+import { isBigNumber, isNumber } from '../../utils/is.js'
 
 const name = 'apply'
 const dependencies = ['typed', 'isInteger']
diff --git a/src/expression/transform/column.transform.js b/src/expression/transform/column.transform.js
index 9941ea43f4..1750d262de 100644
--- a/src/expression/transform/column.transform.js
+++ b/src/expression/transform/column.transform.js
@@ -1,7 +1,7 @@
-import { errorTransform } from './utils/errorTransform'
-import { factory } from '../../utils/factory'
-import { createColumn } from '../../function/matrix/column'
-import { isNumber } from '../../utils/is'
+import { errorTransform } from './utils/errorTransform.js'
+import { factory } from '../../utils/factory.js'
+import { createColumn } from '../../function/matrix/column.js'
+import { isNumber } from '../../utils/is.js'
 
 const name = 'column'
 const dependencies = ['typed', 'Index', 'matrix', 'range']
diff --git a/src/expression/transform/concat.transform.js b/src/expression/transform/concat.transform.js
index 5b39532d33..7102e7f051 100644
--- a/src/expression/transform/concat.transform.js
+++ b/src/expression/transform/concat.transform.js
@@ -1,7 +1,7 @@
-import { isBigNumber, isNumber } from '../../utils/is'
-import { errorTransform } from './utils/errorTransform'
-import { factory } from '../../utils/factory'
-import { createConcat } from '../../function/matrix/concat'
+import { isBigNumber, isNumber } from '../../utils/is.js'
+import { errorTransform } from './utils/errorTransform.js'
+import { factory } from '../../utils/factory.js'
+import { createConcat } from '../../function/matrix/concat.js'
 
 const name = 'concat'
 const dependencies = ['typed', 'matrix', 'isInteger']
diff --git a/src/expression/transform/diff.transform.js b/src/expression/transform/diff.transform.js
index cf111af0e8..0a6b9c884a 100644
--- a/src/expression/transform/diff.transform.js
+++ b/src/expression/transform/diff.transform.js
@@ -1,7 +1,7 @@
-import { isBigNumber, isCollection, isNumber } from '../../utils/is'
-import { factory } from '../../utils/factory'
-import { errorTransform } from './utils/errorTransform'
-import { createDiff } from '../../function/matrix/diff'
+import { isBigNumber, isCollection, isNumber } from '../../utils/is.js'
+import { factory } from '../../utils/factory.js'
+import { errorTransform } from './utils/errorTransform.js'
+import { createDiff } from '../../function/matrix/diff.js'
 
 const name = 'diff'
 const dependencies = ['typed', 'matrix', 'subtract', 'number', 'bignumber']
diff --git a/src/expression/transform/filter.transform.js b/src/expression/transform/filter.transform.js
index 039db2409f..285ceeec19 100644
--- a/src/expression/transform/filter.transform.js
+++ b/src/expression/transform/filter.transform.js
@@ -1,8 +1,8 @@
-import { isFunctionAssignmentNode, isSymbolNode } from '../../utils/is'
-import { filter, filterRegExp } from '../../utils/array'
-import { maxArgumentCount } from '../../utils/function'
-import { compileInlineExpression } from './utils/compileInlineExpression'
-import { factory } from '../../utils/factory'
+import { isFunctionAssignmentNode, isSymbolNode } from '../../utils/is.js'
+import { filter, filterRegExp } from '../../utils/array.js'
+import { maxArgumentCount } from '../../utils/function.js'
+import { compileInlineExpression } from './utils/compileInlineExpression.js'
+import { factory } from '../../utils/factory.js'
 
 const name = 'filter'
 const dependencies = ['typed']
diff --git a/src/expression/transform/forEach.transform.js b/src/expression/transform/forEach.transform.js
index da055ae3a8..873b1eb766 100644
--- a/src/expression/transform/forEach.transform.js
+++ b/src/expression/transform/forEach.transform.js
@@ -1,8 +1,8 @@
-import { isFunctionAssignmentNode, isSymbolNode } from '../../utils/is'
-import { maxArgumentCount } from '../../utils/function'
-import { forEach } from '../../utils/array'
-import { factory } from '../../utils/factory'
-import { compileInlineExpression } from './utils/compileInlineExpression'
+import { isFunctionAssignmentNode, isSymbolNode } from '../../utils/is.js'
+import { maxArgumentCount } from '../../utils/function.js'
+import { forEach } from '../../utils/array.js'
+import { factory } from '../../utils/factory.js'
+import { compileInlineExpression } from './utils/compileInlineExpression.js'
 
 const name = 'forEach'
 const dependencies = ['typed']
diff --git a/src/expression/transform/index.transform.js b/src/expression/transform/index.transform.js
index 1b09631047..1d6ea8eabd 100644
--- a/src/expression/transform/index.transform.js
+++ b/src/expression/transform/index.transform.js
@@ -1,5 +1,5 @@
-import { isArray, isBigNumber, isMatrix, isNumber, isRange } from '../../utils/is'
-import { factory } from '../../utils/factory'
+import { isArray, isBigNumber, isMatrix, isNumber, isRange } from '../../utils/is.js'
+import { factory } from '../../utils/factory.js'
 
 const name = 'index'
 const dependencies = ['Index']
diff --git a/src/expression/transform/map.transform.js b/src/expression/transform/map.transform.js
index 104b58ceee..8ba712d9f6 100644
--- a/src/expression/transform/map.transform.js
+++ b/src/expression/transform/map.transform.js
@@ -1,8 +1,8 @@
-import { isFunctionAssignmentNode, isSymbolNode } from '../../utils/is'
-import { maxArgumentCount } from '../../utils/function'
-import { map } from '../../utils/array'
-import { factory } from '../../utils/factory'
-import { compileInlineExpression } from './utils/compileInlineExpression'
+import { isFunctionAssignmentNode, isSymbolNode } from '../../utils/is.js'
+import { maxArgumentCount } from '../../utils/function.js'
+import { map } from '../../utils/array.js'
+import { factory } from '../../utils/factory.js'
+import { compileInlineExpression } from './utils/compileInlineExpression.js'
 
 const name = 'map'
 const dependencies = ['typed']
diff --git a/src/expression/transform/max.transform.js b/src/expression/transform/max.transform.js
index e87a3e4cdf..a797105678 100644
--- a/src/expression/transform/max.transform.js
+++ b/src/expression/transform/max.transform.js
@@ -1,7 +1,7 @@
-import { isBigNumber, isCollection, isNumber } from '../../utils/is'
-import { factory } from '../../utils/factory'
-import { errorTransform } from './utils/errorTransform'
-import { createMax } from '../../function/statistics/max'
+import { isBigNumber, isCollection, isNumber } from '../../utils/is.js'
+import { factory } from '../../utils/factory.js'
+import { errorTransform } from './utils/errorTransform.js'
+import { createMax } from '../../function/statistics/max.js'
 
 const name = 'max'
 const dependencies = ['typed', 'config', 'numeric', 'larger']
diff --git a/src/expression/transform/mean.transform.js b/src/expression/transform/mean.transform.js
index 1d0b41f309..a0bf85f506 100644
--- a/src/expression/transform/mean.transform.js
+++ b/src/expression/transform/mean.transform.js
@@ -1,7 +1,7 @@
-import { isBigNumber, isCollection, isNumber } from '../../utils/is'
-import { factory } from '../../utils/factory'
-import { errorTransform } from './utils/errorTransform'
-import { createMean } from '../../function/statistics/mean'
+import { isBigNumber, isCollection, isNumber } from '../../utils/is.js'
+import { factory } from '../../utils/factory.js'
+import { errorTransform } from './utils/errorTransform.js'
+import { createMean } from '../../function/statistics/mean.js'
 
 const name = 'mean'
 const dependencies = ['typed', 'add', 'divide']
diff --git a/src/expression/transform/min.transform.js b/src/expression/transform/min.transform.js
index 1fedbcbb36..a378af37d2 100644
--- a/src/expression/transform/min.transform.js
+++ b/src/expression/transform/min.transform.js
@@ -1,7 +1,7 @@
-import { isBigNumber, isCollection, isNumber } from '../../utils/is'
-import { factory } from '../../utils/factory'
-import { errorTransform } from './utils/errorTransform'
-import { createMin } from '../../function/statistics/min'
+import { isBigNumber, isCollection, isNumber } from '../../utils/is.js'
+import { factory } from '../../utils/factory.js'
+import { errorTransform } from './utils/errorTransform.js'
+import { createMin } from '../../function/statistics/min.js'
 
 const name = 'min'
 const dependencies = ['typed', 'config', 'numeric', 'smaller']
diff --git a/src/expression/transform/range.transform.js b/src/expression/transform/range.transform.js
index 7ea67e1a7d..1f84435062 100644
--- a/src/expression/transform/range.transform.js
+++ b/src/expression/transform/range.transform.js
@@ -1,5 +1,5 @@
-import { factory } from '../../utils/factory'
-import { createRange } from '../../function/matrix/range'
+import { factory } from '../../utils/factory.js'
+import { createRange } from '../../function/matrix/range.js'
 
 const name = 'range'
 const dependencies = ['typed', 'config', '?matrix', '?bignumber', 'smaller', 'smallerEq', 'larger', 'largerEq']
diff --git a/src/expression/transform/row.transform.js b/src/expression/transform/row.transform.js
index 5b6b1b9273..1be2783c81 100644
--- a/src/expression/transform/row.transform.js
+++ b/src/expression/transform/row.transform.js
@@ -1,7 +1,7 @@
-import { factory } from '../../utils/factory'
-import { createRow } from '../../function/matrix/row'
-import { errorTransform } from './utils/errorTransform'
-import { isNumber } from '../../utils/is'
+import { factory } from '../../utils/factory.js'
+import { createRow } from '../../function/matrix/row.js'
+import { errorTransform } from './utils/errorTransform.js'
+import { isNumber } from '../../utils/is.js'
 
 const name = 'row'
 const dependencies = ['typed', 'Index', 'matrix', 'range']
diff --git a/src/expression/transform/std.transform.js b/src/expression/transform/std.transform.js
index 1dd106603f..be6616bae2 100644
--- a/src/expression/transform/std.transform.js
+++ b/src/expression/transform/std.transform.js
@@ -1,7 +1,7 @@
-import { factory } from '../../utils/factory'
-import { createStd } from '../../function/statistics/std'
-import { isBigNumber, isNumber, isCollection } from '../../utils/is'
-import { errorTransform } from './utils/errorTransform'
+import { factory } from '../../utils/factory.js'
+import { createStd } from '../../function/statistics/std.js'
+import { isBigNumber, isNumber, isCollection } from '../../utils/is.js'
+import { errorTransform } from './utils/errorTransform.js'
 
 const name = 'std'
 const dependencies = ['typed', 'sqrt', 'variance']
diff --git a/src/expression/transform/subset.transform.js b/src/expression/transform/subset.transform.js
index c30f4c797c..84a089dd76 100644
--- a/src/expression/transform/subset.transform.js
+++ b/src/expression/transform/subset.transform.js
@@ -1,6 +1,6 @@
-import { factory } from '../../utils/factory'
-import { errorTransform } from './utils/errorTransform'
-import { createSubset } from '../../function/matrix/subset'
+import { factory } from '../../utils/factory.js'
+import { errorTransform } from './utils/errorTransform.js'
+import { createSubset } from '../../function/matrix/subset.js'
 
 const name = 'subset'
 const dependencies = ['typed', 'matrix']
diff --git a/src/expression/transform/sum.transform.js b/src/expression/transform/sum.transform.js
index a65c1670c0..36729e6084 100644
--- a/src/expression/transform/sum.transform.js
+++ b/src/expression/transform/sum.transform.js
@@ -1,7 +1,7 @@
-import { isBigNumber, isCollection, isNumber } from '../../utils/is'
-import { factory } from '../../utils/factory'
-import { errorTransform } from './utils/errorTransform'
-import { createSum } from '../../function/statistics/sum'
+import { isBigNumber, isCollection, isNumber } from '../../utils/is.js'
+import { factory } from '../../utils/factory.js'
+import { errorTransform } from './utils/errorTransform.js'
+import { createSum } from '../../function/statistics/sum.js'
 
 /**
  * Attach a transform function to math.sum
diff --git a/src/expression/transform/utils/compileInlineExpression.js b/src/expression/transform/utils/compileInlineExpression.js
index 1aa247303c..b39d63d913 100644
--- a/src/expression/transform/utils/compileInlineExpression.js
+++ b/src/expression/transform/utils/compileInlineExpression.js
@@ -1,4 +1,4 @@
-import { isSymbolNode } from '../../../utils/is'
+import { isSymbolNode } from '../../../utils/is.js'
 
 /**
  * Compile an inline expression like "x > 0"
diff --git a/src/expression/transform/utils/errorTransform.js b/src/expression/transform/utils/errorTransform.js
index e5a2c4000e..b1d90df7c3 100644
--- a/src/expression/transform/utils/errorTransform.js
+++ b/src/expression/transform/utils/errorTransform.js
@@ -1,4 +1,4 @@
-import { IndexError } from '../../../error/IndexError'
+import { IndexError } from '../../../error/IndexError.js'
 
 /**
  * Transform zero-based indices to one-based indices in errors
diff --git a/src/expression/transform/variance.transform.js b/src/expression/transform/variance.transform.js
index 740f361c32..212320aa90 100644
--- a/src/expression/transform/variance.transform.js
+++ b/src/expression/transform/variance.transform.js
@@ -1,7 +1,7 @@
-import { factory } from '../../utils/factory'
-import { isBigNumber, isCollection, isNumber } from '../../utils/is'
-import { errorTransform } from './utils/errorTransform'
-import { createVariance } from '../../function/statistics/variance'
+import { factory } from '../../utils/factory.js'
+import { isBigNumber, isCollection, isNumber } from '../../utils/is.js'
+import { errorTransform } from './utils/errorTransform.js'
+import { createVariance } from '../../function/statistics/variance.js'
 
 const name = 'variance'
 const dependencies = ['typed', 'add', 'subtract', 'multiply', 'divide', 'apply', 'isNaN']
diff --git a/src/factoriesAny.js b/src/factoriesAny.js
index a87428fd74..65bae4aeb3 100644
--- a/src/factoriesAny.js
+++ b/src/factoriesAny.js
@@ -1,241 +1,241 @@
-export { createTyped } from './core/function/typed'
-export { createResultSet } from './type/resultset/ResultSet'
-export { createBigNumberClass } from './type/bignumber/BigNumber'
-export { createComplexClass } from './type/complex/Complex'
-export { createFractionClass } from './type/fraction/Fraction'
-export { createRangeClass } from './type/matrix/Range'
-export { createMatrixClass } from './type/matrix/Matrix'
-export { createDenseMatrixClass } from './type/matrix/DenseMatrix'
-export { createClone } from './function/utils/clone'
-export { createIsInteger } from './function/utils/isInteger'
-export { createIsNegative } from './function/utils/isNegative'
-export { createIsNumeric } from './function/utils/isNumeric'
-export { createHasNumericValue } from './function/utils/hasNumericValue'
-export { createIsPositive } from './function/utils/isPositive'
-export { createIsZero } from './function/utils/isZero'
-export { createIsNaN } from './function/utils/isNaN'
-export { createTypeOf } from './function/utils/typeOf'
-export { createEqualScalar } from './function/relational/equalScalar'
-export { createSparseMatrixClass } from './type/matrix/SparseMatrix'
-export { createNumber } from './type/number'
-export { createString } from './type/string'
-export { createBoolean } from './type/boolean'
-export { createBignumber } from './type/bignumber/function/bignumber'
-export { createComplex } from './type/complex/function/complex'
-export { createFraction } from './type/fraction/function/fraction'
-export { createMatrix } from './type/matrix/function/matrix'
-export { createSplitUnit } from './type/unit/function/splitUnit'
-export { createUnaryMinus } from './function/arithmetic/unaryMinus'
-export { createUnaryPlus } from './function/arithmetic/unaryPlus'
-export { createAbs } from './function/arithmetic/abs'
-export { createApply } from './function/matrix/apply'
-export { createAddScalar } from './function/arithmetic/addScalar'
-export { createCbrt } from './function/arithmetic/cbrt'
-export { createCeil } from './function/arithmetic/ceil'
-export { createCube } from './function/arithmetic/cube'
-export { createExp } from './function/arithmetic/exp'
-export { createExpm1 } from './function/arithmetic/expm1'
-export { createFix } from './function/arithmetic/fix'
-export { createFloor } from './function/arithmetic/floor'
-export { createGcd } from './function/arithmetic/gcd'
-export { createLcm } from './function/arithmetic/lcm'
-export { createLog10 } from './function/arithmetic/log10'
-export { createLog2 } from './function/arithmetic/log2'
-export { createMod } from './function/arithmetic/mod'
-export { createMultiplyScalar } from './function/arithmetic/multiplyScalar'
-export { createMultiply } from './function/arithmetic/multiply'
-export { createNthRoot } from './function/arithmetic/nthRoot'
-export { createSign } from './function/arithmetic/sign'
-export { createSqrt } from './function/arithmetic/sqrt'
-export { createSquare } from './function/arithmetic/square'
-export { createSubtract } from './function/arithmetic/subtract'
-export { createXgcd } from './function/arithmetic/xgcd'
-export { createDotMultiply } from './function/arithmetic/dotMultiply'
-export { createBitAnd } from './function/bitwise/bitAnd'
-export { createBitNot } from './function/bitwise/bitNot'
-export { createBitOr } from './function/bitwise/bitOr'
-export { createBitXor } from './function/bitwise/bitXor'
-export { createArg } from './function/complex/arg'
-export { createConj } from './function/complex/conj'
-export { createIm } from './function/complex/im'
-export { createRe } from './function/complex/re'
-export { createNot } from './function/logical/not'
-export { createOr } from './function/logical/or'
-export { createXor } from './function/logical/xor'
-export { createConcat } from './function/matrix/concat'
-export { createColumn } from './function/matrix/column'
-export { createCross } from './function/matrix/cross'
-export { createDiag } from './function/matrix/diag'
-export { createFilter } from './function/matrix/filter'
-export { createFlatten } from './function/matrix/flatten'
-export { createForEach } from './function/matrix/forEach'
-export { createGetMatrixDataType } from './function/matrix/getMatrixDataType'
-export { createIdentity } from './function/matrix/identity'
-export { createKron } from './function/matrix/kron'
-export { createMap } from './function/matrix/map'
-export { createDiff } from './function/matrix/diff'
-export { createOnes } from './function/matrix/ones'
-export { createRange } from './function/matrix/range'
-export { createReshape } from './function/matrix/reshape'
-export { createResize } from './function/matrix/resize'
-export { createRow } from './function/matrix/row'
-export { createSize } from './function/matrix/size'
-export { createSqueeze } from './function/matrix/squeeze'
-export { createSubset } from './function/matrix/subset'
-export { createTranspose } from './function/matrix/transpose'
-export { createCtranspose } from './function/matrix/ctranspose'
-export { createZeros } from './function/matrix/zeros'
-export { createErf } from './function/special/erf'
-export { createMode } from './function/statistics/mode'
-export { createProd } from './function/statistics/prod'
-export { createFormat } from './function/string/format'
-export { createPrint } from './function/string/print'
-export { createTo } from './function/unit/to'
-export { createIsPrime } from './function/utils/isPrime'
-export { createNumeric } from './function/utils/numeric'
-export { createDivideScalar } from './function/arithmetic/divideScalar'
-export { createPow } from './function/arithmetic/pow'
-export { createRound } from './function/arithmetic/round'
-export { createLog } from './function/arithmetic/log'
-export { createLog1p } from './function/arithmetic/log1p'
-export { createNthRoots } from './function/arithmetic/nthRoots'
-export { createDotPow } from './function/arithmetic/dotPow'
-export { createDotDivide } from './function/arithmetic/dotDivide'
-export { createLsolve } from './function/algebra/solver/lsolve'
-export { createUsolve } from './function/algebra/solver/usolve'
-export { createLsolveAll } from './function/algebra/solver/lsolveAll'
-export { createUsolveAll } from './function/algebra/solver/usolveAll'
-export { createLeftShift } from './function/bitwise/leftShift'
-export { createRightArithShift } from './function/bitwise/rightArithShift'
-export { createRightLogShift } from './function/bitwise/rightLogShift'
-export { createAnd } from './function/logical/and'
-export { createCompare } from './function/relational/compare'
-export { createCompareNatural } from './function/relational/compareNatural'
-export { createCompareText } from './function/relational/compareText'
-export { createEqual } from './function/relational/equal'
-export { createEqualText } from './function/relational/equalText'
-export { createSmaller } from './function/relational/smaller'
-export { createSmallerEq } from './function/relational/smallerEq'
-export { createLarger } from './function/relational/larger'
-export { createLargerEq } from './function/relational/largerEq'
-export { createDeepEqual } from './function/relational/deepEqual'
-export { createUnequal } from './function/relational/unequal'
-export { createPartitionSelect } from './function/matrix/partitionSelect'
-export { createSort } from './function/matrix/sort'
-export { createMax } from './function/statistics/max'
-export { createMin } from './function/statistics/min'
-export { createImmutableDenseMatrixClass } from './type/matrix/ImmutableDenseMatrix'
-export { createIndexClass } from './type/matrix/MatrixIndex'
-export { createFibonacciHeapClass } from './type/matrix/FibonacciHeap'
-export { createSpaClass } from './type/matrix/Spa'
-export { createUnitClass } from './type/unit/Unit'
-export { createUnitFunction } from './type/unit/function/unit'
-export { createSparse } from './type/matrix/function/sparse'
-export { createCreateUnit } from './type/unit/function/createUnit'
-export { createAcos } from './function/trigonometry/acos'
-export { createAcosh } from './function/trigonometry/acosh'
-export { createAcot } from './function/trigonometry/acot'
-export { createAcoth } from './function/trigonometry/acoth'
-export { createAcsc } from './function/trigonometry/acsc'
-export { createAcsch } from './function/trigonometry/acsch'
-export { createAsec } from './function/trigonometry/asec'
-export { createAsech } from './function/trigonometry/asech'
-export { createAsin } from './function/trigonometry/asin'
-export { createAsinh } from './function/trigonometry/asinh'
-export { createAtan } from './function/trigonometry/atan'
-export { createAtan2 } from './function/trigonometry/atan2'
-export { createAtanh } from './function/trigonometry/atanh'
-export { createCos } from './function/trigonometry/cos'
-export { createCosh } from './function/trigonometry/cosh'
-export { createCot } from './function/trigonometry/cot'
-export { createCoth } from './function/trigonometry/coth'
-export { createCsc } from './function/trigonometry/csc'
-export { createCsch } from './function/trigonometry/csch'
-export { createSec } from './function/trigonometry/sec'
-export { createSech } from './function/trigonometry/sech'
-export { createSin } from './function/trigonometry/sin'
-export { createSinh } from './function/trigonometry/sinh'
-export { createTan } from './function/trigonometry/tan'
-export { createTanh } from './function/trigonometry/tanh'
-export { createSetCartesian } from './function/set/setCartesian'
-export { createSetDifference } from './function/set/setDifference'
-export { createSetDistinct } from './function/set/setDistinct'
-export { createSetIntersect } from './function/set/setIntersect'
-export { createSetIsSubset } from './function/set/setIsSubset'
-export { createSetMultiplicity } from './function/set/setMultiplicity'
-export { createSetPowerset } from './function/set/setPowerset'
-export { createSetSize } from './function/set/setSize'
-export { createSetSymDifference } from './function/set/setSymDifference'
-export { createSetUnion } from './function/set/setUnion'
-export { createAdd } from './function/arithmetic/add'
-export { createHypot } from './function/arithmetic/hypot'
-export { createNorm } from './function/arithmetic/norm'
-export { createDot } from './function/matrix/dot'
-export { createTrace } from './function/matrix/trace'
-export { createIndex } from './type/matrix/function'
-export { createNode } from './expression/node/Node'
-export { createAccessorNode } from './expression/node/AccessorNode'
-export { createArrayNode } from './expression/node/ArrayNode'
-export { createAssignmentNode } from './expression/node/AssignmentNode'
-export { createBlockNode } from './expression/node/BlockNode'
-export { createConditionalNode } from './expression/node/ConditionalNode'
-export { createConstantNode } from './expression/node/ConstantNode'
-export { createFunctionAssignmentNode } from './expression/node/FunctionAssignmentNode'
-export { createIndexNode } from './expression/node/IndexNode'
-export { createObjectNode } from './expression/node/ObjectNode'
-export { createOperatorNode } from './expression/node/OperatorNode'
-export { createParenthesisNode } from './expression/node/ParenthesisNode'
-export { createRangeNode } from './expression/node/RangeNode'
-export { createRelationalNode } from './expression/node/RelationalNode'
-export { createSymbolNode } from './expression/node/SymbolNode'
-export { createFunctionNode } from './expression/node/FunctionNode'
-export { createParse } from './expression/parse'
-export { createCompile } from './expression/function/compile'
-export { createEvaluate } from './expression/function/evaluate'
-export { createParserClass } from './expression/Parser'
-export { createParser } from './expression/function/parser'
-export { createLup } from './function/algebra/decomposition/lup'
-export { createQr } from './function/algebra/decomposition/qr'
-export { createSlu } from './function/algebra/decomposition/slu'
-export { createLusolve } from './function/algebra/solver/lusolve'
-export { createHelpClass } from './expression/Help'
-export { createChainClass } from './type/chain/Chain'
-export { createHelp } from './expression/function/help'
-export { createChain } from './type/chain/function/chain'
-export { createDet } from './function/matrix/det'
-export { createInv } from './function/matrix/inv'
-export { createEigs } from './function/matrix/eigs'
-export { createExpm } from './function/matrix/expm'
-export { createSqrtm } from './function/matrix/sqrtm'
-export { createDivide } from './function/arithmetic/divide'
-export { createDistance } from './function/geometry/distance'
-export { createIntersect } from './function/geometry/intersect'
-export { createSum } from './function/statistics/sum'
-export { createMean } from './function/statistics/mean'
-export { createMedian } from './function/statistics/median'
-export { createMad } from './function/statistics/mad'
-export { createVariance } from './function/statistics/variance'
-export { createQuantileSeq } from './function/statistics/quantileSeq'
-export { createStd } from './function/statistics/std'
-export { createCombinations } from './function/probability/combinations'
-export { createCombinationsWithRep } from './function/probability/combinationsWithRep'
-export { createGamma } from './function/probability/gamma'
-export { createFactorial } from './function/probability/factorial'
-export { createKldivergence } from './function/probability/kldivergence'
-export { createMultinomial } from './function/probability/multinomial'
-export { createPermutations } from './function/probability/permutations'
-export { createPickRandom } from './function/probability/pickRandom'
-export { createRandom } from './function/probability/random'
-export { createRandomInt } from './function/probability/randomInt'
-export { createStirlingS2 } from './function/combinatorics/stirlingS2'
-export { createBellNumbers } from './function/combinatorics/bellNumbers'
-export { createCatalan } from './function/combinatorics/catalan'
-export { createComposition } from './function/combinatorics/composition'
-export { createSimplify } from './function/algebra/simplify'
-export { createDerivative } from './function/algebra/derivative'
-export { createRationalize } from './function/algebra/rationalize'
-export { createReviver } from './json/reviver'
-export { createReplacer } from './json/replacer'
+export { createTyped } from './core/function/typed.js'
+export { createResultSet } from './type/resultset/ResultSet.js'
+export { createBigNumberClass } from './type/bignumber/BigNumber.js'
+export { createComplexClass } from './type/complex/Complex.js'
+export { createFractionClass } from './type/fraction/Fraction.js'
+export { createRangeClass } from './type/matrix/Range.js'
+export { createMatrixClass } from './type/matrix/Matrix.js'
+export { createDenseMatrixClass } from './type/matrix/DenseMatrix.js'
+export { createClone } from './function/utils/clone.js'
+export { createIsInteger } from './function/utils/isInteger.js'
+export { createIsNegative } from './function/utils/isNegative.js'
+export { createIsNumeric } from './function/utils/isNumeric.js'
+export { createHasNumericValue } from './function/utils/hasNumericValue.js'
+export { createIsPositive } from './function/utils/isPositive.js'
+export { createIsZero } from './function/utils/isZero.js'
+export { createIsNaN } from './function/utils/isNaN.js'
+export { createTypeOf } from './function/utils/typeOf.js'
+export { createEqualScalar } from './function/relational/equalScalar.js'
+export { createSparseMatrixClass } from './type/matrix/SparseMatrix.js'
+export { createNumber } from './type/number.js'
+export { createString } from './type/string.js'
+export { createBoolean } from './type/boolean.js'
+export { createBignumber } from './type/bignumber/function/bignumber.js'
+export { createComplex } from './type/complex/function/complex.js'
+export { createFraction } from './type/fraction/function/fraction.js'
+export { createMatrix } from './type/matrix/function/matrix.js'
+export { createSplitUnit } from './type/unit/function/splitUnit.js'
+export { createUnaryMinus } from './function/arithmetic/unaryMinus.js'
+export { createUnaryPlus } from './function/arithmetic/unaryPlus.js'
+export { createAbs } from './function/arithmetic/abs.js'
+export { createApply } from './function/matrix/apply.js'
+export { createAddScalar } from './function/arithmetic/addScalar.js'
+export { createCbrt } from './function/arithmetic/cbrt.js'
+export { createCeil } from './function/arithmetic/ceil.js'
+export { createCube } from './function/arithmetic/cube.js'
+export { createExp } from './function/arithmetic/exp.js'
+export { createExpm1 } from './function/arithmetic/expm1.js'
+export { createFix } from './function/arithmetic/fix.js'
+export { createFloor } from './function/arithmetic/floor.js'
+export { createGcd } from './function/arithmetic/gcd.js'
+export { createLcm } from './function/arithmetic/lcm.js'
+export { createLog10 } from './function/arithmetic/log10.js'
+export { createLog2 } from './function/arithmetic/log2.js'
+export { createMod } from './function/arithmetic/mod.js'
+export { createMultiplyScalar } from './function/arithmetic/multiplyScalar.js'
+export { createMultiply } from './function/arithmetic/multiply.js'
+export { createNthRoot } from './function/arithmetic/nthRoot.js'
+export { createSign } from './function/arithmetic/sign.js'
+export { createSqrt } from './function/arithmetic/sqrt.js'
+export { createSquare } from './function/arithmetic/square.js'
+export { createSubtract } from './function/arithmetic/subtract.js'
+export { createXgcd } from './function/arithmetic/xgcd.js'
+export { createDotMultiply } from './function/arithmetic/dotMultiply.js'
+export { createBitAnd } from './function/bitwise/bitAnd.js'
+export { createBitNot } from './function/bitwise/bitNot.js'
+export { createBitOr } from './function/bitwise/bitOr.js'
+export { createBitXor } from './function/bitwise/bitXor.js'
+export { createArg } from './function/complex/arg.js'
+export { createConj } from './function/complex/conj.js'
+export { createIm } from './function/complex/im.js'
+export { createRe } from './function/complex/re.js'
+export { createNot } from './function/logical/not.js'
+export { createOr } from './function/logical/or.js'
+export { createXor } from './function/logical/xor.js'
+export { createConcat } from './function/matrix/concat.js'
+export { createColumn } from './function/matrix/column.js'
+export { createCross } from './function/matrix/cross.js'
+export { createDiag } from './function/matrix/diag.js'
+export { createFilter } from './function/matrix/filter.js'
+export { createFlatten } from './function/matrix/flatten.js'
+export { createForEach } from './function/matrix/forEach.js'
+export { createGetMatrixDataType } from './function/matrix/getMatrixDataType.js'
+export { createIdentity } from './function/matrix/identity.js'
+export { createKron } from './function/matrix/kron.js'
+export { createMap } from './function/matrix/map.js'
+export { createDiff } from './function/matrix/diff.js'
+export { createOnes } from './function/matrix/ones.js'
+export { createRange } from './function/matrix/range.js'
+export { createReshape } from './function/matrix/reshape.js'
+export { createResize } from './function/matrix/resize.js'
+export { createRow } from './function/matrix/row.js'
+export { createSize } from './function/matrix/size.js'
+export { createSqueeze } from './function/matrix/squeeze.js'
+export { createSubset } from './function/matrix/subset.js'
+export { createTranspose } from './function/matrix/transpose.js'
+export { createCtranspose } from './function/matrix/ctranspose.js'
+export { createZeros } from './function/matrix/zeros.js'
+export { createErf } from './function/special/erf.js'
+export { createMode } from './function/statistics/mode.js'
+export { createProd } from './function/statistics/prod.js'
+export { createFormat } from './function/string/format.js'
+export { createPrint } from './function/string/print.js'
+export { createTo } from './function/unit/to.js'
+export { createIsPrime } from './function/utils/isPrime.js'
+export { createNumeric } from './function/utils/numeric.js'
+export { createDivideScalar } from './function/arithmetic/divideScalar.js'
+export { createPow } from './function/arithmetic/pow.js'
+export { createRound } from './function/arithmetic/round.js'
+export { createLog } from './function/arithmetic/log.js'
+export { createLog1p } from './function/arithmetic/log1p.js'
+export { createNthRoots } from './function/arithmetic/nthRoots.js'
+export { createDotPow } from './function/arithmetic/dotPow.js'
+export { createDotDivide } from './function/arithmetic/dotDivide.js'
+export { createLsolve } from './function/algebra/solver/lsolve.js'
+export { createUsolve } from './function/algebra/solver/usolve.js'
+export { createLsolveAll } from './function/algebra/solver/lsolveAll.js'
+export { createUsolveAll } from './function/algebra/solver/usolveAll.js'
+export { createLeftShift } from './function/bitwise/leftShift.js'
+export { createRightArithShift } from './function/bitwise/rightArithShift.js'
+export { createRightLogShift } from './function/bitwise/rightLogShift.js'
+export { createAnd } from './function/logical/and.js'
+export { createCompare } from './function/relational/compare.js'
+export { createCompareNatural } from './function/relational/compareNatural.js'
+export { createCompareText } from './function/relational/compareText.js'
+export { createEqual } from './function/relational/equal.js'
+export { createEqualText } from './function/relational/equalText.js'
+export { createSmaller } from './function/relational/smaller.js'
+export { createSmallerEq } from './function/relational/smallerEq.js'
+export { createLarger } from './function/relational/larger.js'
+export { createLargerEq } from './function/relational/largerEq.js'
+export { createDeepEqual } from './function/relational/deepEqual.js'
+export { createUnequal } from './function/relational/unequal.js'
+export { createPartitionSelect } from './function/matrix/partitionSelect.js'
+export { createSort } from './function/matrix/sort.js'
+export { createMax } from './function/statistics/max.js'
+export { createMin } from './function/statistics/min.js'
+export { createImmutableDenseMatrixClass } from './type/matrix/ImmutableDenseMatrix.js'
+export { createIndexClass } from './type/matrix/MatrixIndex.js'
+export { createFibonacciHeapClass } from './type/matrix/FibonacciHeap.js'
+export { createSpaClass } from './type/matrix/Spa.js'
+export { createUnitClass } from './type/unit/Unit.js'
+export { createUnitFunction } from './type/unit/function/unit.js'
+export { createSparse } from './type/matrix/function/sparse.js'
+export { createCreateUnit } from './type/unit/function/createUnit.js'
+export { createAcos } from './function/trigonometry/acos.js'
+export { createAcosh } from './function/trigonometry/acosh.js'
+export { createAcot } from './function/trigonometry/acot.js'
+export { createAcoth } from './function/trigonometry/acoth.js'
+export { createAcsc } from './function/trigonometry/acsc.js'
+export { createAcsch } from './function/trigonometry/acsch.js'
+export { createAsec } from './function/trigonometry/asec.js'
+export { createAsech } from './function/trigonometry/asech.js'
+export { createAsin } from './function/trigonometry/asin.js'
+export { createAsinh } from './function/trigonometry/asinh.js'
+export { createAtan } from './function/trigonometry/atan.js'
+export { createAtan2 } from './function/trigonometry/atan2.js'
+export { createAtanh } from './function/trigonometry/atanh.js'
+export { createCos } from './function/trigonometry/cos.js'
+export { createCosh } from './function/trigonometry/cosh.js'
+export { createCot } from './function/trigonometry/cot.js'
+export { createCoth } from './function/trigonometry/coth.js'
+export { createCsc } from './function/trigonometry/csc.js'
+export { createCsch } from './function/trigonometry/csch.js'
+export { createSec } from './function/trigonometry/sec.js'
+export { createSech } from './function/trigonometry/sech.js'
+export { createSin } from './function/trigonometry/sin.js'
+export { createSinh } from './function/trigonometry/sinh.js'
+export { createTan } from './function/trigonometry/tan.js'
+export { createTanh } from './function/trigonometry/tanh.js'
+export { createSetCartesian } from './function/set/setCartesian.js'
+export { createSetDifference } from './function/set/setDifference.js'
+export { createSetDistinct } from './function/set/setDistinct.js'
+export { createSetIntersect } from './function/set/setIntersect.js'
+export { createSetIsSubset } from './function/set/setIsSubset.js'
+export { createSetMultiplicity } from './function/set/setMultiplicity.js'
+export { createSetPowerset } from './function/set/setPowerset.js'
+export { createSetSize } from './function/set/setSize.js'
+export { createSetSymDifference } from './function/set/setSymDifference.js'
+export { createSetUnion } from './function/set/setUnion.js'
+export { createAdd } from './function/arithmetic/add.js'
+export { createHypot } from './function/arithmetic/hypot.js'
+export { createNorm } from './function/arithmetic/norm.js'
+export { createDot } from './function/matrix/dot.js'
+export { createTrace } from './function/matrix/trace.js'
+export { createIndex } from './type/matrix/function/index.js'
+export { createNode } from './expression/node/Node.js'
+export { createAccessorNode } from './expression/node/AccessorNode.js'
+export { createArrayNode } from './expression/node/ArrayNode.js'
+export { createAssignmentNode } from './expression/node/AssignmentNode.js'
+export { createBlockNode } from './expression/node/BlockNode.js'
+export { createConditionalNode } from './expression/node/ConditionalNode.js'
+export { createConstantNode } from './expression/node/ConstantNode.js'
+export { createFunctionAssignmentNode } from './expression/node/FunctionAssignmentNode.js'
+export { createIndexNode } from './expression/node/IndexNode.js'
+export { createObjectNode } from './expression/node/ObjectNode.js'
+export { createOperatorNode } from './expression/node/OperatorNode.js'
+export { createParenthesisNode } from './expression/node/ParenthesisNode.js'
+export { createRangeNode } from './expression/node/RangeNode.js'
+export { createRelationalNode } from './expression/node/RelationalNode.js'
+export { createSymbolNode } from './expression/node/SymbolNode.js'
+export { createFunctionNode } from './expression/node/FunctionNode.js'
+export { createParse } from './expression/parse.js'
+export { createCompile } from './expression/function/compile.js'
+export { createEvaluate } from './expression/function/evaluate.js'
+export { createParserClass } from './expression/Parser.js'
+export { createParser } from './expression/function/parser.js'
+export { createLup } from './function/algebra/decomposition/lup.js'
+export { createQr } from './function/algebra/decomposition/qr.js'
+export { createSlu } from './function/algebra/decomposition/slu.js'
+export { createLusolve } from './function/algebra/solver/lusolve.js'
+export { createHelpClass } from './expression/Help.js'
+export { createChainClass } from './type/chain/Chain.js'
+export { createHelp } from './expression/function/help.js'
+export { createChain } from './type/chain/function/chain.js'
+export { createDet } from './function/matrix/det.js'
+export { createInv } from './function/matrix/inv.js'
+export { createEigs } from './function/matrix/eigs.js'
+export { createExpm } from './function/matrix/expm.js'
+export { createSqrtm } from './function/matrix/sqrtm.js'
+export { createDivide } from './function/arithmetic/divide.js'
+export { createDistance } from './function/geometry/distance.js'
+export { createIntersect } from './function/geometry/intersect.js'
+export { createSum } from './function/statistics/sum.js'
+export { createMean } from './function/statistics/mean.js'
+export { createMedian } from './function/statistics/median.js'
+export { createMad } from './function/statistics/mad.js'
+export { createVariance } from './function/statistics/variance.js'
+export { createQuantileSeq } from './function/statistics/quantileSeq.js'
+export { createStd } from './function/statistics/std.js'
+export { createCombinations } from './function/probability/combinations.js'
+export { createCombinationsWithRep } from './function/probability/combinationsWithRep.js'
+export { createGamma } from './function/probability/gamma.js'
+export { createFactorial } from './function/probability/factorial.js'
+export { createKldivergence } from './function/probability/kldivergence.js'
+export { createMultinomial } from './function/probability/multinomial.js'
+export { createPermutations } from './function/probability/permutations.js'
+export { createPickRandom } from './function/probability/pickRandom.js'
+export { createRandom } from './function/probability/random.js'
+export { createRandomInt } from './function/probability/randomInt.js'
+export { createStirlingS2 } from './function/combinatorics/stirlingS2.js'
+export { createBellNumbers } from './function/combinatorics/bellNumbers.js'
+export { createCatalan } from './function/combinatorics/catalan.js'
+export { createComposition } from './function/combinatorics/composition.js'
+export { createSimplify } from './function/algebra/simplify.js'
+export { createDerivative } from './function/algebra/derivative.js'
+export { createRationalize } from './function/algebra/rationalize.js'
+export { createReviver } from './json/reviver.js'
+export { createReplacer } from './json/replacer.js'
 export {
   createE,
   createUppercaseE,
@@ -256,7 +256,7 @@ export {
   createTau,
   createTrue,
   createVersion
-} from './constants'
+} from './constants.js'
 export {
   createAtomicMass,
   createAvogadro,
@@ -308,21 +308,21 @@ export {
   createVacuumImpedance,
   createWeakMixingAngle,
   createWienDisplacement
-} from './type/unit/physicalConstants'
-export { createApplyTransform } from './expression/transform/apply.transform'
-export { createColumnTransform } from './expression/transform/column.transform'
-export { createFilterTransform } from './expression/transform/filter.transform'
-export { createForEachTransform } from './expression/transform/forEach.transform'
-export { createIndexTransform } from './expression/transform/index.transform'
-export { createMapTransform } from './expression/transform/map.transform'
-export { createMaxTransform } from './expression/transform/max.transform'
-export { createMeanTransform } from './expression/transform/mean.transform'
-export { createMinTransform } from './expression/transform/min.transform'
-export { createRangeTransform } from './expression/transform/range.transform'
-export { createRowTransform } from './expression/transform/row.transform'
-export { createSubsetTransform } from './expression/transform/subset.transform'
-export { createConcatTransform } from './expression/transform/concat.transform'
-export { createDiffTransform } from './expression/transform/diff.transform'
-export { createStdTransform } from './expression/transform/std.transform'
-export { createSumTransform } from './expression/transform/sum.transform'
-export { createVarianceTransform } from './expression/transform/variance.transform'
+} from './type/unit/physicalConstants.js'
+export { createApplyTransform } from './expression/transform/apply.transform.js'
+export { createColumnTransform } from './expression/transform/column.transform.js'
+export { createFilterTransform } from './expression/transform/filter.transform.js'
+export { createForEachTransform } from './expression/transform/forEach.transform.js'
+export { createIndexTransform } from './expression/transform/index.transform.js'
+export { createMapTransform } from './expression/transform/map.transform.js'
+export { createMaxTransform } from './expression/transform/max.transform.js'
+export { createMeanTransform } from './expression/transform/mean.transform.js'
+export { createMinTransform } from './expression/transform/min.transform.js'
+export { createRangeTransform } from './expression/transform/range.transform.js'
+export { createRowTransform } from './expression/transform/row.transform.js'
+export { createSubsetTransform } from './expression/transform/subset.transform.js'
+export { createConcatTransform } from './expression/transform/concat.transform.js'
+export { createDiffTransform } from './expression/transform/diff.transform.js'
+export { createStdTransform } from './expression/transform/std.transform.js'
+export { createSumTransform } from './expression/transform/sum.transform.js'
+export { createVarianceTransform } from './expression/transform/variance.transform.js'
diff --git a/src/factoriesNumber.js b/src/factoriesNumber.js
index 8430603a83..3350e4b7fc 100644
--- a/src/factoriesNumber.js
+++ b/src/factoriesNumber.js
@@ -69,29 +69,29 @@ import {
   unaryPlusNumber,
   xgcdNumber,
   xorNumber
-} from './plain/number'
+} from './plain/number/index.js'
 
-import { factory } from './utils/factory'
-import { noIndex, noMatrix, noSubset } from './utils/noop'
+import { factory } from './utils/factory.js'
+import { noIndex, noMatrix, noSubset } from './utils/noop.js'
 
 // ----------------------------------------------------------------------------
 // classes and functions
 
 // core
-export { createTyped } from './core/function/typed'
+export { createTyped } from './core/function/typed.js'
 
 // classes
-export { createResultSet } from './type/resultset/ResultSet'
-export { createRangeClass } from './type/matrix/Range'
-export { createHelpClass } from './expression/Help'
-export { createChainClass } from './type/chain/Chain'
-export { createHelp } from './expression/function/help'
-export { createChain } from './type/chain/function/chain'
+export { createResultSet } from './type/resultset/ResultSet.js'
+export { createRangeClass } from './type/matrix/Range.js'
+export { createHelpClass } from './expression/Help.js'
+export { createChainClass } from './type/chain/Chain.js'
+export { createHelp } from './expression/function/help.js'
+export { createChain } from './type/chain/function/chain.js'
 
 // algebra
-export { createSimplify } from './function/algebra/simplify'
-export { createDerivative } from './function/algebra/derivative'
-export { createRationalize } from './function/algebra/rationalize'
+export { createSimplify } from './function/algebra/simplify.js'
+export { createDerivative } from './function/algebra/derivative.js'
+export { createRationalize } from './function/algebra/rationalize.js'
 
 // arithmetic
 export const createUnaryMinus = /* #__PURE__ */ createNumberFactory('unaryMinus', unaryMinusNumber)
@@ -112,7 +112,7 @@ export const createLog2 = /* #__PURE__ */ createNumberFactory('log2', log2Number
 export const createMod = /* #__PURE__ */ createNumberFactory('mod', modNumber)
 export const createMultiplyScalar = /* #__PURE__ */ createNumberFactory('multiplyScalar', multiplyNumber)
 export const createMultiply = /* #__PURE__ */ createNumberFactory('multiply', multiplyNumber)
-export { createNthRootNumber as createNthRoot } from './function/arithmetic/nthRoot'
+export { createNthRootNumber as createNthRoot } from './function/arithmetic/nthRoot.js'
 export const createSign = /* #__PURE__ */ createNumberFactory('sign', signNumber)
 export const createSqrt = /* #__PURE__ */ createNumberFactory('sqrt', sqrtNumber)
 export const createSquare = /* #__PURE__ */ createNumberFactory('square', squareNumber)
@@ -120,11 +120,11 @@ export const createSubtract = /* #__PURE__ */ createNumberFactory('subtract', su
 export const createXgcd = /* #__PURE__ */ createNumberFactory('xgcd', xgcdNumber)
 export const createDivideScalar = /* #__PURE__ */ createNumberFactory('divideScalar', divideNumber)
 export const createPow = /* #__PURE__ */ createNumberFactory('pow', powNumber)
-export { createRoundNumber as createRound } from './function/arithmetic/round'
+export { createRoundNumber as createRound } from './function/arithmetic/round.js'
 export const createLog = /* #__PURE__ */ createNumberFactory('log', logNumber)
 export const createLog1p = /* #__PURE__ */ createNumberFactory('log1p', log1pNumber)
 export const createAdd = /* #__PURE__ */ createNumberFactory('add', addNumber)
-export { createHypot } from './function/arithmetic/hypot'
+export { createHypot } from './function/arithmetic/hypot.js'
 export const createNorm = /* #__PURE__ */ createNumberFactory('norm', normNumber)
 export const createDivide = /* #__PURE__ */ createNumberFactory('divide', divideNumber)
 
@@ -138,10 +138,10 @@ export const createRightArithShift = /* #__PURE__ */ createNumberFactory('rightA
 export const createRightLogShift = /* #__PURE__ */ createNumberFactory('rightLogShift', rightLogShiftNumber)
 
 // combinatorics
-export { createStirlingS2 } from './function/combinatorics/stirlingS2'
-export { createBellNumbers } from './function/combinatorics/bellNumbers'
-export { createCatalan } from './function/combinatorics/catalan'
-export { createComposition } from './function/combinatorics/composition'
+export { createStirlingS2 } from './function/combinatorics/stirlingS2.js'
+export { createBellNumbers } from './function/combinatorics/bellNumbers.js'
+export { createCatalan } from './function/combinatorics/catalan.js'
+export { createComposition } from './function/combinatorics/composition.js'
 
 // constants
 export {
@@ -164,35 +164,35 @@ export {
   createTau,
   createTrue,
   createVersion
-} from './constants'
+} from './constants.js'
 
 // create
-export { createNumber } from './type/number'
-export { createString } from './type/string'
-export { createBoolean } from './type/boolean'
-export { createParser } from './expression/function/parser'
+export { createNumber } from './type/number.js'
+export { createString } from './type/string.js'
+export { createBoolean } from './type/boolean.js'
+export { createParser } from './expression/function/parser.js'
 
 // expression
-export { createNode } from './expression/node/Node'
-export { createAccessorNode } from './expression/node/AccessorNode'
-export { createArrayNode } from './expression/node/ArrayNode'
-export { createAssignmentNode } from './expression/node/AssignmentNode'
-export { createBlockNode } from './expression/node/BlockNode'
-export { createConditionalNode } from './expression/node/ConditionalNode'
-export { createConstantNode } from './expression/node/ConstantNode'
-export { createFunctionAssignmentNode } from './expression/node/FunctionAssignmentNode'
-export { createIndexNode } from './expression/node/IndexNode'
-export { createObjectNode } from './expression/node/ObjectNode'
-export { createOperatorNode } from './expression/node/OperatorNode'
-export { createParenthesisNode } from './expression/node/ParenthesisNode'
-export { createRangeNode } from './expression/node/RangeNode'
-export { createRelationalNode } from './expression/node/RelationalNode'
-export { createSymbolNode } from './expression/node/SymbolNode'
-export { createFunctionNode } from './expression/node/FunctionNode'
-export { createParse } from './expression/parse'
-export { createCompile } from './expression/function/compile'
-export { createEvaluate } from './expression/function/evaluate'
-export { createParserClass } from './expression/Parser'
+export { createNode } from './expression/node/Node.js'
+export { createAccessorNode } from './expression/node/AccessorNode.js'
+export { createArrayNode } from './expression/node/ArrayNode.js'
+export { createAssignmentNode } from './expression/node/AssignmentNode.js'
+export { createBlockNode } from './expression/node/BlockNode.js'
+export { createConditionalNode } from './expression/node/ConditionalNode.js'
+export { createConstantNode } from './expression/node/ConstantNode.js'
+export { createFunctionAssignmentNode } from './expression/node/FunctionAssignmentNode.js'
+export { createIndexNode } from './expression/node/IndexNode.js'
+export { createObjectNode } from './expression/node/ObjectNode.js'
+export { createOperatorNode } from './expression/node/OperatorNode.js'
+export { createParenthesisNode } from './expression/node/ParenthesisNode.js'
+export { createRangeNode } from './expression/node/RangeNode.js'
+export { createRelationalNode } from './expression/node/RelationalNode.js'
+export { createSymbolNode } from './expression/node/SymbolNode.js'
+export { createFunctionNode } from './expression/node/FunctionNode.js'
+export { createParse } from './expression/parse.js'
+export { createCompile } from './expression/function/compile.js'
+export { createEvaluate } from './expression/function/evaluate.js'
+export { createParserClass } from './expression/Parser.js'
 
 // logical
 export const createAnd = /* #__PURE__ */ createNumberFactory('and', andNumber)
@@ -201,64 +201,64 @@ export const createOr = /* #__PURE__ */ createNumberFactory('or', orNumber)
 export const createXor = /* #__PURE__ */ createNumberFactory('xor', xorNumber)
 
 // matrix
-export { createApply } from './function/matrix/apply'
-export { createFilter } from './function/matrix/filter'
-export { createForEach } from './function/matrix/forEach'
-export { createMap } from './function/matrix/map'
-export { createRange } from './function/matrix/range'
-export { createSize } from './function/matrix/size'
+export { createApply } from './function/matrix/apply.js'
+export { createFilter } from './function/matrix/filter.js'
+export { createForEach } from './function/matrix/forEach.js'
+export { createMap } from './function/matrix/map.js'
+export { createRange } from './function/matrix/range.js'
+export { createSize } from './function/matrix/size.js'
 // FIXME: create a lightweight "number" implementation of subset only supporting plain objects/arrays
 export const createIndex = /* #__PURE__ */ factory('index', [], () => noIndex)
 export const createMatrix = /* #__PURE__ */ factory('matrix', [], () => noMatrix) // FIXME: needed now because subset transform needs it. Remove the need for it in subset
 export const createSubset = /* #__PURE__ */ factory('subset', [], () => noSubset)
 // TODO: provide number+array implementations for map, filter, forEach, zeros, ...?
 // TODO: create range implementation for range?
-export { createPartitionSelect } from './function/matrix/partitionSelect'
+export { createPartitionSelect } from './function/matrix/partitionSelect.js'
 
 // probability
 export const createCombinations = createNumberFactory('combinations', combinationsNumber)
 export const createGamma = createNumberFactory('gamma', gammaNumber)
-export { createCombinationsWithRep } from './function/probability/combinationsWithRep'
-export { createFactorial } from './function/probability/factorial'
-export { createMultinomial } from './function/probability/multinomial'
-export { createPermutations } from './function/probability/permutations'
-export { createPickRandom } from './function/probability/pickRandom'
-export { createRandomNumber as createRandom } from './function/probability/random'
-export { createRandomInt } from './function/probability/randomInt'
+export { createCombinationsWithRep } from './function/probability/combinationsWithRep.js'
+export { createFactorial } from './function/probability/factorial.js'
+export { createMultinomial } from './function/probability/multinomial.js'
+export { createPermutations } from './function/probability/permutations.js'
+export { createPickRandom } from './function/probability/pickRandom.js'
+export { createRandomNumber as createRandom } from './function/probability/random.js'
+export { createRandomInt } from './function/probability/randomInt.js'
 
 // relational
-export { createEqualScalarNumber as createEqualScalar } from './function/relational/equalScalar'
-export { createCompareNumber as createCompare } from './function/relational/compare'
-export { createCompareNatural } from './function/relational/compareNatural'
-export { createCompareTextNumber as createCompareText } from './function/relational/compareText'
-export { createEqualNumber as createEqual } from './function/relational/equal'
-export { createEqualText } from './function/relational/equalText'
-export { createSmallerNumber as createSmaller } from './function/relational/smaller'
-export { createSmallerEqNumber as createSmallerEq } from './function/relational/smallerEq'
-export { createLargerNumber as createLarger } from './function/relational/larger'
-export { createLargerEqNumber as createLargerEq } from './function/relational/largerEq'
-export { createDeepEqual } from './function/relational/deepEqual'
-export { createUnequalNumber as createUnequal } from './function/relational/unequal'
+export { createEqualScalarNumber as createEqualScalar } from './function/relational/equalScalar.js'
+export { createCompareNumber as createCompare } from './function/relational/compare.js'
+export { createCompareNatural } from './function/relational/compareNatural.js'
+export { createCompareTextNumber as createCompareText } from './function/relational/compareText.js'
+export { createEqualNumber as createEqual } from './function/relational/equal.js'
+export { createEqualText } from './function/relational/equalText.js'
+export { createSmallerNumber as createSmaller } from './function/relational/smaller.js'
+export { createSmallerEqNumber as createSmallerEq } from './function/relational/smallerEq.js'
+export { createLargerNumber as createLarger } from './function/relational/larger.js'
+export { createLargerEqNumber as createLargerEq } from './function/relational/largerEq.js'
+export { createDeepEqual } from './function/relational/deepEqual.js'
+export { createUnequalNumber as createUnequal } from './function/relational/unequal.js'
 
 // special
-export { createErf } from './function/special/erf'
+export { createErf } from './function/special/erf.js'
 
 // statistics
-export { createMode } from './function/statistics/mode'
-export { createProd } from './function/statistics/prod'
-export { createMax } from './function/statistics/max'
-export { createMin } from './function/statistics/min'
-export { createSum } from './function/statistics/sum'
-export { createMean } from './function/statistics/mean'
-export { createMedian } from './function/statistics/median'
-export { createMad } from './function/statistics/mad'
-export { createVariance } from './function/statistics/variance'
-export { createQuantileSeq } from './function/statistics/quantileSeq'
-export { createStd } from './function/statistics/std'
+export { createMode } from './function/statistics/mode.js'
+export { createProd } from './function/statistics/prod.js'
+export { createMax } from './function/statistics/max.js'
+export { createMin } from './function/statistics/min.js'
+export { createSum } from './function/statistics/sum.js'
+export { createMean } from './function/statistics/mean.js'
+export { createMedian } from './function/statistics/median.js'
+export { createMad } from './function/statistics/mad.js'
+export { createVariance } from './function/statistics/variance.js'
+export { createQuantileSeq } from './function/statistics/quantileSeq.js'
+export { createStd } from './function/statistics/std.js'
 
 // string
-export { createFormat } from './function/string/format'
-export { createPrint } from './function/string/print'
+export { createFormat } from './function/string/format.js'
+export { createPrint } from './function/string/print.js'
 
 // trigonometry
 export const createAcos = /* #__PURE__ */ createNumberFactory('acos', acosNumber)
@@ -288,35 +288,35 @@ export const createTan = /* #__PURE__ */ createNumberFactory('tan', tanNumber)
 export const createTanh = /* #__PURE__ */ createNumberFactory('tanh', tanhNumber)
 
 // transforms
-export { createApplyTransform } from './expression/transform/apply.transform'
-export { createFilterTransform } from './expression/transform/filter.transform'
-export { createForEachTransform } from './expression/transform/forEach.transform'
-export { createMapTransform } from './expression/transform/map.transform'
-export { createMaxTransform } from './expression/transform/max.transform'
-export { createMeanTransform } from './expression/transform/mean.transform'
-export { createMinTransform } from './expression/transform/min.transform'
-export { createRangeTransform } from './expression/transform/range.transform'
-export { createSubsetTransform } from './expression/transform/subset.transform'
-export { createStdTransform } from './expression/transform/std.transform'
-export { createSumTransform } from './expression/transform/sum.transform'
-export { createVarianceTransform } from './expression/transform/variance.transform'
+export { createApplyTransform } from './expression/transform/apply.transform.js'
+export { createFilterTransform } from './expression/transform/filter.transform.js'
+export { createForEachTransform } from './expression/transform/forEach.transform.js'
+export { createMapTransform } from './expression/transform/map.transform.js'
+export { createMaxTransform } from './expression/transform/max.transform.js'
+export { createMeanTransform } from './expression/transform/mean.transform.js'
+export { createMinTransform } from './expression/transform/min.transform.js'
+export { createRangeTransform } from './expression/transform/range.transform.js'
+export { createSubsetTransform } from './expression/transform/subset.transform.js'
+export { createStdTransform } from './expression/transform/std.transform.js'
+export { createSumTransform } from './expression/transform/sum.transform.js'
+export { createVarianceTransform } from './expression/transform/variance.transform.js'
 
 // utils
-export { createClone } from './function/utils/clone'
+export { createClone } from './function/utils/clone.js'
 export const createIsInteger = /* #__PURE__ */ createNumberFactory('isInteger', isIntegerNumber)
 export const createIsNegative = /* #__PURE__ */ createNumberFactory('isNegative', isNegativeNumber)
-export { createIsNumeric } from './function/utils/isNumeric'
-export { createHasNumericValue } from './function/utils/hasNumericValue'
+export { createIsNumeric } from './function/utils/isNumeric.js'
+export { createHasNumericValue } from './function/utils/hasNumericValue.js'
 export const createIsPositive = /* #__PURE__ */ createNumberFactory('isPositive', isPositiveNumber)
 export const createIsZero = /* #__PURE__ */ createNumberFactory('isZero', isZeroNumber)
 export const createIsNaN = /* #__PURE__ */ createNumberFactory('isNaN', isNaNNumber)
-export { createTypeOf } from './function/utils/typeOf'
-export { createIsPrime } from './function/utils/isPrime'
-export { createNumeric } from './function/utils/numeric'
+export { createTypeOf } from './function/utils/typeOf.js'
+export { createIsPrime } from './function/utils/isPrime.js'
+export { createNumeric } from './function/utils/numeric.js'
 
 // json
-export { createReviver } from './json/reviver'
-export { createReplacer } from './json/replacer'
+export { createReviver } from './json/reviver.js'
+export { createReplacer } from './json/replacer.js'
 
 // helper function to create a factory function for a function which only needs typed-function
 function createNumberFactory (name, fn) {
diff --git a/src/function/algebra/decomposition/lup.js b/src/function/algebra/decomposition/lup.js
index abfc5f9410..d841aaffd5 100644
--- a/src/function/algebra/decomposition/lup.js
+++ b/src/function/algebra/decomposition/lup.js
@@ -1,5 +1,5 @@
-import { clone } from '../../../utils/object'
-import { factory } from '../../../utils/factory'
+import { clone } from '../../../utils/object.js'
+import { factory } from '../../../utils/factory.js'
 
 const name = 'lup'
 const dependencies = [
diff --git a/src/function/algebra/decomposition/qr.js b/src/function/algebra/decomposition/qr.js
index 883917bbd8..03bf7b17a9 100644
--- a/src/function/algebra/decomposition/qr.js
+++ b/src/function/algebra/decomposition/qr.js
@@ -1,4 +1,4 @@
-import { factory } from '../../../utils/factory'
+import { factory } from '../../../utils/factory.js'
 
 const name = 'qr'
 const dependencies = [
diff --git a/src/function/algebra/decomposition/slu.js b/src/function/algebra/decomposition/slu.js
index 1f1c0fbe14..991bd1a4ab 100644
--- a/src/function/algebra/decomposition/slu.js
+++ b/src/function/algebra/decomposition/slu.js
@@ -1,7 +1,7 @@
-import { isInteger } from '../../../utils/number'
-import { factory } from '../../../utils/factory'
-import { createCsSqr } from '../sparse/csSqr'
-import { createCsLu } from '../sparse/csLu'
+import { isInteger } from '../../../utils/number.js'
+import { factory } from '../../../utils/factory.js'
+import { createCsSqr } from '../sparse/csSqr.js'
+import { createCsLu } from '../sparse/csLu.js'
 
 const name = 'slu'
 const dependencies = [
diff --git a/src/function/algebra/derivative.js b/src/function/algebra/derivative.js
index 2d55b868cf..745d810caf 100644
--- a/src/function/algebra/derivative.js
+++ b/src/function/algebra/derivative.js
@@ -1,5 +1,5 @@
-import { isConstantNode, typeOf } from '../../utils/is'
-import { factory } from '../../utils/factory'
+import { isConstantNode, typeOf } from '../../utils/is.js'
+import { factory } from '../../utils/factory.js'
 
 const name = 'derivative'
 const dependencies = [
diff --git a/src/function/algebra/rationalize.js b/src/function/algebra/rationalize.js
index dd2206e210..59e27d25a2 100644
--- a/src/function/algebra/rationalize.js
+++ b/src/function/algebra/rationalize.js
@@ -1,7 +1,7 @@
-import { isInteger } from '../../utils/number'
-import { factory } from '../../utils/factory'
-import { createSimplifyConstant } from './simplify/simplifyConstant'
-import { createSimplifyCore } from './simplify/simplifyCore'
+import { isInteger } from '../../utils/number.js'
+import { factory } from '../../utils/factory.js'
+import { createSimplifyConstant } from './simplify/simplifyConstant.js'
+import { createSimplifyCore } from './simplify/simplifyCore.js'
 
 const name = 'rationalize'
 const dependencies = [
diff --git a/src/function/algebra/simplify.js b/src/function/algebra/simplify.js
index 2eefbca94d..1a18cb9509 100644
--- a/src/function/algebra/simplify.js
+++ b/src/function/algebra/simplify.js
@@ -1,10 +1,10 @@
-import { isConstantNode, isParenthesisNode } from '../../utils/is'
-import { factory } from '../../utils/factory'
-import { createUtil } from './simplify/util'
-import { createSimplifyCore } from './simplify/simplifyCore'
-import { createSimplifyConstant } from './simplify/simplifyConstant'
-import { createResolve } from './simplify/resolve'
-import { hasOwnProperty } from '../../utils/object'
+import { isConstantNode, isParenthesisNode } from '../../utils/is.js'
+import { factory } from '../../utils/factory.js'
+import { createUtil } from './simplify/util.js'
+import { createSimplifyCore } from './simplify/simplifyCore.js'
+import { createSimplifyConstant } from './simplify/simplifyConstant.js'
+import { createResolve } from './simplify/resolve.js'
+import { hasOwnProperty } from '../../utils/object.js'
 
 const name = 'simplify'
 const dependencies = [
diff --git a/src/function/algebra/simplify/resolve.js b/src/function/algebra/simplify/resolve.js
index ddaf5e7df0..7d7d638664 100644
--- a/src/function/algebra/simplify/resolve.js
+++ b/src/function/algebra/simplify/resolve.js
@@ -1,5 +1,5 @@
-import { isFunctionNode, isNode, isOperatorNode, isParenthesisNode, isSymbolNode } from '../../../utils/is'
-import { factory } from '../../../utils/factory'
+import { isFunctionNode, isNode, isOperatorNode, isParenthesisNode, isSymbolNode } from '../../../utils/is.js'
+import { factory } from '../../../utils/factory.js'
 
 const name = 'resolve'
 const dependencies = [
diff --git a/src/function/algebra/simplify/simplifyConstant.js b/src/function/algebra/simplify/simplifyConstant.js
index cb6b84b554..5747064b9b 100644
--- a/src/function/algebra/simplify/simplifyConstant.js
+++ b/src/function/algebra/simplify/simplifyConstant.js
@@ -1,8 +1,8 @@
 // TODO this could be improved by simplifying seperated constants under associative and commutative operators
-import { isFraction, isNode, isOperatorNode } from '../../../utils/is'
-import { factory } from '../../../utils/factory'
-import { createUtil } from './util'
-import { noBignumber, noFraction } from '../../../utils/noop'
+import { isFraction, isNode, isOperatorNode } from '../../../utils/is.js'
+import { factory } from '../../../utils/factory.js'
+import { createUtil } from './util.js'
+import { noBignumber, noFraction } from '../../../utils/noop.js'
 
 const name = 'simplifyConstant'
 const dependencies = [
diff --git a/src/function/algebra/simplify/simplifyCore.js b/src/function/algebra/simplify/simplifyCore.js
index e9e13c7e81..ad64cd551c 100644
--- a/src/function/algebra/simplify/simplifyCore.js
+++ b/src/function/algebra/simplify/simplifyCore.js
@@ -1,5 +1,5 @@
-import { isConstantNode, isFunctionNode, isOperatorNode, isParenthesisNode, isSymbolNode } from '../../../utils/is'
-import { factory } from '../../../utils/factory'
+import { isConstantNode, isFunctionNode, isOperatorNode, isParenthesisNode, isSymbolNode } from '../../../utils/is.js'
+import { factory } from '../../../utils/factory.js'
 
 const name = 'simplifyCore'
 const dependencies = [
diff --git a/src/function/algebra/simplify/util.js b/src/function/algebra/simplify/util.js
index 6a5a8ff4a0..0860bc9b80 100644
--- a/src/function/algebra/simplify/util.js
+++ b/src/function/algebra/simplify/util.js
@@ -1,6 +1,6 @@
-import { isOperatorNode } from '../../../utils/is'
-import { factory } from '../../../utils/factory'
-import { hasOwnProperty } from '../../../utils/object'
+import { isOperatorNode } from '../../../utils/is.js'
+import { factory } from '../../../utils/factory.js'
+import { hasOwnProperty } from '../../../utils/object.js'
 
 const name = 'simplifyUtil'
 const dependencies = [
diff --git a/src/function/algebra/solver/lsolve.js b/src/function/algebra/solver/lsolve.js
index eb1623930f..07703966a9 100644
--- a/src/function/algebra/solver/lsolve.js
+++ b/src/function/algebra/solver/lsolve.js
@@ -1,5 +1,5 @@
-import { factory } from '../../../utils/factory'
-import { createSolveValidation } from './utils/solveValidation'
+import { factory } from '../../../utils/factory.js'
+import { createSolveValidation } from './utils/solveValidation.js'
 
 const name = 'lsolve'
 const dependencies = [
diff --git a/src/function/algebra/solver/lsolveAll.js b/src/function/algebra/solver/lsolveAll.js
index 7a4c825785..1f80488f84 100644
--- a/src/function/algebra/solver/lsolveAll.js
+++ b/src/function/algebra/solver/lsolveAll.js
@@ -1,5 +1,5 @@
-import { factory } from '../../../utils/factory'
-import { createSolveValidation } from './utils/solveValidation'
+import { factory } from '../../../utils/factory.js'
+import { createSolveValidation } from './utils/solveValidation.js'
 
 const name = 'lsolveAll'
 const dependencies = [
diff --git a/src/function/algebra/solver/lusolve.js b/src/function/algebra/solver/lusolve.js
index 8bebb86051..d0f996d185 100644
--- a/src/function/algebra/solver/lusolve.js
+++ b/src/function/algebra/solver/lusolve.js
@@ -1,7 +1,7 @@
-import { isArray, isMatrix } from '../../../utils/is'
-import { factory } from '../../../utils/factory'
-import { createSolveValidation } from './utils/solveValidation'
-import { csIpvec } from '../sparse/csIpvec'
+import { isArray, isMatrix } from '../../../utils/is.js'
+import { factory } from '../../../utils/factory.js'
+import { createSolveValidation } from './utils/solveValidation.js'
+import { csIpvec } from '../sparse/csIpvec.js'
 
 const name = 'lusolve'
 const dependencies = [
diff --git a/src/function/algebra/solver/usolve.js b/src/function/algebra/solver/usolve.js
index 87bc9c93b2..c2c3577d74 100644
--- a/src/function/algebra/solver/usolve.js
+++ b/src/function/algebra/solver/usolve.js
@@ -1,5 +1,5 @@
-import { factory } from '../../../utils/factory'
-import { createSolveValidation } from './utils/solveValidation'
+import { factory } from '../../../utils/factory.js'
+import { createSolveValidation } from './utils/solveValidation.js'
 
 const name = 'usolve'
 const dependencies = [
diff --git a/src/function/algebra/solver/usolveAll.js b/src/function/algebra/solver/usolveAll.js
index 9e1b9822fd..5a9448e888 100644
--- a/src/function/algebra/solver/usolveAll.js
+++ b/src/function/algebra/solver/usolveAll.js
@@ -1,5 +1,5 @@
-import { factory } from '../../../utils/factory'
-import { createSolveValidation } from './utils/solveValidation'
+import { factory } from '../../../utils/factory.js'
+import { createSolveValidation } from './utils/solveValidation.js'
 
 const name = 'usolveAll'
 const dependencies = [
diff --git a/src/function/algebra/solver/utils/solveValidation.js b/src/function/algebra/solver/utils/solveValidation.js
index eb6dd66965..5970326f2a 100644
--- a/src/function/algebra/solver/utils/solveValidation.js
+++ b/src/function/algebra/solver/utils/solveValidation.js
@@ -1,6 +1,6 @@
-import { isArray, isMatrix, isDenseMatrix, isSparseMatrix } from '../../../../utils/is'
-import { arraySize } from '../../../../utils/array'
-import { format } from '../../../../utils/string'
+import { isArray, isMatrix, isDenseMatrix, isSparseMatrix } from '../../../../utils/is.js'
+import { arraySize } from '../../../../utils/array.js'
+import { format } from '../../../../utils/string.js'
 
 export function createSolveValidation ({ DenseMatrix }) {
   /**
diff --git a/src/function/algebra/sparse/csAmd.js b/src/function/algebra/sparse/csAmd.js
index ecdc721c09..3c105d54f4 100644
--- a/src/function/algebra/sparse/csAmd.js
+++ b/src/function/algebra/sparse/csAmd.js
@@ -1,7 +1,7 @@
-import { factory } from '../../../utils/factory'
-import { csFkeep } from './csFkeep'
-import { csFlip } from './csFlip'
-import { csTdfs } from './csTdfs'
+import { factory } from '../../../utils/factory.js'
+import { csFkeep } from './csFkeep.js'
+import { csFlip } from './csFlip.js'
+import { csTdfs } from './csTdfs.js'
 
 const name = 'csAmd'
 const dependencies = [
diff --git a/src/function/algebra/sparse/csChol.js b/src/function/algebra/sparse/csChol.js
index f8213d9eed..7f176c3d15 100644
--- a/src/function/algebra/sparse/csChol.js
+++ b/src/function/algebra/sparse/csChol.js
@@ -1,6 +1,6 @@
-import { factory } from '../../../utils/factory'
-import { csEreach } from './csEreach'
-import { createCsSymperm } from './csSymperm'
+import { factory } from '../../../utils/factory.js'
+import { csEreach } from './csEreach.js'
+import { createCsSymperm } from './csSymperm.js'
 
 const name = 'csChol'
 const dependencies = [
diff --git a/src/function/algebra/sparse/csCounts.js b/src/function/algebra/sparse/csCounts.js
index d00c106aa5..ded95c89c4 100644
--- a/src/function/algebra/sparse/csCounts.js
+++ b/src/function/algebra/sparse/csCounts.js
@@ -1,5 +1,5 @@
-import { factory } from '../../../utils/factory'
-import { csLeaf } from './csLeaf'
+import { factory } from '../../../utils/factory.js'
+import { csLeaf } from './csLeaf.js'
 
 const name = 'csCounts'
 const dependencies = [
diff --git a/src/function/algebra/sparse/csDfs.js b/src/function/algebra/sparse/csDfs.js
index 462fde1695..6ffe0708c4 100644
--- a/src/function/algebra/sparse/csDfs.js
+++ b/src/function/algebra/sparse/csDfs.js
@@ -1,6 +1,6 @@
-import { csMarked } from './csMarked'
-import { csMark } from './csMark'
-import { csUnflip } from './csUnflip'
+import { csMarked } from './csMarked.js'
+import { csMark } from './csMark.js'
+import { csUnflip } from './csUnflip.js'
 
 /**
  * Depth-first search computes the nonzero pattern xi of the directed graph G (Matrix) starting
diff --git a/src/function/algebra/sparse/csEreach.js b/src/function/algebra/sparse/csEreach.js
index 813e279d84..30ac8f041f 100644
--- a/src/function/algebra/sparse/csEreach.js
+++ b/src/function/algebra/sparse/csEreach.js
@@ -1,5 +1,5 @@
-import { csMark } from './csMark'
-import { csMarked } from './csMarked'
+import { csMark } from './csMark.js'
+import { csMarked } from './csMarked.js'
 
 /**
  * Find nonzero pattern of Cholesky L(k,1:k-1) using etree and triu(A(:,k))
diff --git a/src/function/algebra/sparse/csLu.js b/src/function/algebra/sparse/csLu.js
index 2035129b28..dcf2993996 100644
--- a/src/function/algebra/sparse/csLu.js
+++ b/src/function/algebra/sparse/csLu.js
@@ -1,5 +1,5 @@
-import { factory } from '../../../utils/factory'
-import { createCsSpsolve } from './csSpsolve'
+import { factory } from '../../../utils/factory.js'
+import { createCsSpsolve } from './csSpsolve.js'
 
 const name = 'csLu'
 const dependencies = [
diff --git a/src/function/algebra/sparse/csMark.js b/src/function/algebra/sparse/csMark.js
index be2e82a4d5..04a023d410 100644
--- a/src/function/algebra/sparse/csMark.js
+++ b/src/function/algebra/sparse/csMark.js
@@ -1,4 +1,4 @@
-import { csFlip } from './csFlip'
+import { csFlip } from './csFlip.js'
 
 /**
  * Marks the node at w[j]
diff --git a/src/function/algebra/sparse/csPost.js b/src/function/algebra/sparse/csPost.js
index b85ac2b459..146e124718 100644
--- a/src/function/algebra/sparse/csPost.js
+++ b/src/function/algebra/sparse/csPost.js
@@ -1,4 +1,4 @@
-import { csTdfs } from './csTdfs'
+import { csTdfs } from './csTdfs.js'
 
 /**
  * Post order a tree of forest
diff --git a/src/function/algebra/sparse/csReach.js b/src/function/algebra/sparse/csReach.js
index f187ce5ab9..e78d97c8d2 100644
--- a/src/function/algebra/sparse/csReach.js
+++ b/src/function/algebra/sparse/csReach.js
@@ -1,6 +1,6 @@
-import { csMarked } from './csMarked'
-import { csMark } from './csMark'
-import { csDfs } from './csDfs'
+import { csMarked } from './csMarked.js'
+import { csMark } from './csMark.js'
+import { csDfs } from './csDfs.js'
 
 /**
  * The csReach function computes X = Reach(B), where B is the nonzero pattern of the n-by-1
diff --git a/src/function/algebra/sparse/csSpsolve.js b/src/function/algebra/sparse/csSpsolve.js
index 5821ae4dfe..0872e2a46c 100644
--- a/src/function/algebra/sparse/csSpsolve.js
+++ b/src/function/algebra/sparse/csSpsolve.js
@@ -1,5 +1,5 @@
-import { csReach } from './csReach'
-import { factory } from '../../../utils/factory'
+import { csReach } from './csReach.js'
+import { factory } from '../../../utils/factory.js'
 
 const name = 'csSpsolve'
 const dependencies = [
diff --git a/src/function/algebra/sparse/csSqr.js b/src/function/algebra/sparse/csSqr.js
index 37c1a46774..c15e14918f 100644
--- a/src/function/algebra/sparse/csSqr.js
+++ b/src/function/algebra/sparse/csSqr.js
@@ -1,9 +1,9 @@
-import { csPermute } from './csPermute'
-import { csPost } from './csPost'
-import { csEtree } from './csEtree'
-import { createCsAmd } from './csAmd'
-import { createCsCounts } from './csCounts'
-import { factory } from '../../../utils/factory'
+import { csPermute } from './csPermute.js'
+import { csPost } from './csPost.js'
+import { csEtree } from './csEtree.js'
+import { createCsAmd } from './csAmd.js'
+import { createCsCounts } from './csCounts.js'
+import { factory } from '../../../utils/factory.js'
 
 const name = 'csSqr'
 const dependencies = [
diff --git a/src/function/algebra/sparse/csSymperm.js b/src/function/algebra/sparse/csSymperm.js
index 3f6254b862..4c93fbf7a0 100644
--- a/src/function/algebra/sparse/csSymperm.js
+++ b/src/function/algebra/sparse/csSymperm.js
@@ -1,5 +1,5 @@
-import { csCumsum } from './csCumsum'
-import { factory } from '../../../utils/factory'
+import { csCumsum } from './csCumsum.js'
+import { factory } from '../../../utils/factory.js'
 
 const name = 'csSymperm'
 const dependencies = ['conj', 'SparseMatrix']
diff --git a/src/function/algebra/sparse/csUnflip.js b/src/function/algebra/sparse/csUnflip.js
index d2ce710ab4..59aa4e60c4 100644
--- a/src/function/algebra/sparse/csUnflip.js
+++ b/src/function/algebra/sparse/csUnflip.js
@@ -1,4 +1,4 @@
-import { csFlip } from './csFlip'
+import { csFlip } from './csFlip.js'
 
 /**
  * Flips the value if it is negative of returns the same value otherwise.
diff --git a/src/function/arithmetic/abs.js b/src/function/arithmetic/abs.js
index 1fe76fa79b..e1c237e2e9 100644
--- a/src/function/arithmetic/abs.js
+++ b/src/function/arithmetic/abs.js
@@ -1,6 +1,6 @@
-import { factory } from '../../utils/factory'
-import { deepMap } from '../../utils/collection'
-import { absNumber } from '../../plain/number'
+import { factory } from '../../utils/factory.js'
+import { deepMap } from '../../utils/collection.js'
+import { absNumber } from '../../plain/number/index.js'
 
 const name = 'abs'
 const dependencies = ['typed']
diff --git a/src/function/arithmetic/add.js b/src/function/arithmetic/add.js
index 5b29a843c1..68dfb27007 100644
--- a/src/function/arithmetic/add.js
+++ b/src/function/arithmetic/add.js
@@ -1,10 +1,10 @@
-import { factory } from '../../utils/factory'
-import { extend } from '../../utils/object'
-import { createAlgorithm01 } from '../../type/matrix/utils/algorithm01'
-import { createAlgorithm04 } from '../../type/matrix/utils/algorithm04'
-import { createAlgorithm10 } from '../../type/matrix/utils/algorithm10'
-import { createAlgorithm13 } from '../../type/matrix/utils/algorithm13'
-import { createAlgorithm14 } from '../../type/matrix/utils/algorithm14'
+import { factory } from '../../utils/factory.js'
+import { extend } from '../../utils/object.js'
+import { createAlgorithm01 } from '../../type/matrix/utils/algorithm01.js'
+import { createAlgorithm04 } from '../../type/matrix/utils/algorithm04.js'
+import { createAlgorithm10 } from '../../type/matrix/utils/algorithm10.js'
+import { createAlgorithm13 } from '../../type/matrix/utils/algorithm13.js'
+import { createAlgorithm14 } from '../../type/matrix/utils/algorithm14.js'
 
 const name = 'add'
 const dependencies = [
diff --git a/src/function/arithmetic/addScalar.js b/src/function/arithmetic/addScalar.js
index 37ac41993a..79ba8c0fa3 100644
--- a/src/function/arithmetic/addScalar.js
+++ b/src/function/arithmetic/addScalar.js
@@ -1,5 +1,5 @@
-import { factory } from '../../utils/factory'
-import { addNumber } from '../../plain/number'
+import { factory } from '../../utils/factory.js'
+import { addNumber } from '../../plain/number/index.js'
 
 const name = 'addScalar'
 const dependencies = ['typed']
diff --git a/src/function/arithmetic/cbrt.js b/src/function/arithmetic/cbrt.js
index 14f6c4753e..1d90caa8cf 100644
--- a/src/function/arithmetic/cbrt.js
+++ b/src/function/arithmetic/cbrt.js
@@ -1,7 +1,7 @@
-import { factory } from '../../utils/factory'
-import { isBigNumber, isComplex, isFraction } from '../../utils/is'
-import { deepMap } from '../../utils/collection'
-import { cbrtNumber } from '../../plain/number'
+import { factory } from '../../utils/factory.js'
+import { isBigNumber, isComplex, isFraction } from '../../utils/is.js'
+import { deepMap } from '../../utils/collection.js'
+import { cbrtNumber } from '../../plain/number/index.js'
 
 const name = 'cbrt'
 const dependencies = [
diff --git a/src/function/arithmetic/ceil.js b/src/function/arithmetic/ceil.js
index 12a8d90a91..eec7bf3464 100644
--- a/src/function/arithmetic/ceil.js
+++ b/src/function/arithmetic/ceil.js
@@ -1,8 +1,8 @@
-import { factory } from '../../utils/factory'
-import { deepMap } from '../../utils/collection'
-import { nearlyEqual } from '../../utils/number'
-import { nearlyEqual as bigNearlyEqual } from '../../utils/bignumber/nearlyEqual'
-import { ceilNumber } from '../../plain/number'
+import { factory } from '../../utils/factory.js'
+import { deepMap } from '../../utils/collection.js'
+import { nearlyEqual } from '../../utils/number.js'
+import { nearlyEqual as bigNearlyEqual } from '../../utils/bignumber/nearlyEqual.js'
+import { ceilNumber } from '../../plain/number/index.js'
 
 const name = 'ceil'
 const dependencies = ['typed', 'config', 'round']
diff --git a/src/function/arithmetic/cube.js b/src/function/arithmetic/cube.js
index 77d8e6c625..22814a78a9 100644
--- a/src/function/arithmetic/cube.js
+++ b/src/function/arithmetic/cube.js
@@ -1,6 +1,6 @@
-import { factory } from '../../utils/factory'
-import { deepMap } from '../../utils/collection'
-import { cubeNumber } from '../../plain/number'
+import { factory } from '../../utils/factory.js'
+import { deepMap } from '../../utils/collection.js'
+import { cubeNumber } from '../../plain/number/index.js'
 
 const name = 'cube'
 const dependencies = ['typed']
diff --git a/src/function/arithmetic/divide.js b/src/function/arithmetic/divide.js
index 0aa972e94d..214eaa3e39 100644
--- a/src/function/arithmetic/divide.js
+++ b/src/function/arithmetic/divide.js
@@ -1,7 +1,7 @@
-import { factory } from '../../utils/factory'
-import { extend } from '../../utils/object'
-import { createAlgorithm11 } from '../../type/matrix/utils/algorithm11'
-import { createAlgorithm14 } from '../../type/matrix/utils/algorithm14'
+import { factory } from '../../utils/factory.js'
+import { extend } from '../../utils/object.js'
+import { createAlgorithm11 } from '../../type/matrix/utils/algorithm11.js'
+import { createAlgorithm14 } from '../../type/matrix/utils/algorithm14.js'
 
 const name = 'divide'
 const dependencies = [
diff --git a/src/function/arithmetic/divideScalar.js b/src/function/arithmetic/divideScalar.js
index f603cc8476..cd50e319f4 100644
--- a/src/function/arithmetic/divideScalar.js
+++ b/src/function/arithmetic/divideScalar.js
@@ -1,5 +1,5 @@
-import { factory } from '../../utils/factory'
-import { typeOf } from '../../utils/is'
+import { factory } from '../../utils/factory.js'
+import { typeOf } from '../../utils/is.js'
 
 const name = 'divideScalar'
 const dependencies = ['typed', 'numeric']
diff --git a/src/function/arithmetic/dotDivide.js b/src/function/arithmetic/dotDivide.js
index 73ab0d8d0e..12e380d986 100644
--- a/src/function/arithmetic/dotDivide.js
+++ b/src/function/arithmetic/dotDivide.js
@@ -1,11 +1,11 @@
-import { factory } from '../../utils/factory'
-import { createAlgorithm02 } from '../../type/matrix/utils/algorithm02'
-import { createAlgorithm03 } from '../../type/matrix/utils/algorithm03'
-import { createAlgorithm07 } from '../../type/matrix/utils/algorithm07'
-import { createAlgorithm11 } from '../../type/matrix/utils/algorithm11'
-import { createAlgorithm12 } from '../../type/matrix/utils/algorithm12'
-import { createAlgorithm13 } from '../../type/matrix/utils/algorithm13'
-import { createAlgorithm14 } from '../../type/matrix/utils/algorithm14'
+import { factory } from '../../utils/factory.js'
+import { createAlgorithm02 } from '../../type/matrix/utils/algorithm02.js'
+import { createAlgorithm03 } from '../../type/matrix/utils/algorithm03.js'
+import { createAlgorithm07 } from '../../type/matrix/utils/algorithm07.js'
+import { createAlgorithm11 } from '../../type/matrix/utils/algorithm11.js'
+import { createAlgorithm12 } from '../../type/matrix/utils/algorithm12.js'
+import { createAlgorithm13 } from '../../type/matrix/utils/algorithm13.js'
+import { createAlgorithm14 } from '../../type/matrix/utils/algorithm14.js'
 
 const name = 'dotDivide'
 const dependencies = [
diff --git a/src/function/arithmetic/dotMultiply.js b/src/function/arithmetic/dotMultiply.js
index 1536c13bcd..6a43d61500 100644
--- a/src/function/arithmetic/dotMultiply.js
+++ b/src/function/arithmetic/dotMultiply.js
@@ -1,9 +1,9 @@
-import { factory } from '../../utils/factory'
-import { createAlgorithm02 } from '../../type/matrix/utils/algorithm02'
-import { createAlgorithm09 } from '../../type/matrix/utils/algorithm09'
-import { createAlgorithm11 } from '../../type/matrix/utils/algorithm11'
-import { createAlgorithm13 } from '../../type/matrix/utils/algorithm13'
-import { createAlgorithm14 } from '../../type/matrix/utils/algorithm14'
+import { factory } from '../../utils/factory.js'
+import { createAlgorithm02 } from '../../type/matrix/utils/algorithm02.js'
+import { createAlgorithm09 } from '../../type/matrix/utils/algorithm09.js'
+import { createAlgorithm11 } from '../../type/matrix/utils/algorithm11.js'
+import { createAlgorithm13 } from '../../type/matrix/utils/algorithm13.js'
+import { createAlgorithm14 } from '../../type/matrix/utils/algorithm14.js'
 
 const name = 'dotMultiply'
 const dependencies = [
diff --git a/src/function/arithmetic/dotPow.js b/src/function/arithmetic/dotPow.js
index 384e2d412d..74f2793136 100644
--- a/src/function/arithmetic/dotPow.js
+++ b/src/function/arithmetic/dotPow.js
@@ -1,10 +1,10 @@
-import { factory } from '../../utils/factory'
-import { createAlgorithm03 } from '../../type/matrix/utils/algorithm03'
-import { createAlgorithm07 } from '../../type/matrix/utils/algorithm07'
-import { createAlgorithm11 } from '../../type/matrix/utils/algorithm11'
-import { createAlgorithm12 } from '../../type/matrix/utils/algorithm12'
-import { createAlgorithm13 } from '../../type/matrix/utils/algorithm13'
-import { createAlgorithm14 } from '../../type/matrix/utils/algorithm14'
+import { factory } from '../../utils/factory.js'
+import { createAlgorithm03 } from '../../type/matrix/utils/algorithm03.js'
+import { createAlgorithm07 } from '../../type/matrix/utils/algorithm07.js'
+import { createAlgorithm11 } from '../../type/matrix/utils/algorithm11.js'
+import { createAlgorithm12 } from '../../type/matrix/utils/algorithm12.js'
+import { createAlgorithm13 } from '../../type/matrix/utils/algorithm13.js'
+import { createAlgorithm14 } from '../../type/matrix/utils/algorithm14.js'
 
 const name = 'dotPow'
 const dependencies = [
diff --git a/src/function/arithmetic/exp.js b/src/function/arithmetic/exp.js
index 92162854bc..606c885f1e 100644
--- a/src/function/arithmetic/exp.js
+++ b/src/function/arithmetic/exp.js
@@ -1,6 +1,6 @@
-import { factory } from '../../utils/factory'
-import { deepMap } from '../../utils/collection'
-import { expNumber } from '../../plain/number'
+import { factory } from '../../utils/factory.js'
+import { deepMap } from '../../utils/collection.js'
+import { expNumber } from '../../plain/number/index.js'
 
 const name = 'exp'
 const dependencies = ['typed']
diff --git a/src/function/arithmetic/expm1.js b/src/function/arithmetic/expm1.js
index 3e6640ffc9..37845015f7 100644
--- a/src/function/arithmetic/expm1.js
+++ b/src/function/arithmetic/expm1.js
@@ -1,6 +1,6 @@
-import { factory } from '../../utils/factory'
-import { deepMap } from '../../utils/collection'
-import { expm1Number } from '../../plain/number'
+import { factory } from '../../utils/factory.js'
+import { deepMap } from '../../utils/collection.js'
+import { expm1Number } from '../../plain/number/index.js'
 
 const name = 'expm1'
 const dependencies = ['typed', 'Complex']
diff --git a/src/function/arithmetic/fix.js b/src/function/arithmetic/fix.js
index 7f3fe30352..8f300a9707 100644
--- a/src/function/arithmetic/fix.js
+++ b/src/function/arithmetic/fix.js
@@ -1,5 +1,5 @@
-import { factory } from '../../utils/factory'
-import { deepMap } from '../../utils/collection'
+import { factory } from '../../utils/factory.js'
+import { deepMap } from '../../utils/collection.js'
 
 const name = 'fix'
 const dependencies = ['typed', 'Complex', 'ceil', 'floor']
diff --git a/src/function/arithmetic/floor.js b/src/function/arithmetic/floor.js
index 5d802deb4a..70125b13fa 100644
--- a/src/function/arithmetic/floor.js
+++ b/src/function/arithmetic/floor.js
@@ -1,7 +1,7 @@
-import { factory } from '../../utils/factory'
-import { deepMap } from '../../utils/collection'
-import { nearlyEqual } from '../../utils/number'
-import { nearlyEqual as bigNearlyEqual } from '../../utils/bignumber/nearlyEqual'
+import { factory } from '../../utils/factory.js'
+import { deepMap } from '../../utils/collection.js'
+import { nearlyEqual } from '../../utils/number.js'
+import { nearlyEqual as bigNearlyEqual } from '../../utils/bignumber/nearlyEqual.js'
 
 const name = 'floor'
 const dependencies = ['typed', 'config', 'round']
diff --git a/src/function/arithmetic/gcd.js b/src/function/arithmetic/gcd.js
index b872cda1bb..440565008a 100644
--- a/src/function/arithmetic/gcd.js
+++ b/src/function/arithmetic/gcd.js
@@ -1,10 +1,10 @@
-import { factory } from '../../utils/factory'
-import { createAlgorithm01 } from '../../type/matrix/utils/algorithm01'
-import { createAlgorithm04 } from '../../type/matrix/utils/algorithm04'
-import { createAlgorithm10 } from '../../type/matrix/utils/algorithm10'
-import { createAlgorithm13 } from '../../type/matrix/utils/algorithm13'
-import { createAlgorithm14 } from '../../type/matrix/utils/algorithm14'
-import { gcdNumber } from '../../plain/number'
+import { factory } from '../../utils/factory.js'
+import { createAlgorithm01 } from '../../type/matrix/utils/algorithm01.js'
+import { createAlgorithm04 } from '../../type/matrix/utils/algorithm04.js'
+import { createAlgorithm10 } from '../../type/matrix/utils/algorithm10.js'
+import { createAlgorithm13 } from '../../type/matrix/utils/algorithm13.js'
+import { createAlgorithm14 } from '../../type/matrix/utils/algorithm14.js'
+import { gcdNumber } from '../../plain/number/index.js'
 
 const name = 'gcd'
 const dependencies = [
diff --git a/src/function/arithmetic/hypot.js b/src/function/arithmetic/hypot.js
index afac05bb53..9b4dd06784 100644
--- a/src/function/arithmetic/hypot.js
+++ b/src/function/arithmetic/hypot.js
@@ -1,5 +1,5 @@
-import { factory } from '../../utils/factory'
-import { flatten } from '../../utils/array'
+import { factory } from '../../utils/factory.js'
+import { flatten } from '../../utils/array.js'
 
 const name = 'hypot'
 const dependencies = [
diff --git a/src/function/arithmetic/lcm.js b/src/function/arithmetic/lcm.js
index 750a36933a..997fe98502 100644
--- a/src/function/arithmetic/lcm.js
+++ b/src/function/arithmetic/lcm.js
@@ -1,10 +1,10 @@
-import { factory } from '../../utils/factory'
-import { createAlgorithm02 } from '../../type/matrix/utils/algorithm02'
-import { createAlgorithm06 } from '../../type/matrix/utils/algorithm06'
-import { createAlgorithm11 } from '../../type/matrix/utils/algorithm11'
-import { createAlgorithm13 } from '../../type/matrix/utils/algorithm13'
-import { createAlgorithm14 } from '../../type/matrix/utils/algorithm14'
-import { lcmNumber } from '../../plain/number'
+import { factory } from '../../utils/factory.js'
+import { createAlgorithm02 } from '../../type/matrix/utils/algorithm02.js'
+import { createAlgorithm06 } from '../../type/matrix/utils/algorithm06.js'
+import { createAlgorithm11 } from '../../type/matrix/utils/algorithm11.js'
+import { createAlgorithm13 } from '../../type/matrix/utils/algorithm13.js'
+import { createAlgorithm14 } from '../../type/matrix/utils/algorithm14.js'
+import { lcmNumber } from '../../plain/number/index.js'
 
 const name = 'lcm'
 const dependencies = [
diff --git a/src/function/arithmetic/log.js b/src/function/arithmetic/log.js
index 8f405986c5..ad7b54ea36 100644
--- a/src/function/arithmetic/log.js
+++ b/src/function/arithmetic/log.js
@@ -1,6 +1,6 @@
-import { factory } from '../../utils/factory'
-import { deepMap } from '../../utils/collection'
-import { logNumber } from '../../plain/number'
+import { factory } from '../../utils/factory.js'
+import { deepMap } from '../../utils/collection.js'
+import { logNumber } from '../../plain/number/index.js'
 
 const name = 'log'
 const dependencies = ['config', 'typed', 'divideScalar', 'Complex']
diff --git a/src/function/arithmetic/log10.js b/src/function/arithmetic/log10.js
index b6f76fb849..998b2a97ce 100644
--- a/src/function/arithmetic/log10.js
+++ b/src/function/arithmetic/log10.js
@@ -1,6 +1,6 @@
-import { factory } from '../../utils/factory'
-import { deepMap } from '../../utils/collection'
-import { log10Number } from '../../plain/number'
+import { factory } from '../../utils/factory.js'
+import { deepMap } from '../../utils/collection.js'
+import { log10Number } from '../../plain/number/index.js'
 
 const name = 'log10'
 const dependencies = ['typed', 'config', 'Complex']
diff --git a/src/function/arithmetic/log1p.js b/src/function/arithmetic/log1p.js
index 2fc3563115..c036cdafe1 100644
--- a/src/function/arithmetic/log1p.js
+++ b/src/function/arithmetic/log1p.js
@@ -1,6 +1,6 @@
-import { factory } from '../../utils/factory'
-import { deepMap } from '../../utils/collection'
-import { log1p as _log1p } from '../../utils/number'
+import { factory } from '../../utils/factory.js'
+import { deepMap } from '../../utils/collection.js'
+import { log1p as _log1p } from '../../utils/number.js'
 
 const name = 'log1p'
 const dependencies = ['typed', 'config', 'divideScalar', 'log', 'Complex']
diff --git a/src/function/arithmetic/log2.js b/src/function/arithmetic/log2.js
index 7a50bdc2fe..de3b96c331 100644
--- a/src/function/arithmetic/log2.js
+++ b/src/function/arithmetic/log2.js
@@ -1,6 +1,6 @@
-import { factory } from '../../utils/factory'
-import { deepMap } from '../../utils/collection'
-import { log2Number } from '../../plain/number'
+import { factory } from '../../utils/factory.js'
+import { deepMap } from '../../utils/collection.js'
+import { log2Number } from '../../plain/number/index.js'
 
 const name = 'log2'
 const dependencies = ['typed', 'config', 'Complex']
diff --git a/src/function/arithmetic/mod.js b/src/function/arithmetic/mod.js
index 416463dbc7..8601a4c285 100644
--- a/src/function/arithmetic/mod.js
+++ b/src/function/arithmetic/mod.js
@@ -1,12 +1,12 @@
-import { factory } from '../../utils/factory'
-import { createAlgorithm02 } from '../../type/matrix/utils/algorithm02'
-import { createAlgorithm03 } from '../../type/matrix/utils/algorithm03'
-import { createAlgorithm05 } from '../../type/matrix/utils/algorithm05'
-import { createAlgorithm11 } from '../../type/matrix/utils/algorithm11'
-import { createAlgorithm12 } from '../../type/matrix/utils/algorithm12'
-import { createAlgorithm13 } from '../../type/matrix/utils/algorithm13'
-import { createAlgorithm14 } from '../../type/matrix/utils/algorithm14'
-import { modNumber } from '../../plain/number'
+import { factory } from '../../utils/factory.js'
+import { createAlgorithm02 } from '../../type/matrix/utils/algorithm02.js'
+import { createAlgorithm03 } from '../../type/matrix/utils/algorithm03.js'
+import { createAlgorithm05 } from '../../type/matrix/utils/algorithm05.js'
+import { createAlgorithm11 } from '../../type/matrix/utils/algorithm11.js'
+import { createAlgorithm12 } from '../../type/matrix/utils/algorithm12.js'
+import { createAlgorithm13 } from '../../type/matrix/utils/algorithm13.js'
+import { createAlgorithm14 } from '../../type/matrix/utils/algorithm14.js'
+import { modNumber } from '../../plain/number/index.js'
 
 const name = 'mod'
 const dependencies = [
diff --git a/src/function/arithmetic/multiply.js b/src/function/arithmetic/multiply.js
index 2672f9fa14..739cd4b591 100644
--- a/src/function/arithmetic/multiply.js
+++ b/src/function/arithmetic/multiply.js
@@ -1,9 +1,9 @@
-import { factory } from '../../utils/factory'
-import { isMatrix } from '../../utils/is'
-import { extend } from '../../utils/object'
-import { arraySize } from '../../utils/array'
-import { createAlgorithm11 } from '../../type/matrix/utils/algorithm11'
-import { createAlgorithm14 } from '../../type/matrix/utils/algorithm14'
+import { factory } from '../../utils/factory.js'
+import { isMatrix } from '../../utils/is.js'
+import { extend } from '../../utils/object.js'
+import { arraySize } from '../../utils/array.js'
+import { createAlgorithm11 } from '../../type/matrix/utils/algorithm11.js'
+import { createAlgorithm14 } from '../../type/matrix/utils/algorithm14.js'
 
 const name = 'multiply'
 const dependencies = [
diff --git a/src/function/arithmetic/multiplyScalar.js b/src/function/arithmetic/multiplyScalar.js
index f6cb57b242..e0734f2f28 100644
--- a/src/function/arithmetic/multiplyScalar.js
+++ b/src/function/arithmetic/multiplyScalar.js
@@ -1,5 +1,5 @@
-import { factory } from '../../utils/factory'
-import { multiplyNumber } from '../../plain/number'
+import { factory } from '../../utils/factory.js'
+import { multiplyNumber } from '../../plain/number/index.js'
 
 const name = 'multiplyScalar'
 const dependencies = ['typed']
diff --git a/src/function/arithmetic/norm.js b/src/function/arithmetic/norm.js
index 421aac1840..9ef2632b1f 100644
--- a/src/function/arithmetic/norm.js
+++ b/src/function/arithmetic/norm.js
@@ -1,4 +1,4 @@
-import { factory } from '../../utils/factory'
+import { factory } from '../../utils/factory.js'
 
 const name = 'norm'
 const dependencies = [
diff --git a/src/function/arithmetic/nthRoot.js b/src/function/arithmetic/nthRoot.js
index b9ad84ae78..695835d1de 100644
--- a/src/function/arithmetic/nthRoot.js
+++ b/src/function/arithmetic/nthRoot.js
@@ -1,11 +1,11 @@
-import { factory } from '../../utils/factory'
-import { createAlgorithm01 } from '../../type/matrix/utils/algorithm01'
-import { createAlgorithm02 } from '../../type/matrix/utils/algorithm02'
-import { createAlgorithm06 } from '../../type/matrix/utils/algorithm06'
-import { createAlgorithm11 } from '../../type/matrix/utils/algorithm11'
-import { createAlgorithm13 } from '../../type/matrix/utils/algorithm13'
-import { createAlgorithm14 } from '../../type/matrix/utils/algorithm14'
-import { nthRootNumber } from '../../plain/number'
+import { factory } from '../../utils/factory.js'
+import { createAlgorithm01 } from '../../type/matrix/utils/algorithm01.js'
+import { createAlgorithm02 } from '../../type/matrix/utils/algorithm02.js'
+import { createAlgorithm06 } from '../../type/matrix/utils/algorithm06.js'
+import { createAlgorithm11 } from '../../type/matrix/utils/algorithm11.js'
+import { createAlgorithm13 } from '../../type/matrix/utils/algorithm13.js'
+import { createAlgorithm14 } from '../../type/matrix/utils/algorithm14.js'
+import { nthRootNumber } from '../../plain/number/index.js'
 
 const name = 'nthRoot'
 const dependencies = [
diff --git a/src/function/arithmetic/nthRoots.js b/src/function/arithmetic/nthRoots.js
index 7f6ffcbc93..089d602229 100644
--- a/src/function/arithmetic/nthRoots.js
+++ b/src/function/arithmetic/nthRoots.js
@@ -1,4 +1,4 @@
-import { factory } from '../../utils/factory'
+import { factory } from '../../utils/factory.js'
 
 const name = 'nthRoots'
 const dependencies = ['config', 'typed', 'divideScalar', 'Complex']
diff --git a/src/function/arithmetic/pow.js b/src/function/arithmetic/pow.js
index 9ed40ebd76..0039adce00 100644
--- a/src/function/arithmetic/pow.js
+++ b/src/function/arithmetic/pow.js
@@ -1,7 +1,7 @@
-import { factory } from '../../utils/factory'
-import { isInteger } from '../../utils/number'
-import { arraySize as size } from '../../utils/array'
-import { powNumber } from '../../plain/number'
+import { factory } from '../../utils/factory.js'
+import { isInteger } from '../../utils/number.js'
+import { arraySize as size } from '../../utils/array.js'
+import { powNumber } from '../../plain/number/index.js'
 
 const name = 'pow'
 const dependencies = [
diff --git a/src/function/arithmetic/round.js b/src/function/arithmetic/round.js
index a2d02d7e5d..5052d299a9 100644
--- a/src/function/arithmetic/round.js
+++ b/src/function/arithmetic/round.js
@@ -1,10 +1,10 @@
-import { factory } from '../../utils/factory'
-import { deepMap } from '../../utils/collection'
-import { isInteger } from '../../utils/number'
-import { createAlgorithm11 } from '../../type/matrix/utils/algorithm11'
-import { createAlgorithm12 } from '../../type/matrix/utils/algorithm12'
-import { createAlgorithm14 } from '../../type/matrix/utils/algorithm14'
-import { roundNumber } from '../../plain/number'
+import { factory } from '../../utils/factory.js'
+import { deepMap } from '../../utils/collection.js'
+import { isInteger } from '../../utils/number.js'
+import { createAlgorithm11 } from '../../type/matrix/utils/algorithm11.js'
+import { createAlgorithm12 } from '../../type/matrix/utils/algorithm12.js'
+import { createAlgorithm14 } from '../../type/matrix/utils/algorithm14.js'
+import { roundNumber } from '../../plain/number/index.js'
 
 const NO_INT = 'Number of decimals in function round must be an integer'
 
diff --git a/src/function/arithmetic/sign.js b/src/function/arithmetic/sign.js
index 10d1c20acd..527b3c8524 100644
--- a/src/function/arithmetic/sign.js
+++ b/src/function/arithmetic/sign.js
@@ -1,6 +1,6 @@
-import { factory } from '../../utils/factory'
-import { deepMap } from '../../utils/collection'
-import { signNumber } from '../../plain/number'
+import { factory } from '../../utils/factory.js'
+import { deepMap } from '../../utils/collection.js'
+import { signNumber } from '../../plain/number/index.js'
 
 const name = 'sign'
 const dependencies = ['typed', 'BigNumber', 'Fraction', 'complex']
diff --git a/src/function/arithmetic/sqrt.js b/src/function/arithmetic/sqrt.js
index 5e20eb5e50..6d3b9a34ec 100644
--- a/src/function/arithmetic/sqrt.js
+++ b/src/function/arithmetic/sqrt.js
@@ -1,5 +1,5 @@
-import { factory } from '../../utils/factory'
-import { deepMap } from '../../utils/collection'
+import { factory } from '../../utils/factory.js'
+import { deepMap } from '../../utils/collection.js'
 
 const name = 'sqrt'
 const dependencies = ['config', 'typed', 'Complex']
diff --git a/src/function/arithmetic/square.js b/src/function/arithmetic/square.js
index be736932cb..c9e9adde8e 100644
--- a/src/function/arithmetic/square.js
+++ b/src/function/arithmetic/square.js
@@ -1,6 +1,6 @@
-import { factory } from '../../utils/factory'
-import { deepMap } from '../../utils/collection'
-import { squareNumber } from '../../plain/number'
+import { factory } from '../../utils/factory.js'
+import { deepMap } from '../../utils/collection.js'
+import { squareNumber } from '../../plain/number/index.js'
 
 const name = 'square'
 const dependencies = ['typed']
diff --git a/src/function/arithmetic/subtract.js b/src/function/arithmetic/subtract.js
index 202af405c9..abbb2f9204 100644
--- a/src/function/arithmetic/subtract.js
+++ b/src/function/arithmetic/subtract.js
@@ -1,11 +1,11 @@
-import { factory } from '../../utils/factory'
-import { DimensionError } from '../../error/DimensionError'
-import { createAlgorithm01 } from '../../type/matrix/utils/algorithm01'
-import { createAlgorithm03 } from '../../type/matrix/utils/algorithm03'
-import { createAlgorithm05 } from '../../type/matrix/utils/algorithm05'
-import { createAlgorithm10 } from '../../type/matrix/utils/algorithm10'
-import { createAlgorithm13 } from '../../type/matrix/utils/algorithm13'
-import { createAlgorithm14 } from '../../type/matrix/utils/algorithm14'
+import { factory } from '../../utils/factory.js'
+import { DimensionError } from '../../error/DimensionError.js'
+import { createAlgorithm01 } from '../../type/matrix/utils/algorithm01.js'
+import { createAlgorithm03 } from '../../type/matrix/utils/algorithm03.js'
+import { createAlgorithm05 } from '../../type/matrix/utils/algorithm05.js'
+import { createAlgorithm10 } from '../../type/matrix/utils/algorithm10.js'
+import { createAlgorithm13 } from '../../type/matrix/utils/algorithm13.js'
+import { createAlgorithm14 } from '../../type/matrix/utils/algorithm14.js'
 
 const name = 'subtract'
 const dependencies = [
diff --git a/src/function/arithmetic/unaryMinus.js b/src/function/arithmetic/unaryMinus.js
index 3c1326033b..73f6a7ea88 100644
--- a/src/function/arithmetic/unaryMinus.js
+++ b/src/function/arithmetic/unaryMinus.js
@@ -1,6 +1,6 @@
-import { factory } from '../../utils/factory'
-import { deepMap } from '../../utils/collection'
-import { unaryMinusNumber } from '../../plain/number'
+import { factory } from '../../utils/factory.js'
+import { deepMap } from '../../utils/collection.js'
+import { unaryMinusNumber } from '../../plain/number/index.js'
 
 const name = 'unaryMinus'
 const dependencies = ['typed']
diff --git a/src/function/arithmetic/unaryPlus.js b/src/function/arithmetic/unaryPlus.js
index 662343b55c..bcaccd1941 100644
--- a/src/function/arithmetic/unaryPlus.js
+++ b/src/function/arithmetic/unaryPlus.js
@@ -1,6 +1,6 @@
-import { factory } from '../../utils/factory'
-import { deepMap } from '../../utils/collection'
-import { unaryPlusNumber } from '../../plain/number'
+import { factory } from '../../utils/factory.js'
+import { deepMap } from '../../utils/collection.js'
+import { unaryPlusNumber } from '../../plain/number/index.js'
 
 const name = 'unaryPlus'
 const dependencies = ['typed', 'config', 'BigNumber']
diff --git a/src/function/arithmetic/xgcd.js b/src/function/arithmetic/xgcd.js
index ec885a8b1a..556798af59 100644
--- a/src/function/arithmetic/xgcd.js
+++ b/src/function/arithmetic/xgcd.js
@@ -1,5 +1,5 @@
-import { factory } from '../../utils/factory'
-import { xgcdNumber } from '../../plain/number'
+import { factory } from '../../utils/factory.js'
+import { xgcdNumber } from '../../plain/number/index.js'
 
 const name = 'xgcd'
 const dependencies = ['typed', 'config', 'matrix', 'BigNumber']
diff --git a/src/function/bitwise/bitAnd.js b/src/function/bitwise/bitAnd.js
index 605720077e..aaaf8524fd 100644
--- a/src/function/bitwise/bitAnd.js
+++ b/src/function/bitwise/bitAnd.js
@@ -1,11 +1,11 @@
-import { bitAndBigNumber } from '../../utils/bignumber/bitwise'
-import { createAlgorithm02 } from '../../type/matrix/utils/algorithm02'
-import { createAlgorithm11 } from '../../type/matrix/utils/algorithm11'
-import { createAlgorithm13 } from '../../type/matrix/utils/algorithm13'
-import { createAlgorithm14 } from '../../type/matrix/utils/algorithm14'
-import { createAlgorithm06 } from '../../type/matrix/utils/algorithm06'
-import { factory } from '../../utils/factory'
-import { bitAndNumber } from '../../plain/number'
+import { bitAndBigNumber } from '../../utils/bignumber/bitwise.js'
+import { createAlgorithm02 } from '../../type/matrix/utils/algorithm02.js'
+import { createAlgorithm11 } from '../../type/matrix/utils/algorithm11.js'
+import { createAlgorithm13 } from '../../type/matrix/utils/algorithm13.js'
+import { createAlgorithm14 } from '../../type/matrix/utils/algorithm14.js'
+import { createAlgorithm06 } from '../../type/matrix/utils/algorithm06.js'
+import { factory } from '../../utils/factory.js'
+import { bitAndNumber } from '../../plain/number/index.js'
 
 const name = 'bitAnd'
 const dependencies = [
diff --git a/src/function/bitwise/bitNot.js b/src/function/bitwise/bitNot.js
index b0b1770cae..db532974a4 100644
--- a/src/function/bitwise/bitNot.js
+++ b/src/function/bitwise/bitNot.js
@@ -1,7 +1,7 @@
-import { bitNotBigNumber } from '../../utils/bignumber/bitwise'
-import { deepMap } from '../../utils/collection'
-import { factory } from '../../utils/factory'
-import { bitNotNumber } from '../../plain/number'
+import { bitNotBigNumber } from '../../utils/bignumber/bitwise.js'
+import { deepMap } from '../../utils/collection.js'
+import { factory } from '../../utils/factory.js'
+import { bitNotNumber } from '../../plain/number/index.js'
 
 const name = 'bitNot'
 const dependencies = ['typed']
diff --git a/src/function/bitwise/bitOr.js b/src/function/bitwise/bitOr.js
index 0d2e1f59ce..908450ce8f 100644
--- a/src/function/bitwise/bitOr.js
+++ b/src/function/bitwise/bitOr.js
@@ -1,11 +1,11 @@
-import { bitOrBigNumber } from '../../utils/bignumber/bitwise'
-import { factory } from '../../utils/factory'
-import { createAlgorithm14 } from '../../type/matrix/utils/algorithm14'
-import { createAlgorithm13 } from '../../type/matrix/utils/algorithm13'
-import { createAlgorithm10 } from '../../type/matrix/utils/algorithm10'
-import { createAlgorithm04 } from '../../type/matrix/utils/algorithm04'
-import { createAlgorithm01 } from '../../type/matrix/utils/algorithm01'
-import { bitOrNumber } from '../../plain/number'
+import { bitOrBigNumber } from '../../utils/bignumber/bitwise.js'
+import { factory } from '../../utils/factory.js'
+import { createAlgorithm14 } from '../../type/matrix/utils/algorithm14.js'
+import { createAlgorithm13 } from '../../type/matrix/utils/algorithm13.js'
+import { createAlgorithm10 } from '../../type/matrix/utils/algorithm10.js'
+import { createAlgorithm04 } from '../../type/matrix/utils/algorithm04.js'
+import { createAlgorithm01 } from '../../type/matrix/utils/algorithm01.js'
+import { bitOrNumber } from '../../plain/number/index.js'
 
 const name = 'bitOr'
 const dependencies = [
diff --git a/src/function/bitwise/bitXor.js b/src/function/bitwise/bitXor.js
index 6e95c57e7c..b2edac3139 100644
--- a/src/function/bitwise/bitXor.js
+++ b/src/function/bitwise/bitXor.js
@@ -1,11 +1,11 @@
-import { bitXor as bigBitXor } from '../../utils/bignumber/bitwise'
-import { createAlgorithm03 } from '../../type/matrix/utils/algorithm03'
-import { createAlgorithm07 } from '../../type/matrix/utils/algorithm07'
-import { createAlgorithm12 } from '../../type/matrix/utils/algorithm12'
-import { createAlgorithm13 } from '../../type/matrix/utils/algorithm13'
-import { createAlgorithm14 } from '../../type/matrix/utils/algorithm14'
-import { factory } from '../../utils/factory'
-import { bitXorNumber } from '../../plain/number'
+import { bitXor as bigBitXor } from '../../utils/bignumber/bitwise.js'
+import { createAlgorithm03 } from '../../type/matrix/utils/algorithm03.js'
+import { createAlgorithm07 } from '../../type/matrix/utils/algorithm07.js'
+import { createAlgorithm12 } from '../../type/matrix/utils/algorithm12.js'
+import { createAlgorithm13 } from '../../type/matrix/utils/algorithm13.js'
+import { createAlgorithm14 } from '../../type/matrix/utils/algorithm14.js'
+import { factory } from '../../utils/factory.js'
+import { bitXorNumber } from '../../plain/number/index.js'
 
 const name = 'bitXor'
 const dependencies = [
diff --git a/src/function/bitwise/leftShift.js b/src/function/bitwise/leftShift.js
index ffb85f1eca..0e72039bf4 100644
--- a/src/function/bitwise/leftShift.js
+++ b/src/function/bitwise/leftShift.js
@@ -1,13 +1,13 @@
-import { createAlgorithm02 } from '../../type/matrix/utils/algorithm02'
-import { createAlgorithm11 } from '../../type/matrix/utils/algorithm11'
-import { createAlgorithm13 } from '../../type/matrix/utils/algorithm13'
-import { createAlgorithm14 } from '../../type/matrix/utils/algorithm14'
-import { createAlgorithm01 } from '../../type/matrix/utils/algorithm01'
-import { createAlgorithm10 } from '../../type/matrix/utils/algorithm10'
-import { createAlgorithm08 } from '../../type/matrix/utils/algorithm08'
-import { factory } from '../../utils/factory'
-import { leftShiftNumber } from '../../plain/number'
-import { leftShiftBigNumber } from '../../utils/bignumber/bitwise'
+import { createAlgorithm02 } from '../../type/matrix/utils/algorithm02.js'
+import { createAlgorithm11 } from '../../type/matrix/utils/algorithm11.js'
+import { createAlgorithm13 } from '../../type/matrix/utils/algorithm13.js'
+import { createAlgorithm14 } from '../../type/matrix/utils/algorithm14.js'
+import { createAlgorithm01 } from '../../type/matrix/utils/algorithm01.js'
+import { createAlgorithm10 } from '../../type/matrix/utils/algorithm10.js'
+import { createAlgorithm08 } from '../../type/matrix/utils/algorithm08.js'
+import { factory } from '../../utils/factory.js'
+import { leftShiftNumber } from '../../plain/number/index.js'
+import { leftShiftBigNumber } from '../../utils/bignumber/bitwise.js'
 
 const name = 'leftShift'
 const dependencies = [
diff --git a/src/function/bitwise/rightArithShift.js b/src/function/bitwise/rightArithShift.js
index f1689fdba6..16c806f44a 100644
--- a/src/function/bitwise/rightArithShift.js
+++ b/src/function/bitwise/rightArithShift.js
@@ -1,13 +1,13 @@
-import { rightArithShiftBigNumber } from '../../utils/bignumber/bitwise'
-import { createAlgorithm02 } from '../../type/matrix/utils/algorithm02'
-import { createAlgorithm11 } from '../../type/matrix/utils/algorithm11'
-import { createAlgorithm13 } from '../../type/matrix/utils/algorithm13'
-import { createAlgorithm14 } from '../../type/matrix/utils/algorithm14'
-import { createAlgorithm01 } from '../../type/matrix/utils/algorithm01'
-import { createAlgorithm10 } from '../../type/matrix/utils/algorithm10'
-import { createAlgorithm08 } from '../../type/matrix/utils/algorithm08'
-import { factory } from '../../utils/factory'
-import { rightArithShiftNumber } from '../../plain/number'
+import { rightArithShiftBigNumber } from '../../utils/bignumber/bitwise.js'
+import { createAlgorithm02 } from '../../type/matrix/utils/algorithm02.js'
+import { createAlgorithm11 } from '../../type/matrix/utils/algorithm11.js'
+import { createAlgorithm13 } from '../../type/matrix/utils/algorithm13.js'
+import { createAlgorithm14 } from '../../type/matrix/utils/algorithm14.js'
+import { createAlgorithm01 } from '../../type/matrix/utils/algorithm01.js'
+import { createAlgorithm10 } from '../../type/matrix/utils/algorithm10.js'
+import { createAlgorithm08 } from '../../type/matrix/utils/algorithm08.js'
+import { factory } from '../../utils/factory.js'
+import { rightArithShiftNumber } from '../../plain/number/index.js'
 
 const name = 'rightArithShift'
 const dependencies = [
diff --git a/src/function/bitwise/rightLogShift.js b/src/function/bitwise/rightLogShift.js
index 174cb7ad23..7354f1bab8 100644
--- a/src/function/bitwise/rightLogShift.js
+++ b/src/function/bitwise/rightLogShift.js
@@ -1,12 +1,12 @@
-import { createAlgorithm02 } from '../../type/matrix/utils/algorithm02'
-import { createAlgorithm11 } from '../../type/matrix/utils/algorithm11'
-import { createAlgorithm13 } from '../../type/matrix/utils/algorithm13'
-import { createAlgorithm14 } from '../../type/matrix/utils/algorithm14'
-import { createAlgorithm01 } from '../../type/matrix/utils/algorithm01'
-import { createAlgorithm10 } from '../../type/matrix/utils/algorithm10'
-import { createAlgorithm08 } from '../../type/matrix/utils/algorithm08'
-import { factory } from '../../utils/factory'
-import { rightLogShiftNumber } from '../../plain/number'
+import { createAlgorithm02 } from '../../type/matrix/utils/algorithm02.js'
+import { createAlgorithm11 } from '../../type/matrix/utils/algorithm11.js'
+import { createAlgorithm13 } from '../../type/matrix/utils/algorithm13.js'
+import { createAlgorithm14 } from '../../type/matrix/utils/algorithm14.js'
+import { createAlgorithm01 } from '../../type/matrix/utils/algorithm01.js'
+import { createAlgorithm10 } from '../../type/matrix/utils/algorithm10.js'
+import { createAlgorithm08 } from '../../type/matrix/utils/algorithm08.js'
+import { factory } from '../../utils/factory.js'
+import { rightLogShiftNumber } from '../../plain/number/index.js'
 
 const name = 'rightLogShift'
 const dependencies = [
diff --git a/src/function/combinatorics/bellNumbers.js b/src/function/combinatorics/bellNumbers.js
index 59573c5b8b..fcc9472868 100644
--- a/src/function/combinatorics/bellNumbers.js
+++ b/src/function/combinatorics/bellNumbers.js
@@ -1,4 +1,4 @@
-import { factory } from '../../utils/factory'
+import { factory } from '../../utils/factory.js'
 
 const name = 'bellNumbers'
 const dependencies = ['typed', 'addScalar', 'isNegative', 'isInteger', 'stirlingS2']
diff --git a/src/function/combinatorics/catalan.js b/src/function/combinatorics/catalan.js
index 9837c8dce3..dbe6ce76ff 100644
--- a/src/function/combinatorics/catalan.js
+++ b/src/function/combinatorics/catalan.js
@@ -1,4 +1,4 @@
-import { factory } from '../../utils/factory'
+import { factory } from '../../utils/factory.js'
 
 const name = 'catalan'
 const dependencies = [
diff --git a/src/function/combinatorics/composition.js b/src/function/combinatorics/composition.js
index 96d3ff695e..9a937b1e93 100644
--- a/src/function/combinatorics/composition.js
+++ b/src/function/combinatorics/composition.js
@@ -1,4 +1,4 @@
-import { factory } from '../../utils/factory'
+import { factory } from '../../utils/factory.js'
 
 const name = 'composition'
 const dependencies = [
diff --git a/src/function/combinatorics/stirlingS2.js b/src/function/combinatorics/stirlingS2.js
index b43b2c8481..89bd9c8a1c 100644
--- a/src/function/combinatorics/stirlingS2.js
+++ b/src/function/combinatorics/stirlingS2.js
@@ -1,4 +1,4 @@
-import { factory } from '../../utils/factory'
+import { factory } from '../../utils/factory.js'
 
 const name = 'stirlingS2'
 const dependencies = [
diff --git a/src/function/complex/arg.js b/src/function/complex/arg.js
index db37e11d10..67b4c278ef 100644
--- a/src/function/complex/arg.js
+++ b/src/function/complex/arg.js
@@ -1,5 +1,5 @@
-import { factory } from '../../utils/factory'
-import { deepMap } from '../../utils/collection'
+import { factory } from '../../utils/factory.js'
+import { deepMap } from '../../utils/collection.js'
 
 const name = 'arg'
 const dependencies = ['typed']
diff --git a/src/function/complex/conj.js b/src/function/complex/conj.js
index 757118a3f5..b94ece8bf7 100644
--- a/src/function/complex/conj.js
+++ b/src/function/complex/conj.js
@@ -1,5 +1,5 @@
-import { factory } from '../../utils/factory'
-import { deepMap } from '../../utils/collection'
+import { factory } from '../../utils/factory.js'
+import { deepMap } from '../../utils/collection.js'
 
 const name = 'conj'
 const dependencies = ['typed']
diff --git a/src/function/complex/im.js b/src/function/complex/im.js
index cc6410f74a..d51fa29b77 100644
--- a/src/function/complex/im.js
+++ b/src/function/complex/im.js
@@ -1,5 +1,5 @@
-import { factory } from '../../utils/factory'
-import { deepMap } from '../../utils/collection'
+import { factory } from '../../utils/factory.js'
+import { deepMap } from '../../utils/collection.js'
 
 const name = 'im'
 const dependencies = ['typed']
diff --git a/src/function/complex/re.js b/src/function/complex/re.js
index 5f2c8f629c..a22d1a68a1 100644
--- a/src/function/complex/re.js
+++ b/src/function/complex/re.js
@@ -1,5 +1,5 @@
-import { factory } from '../../utils/factory'
-import { deepMap } from '../../utils/collection'
+import { factory } from '../../utils/factory.js'
+import { deepMap } from '../../utils/collection.js'
 
 const name = 're'
 const dependencies = ['typed']
diff --git a/src/function/geometry/distance.js b/src/function/geometry/distance.js
index 3ecd295106..246cb2663a 100644
--- a/src/function/geometry/distance.js
+++ b/src/function/geometry/distance.js
@@ -1,5 +1,5 @@
-import { isBigNumber } from '../../utils/is'
-import { factory } from '../../utils/factory'
+import { isBigNumber } from '../../utils/is.js'
+import { factory } from '../../utils/factory.js'
 
 const name = 'distance'
 const dependencies = [
diff --git a/src/function/geometry/intersect.js b/src/function/geometry/intersect.js
index 59ec96f015..3df58f591e 100644
--- a/src/function/geometry/intersect.js
+++ b/src/function/geometry/intersect.js
@@ -1,5 +1,5 @@
-import { isBigNumber } from '../../utils/is'
-import { factory } from '../../utils/factory'
+import { isBigNumber } from '../../utils/is.js'
+import { factory } from '../../utils/factory.js'
 
 const name = 'intersect'
 const dependencies = [
diff --git a/src/function/logical/and.js b/src/function/logical/and.js
index c63fbcb428..a20523f34b 100644
--- a/src/function/logical/and.js
+++ b/src/function/logical/and.js
@@ -1,10 +1,10 @@
-import { createAlgorithm02 } from '../../type/matrix/utils/algorithm02'
-import { createAlgorithm11 } from '../../type/matrix/utils/algorithm11'
-import { createAlgorithm13 } from '../../type/matrix/utils/algorithm13'
-import { createAlgorithm14 } from '../../type/matrix/utils/algorithm14'
-import { createAlgorithm06 } from '../../type/matrix/utils/algorithm06'
-import { factory } from '../../utils/factory'
-import { andNumber } from '../../plain/number'
+import { createAlgorithm02 } from '../../type/matrix/utils/algorithm02.js'
+import { createAlgorithm11 } from '../../type/matrix/utils/algorithm11.js'
+import { createAlgorithm13 } from '../../type/matrix/utils/algorithm13.js'
+import { createAlgorithm14 } from '../../type/matrix/utils/algorithm14.js'
+import { createAlgorithm06 } from '../../type/matrix/utils/algorithm06.js'
+import { factory } from '../../utils/factory.js'
+import { andNumber } from '../../plain/number/index.js'
 
 const name = 'and'
 const dependencies = [
diff --git a/src/function/logical/not.js b/src/function/logical/not.js
index 855dfffe10..aa38beaee7 100644
--- a/src/function/logical/not.js
+++ b/src/function/logical/not.js
@@ -1,6 +1,6 @@
-import { deepMap } from '../../utils/collection'
-import { factory } from '../../utils/factory'
-import { notNumber } from '../../plain/number'
+import { deepMap } from '../../utils/collection.js'
+import { factory } from '../../utils/factory.js'
+import { notNumber } from '../../plain/number/index.js'
 
 const name = 'not'
 const dependencies = ['typed']
diff --git a/src/function/logical/or.js b/src/function/logical/or.js
index ca6e27a25e..d7539055f0 100644
--- a/src/function/logical/or.js
+++ b/src/function/logical/or.js
@@ -1,10 +1,10 @@
-import { createAlgorithm03 } from '../../type/matrix/utils/algorithm03'
-import { createAlgorithm12 } from '../../type/matrix/utils/algorithm12'
-import { createAlgorithm13 } from '../../type/matrix/utils/algorithm13'
-import { createAlgorithm14 } from '../../type/matrix/utils/algorithm14'
-import { createAlgorithm05 } from '../../type/matrix/utils/algorithm05'
-import { factory } from '../../utils/factory'
-import { orNumber } from '../../plain/number'
+import { createAlgorithm03 } from '../../type/matrix/utils/algorithm03.js'
+import { createAlgorithm12 } from '../../type/matrix/utils/algorithm12.js'
+import { createAlgorithm13 } from '../../type/matrix/utils/algorithm13.js'
+import { createAlgorithm14 } from '../../type/matrix/utils/algorithm14.js'
+import { createAlgorithm05 } from '../../type/matrix/utils/algorithm05.js'
+import { factory } from '../../utils/factory.js'
+import { orNumber } from '../../plain/number/index.js'
 
 const name = 'or'
 const dependencies = [
diff --git a/src/function/logical/xor.js b/src/function/logical/xor.js
index f021ce18aa..6ee5ab05c5 100644
--- a/src/function/logical/xor.js
+++ b/src/function/logical/xor.js
@@ -1,10 +1,10 @@
-import { createAlgorithm03 } from '../../type/matrix/utils/algorithm03'
-import { createAlgorithm07 } from '../../type/matrix/utils/algorithm07'
-import { createAlgorithm12 } from '../../type/matrix/utils/algorithm12'
-import { createAlgorithm13 } from '../../type/matrix/utils/algorithm13'
-import { createAlgorithm14 } from '../../type/matrix/utils/algorithm14'
-import { factory } from '../../utils/factory'
-import { xorNumber } from '../../plain/number'
+import { createAlgorithm03 } from '../../type/matrix/utils/algorithm03.js'
+import { createAlgorithm07 } from '../../type/matrix/utils/algorithm07.js'
+import { createAlgorithm12 } from '../../type/matrix/utils/algorithm12.js'
+import { createAlgorithm13 } from '../../type/matrix/utils/algorithm13.js'
+import { createAlgorithm14 } from '../../type/matrix/utils/algorithm14.js'
+import { factory } from '../../utils/factory.js'
+import { xorNumber } from '../../plain/number/index.js'
 
 const name = 'xor'
 const dependencies = [
diff --git a/src/function/matrix/apply.js b/src/function/matrix/apply.js
index 8711d8eb95..d675779fc3 100644
--- a/src/function/matrix/apply.js
+++ b/src/function/matrix/apply.js
@@ -1,7 +1,7 @@
-import { factory } from '../../utils/factory'
-import { arraySize } from '../../utils/array'
-import { isMatrix } from '../../utils/is'
-import { IndexError } from '../../error/IndexError'
+import { factory } from '../../utils/factory.js'
+import { arraySize } from '../../utils/array.js'
+import { isMatrix } from '../../utils/is.js'
+import { IndexError } from '../../error/IndexError.js'
 
 const name = 'apply'
 const dependencies = ['typed', 'isInteger']
diff --git a/src/function/matrix/column.js b/src/function/matrix/column.js
index 3de1ac4752..bb4f219872 100644
--- a/src/function/matrix/column.js
+++ b/src/function/matrix/column.js
@@ -1,6 +1,6 @@
-import { factory } from '../../utils/factory'
-import { clone } from '../../utils/object'
-import { validateIndex } from '../../utils/array'
+import { factory } from '../../utils/factory.js'
+import { clone } from '../../utils/object.js'
+import { validateIndex } from '../../utils/array.js'
 
 const name = 'column'
 const dependencies = ['typed', 'Index', 'matrix', 'range']
diff --git a/src/function/matrix/concat.js b/src/function/matrix/concat.js
index c170af3a8d..8db4bd6668 100644
--- a/src/function/matrix/concat.js
+++ b/src/function/matrix/concat.js
@@ -1,9 +1,9 @@
-import { isBigNumber, isMatrix, isNumber } from '../../utils/is'
-import { clone } from '../../utils/object'
-import { arraySize } from '../../utils/array'
-import { IndexError } from '../../error/IndexError'
-import { DimensionError } from '../../error/DimensionError'
-import { factory } from '../../utils/factory'
+import { isBigNumber, isMatrix, isNumber } from '../../utils/is.js'
+import { clone } from '../../utils/object.js'
+import { arraySize } from '../../utils/array.js'
+import { IndexError } from '../../error/IndexError.js'
+import { DimensionError } from '../../error/DimensionError.js'
+import { factory } from '../../utils/factory.js'
 
 const name = 'concat'
 const dependencies = ['typed', 'matrix', 'isInteger']
diff --git a/src/function/matrix/cross.js b/src/function/matrix/cross.js
index 69d4c00871..a943441720 100644
--- a/src/function/matrix/cross.js
+++ b/src/function/matrix/cross.js
@@ -1,5 +1,5 @@
-import { arraySize, squeeze } from '../../utils/array'
-import { factory } from '../../utils/factory'
+import { arraySize, squeeze } from '../../utils/array.js'
+import { factory } from '../../utils/factory.js'
 
 const name = 'cross'
 const dependencies = ['typed', 'matrix', 'subtract', 'multiply']
diff --git a/src/function/matrix/ctranspose.js b/src/function/matrix/ctranspose.js
index e800650085..a423ab2a5c 100644
--- a/src/function/matrix/ctranspose.js
+++ b/src/function/matrix/ctranspose.js
@@ -1,4 +1,4 @@
-import { factory } from '../../utils/factory'
+import { factory } from '../../utils/factory.js'
 
 const name = 'ctranspose'
 const dependencies = ['typed', 'transpose', 'conj']
diff --git a/src/function/matrix/det.js b/src/function/matrix/det.js
index 6b14afd9b8..5605205f64 100644
--- a/src/function/matrix/det.js
+++ b/src/function/matrix/det.js
@@ -1,7 +1,7 @@
-import { isMatrix } from '../../utils/is'
-import { clone } from '../../utils/object'
-import { format } from '../../utils/string'
-import { factory } from '../../utils/factory'
+import { isMatrix } from '../../utils/is.js'
+import { clone } from '../../utils/object.js'
+import { format } from '../../utils/string.js'
+import { factory } from '../../utils/factory.js'
 
 const name = 'det'
 const dependencies = ['typed', 'matrix', 'subtract', 'multiply', 'unaryMinus', 'lup']
diff --git a/src/function/matrix/diag.js b/src/function/matrix/diag.js
index 093c04c9db..a0f9bc4d47 100644
--- a/src/function/matrix/diag.js
+++ b/src/function/matrix/diag.js
@@ -1,7 +1,7 @@
-import { isMatrix } from '../../utils/is'
-import { arraySize } from '../../utils/array'
-import { isInteger } from '../../utils/number'
-import { factory } from '../../utils/factory'
+import { isMatrix } from '../../utils/is.js'
+import { arraySize } from '../../utils/array.js'
+import { isInteger } from '../../utils/number.js'
+import { factory } from '../../utils/factory.js'
 
 const name = 'diag'
 const dependencies = ['typed', 'matrix', 'DenseMatrix', 'SparseMatrix']
diff --git a/src/function/matrix/diff.js b/src/function/matrix/diff.js
index 62fe950d9a..40ce422188 100644
--- a/src/function/matrix/diff.js
+++ b/src/function/matrix/diff.js
@@ -1,6 +1,6 @@
-import { factory } from '../../utils/factory'
-import { isInteger } from '../../utils/number'
-import { isMatrix } from '../../utils/is'
+import { factory } from '../../utils/factory.js'
+import { isInteger } from '../../utils/number.js'
+import { isMatrix } from '../../utils/is.js'
 
 const name = 'diff'
 const dependencies = ['typed', 'matrix', 'subtract', 'number']
diff --git a/src/function/matrix/dot.js b/src/function/matrix/dot.js
index a03f39c7c8..bf47bb8b76 100644
--- a/src/function/matrix/dot.js
+++ b/src/function/matrix/dot.js
@@ -1,5 +1,5 @@
-import { factory } from '../../utils/factory'
-import { isMatrix } from '../../utils/is'
+import { factory } from '../../utils/factory.js'
+import { isMatrix } from '../../utils/is.js'
 
 const name = 'dot'
 const dependencies = ['typed', 'addScalar', 'multiplyScalar', 'conj', 'size']
diff --git a/src/function/matrix/eigs.js b/src/function/matrix/eigs.js
index acb90551f3..36b85d6808 100644
--- a/src/function/matrix/eigs.js
+++ b/src/function/matrix/eigs.js
@@ -1,6 +1,6 @@
-import { clone } from '../../utils/object'
-import { factory } from '../../utils/factory'
-import { format } from '../../utils/string'
+import { clone } from '../../utils/object.js'
+import { factory } from '../../utils/factory.js'
+import { format } from '../../utils/string.js'
 
 const name = 'eigs'
 const dependencies = ['config', 'typed', 'matrix', 'addScalar', 'equal', 'subtract', 'abs', 'atan', 'cos', 'sin', 'multiplyScalar', 'inv', 'bignumber', 'multiply', 'add']
diff --git a/src/function/matrix/expm.js b/src/function/matrix/expm.js
index 8a3e4560fb..df9e94be58 100644
--- a/src/function/matrix/expm.js
+++ b/src/function/matrix/expm.js
@@ -1,6 +1,6 @@
-import { isSparseMatrix } from '../../utils/is'
-import { format } from '../../utils/string'
-import { factory } from '../../utils/factory'
+import { isSparseMatrix } from '../../utils/is.js'
+import { format } from '../../utils/string.js'
+import { factory } from '../../utils/factory.js'
 
 const name = 'expm'
 const dependencies = ['typed', 'abs', 'add', 'identity', 'inv', 'multiply']
diff --git a/src/function/matrix/filter.js b/src/function/matrix/filter.js
index 0c7957e19c..9a4c14a1a0 100644
--- a/src/function/matrix/filter.js
+++ b/src/function/matrix/filter.js
@@ -1,6 +1,6 @@
-import { filter, filterRegExp } from '../../utils/array'
-import { maxArgumentCount } from '../../utils/function'
-import { factory } from '../../utils/factory'
+import { filter, filterRegExp } from '../../utils/array.js'
+import { maxArgumentCount } from '../../utils/function.js'
+import { factory } from '../../utils/factory.js'
 
 const name = 'filter'
 const dependencies = ['typed']
diff --git a/src/function/matrix/flatten.js b/src/function/matrix/flatten.js
index 880f6634ff..59505b9acb 100644
--- a/src/function/matrix/flatten.js
+++ b/src/function/matrix/flatten.js
@@ -1,6 +1,6 @@
-import { clone } from '../../utils/object'
-import { flatten as flattenArray } from '../../utils/array'
-import { factory } from '../../utils/factory'
+import { clone } from '../../utils/object.js'
+import { flatten as flattenArray } from '../../utils/array.js'
+import { factory } from '../../utils/factory.js'
 
 const name = 'flatten'
 const dependencies = ['typed', 'matrix']
diff --git a/src/function/matrix/forEach.js b/src/function/matrix/forEach.js
index c83bd2e09a..ac76980316 100644
--- a/src/function/matrix/forEach.js
+++ b/src/function/matrix/forEach.js
@@ -1,6 +1,6 @@
-import { maxArgumentCount } from '../../utils/function'
-import { forEach as forEachArray } from '../../utils/array'
-import { factory } from '../../utils/factory'
+import { maxArgumentCount } from '../../utils/function.js'
+import { forEach as forEachArray } from '../../utils/array.js'
+import { factory } from '../../utils/factory.js'
 
 const name = 'forEach'
 const dependencies = ['typed']
diff --git a/src/function/matrix/getMatrixDataType.js b/src/function/matrix/getMatrixDataType.js
index a3aa8fa9fb..de008f5cf4 100644
--- a/src/function/matrix/getMatrixDataType.js
+++ b/src/function/matrix/getMatrixDataType.js
@@ -1,6 +1,6 @@
-import { factory } from '../../utils/factory'
-import { getArrayDataType } from '../../utils/array'
-import { typeOf } from '../../utils/is'
+import { factory } from '../../utils/factory.js'
+import { getArrayDataType } from '../../utils/array.js'
+import { typeOf } from '../../utils/is.js'
 
 const name = 'getMatrixDataType'
 const dependencies = ['typed']
diff --git a/src/function/matrix/identity.js b/src/function/matrix/identity.js
index 1e12e33269..5ee1cf0bc6 100644
--- a/src/function/matrix/identity.js
+++ b/src/function/matrix/identity.js
@@ -1,7 +1,7 @@
-import { isBigNumber } from '../../utils/is'
-import { resize } from '../../utils/array'
-import { isInteger } from '../../utils/number'
-import { factory } from '../../utils/factory'
+import { isBigNumber } from '../../utils/is.js'
+import { resize } from '../../utils/array.js'
+import { isInteger } from '../../utils/number.js'
+import { factory } from '../../utils/factory.js'
 
 const name = 'identity'
 const dependencies = [
diff --git a/src/function/matrix/inv.js b/src/function/matrix/inv.js
index 28281a59e1..5065fce27e 100644
--- a/src/function/matrix/inv.js
+++ b/src/function/matrix/inv.js
@@ -1,7 +1,7 @@
-import { isMatrix } from '../../utils/is'
-import { arraySize } from '../../utils/array'
-import { factory } from '../../utils/factory'
-import { format } from '../../utils/string'
+import { isMatrix } from '../../utils/is.js'
+import { arraySize } from '../../utils/array.js'
+import { factory } from '../../utils/factory.js'
+import { format } from '../../utils/string.js'
 
 const name = 'inv'
 const dependencies = [
diff --git a/src/function/matrix/kron.js b/src/function/matrix/kron.js
index 8b931e526b..a7a92b1adc 100644
--- a/src/function/matrix/kron.js
+++ b/src/function/matrix/kron.js
@@ -1,5 +1,5 @@
-import { arraySize as size } from '../../utils/array'
-import { factory } from '../../utils/factory'
+import { arraySize as size } from '../../utils/array.js'
+import { factory } from '../../utils/factory.js'
 
 const name = 'kron'
 const dependencies = ['typed', 'matrix', 'multiplyScalar']
diff --git a/src/function/matrix/map.js b/src/function/matrix/map.js
index 5372cb1078..71a27cd4b5 100644
--- a/src/function/matrix/map.js
+++ b/src/function/matrix/map.js
@@ -1,5 +1,5 @@
-import { maxArgumentCount } from '../../utils/function'
-import { factory } from '../../utils/factory'
+import { maxArgumentCount } from '../../utils/function.js'
+import { factory } from '../../utils/factory.js'
 
 const name = 'map'
 const dependencies = ['typed']
diff --git a/src/function/matrix/ones.js b/src/function/matrix/ones.js
index 5b8c47745f..7e501304c9 100644
--- a/src/function/matrix/ones.js
+++ b/src/function/matrix/ones.js
@@ -1,7 +1,7 @@
-import { isBigNumber } from '../../utils/is'
-import { isInteger } from '../../utils/number'
-import { resize } from '../../utils/array'
-import { factory } from '../../utils/factory'
+import { isBigNumber } from '../../utils/is.js'
+import { isInteger } from '../../utils/number.js'
+import { resize } from '../../utils/array.js'
+import { factory } from '../../utils/factory.js'
 
 const name = 'ones'
 const dependencies = ['typed', 'config', 'matrix', 'BigNumber']
diff --git a/src/function/matrix/partitionSelect.js b/src/function/matrix/partitionSelect.js
index 1f69dad8a3..f1b60e092d 100644
--- a/src/function/matrix/partitionSelect.js
+++ b/src/function/matrix/partitionSelect.js
@@ -1,6 +1,6 @@
-import { isMatrix } from '../../utils/is'
-import { isInteger } from '../../utils/number'
-import { factory } from '../../utils/factory'
+import { isMatrix } from '../../utils/is.js'
+import { isInteger } from '../../utils/number.js'
+import { factory } from '../../utils/factory.js'
 
 const name = 'partitionSelect'
 const dependencies = ['typed', 'isNumeric', 'isNaN', 'compare']
diff --git a/src/function/matrix/range.js b/src/function/matrix/range.js
index 35b36816f4..13bd8a15e9 100644
--- a/src/function/matrix/range.js
+++ b/src/function/matrix/range.js
@@ -1,5 +1,5 @@
-import { factory } from '../../utils/factory'
-import { noBignumber, noMatrix } from '../../utils/noop'
+import { factory } from '../../utils/factory.js'
+import { noBignumber, noMatrix } from '../../utils/noop.js'
 
 const name = 'range'
 const dependencies = ['typed', 'config', '?matrix', '?bignumber', 'smaller', 'smallerEq', 'larger', 'largerEq']
diff --git a/src/function/matrix/reshape.js b/src/function/matrix/reshape.js
index 530c2311c5..17e848924f 100644
--- a/src/function/matrix/reshape.js
+++ b/src/function/matrix/reshape.js
@@ -1,5 +1,5 @@
-import { reshape as arrayReshape } from '../../utils/array'
-import { factory } from '../../utils/factory'
+import { reshape as arrayReshape } from '../../utils/array.js'
+import { factory } from '../../utils/factory.js'
 
 const name = 'reshape'
 const dependencies = ['typed', 'isInteger', 'matrix']
diff --git a/src/function/matrix/resize.js b/src/function/matrix/resize.js
index ea55d04ac7..3f28a91377 100644
--- a/src/function/matrix/resize.js
+++ b/src/function/matrix/resize.js
@@ -1,11 +1,11 @@
-import { isBigNumber, isMatrix } from '../../utils/is'
-import { DimensionError } from '../../error/DimensionError'
-import { ArgumentsError } from '../../error/ArgumentsError'
-import { isInteger } from '../../utils/number'
-import { format } from '../../utils/string'
-import { clone } from '../../utils/object'
-import { resize as arrayResize } from '../../utils/array'
-import { factory } from '../../utils/factory'
+import { isBigNumber, isMatrix } from '../../utils/is.js'
+import { DimensionError } from '../../error/DimensionError.js'
+import { ArgumentsError } from '../../error/ArgumentsError.js'
+import { isInteger } from '../../utils/number.js'
+import { format } from '../../utils/string.js'
+import { clone } from '../../utils/object.js'
+import { resize as arrayResize } from '../../utils/array.js'
+import { factory } from '../../utils/factory.js'
 
 const name = 'resize'
 const dependencies = ['config', 'matrix']
diff --git a/src/function/matrix/row.js b/src/function/matrix/row.js
index 49f62d99b7..33c3f1b442 100644
--- a/src/function/matrix/row.js
+++ b/src/function/matrix/row.js
@@ -1,6 +1,6 @@
-import { factory } from '../../utils/factory'
-import { clone } from '../../utils/object'
-import { validateIndex } from '../../utils/array'
+import { factory } from '../../utils/factory.js'
+import { clone } from '../../utils/object.js'
+import { validateIndex } from '../../utils/array.js'
 
 const name = 'row'
 const dependencies = ['typed', 'Index', 'matrix', 'range']
diff --git a/src/function/matrix/size.js b/src/function/matrix/size.js
index e3d6fd4ff8..9af7f57c8d 100644
--- a/src/function/matrix/size.js
+++ b/src/function/matrix/size.js
@@ -1,6 +1,6 @@
-import { arraySize } from '../../utils/array'
-import { factory } from '../../utils/factory'
-import { noMatrix } from '../../utils/noop'
+import { arraySize } from '../../utils/array.js'
+import { factory } from '../../utils/factory.js'
+import { noMatrix } from '../../utils/noop.js'
 
 const name = 'size'
 const dependencies = ['typed', 'config', '?matrix']
diff --git a/src/function/matrix/sort.js b/src/function/matrix/sort.js
index 49a773dad3..104118747c 100644
--- a/src/function/matrix/sort.js
+++ b/src/function/matrix/sort.js
@@ -1,5 +1,5 @@
-import { arraySize as size } from '../../utils/array'
-import { factory } from '../../utils/factory'
+import { arraySize as size } from '../../utils/array.js'
+import { factory } from '../../utils/factory.js'
 
 const name = 'sort'
 const dependencies = ['typed', 'matrix', 'compare', 'compareNatural']
diff --git a/src/function/matrix/sqrtm.js b/src/function/matrix/sqrtm.js
index 84a87c421c..1a81e7829e 100644
--- a/src/function/matrix/sqrtm.js
+++ b/src/function/matrix/sqrtm.js
@@ -1,7 +1,7 @@
-import { isMatrix } from '../../utils/is'
-import { format } from '../../utils/string'
-import { arraySize } from '../../utils/array'
-import { factory } from '../../utils/factory'
+import { isMatrix } from '../../utils/is.js'
+import { format } from '../../utils/string.js'
+import { arraySize } from '../../utils/array.js'
+import { factory } from '../../utils/factory.js'
 
 const name = 'sqrtm'
 const dependencies = ['typed', 'abs', 'add', 'multiply', 'sqrt', 'subtract', 'inv', 'size', 'max', 'identity']
diff --git a/src/function/matrix/squeeze.js b/src/function/matrix/squeeze.js
index 5c31042af3..cee45426c7 100644
--- a/src/function/matrix/squeeze.js
+++ b/src/function/matrix/squeeze.js
@@ -1,6 +1,6 @@
-import { clone } from '../../utils/object'
-import { squeeze as arraySqueeze } from '../../utils/array'
-import { factory } from '../../utils/factory'
+import { clone } from '../../utils/object.js'
+import { squeeze as arraySqueeze } from '../../utils/array.js'
+import { factory } from '../../utils/factory.js'
 
 const name = 'squeeze'
 const dependencies = ['typed', 'matrix']
diff --git a/src/function/matrix/subset.js b/src/function/matrix/subset.js
index 19a2ef0945..4af7d60f70 100644
--- a/src/function/matrix/subset.js
+++ b/src/function/matrix/subset.js
@@ -1,9 +1,9 @@
-import { isIndex } from '../../utils/is'
-import { clone } from '../../utils/object'
-import { validateIndex } from '../../utils/array'
-import { getSafeProperty, setSafeProperty } from '../../utils/customs'
-import { DimensionError } from '../../error/DimensionError'
-import { factory } from '../../utils/factory'
+import { isIndex } from '../../utils/is.js'
+import { clone } from '../../utils/object.js'
+import { validateIndex } from '../../utils/array.js'
+import { getSafeProperty, setSafeProperty } from '../../utils/customs.js'
+import { DimensionError } from '../../error/DimensionError.js'
+import { factory } from '../../utils/factory.js'
 
 const name = 'subset'
 const dependencies = ['typed', 'matrix']
diff --git a/src/function/matrix/trace.js b/src/function/matrix/trace.js
index 2857711d67..1d49f2fc52 100644
--- a/src/function/matrix/trace.js
+++ b/src/function/matrix/trace.js
@@ -1,6 +1,6 @@
-import { clone } from '../../utils/object'
-import { format } from '../../utils/string'
-import { factory } from '../../utils/factory'
+import { clone } from '../../utils/object.js'
+import { format } from '../../utils/string.js'
+import { factory } from '../../utils/factory.js'
 
 const name = 'trace'
 const dependencies = ['typed', 'matrix', 'add']
diff --git a/src/function/matrix/transpose.js b/src/function/matrix/transpose.js
index 5b83e66e82..709e6794cd 100644
--- a/src/function/matrix/transpose.js
+++ b/src/function/matrix/transpose.js
@@ -1,6 +1,6 @@
-import { clone } from '../../utils/object'
-import { format } from '../../utils/string'
-import { factory } from '../../utils/factory'
+import { clone } from '../../utils/object.js'
+import { format } from '../../utils/string.js'
+import { factory } from '../../utils/factory.js'
 
 const name = 'transpose'
 const dependencies = ['typed', 'matrix']
diff --git a/src/function/matrix/zeros.js b/src/function/matrix/zeros.js
index c3888055d7..eb53ceb41e 100644
--- a/src/function/matrix/zeros.js
+++ b/src/function/matrix/zeros.js
@@ -1,7 +1,7 @@
-import { isBigNumber } from '../../utils/is'
-import { isInteger } from '../../utils/number'
-import { resize } from '../../utils/array'
-import { factory } from '../../utils/factory'
+import { isBigNumber } from '../../utils/is.js'
+import { isInteger } from '../../utils/number.js'
+import { resize } from '../../utils/array.js'
+import { factory } from '../../utils/factory.js'
 
 const name = 'zeros'
 const dependencies = ['typed', 'config', 'matrix', 'BigNumber']
diff --git a/src/function/probability/combinations.js b/src/function/probability/combinations.js
index 3f7a701739..e98accb004 100644
--- a/src/function/probability/combinations.js
+++ b/src/function/probability/combinations.js
@@ -1,5 +1,5 @@
-import { factory } from '../../utils/factory'
-import { combinationsNumber } from '../../plain/number/combinations'
+import { factory } from '../../utils/factory.js'
+import { combinationsNumber } from '../../plain/number/combinations.js'
 
 const name = 'combinations'
 const dependencies = ['typed']
diff --git a/src/function/probability/combinationsWithRep.js b/src/function/probability/combinationsWithRep.js
index ab7a79ecb4..480f26ee1c 100644
--- a/src/function/probability/combinationsWithRep.js
+++ b/src/function/probability/combinationsWithRep.js
@@ -1,6 +1,6 @@
-import { factory } from '../../utils/factory'
-import { isInteger } from '../../utils/number'
-import { product } from '../../utils/product'
+import { factory } from '../../utils/factory.js'
+import { isInteger } from '../../utils/number.js'
+import { product } from '../../utils/product.js'
 
 const name = 'combinationsWithRep'
 const dependencies = ['typed']
diff --git a/src/function/probability/factorial.js b/src/function/probability/factorial.js
index 0d064323da..f4d6b390d7 100644
--- a/src/function/probability/factorial.js
+++ b/src/function/probability/factorial.js
@@ -1,5 +1,5 @@
-import { deepMap } from '../../utils/collection'
-import { factory } from '../../utils/factory'
+import { deepMap } from '../../utils/collection.js'
+import { factory } from '../../utils/factory.js'
 
 const name = 'factorial'
 const dependencies = ['typed', 'gamma']
diff --git a/src/function/probability/gamma.js b/src/function/probability/gamma.js
index 0c3a4a9535..ea82da83bb 100644
--- a/src/function/probability/gamma.js
+++ b/src/function/probability/gamma.js
@@ -1,6 +1,6 @@
-import { deepMap } from '../../utils/collection'
-import { factory } from '../../utils/factory'
-import { gammaG, gammaNumber, gammaP } from '../../plain/number'
+import { deepMap } from '../../utils/collection.js'
+import { factory } from '../../utils/factory.js'
+import { gammaG, gammaNumber, gammaP } from '../../plain/number/index.js'
 
 const name = 'gamma'
 const dependencies = ['typed', 'config', 'multiplyScalar', 'pow', 'BigNumber', 'Complex']
diff --git a/src/function/probability/kldivergence.js b/src/function/probability/kldivergence.js
index 4b3ad10b7a..7eae4d683b 100644
--- a/src/function/probability/kldivergence.js
+++ b/src/function/probability/kldivergence.js
@@ -1,4 +1,4 @@
-import { factory } from '../../utils/factory'
+import { factory } from '../../utils/factory.js'
 
 const name = 'kldivergence'
 const dependencies = ['typed', 'matrix', 'divide', 'sum', 'multiply', 'dotDivide', 'log', 'isNumeric']
diff --git a/src/function/probability/multinomial.js b/src/function/probability/multinomial.js
index 6a5e36a420..d67d839f34 100644
--- a/src/function/probability/multinomial.js
+++ b/src/function/probability/multinomial.js
@@ -1,5 +1,5 @@
-import { deepForEach } from '../../utils/collection'
-import { factory } from '../../utils/factory'
+import { deepForEach } from '../../utils/collection.js'
+import { factory } from '../../utils/factory.js'
 
 const name = 'multinomial'
 const dependencies = ['typed', 'add', 'divide', 'multiply', 'factorial', 'isInteger', 'isPositive']
diff --git a/src/function/probability/permutations.js b/src/function/probability/permutations.js
index 0ddd92413f..4cffe4b783 100644
--- a/src/function/probability/permutations.js
+++ b/src/function/probability/permutations.js
@@ -1,6 +1,6 @@
-import { isInteger } from '../../utils/number'
-import { product } from '../../utils/product'
-import { factory } from '../../utils/factory'
+import { isInteger } from '../../utils/number.js'
+import { product } from '../../utils/product.js'
+import { factory } from '../../utils/factory.js'
 
 const name = 'permutations'
 const dependencies = ['typed', 'factorial']
diff --git a/src/function/probability/pickRandom.js b/src/function/probability/pickRandom.js
index e0104553d6..a9cf3c3489 100644
--- a/src/function/probability/pickRandom.js
+++ b/src/function/probability/pickRandom.js
@@ -1,7 +1,7 @@
-import { factory } from '../../utils/factory'
-import { isNumber } from '../../utils/is'
-import { arraySize } from '../../utils/array'
-import { createRng } from './util/seededRNG'
+import { factory } from '../../utils/factory.js'
+import { isNumber } from '../../utils/is.js'
+import { arraySize } from '../../utils/array.js'
+import { createRng } from './util/seededRNG.js'
 
 const name = 'pickRandom'
 const dependencies = ['typed', 'config', '?on']
diff --git a/src/function/probability/random.js b/src/function/probability/random.js
index 9ffdd0557a..c454116b7a 100644
--- a/src/function/probability/random.js
+++ b/src/function/probability/random.js
@@ -1,7 +1,7 @@
-import { factory } from '../../utils/factory'
-import { isMatrix } from '../../utils/is'
-import { createRng } from './util/seededRNG'
-import { randomMatrix } from './util/randomMatrix'
+import { factory } from '../../utils/factory.js'
+import { isMatrix } from '../../utils/is.js'
+import { createRng } from './util/seededRNG.js'
+import { randomMatrix } from './util/randomMatrix.js'
 
 const name = 'random'
 const dependencies = ['typed', 'config', '?on']
diff --git a/src/function/probability/randomInt.js b/src/function/probability/randomInt.js
index 775e23f45d..8285bdaa86 100644
--- a/src/function/probability/randomInt.js
+++ b/src/function/probability/randomInt.js
@@ -1,7 +1,7 @@
-import { factory } from '../../utils/factory'
-import { randomMatrix } from './util/randomMatrix'
-import { createRng } from './util/seededRNG'
-import { isMatrix } from '../../utils/is'
+import { factory } from '../../utils/factory.js'
+import { randomMatrix } from './util/randomMatrix.js'
+import { createRng } from './util/seededRNG.js'
+import { isMatrix } from '../../utils/is.js'
 
 const name = 'randomInt'
 const dependencies = ['typed', 'config', '?on']
diff --git a/src/function/relational/compare.js b/src/function/relational/compare.js
index fb86cdd586..0078dd9893 100644
--- a/src/function/relational/compare.js
+++ b/src/function/relational/compare.js
@@ -1,11 +1,11 @@
-import { nearlyEqual as bigNearlyEqual } from '../../utils/bignumber/nearlyEqual'
-import { nearlyEqual } from '../../utils/number'
-import { factory } from '../../utils/factory'
-import { createAlgorithm03 } from '../../type/matrix/utils/algorithm03'
-import { createAlgorithm12 } from '../../type/matrix/utils/algorithm12'
-import { createAlgorithm14 } from '../../type/matrix/utils/algorithm14'
-import { createAlgorithm13 } from '../../type/matrix/utils/algorithm13'
-import { createAlgorithm05 } from '../../type/matrix/utils/algorithm05'
+import { nearlyEqual as bigNearlyEqual } from '../../utils/bignumber/nearlyEqual.js'
+import { nearlyEqual } from '../../utils/number.js'
+import { factory } from '../../utils/factory.js'
+import { createAlgorithm03 } from '../../type/matrix/utils/algorithm03.js'
+import { createAlgorithm12 } from '../../type/matrix/utils/algorithm12.js'
+import { createAlgorithm14 } from '../../type/matrix/utils/algorithm14.js'
+import { createAlgorithm13 } from '../../type/matrix/utils/algorithm13.js'
+import { createAlgorithm05 } from '../../type/matrix/utils/algorithm05.js'
 
 const name = 'compare'
 const dependencies = [
diff --git a/src/function/relational/compareNatural.js b/src/function/relational/compareNatural.js
index 9e4f455937..19e8558b3e 100644
--- a/src/function/relational/compareNatural.js
+++ b/src/function/relational/compareNatural.js
@@ -1,6 +1,6 @@
 import naturalSort from 'javascript-natural-sort'
-import { isDenseMatrix, isSparseMatrix, typeOf } from '../../utils/is'
-import { factory } from '../../utils/factory'
+import { isDenseMatrix, isSparseMatrix, typeOf } from '../../utils/is.js'
+import { factory } from '../../utils/factory.js'
 
 const name = 'compareNatural'
 const dependencies = [
diff --git a/src/function/relational/compareText.js b/src/function/relational/compareText.js
index b77307cfe7..05b7553e17 100644
--- a/src/function/relational/compareText.js
+++ b/src/function/relational/compareText.js
@@ -1,7 +1,7 @@
-import { compareText as _compareText } from '../../utils/string'
-import { factory } from '../../utils/factory'
-import { createAlgorithm14 } from '../../type/matrix/utils/algorithm14'
-import { createAlgorithm13 } from '../../type/matrix/utils/algorithm13'
+import { compareText as _compareText } from '../../utils/string.js'
+import { factory } from '../../utils/factory.js'
+import { createAlgorithm14 } from '../../type/matrix/utils/algorithm14.js'
+import { createAlgorithm13 } from '../../type/matrix/utils/algorithm13.js'
 
 const name = 'compareText'
 const dependencies = [
diff --git a/src/function/relational/deepEqual.js b/src/function/relational/deepEqual.js
index b4a9dcfdc4..f693b8b6e9 100644
--- a/src/function/relational/deepEqual.js
+++ b/src/function/relational/deepEqual.js
@@ -1,4 +1,4 @@
-import { factory } from '../../utils/factory'
+import { factory } from '../../utils/factory.js'
 
 const name = 'deepEqual'
 const dependencies = [
diff --git a/src/function/relational/equal.js b/src/function/relational/equal.js
index cb477b6771..94f294e050 100644
--- a/src/function/relational/equal.js
+++ b/src/function/relational/equal.js
@@ -1,9 +1,9 @@
-import { factory } from '../../utils/factory'
-import { createAlgorithm03 } from '../../type/matrix/utils/algorithm03'
-import { createAlgorithm07 } from '../../type/matrix/utils/algorithm07'
-import { createAlgorithm12 } from '../../type/matrix/utils/algorithm12'
-import { createAlgorithm13 } from '../../type/matrix/utils/algorithm13'
-import { createAlgorithm14 } from '../../type/matrix/utils/algorithm14'
+import { factory } from '../../utils/factory.js'
+import { createAlgorithm03 } from '../../type/matrix/utils/algorithm03.js'
+import { createAlgorithm07 } from '../../type/matrix/utils/algorithm07.js'
+import { createAlgorithm12 } from '../../type/matrix/utils/algorithm12.js'
+import { createAlgorithm13 } from '../../type/matrix/utils/algorithm13.js'
+import { createAlgorithm14 } from '../../type/matrix/utils/algorithm14.js'
 
 const name = 'equal'
 const dependencies = [
diff --git a/src/function/relational/equalScalar.js b/src/function/relational/equalScalar.js
index 4c991a146f..cedfc085ca 100644
--- a/src/function/relational/equalScalar.js
+++ b/src/function/relational/equalScalar.js
@@ -1,7 +1,7 @@
-import { nearlyEqual as bigNearlyEqual } from '../../utils/bignumber/nearlyEqual'
-import { nearlyEqual } from '../../utils/number'
-import { factory } from '../../utils/factory'
-import { complexEquals } from '../../utils/complex'
+import { nearlyEqual as bigNearlyEqual } from '../../utils/bignumber/nearlyEqual.js'
+import { nearlyEqual } from '../../utils/number.js'
+import { factory } from '../../utils/factory.js'
+import { complexEquals } from '../../utils/complex.js'
 
 const name = 'equalScalar'
 const dependencies = ['typed', 'config']
diff --git a/src/function/relational/equalText.js b/src/function/relational/equalText.js
index 2b3c606eda..5751645514 100644
--- a/src/function/relational/equalText.js
+++ b/src/function/relational/equalText.js
@@ -1,4 +1,4 @@
-import { factory } from '../../utils/factory'
+import { factory } from '../../utils/factory.js'
 
 const name = 'equalText'
 const dependencies = [
diff --git a/src/function/relational/larger.js b/src/function/relational/larger.js
index 143a07bd89..1f9f04735a 100644
--- a/src/function/relational/larger.js
+++ b/src/function/relational/larger.js
@@ -1,11 +1,11 @@
-import { nearlyEqual as bigNearlyEqual } from '../../utils/bignumber/nearlyEqual'
-import { nearlyEqual } from '../../utils/number'
-import { factory } from '../../utils/factory'
-import { createAlgorithm03 } from '../../type/matrix/utils/algorithm03'
-import { createAlgorithm07 } from '../../type/matrix/utils/algorithm07'
-import { createAlgorithm12 } from '../../type/matrix/utils/algorithm12'
-import { createAlgorithm14 } from '../../type/matrix/utils/algorithm14'
-import { createAlgorithm13 } from '../../type/matrix/utils/algorithm13'
+import { nearlyEqual as bigNearlyEqual } from '../../utils/bignumber/nearlyEqual.js'
+import { nearlyEqual } from '../../utils/number.js'
+import { factory } from '../../utils/factory.js'
+import { createAlgorithm03 } from '../../type/matrix/utils/algorithm03.js'
+import { createAlgorithm07 } from '../../type/matrix/utils/algorithm07.js'
+import { createAlgorithm12 } from '../../type/matrix/utils/algorithm12.js'
+import { createAlgorithm14 } from '../../type/matrix/utils/algorithm14.js'
+import { createAlgorithm13 } from '../../type/matrix/utils/algorithm13.js'
 
 const name = 'larger'
 const dependencies = [
diff --git a/src/function/relational/largerEq.js b/src/function/relational/largerEq.js
index 5c71ebb764..85ce692b58 100644
--- a/src/function/relational/largerEq.js
+++ b/src/function/relational/largerEq.js
@@ -1,11 +1,11 @@
-import { nearlyEqual as bigNearlyEqual } from '../../utils/bignumber/nearlyEqual'
-import { nearlyEqual } from '../../utils/number'
-import { factory } from '../../utils/factory'
-import { createAlgorithm03 } from '../../type/matrix/utils/algorithm03'
-import { createAlgorithm07 } from '../../type/matrix/utils/algorithm07'
-import { createAlgorithm12 } from '../../type/matrix/utils/algorithm12'
-import { createAlgorithm14 } from '../../type/matrix/utils/algorithm14'
-import { createAlgorithm13 } from '../../type/matrix/utils/algorithm13'
+import { nearlyEqual as bigNearlyEqual } from '../../utils/bignumber/nearlyEqual.js'
+import { nearlyEqual } from '../../utils/number.js'
+import { factory } from '../../utils/factory.js'
+import { createAlgorithm03 } from '../../type/matrix/utils/algorithm03.js'
+import { createAlgorithm07 } from '../../type/matrix/utils/algorithm07.js'
+import { createAlgorithm12 } from '../../type/matrix/utils/algorithm12.js'
+import { createAlgorithm14 } from '../../type/matrix/utils/algorithm14.js'
+import { createAlgorithm13 } from '../../type/matrix/utils/algorithm13.js'
 
 const name = 'largerEq'
 const dependencies = [
diff --git a/src/function/relational/smaller.js b/src/function/relational/smaller.js
index 5a241e56d1..cf0564d418 100644
--- a/src/function/relational/smaller.js
+++ b/src/function/relational/smaller.js
@@ -1,11 +1,11 @@
-import { nearlyEqual as bigNearlyEqual } from '../../utils/bignumber/nearlyEqual'
-import { nearlyEqual } from '../../utils/number'
-import { factory } from '../../utils/factory'
-import { createAlgorithm03 } from '../../type/matrix/utils/algorithm03'
-import { createAlgorithm07 } from '../../type/matrix/utils/algorithm07'
-import { createAlgorithm12 } from '../../type/matrix/utils/algorithm12'
-import { createAlgorithm14 } from '../../type/matrix/utils/algorithm14'
-import { createAlgorithm13 } from '../../type/matrix/utils/algorithm13'
+import { nearlyEqual as bigNearlyEqual } from '../../utils/bignumber/nearlyEqual.js'
+import { nearlyEqual } from '../../utils/number.js'
+import { factory } from '../../utils/factory.js'
+import { createAlgorithm03 } from '../../type/matrix/utils/algorithm03.js'
+import { createAlgorithm07 } from '../../type/matrix/utils/algorithm07.js'
+import { createAlgorithm12 } from '../../type/matrix/utils/algorithm12.js'
+import { createAlgorithm14 } from '../../type/matrix/utils/algorithm14.js'
+import { createAlgorithm13 } from '../../type/matrix/utils/algorithm13.js'
 
 const name = 'smaller'
 const dependencies = [
diff --git a/src/function/relational/smallerEq.js b/src/function/relational/smallerEq.js
index 09aad7967f..3b9b755eb2 100644
--- a/src/function/relational/smallerEq.js
+++ b/src/function/relational/smallerEq.js
@@ -1,11 +1,11 @@
-import { nearlyEqual as bigNearlyEqual } from '../../utils/bignumber/nearlyEqual'
-import { nearlyEqual } from '../../utils/number'
-import { factory } from '../../utils/factory'
-import { createAlgorithm03 } from '../../type/matrix/utils/algorithm03'
-import { createAlgorithm07 } from '../../type/matrix/utils/algorithm07'
-import { createAlgorithm12 } from '../../type/matrix/utils/algorithm12'
-import { createAlgorithm14 } from '../../type/matrix/utils/algorithm14'
-import { createAlgorithm13 } from '../../type/matrix/utils/algorithm13'
+import { nearlyEqual as bigNearlyEqual } from '../../utils/bignumber/nearlyEqual.js'
+import { nearlyEqual } from '../../utils/number.js'
+import { factory } from '../../utils/factory.js'
+import { createAlgorithm03 } from '../../type/matrix/utils/algorithm03.js'
+import { createAlgorithm07 } from '../../type/matrix/utils/algorithm07.js'
+import { createAlgorithm12 } from '../../type/matrix/utils/algorithm12.js'
+import { createAlgorithm14 } from '../../type/matrix/utils/algorithm14.js'
+import { createAlgorithm13 } from '../../type/matrix/utils/algorithm13.js'
 
 const name = 'smallerEq'
 const dependencies = [
diff --git a/src/function/relational/unequal.js b/src/function/relational/unequal.js
index 5f4bf986d1..9ba26b8a85 100644
--- a/src/function/relational/unequal.js
+++ b/src/function/relational/unequal.js
@@ -1,9 +1,9 @@
-import { factory } from '../../utils/factory'
-import { createAlgorithm03 } from '../../type/matrix/utils/algorithm03'
-import { createAlgorithm07 } from '../../type/matrix/utils/algorithm07'
-import { createAlgorithm12 } from '../../type/matrix/utils/algorithm12'
-import { createAlgorithm14 } from '../../type/matrix/utils/algorithm14'
-import { createAlgorithm13 } from '../../type/matrix/utils/algorithm13'
+import { factory } from '../../utils/factory.js'
+import { createAlgorithm03 } from '../../type/matrix/utils/algorithm03.js'
+import { createAlgorithm07 } from '../../type/matrix/utils/algorithm07.js'
+import { createAlgorithm12 } from '../../type/matrix/utils/algorithm12.js'
+import { createAlgorithm14 } from '../../type/matrix/utils/algorithm14.js'
+import { createAlgorithm13 } from '../../type/matrix/utils/algorithm13.js'
 
 const name = 'unequal'
 const dependencies = [
diff --git a/src/function/set/setCartesian.js b/src/function/set/setCartesian.js
index 2b3622c394..6df3884564 100644
--- a/src/function/set/setCartesian.js
+++ b/src/function/set/setCartesian.js
@@ -1,5 +1,5 @@
-import { flatten } from '../../utils/array'
-import { factory } from '../../utils/factory'
+import { flatten } from '../../utils/array.js'
+import { factory } from '../../utils/factory.js'
 
 const name = 'setCartesian'
 const dependencies = ['typed', 'size', 'subset', 'compareNatural', 'Index', 'DenseMatrix']
diff --git a/src/function/set/setDifference.js b/src/function/set/setDifference.js
index ccad637905..872c369e95 100644
--- a/src/function/set/setDifference.js
+++ b/src/function/set/setDifference.js
@@ -1,5 +1,5 @@
-import { flatten, generalize, identify } from '../../utils/array'
-import { factory } from '../../utils/factory'
+import { flatten, generalize, identify } from '../../utils/array.js'
+import { factory } from '../../utils/factory.js'
 
 const name = 'setDifference'
 const dependencies = ['typed', 'size', 'subset', 'compareNatural', 'Index', 'DenseMatrix']
diff --git a/src/function/set/setDistinct.js b/src/function/set/setDistinct.js
index 463ee9b66c..0cedd94c1f 100644
--- a/src/function/set/setDistinct.js
+++ b/src/function/set/setDistinct.js
@@ -1,5 +1,5 @@
-import { flatten } from '../../utils/array'
-import { factory } from '../../utils/factory'
+import { flatten } from '../../utils/array.js'
+import { factory } from '../../utils/factory.js'
 
 const name = 'setDistinct'
 const dependencies = ['typed', 'size', 'subset', 'compareNatural', 'Index', 'DenseMatrix']
diff --git a/src/function/set/setIntersect.js b/src/function/set/setIntersect.js
index 2ea74a238e..4f2845e507 100644
--- a/src/function/set/setIntersect.js
+++ b/src/function/set/setIntersect.js
@@ -1,5 +1,5 @@
-import { flatten, generalize, identify } from '../../utils/array'
-import { factory } from '../../utils/factory'
+import { flatten, generalize, identify } from '../../utils/array.js'
+import { factory } from '../../utils/factory.js'
 
 const name = 'setIntersect'
 const dependencies = ['typed', 'size', 'subset', 'compareNatural', 'Index', 'DenseMatrix']
diff --git a/src/function/set/setIsSubset.js b/src/function/set/setIsSubset.js
index 00e3894546..3cd7ebc638 100644
--- a/src/function/set/setIsSubset.js
+++ b/src/function/set/setIsSubset.js
@@ -1,5 +1,5 @@
-import { flatten, identify } from '../../utils/array'
-import { factory } from '../../utils/factory'
+import { flatten, identify } from '../../utils/array.js'
+import { factory } from '../../utils/factory.js'
 
 const name = 'setIsSubset'
 const dependencies = ['typed', 'size', 'subset', 'compareNatural', 'Index']
diff --git a/src/function/set/setMultiplicity.js b/src/function/set/setMultiplicity.js
index 9bd5b0d4c8..7935ac210e 100644
--- a/src/function/set/setMultiplicity.js
+++ b/src/function/set/setMultiplicity.js
@@ -1,5 +1,5 @@
-import { flatten } from '../../utils/array'
-import { factory } from '../../utils/factory'
+import { flatten } from '../../utils/array.js'
+import { factory } from '../../utils/factory.js'
 
 const name = 'setMultiplicity'
 const dependencies = ['typed', 'size', 'subset', 'compareNatural', 'Index']
diff --git a/src/function/set/setPowerset.js b/src/function/set/setPowerset.js
index a33f194890..9737854e0a 100644
--- a/src/function/set/setPowerset.js
+++ b/src/function/set/setPowerset.js
@@ -1,5 +1,5 @@
-import { flatten } from '../../utils/array'
-import { factory } from '../../utils/factory'
+import { flatten } from '../../utils/array.js'
+import { factory } from '../../utils/factory.js'
 
 const name = 'setPowerset'
 const dependencies = ['typed', 'size', 'subset', 'compareNatural', 'Index']
diff --git a/src/function/set/setSize.js b/src/function/set/setSize.js
index 7bf0e82d4b..81f6c09218 100644
--- a/src/function/set/setSize.js
+++ b/src/function/set/setSize.js
@@ -1,5 +1,5 @@
-import { flatten } from '../../utils/array'
-import { factory } from '../../utils/factory'
+import { flatten } from '../../utils/array.js'
+import { factory } from '../../utils/factory.js'
 
 const name = 'setSize'
 const dependencies = ['typed', 'compareNatural']
diff --git a/src/function/set/setSymDifference.js b/src/function/set/setSymDifference.js
index acd5ee4409..812cfbc586 100644
--- a/src/function/set/setSymDifference.js
+++ b/src/function/set/setSymDifference.js
@@ -1,5 +1,5 @@
-import { flatten } from '../../utils/array'
-import { factory } from '../../utils/factory'
+import { flatten } from '../../utils/array.js'
+import { factory } from '../../utils/factory.js'
 
 const name = 'setSymDifference'
 const dependencies = ['typed', 'size', 'concat', 'subset', 'setDifference', 'Index']
diff --git a/src/function/set/setUnion.js b/src/function/set/setUnion.js
index 9dcde0d7af..ce53bea081 100644
--- a/src/function/set/setUnion.js
+++ b/src/function/set/setUnion.js
@@ -1,5 +1,5 @@
-import { flatten } from '../../utils/array'
-import { factory } from '../../utils/factory'
+import { flatten } from '../../utils/array.js'
+import { factory } from '../../utils/factory.js'
 
 const name = 'setUnion'
 const dependencies = ['typed', 'size', 'concat', 'subset', 'setIntersect', 'setSymDifference', 'Index']
diff --git a/src/function/special/erf.js b/src/function/special/erf.js
index 57da35f6fd..ce992ddc9b 100644
--- a/src/function/special/erf.js
+++ b/src/function/special/erf.js
@@ -1,6 +1,6 @@
-import { deepMap } from '../../utils/collection'
-import { sign } from '../../utils/number'
-import { factory } from '../../utils/factory'
+import { deepMap } from '../../utils/collection.js'
+import { sign } from '../../utils/number.js'
+import { factory } from '../../utils/factory.js'
 
 const name = 'erf'
 const dependencies = [
diff --git a/src/function/statistics/mad.js b/src/function/statistics/mad.js
index 86b5a2ef98..baa7fa75b1 100644
--- a/src/function/statistics/mad.js
+++ b/src/function/statistics/mad.js
@@ -1,6 +1,6 @@
-import { flatten } from '../../utils/array'
-import { factory } from '../../utils/factory'
-import { improveErrorMessage } from './utils/improveErrorMessage'
+import { flatten } from '../../utils/array.js'
+import { factory } from '../../utils/factory.js'
+import { improveErrorMessage } from './utils/improveErrorMessage.js'
 
 const name = 'mad'
 const dependencies = ['typed', 'abs', 'map', 'median', 'subtract']
diff --git a/src/function/statistics/max.js b/src/function/statistics/max.js
index ec14afff6c..c1e8091c2a 100644
--- a/src/function/statistics/max.js
+++ b/src/function/statistics/max.js
@@ -1,6 +1,6 @@
-import { deepForEach, reduce, containsCollections } from '../../utils/collection'
-import { factory } from '../../utils/factory'
-import { improveErrorMessage } from './utils/improveErrorMessage'
+import { deepForEach, reduce, containsCollections } from '../../utils/collection.js'
+import { factory } from '../../utils/factory.js'
+import { improveErrorMessage } from './utils/improveErrorMessage.js'
 
 const name = 'max'
 const dependencies = ['typed', 'config', 'numeric', 'larger']
diff --git a/src/function/statistics/mean.js b/src/function/statistics/mean.js
index 557d71e039..995aa34169 100644
--- a/src/function/statistics/mean.js
+++ b/src/function/statistics/mean.js
@@ -1,7 +1,7 @@
-import { containsCollections, deepForEach, reduce } from '../../utils/collection'
-import { arraySize } from '../../utils/array'
-import { factory } from '../../utils/factory'
-import { improveErrorMessage } from './utils/improveErrorMessage'
+import { containsCollections, deepForEach, reduce } from '../../utils/collection.js'
+import { arraySize } from '../../utils/array.js'
+import { factory } from '../../utils/factory.js'
+import { improveErrorMessage } from './utils/improveErrorMessage.js'
 
 const name = 'mean'
 const dependencies = ['typed', 'add', 'divide']
diff --git a/src/function/statistics/median.js b/src/function/statistics/median.js
index dc6470aa29..8d8d02f9b3 100644
--- a/src/function/statistics/median.js
+++ b/src/function/statistics/median.js
@@ -1,7 +1,7 @@
-import { containsCollections } from '../../utils/collection'
-import { flatten } from '../../utils/array'
-import { factory } from '../../utils/factory'
-import { improveErrorMessage } from './utils/improveErrorMessage'
+import { containsCollections } from '../../utils/collection.js'
+import { flatten } from '../../utils/array.js'
+import { factory } from '../../utils/factory.js'
+import { improveErrorMessage } from './utils/improveErrorMessage.js'
 
 const name = 'median'
 const dependencies = ['typed', 'add', 'divide', 'compare', 'partitionSelect']
diff --git a/src/function/statistics/min.js b/src/function/statistics/min.js
index a6c0e2a982..4a2dd957f2 100644
--- a/src/function/statistics/min.js
+++ b/src/function/statistics/min.js
@@ -1,6 +1,6 @@
-import { containsCollections, deepForEach, reduce } from '../../utils/collection'
-import { factory } from '../../utils/factory'
-import { improveErrorMessage } from './utils/improveErrorMessage'
+import { containsCollections, deepForEach, reduce } from '../../utils/collection.js'
+import { factory } from '../../utils/factory.js'
+import { improveErrorMessage } from './utils/improveErrorMessage.js'
 
 const name = 'min'
 const dependencies = ['typed', 'config', 'numeric', 'smaller']
diff --git a/src/function/statistics/mode.js b/src/function/statistics/mode.js
index 5777babb75..b20512df6a 100644
--- a/src/function/statistics/mode.js
+++ b/src/function/statistics/mode.js
@@ -1,5 +1,5 @@
-import { flatten } from '../../utils/array'
-import { factory } from '../../utils/factory'
+import { flatten } from '../../utils/array.js'
+import { factory } from '../../utils/factory.js'
 
 const name = 'mode'
 const dependencies = ['typed', 'isNaN', 'isNumeric']
diff --git a/src/function/statistics/prod.js b/src/function/statistics/prod.js
index 354e4ded72..3a9091ae97 100644
--- a/src/function/statistics/prod.js
+++ b/src/function/statistics/prod.js
@@ -1,6 +1,6 @@
-import { deepForEach } from '../../utils/collection'
-import { factory } from '../../utils/factory'
-import { improveErrorMessage } from './utils/improveErrorMessage'
+import { deepForEach } from '../../utils/collection.js'
+import { factory } from '../../utils/factory.js'
+import { improveErrorMessage } from './utils/improveErrorMessage.js'
 
 const name = 'prod'
 const dependencies = ['typed', 'config', 'multiplyScalar', 'numeric']
diff --git a/src/function/statistics/quantileSeq.js b/src/function/statistics/quantileSeq.js
index d4c80371e8..3a8950023a 100644
--- a/src/function/statistics/quantileSeq.js
+++ b/src/function/statistics/quantileSeq.js
@@ -1,7 +1,7 @@
-import { isBigNumber, isCollection, isNumber } from '../../utils/is'
-import { isInteger } from '../../utils/number'
-import { flatten } from '../../utils/array'
-import { factory } from '../../utils/factory'
+import { isBigNumber, isCollection, isNumber } from '../../utils/is.js'
+import { isInteger } from '../../utils/number.js'
+import { flatten } from '../../utils/array.js'
+import { factory } from '../../utils/factory.js'
 
 const name = 'quantileSeq'
 const dependencies = ['typed', 'add', 'multiply', 'partitionSelect', 'compare']
diff --git a/src/function/statistics/std.js b/src/function/statistics/std.js
index a26ffd5e3c..f19d282665 100644
--- a/src/function/statistics/std.js
+++ b/src/function/statistics/std.js
@@ -1,4 +1,4 @@
-import { factory } from '../../utils/factory'
+import { factory } from '../../utils/factory.js'
 
 const name = 'std'
 const dependencies = ['typed', 'sqrt', 'variance']
diff --git a/src/function/statistics/sum.js b/src/function/statistics/sum.js
index 7070710487..de1976e15b 100644
--- a/src/function/statistics/sum.js
+++ b/src/function/statistics/sum.js
@@ -1,6 +1,6 @@
-import { containsCollections, deepForEach, reduce } from '../../utils/collection'
-import { factory } from '../../utils/factory'
-import { improveErrorMessage } from './utils/improveErrorMessage'
+import { containsCollections, deepForEach, reduce } from '../../utils/collection.js'
+import { factory } from '../../utils/factory.js'
+import { improveErrorMessage } from './utils/improveErrorMessage.js'
 
 const name = 'sum'
 const dependencies = ['typed', 'config', 'add', 'numeric']
diff --git a/src/function/statistics/utils/improveErrorMessage.js b/src/function/statistics/utils/improveErrorMessage.js
index 044a6b227f..e31a71bfba 100644
--- a/src/function/statistics/utils/improveErrorMessage.js
+++ b/src/function/statistics/utils/improveErrorMessage.js
@@ -1,4 +1,4 @@
-import { typeOf } from '../../../utils/is'
+import { typeOf } from '../../../utils/is.js'
 
 /**
  * Improve error messages for statistics functions. Errors are typically
diff --git a/src/function/statistics/variance.js b/src/function/statistics/variance.js
index 13720f293e..efd31ed632 100644
--- a/src/function/statistics/variance.js
+++ b/src/function/statistics/variance.js
@@ -1,7 +1,7 @@
-import { deepForEach } from '../../utils/collection'
-import { isBigNumber } from '../../utils/is'
-import { factory } from '../../utils/factory'
-import { improveErrorMessage } from './utils/improveErrorMessage'
+import { deepForEach } from '../../utils/collection.js'
+import { isBigNumber } from '../../utils/is.js'
+import { factory } from '../../utils/factory.js'
+import { improveErrorMessage } from './utils/improveErrorMessage.js'
 
 const DEFAULT_NORMALIZATION = 'unbiased'
 
diff --git a/src/function/string/format.js b/src/function/string/format.js
index a65056669d..10a7da4541 100644
--- a/src/function/string/format.js
+++ b/src/function/string/format.js
@@ -1,5 +1,5 @@
-import { format as formatString } from '../../utils/string'
-import { factory } from '../../utils/factory'
+import { format as formatString } from '../../utils/string.js'
+import { factory } from '../../utils/factory.js'
 
 const name = 'format'
 const dependencies = ['typed']
diff --git a/src/function/string/print.js b/src/function/string/print.js
index 90b0fa9a91..bc35713f9f 100644
--- a/src/function/string/print.js
+++ b/src/function/string/print.js
@@ -1,6 +1,6 @@
-import { format } from '../../utils/string'
-import { isString } from '../../utils/is'
-import { factory } from '../../utils/factory'
+import { format } from '../../utils/string.js'
+import { isString } from '../../utils/is.js'
+import { factory } from '../../utils/factory.js'
 
 const name = 'print'
 const dependencies = ['typed']
diff --git a/src/function/trigonometry/acos.js b/src/function/trigonometry/acos.js
index 9039ffea22..1882d91048 100644
--- a/src/function/trigonometry/acos.js
+++ b/src/function/trigonometry/acos.js
@@ -1,5 +1,5 @@
-import { factory } from '../../utils/factory'
-import { deepMap } from '../../utils/collection'
+import { factory } from '../../utils/factory.js'
+import { deepMap } from '../../utils/collection.js'
 
 const name = 'acos'
 const dependencies = ['typed', 'config', 'Complex']
diff --git a/src/function/trigonometry/acosh.js b/src/function/trigonometry/acosh.js
index 8e54c6920f..7fbe1d1280 100644
--- a/src/function/trigonometry/acosh.js
+++ b/src/function/trigonometry/acosh.js
@@ -1,6 +1,6 @@
-import { factory } from '../../utils/factory'
-import { deepMap } from '../../utils/collection'
-import { acoshNumber } from '../../plain/number'
+import { factory } from '../../utils/factory.js'
+import { deepMap } from '../../utils/collection.js'
+import { acoshNumber } from '../../plain/number/index.js'
 
 const name = 'acosh'
 const dependencies = ['typed', 'config', 'Complex']
diff --git a/src/function/trigonometry/acot.js b/src/function/trigonometry/acot.js
index ece597c730..07dd3166c1 100644
--- a/src/function/trigonometry/acot.js
+++ b/src/function/trigonometry/acot.js
@@ -1,6 +1,6 @@
-import { factory } from '../../utils/factory'
-import { deepMap } from '../../utils/collection'
-import { acotNumber } from '../../plain/number'
+import { factory } from '../../utils/factory.js'
+import { deepMap } from '../../utils/collection.js'
+import { acotNumber } from '../../plain/number/index.js'
 
 const name = 'acot'
 const dependencies = ['typed', 'BigNumber']
diff --git a/src/function/trigonometry/acoth.js b/src/function/trigonometry/acoth.js
index a019ca978a..96ec9ac188 100644
--- a/src/function/trigonometry/acoth.js
+++ b/src/function/trigonometry/acoth.js
@@ -1,6 +1,6 @@
-import { factory } from '../../utils/factory'
-import { deepMap } from '../../utils/collection'
-import { acothNumber } from '../../plain/number'
+import { factory } from '../../utils/factory.js'
+import { deepMap } from '../../utils/collection.js'
+import { acothNumber } from '../../plain/number/index.js'
 
 const name = 'acoth'
 const dependencies = ['typed', 'config', 'Complex', 'BigNumber']
diff --git a/src/function/trigonometry/acsc.js b/src/function/trigonometry/acsc.js
index 837b8caac9..620c44cbd8 100644
--- a/src/function/trigonometry/acsc.js
+++ b/src/function/trigonometry/acsc.js
@@ -1,6 +1,6 @@
-import { factory } from '../../utils/factory'
-import { deepMap } from '../../utils/collection'
-import { acscNumber } from '../../plain/number'
+import { factory } from '../../utils/factory.js'
+import { deepMap } from '../../utils/collection.js'
+import { acscNumber } from '../../plain/number/index.js'
 
 const name = 'acsc'
 const dependencies = ['typed', 'config', 'Complex', 'BigNumber']
diff --git a/src/function/trigonometry/acsch.js b/src/function/trigonometry/acsch.js
index ccbf40792b..ff7c3d0232 100644
--- a/src/function/trigonometry/acsch.js
+++ b/src/function/trigonometry/acsch.js
@@ -1,6 +1,6 @@
-import { factory } from '../../utils/factory'
-import { deepMap } from '../../utils/collection'
-import { acschNumber } from '../../plain/number'
+import { factory } from '../../utils/factory.js'
+import { deepMap } from '../../utils/collection.js'
+import { acschNumber } from '../../plain/number/index.js'
 
 const name = 'acsch'
 const dependencies = ['typed', 'BigNumber']
diff --git a/src/function/trigonometry/asec.js b/src/function/trigonometry/asec.js
index b39731470a..451094a234 100644
--- a/src/function/trigonometry/asec.js
+++ b/src/function/trigonometry/asec.js
@@ -1,6 +1,6 @@
-import { factory } from '../../utils/factory'
-import { deepMap } from '../../utils/collection'
-import { asecNumber } from '../../plain/number'
+import { factory } from '../../utils/factory.js'
+import { deepMap } from '../../utils/collection.js'
+import { asecNumber } from '../../plain/number/index.js'
 
 const name = 'asec'
 const dependencies = ['typed', 'config', 'Complex', 'BigNumber']
diff --git a/src/function/trigonometry/asech.js b/src/function/trigonometry/asech.js
index ec7fea51f5..7576f952e4 100644
--- a/src/function/trigonometry/asech.js
+++ b/src/function/trigonometry/asech.js
@@ -1,6 +1,6 @@
-import { factory } from '../../utils/factory'
-import { deepMap } from '../../utils/collection'
-import { asechNumber } from '../../plain/number'
+import { factory } from '../../utils/factory.js'
+import { deepMap } from '../../utils/collection.js'
+import { asechNumber } from '../../plain/number/index.js'
 
 const name = 'asech'
 const dependencies = ['typed', 'config', 'Complex', 'BigNumber']
diff --git a/src/function/trigonometry/asin.js b/src/function/trigonometry/asin.js
index af9c04b6a8..5958096ace 100644
--- a/src/function/trigonometry/asin.js
+++ b/src/function/trigonometry/asin.js
@@ -1,5 +1,5 @@
-import { factory } from '../../utils/factory'
-import { deepMap } from '../../utils/collection'
+import { factory } from '../../utils/factory.js'
+import { deepMap } from '../../utils/collection.js'
 
 const name = 'asin'
 const dependencies = ['typed', 'config', 'Complex']
diff --git a/src/function/trigonometry/asinh.js b/src/function/trigonometry/asinh.js
index ebb6e23e91..3cb41cc891 100644
--- a/src/function/trigonometry/asinh.js
+++ b/src/function/trigonometry/asinh.js
@@ -1,6 +1,6 @@
-import { factory } from '../../utils/factory'
-import { deepMap } from '../../utils/collection'
-import { asinhNumber } from '../../plain/number'
+import { factory } from '../../utils/factory.js'
+import { deepMap } from '../../utils/collection.js'
+import { asinhNumber } from '../../plain/number/index.js'
 
 const name = 'asinh'
 const dependencies = ['typed']
diff --git a/src/function/trigonometry/atan.js b/src/function/trigonometry/atan.js
index 6e2b70ff83..27954b67a1 100644
--- a/src/function/trigonometry/atan.js
+++ b/src/function/trigonometry/atan.js
@@ -1,5 +1,5 @@
-import { factory } from '../../utils/factory'
-import { deepMap } from '../../utils/collection'
+import { factory } from '../../utils/factory.js'
+import { deepMap } from '../../utils/collection.js'
 
 const name = 'atan'
 const dependencies = ['typed']
diff --git a/src/function/trigonometry/atan2.js b/src/function/trigonometry/atan2.js
index cfdfaf1fdc..3ab817d882 100644
--- a/src/function/trigonometry/atan2.js
+++ b/src/function/trigonometry/atan2.js
@@ -1,11 +1,11 @@
-import { factory } from '../../utils/factory'
-import { createAlgorithm02 } from '../../type/matrix/utils/algorithm02'
-import { createAlgorithm03 } from '../../type/matrix/utils/algorithm03'
-import { createAlgorithm09 } from '../../type/matrix/utils/algorithm09'
-import { createAlgorithm11 } from '../../type/matrix/utils/algorithm11'
-import { createAlgorithm12 } from '../../type/matrix/utils/algorithm12'
-import { createAlgorithm13 } from '../../type/matrix/utils/algorithm13'
-import { createAlgorithm14 } from '../../type/matrix/utils/algorithm14'
+import { factory } from '../../utils/factory.js'
+import { createAlgorithm02 } from '../../type/matrix/utils/algorithm02.js'
+import { createAlgorithm03 } from '../../type/matrix/utils/algorithm03.js'
+import { createAlgorithm09 } from '../../type/matrix/utils/algorithm09.js'
+import { createAlgorithm11 } from '../../type/matrix/utils/algorithm11.js'
+import { createAlgorithm12 } from '../../type/matrix/utils/algorithm12.js'
+import { createAlgorithm13 } from '../../type/matrix/utils/algorithm13.js'
+import { createAlgorithm14 } from '../../type/matrix/utils/algorithm14.js'
 
 const name = 'atan2'
 const dependencies = [
diff --git a/src/function/trigonometry/atanh.js b/src/function/trigonometry/atanh.js
index f03f023e68..b4b9c4cfee 100644
--- a/src/function/trigonometry/atanh.js
+++ b/src/function/trigonometry/atanh.js
@@ -1,6 +1,6 @@
-import { factory } from '../../utils/factory'
-import { deepMap } from '../../utils/collection'
-import { atanhNumber } from '../../plain/number'
+import { factory } from '../../utils/factory.js'
+import { deepMap } from '../../utils/collection.js'
+import { atanhNumber } from '../../plain/number/index.js'
 
 const name = 'atanh'
 const dependencies = ['typed', 'config', 'Complex']
diff --git a/src/function/trigonometry/cos.js b/src/function/trigonometry/cos.js
index d4c07b7181..4f30a5c2a0 100644
--- a/src/function/trigonometry/cos.js
+++ b/src/function/trigonometry/cos.js
@@ -1,5 +1,5 @@
-import { factory } from '../../utils/factory'
-import { deepMap } from '../../utils/collection'
+import { factory } from '../../utils/factory.js'
+import { deepMap } from '../../utils/collection.js'
 
 const name = 'cos'
 const dependencies = ['typed']
diff --git a/src/function/trigonometry/cosh.js b/src/function/trigonometry/cosh.js
index e0faed174f..3bcd921b93 100644
--- a/src/function/trigonometry/cosh.js
+++ b/src/function/trigonometry/cosh.js
@@ -1,6 +1,6 @@
-import { factory } from '../../utils/factory'
-import { deepMap } from '../../utils/collection'
-import { cosh as coshNumber } from '../../utils/number'
+import { factory } from '../../utils/factory.js'
+import { deepMap } from '../../utils/collection.js'
+import { cosh as coshNumber } from '../../utils/number.js'
 
 const name = 'cosh'
 const dependencies = ['typed']
diff --git a/src/function/trigonometry/cot.js b/src/function/trigonometry/cot.js
index 79c53a54fe..64f544a953 100644
--- a/src/function/trigonometry/cot.js
+++ b/src/function/trigonometry/cot.js
@@ -1,6 +1,6 @@
-import { factory } from '../../utils/factory'
-import { deepMap } from '../../utils/collection'
-import { cotNumber } from '../../plain/number'
+import { factory } from '../../utils/factory.js'
+import { deepMap } from '../../utils/collection.js'
+import { cotNumber } from '../../plain/number/index.js'
 
 const name = 'cot'
 const dependencies = ['typed', 'BigNumber']
diff --git a/src/function/trigonometry/coth.js b/src/function/trigonometry/coth.js
index 822eb15c2a..68b9b9bc3a 100644
--- a/src/function/trigonometry/coth.js
+++ b/src/function/trigonometry/coth.js
@@ -1,6 +1,6 @@
-import { factory } from '../../utils/factory'
-import { deepMap } from '../../utils/collection'
-import { cothNumber } from '../../plain/number'
+import { factory } from '../../utils/factory.js'
+import { deepMap } from '../../utils/collection.js'
+import { cothNumber } from '../../plain/number/index.js'
 
 const name = 'coth'
 const dependencies = ['typed', 'BigNumber']
diff --git a/src/function/trigonometry/csc.js b/src/function/trigonometry/csc.js
index edbb6eab68..b29da96870 100644
--- a/src/function/trigonometry/csc.js
+++ b/src/function/trigonometry/csc.js
@@ -1,6 +1,6 @@
-import { factory } from '../../utils/factory'
-import { deepMap } from '../../utils/collection'
-import { cscNumber } from '../../plain/number'
+import { factory } from '../../utils/factory.js'
+import { deepMap } from '../../utils/collection.js'
+import { cscNumber } from '../../plain/number/index.js'
 
 const name = 'csc'
 const dependencies = ['typed', 'BigNumber']
diff --git a/src/function/trigonometry/csch.js b/src/function/trigonometry/csch.js
index e97b0d3132..f13c33faf6 100644
--- a/src/function/trigonometry/csch.js
+++ b/src/function/trigonometry/csch.js
@@ -1,6 +1,6 @@
-import { factory } from '../../utils/factory'
-import { deepMap } from '../../utils/collection'
-import { cschNumber } from '../../plain/number'
+import { factory } from '../../utils/factory.js'
+import { deepMap } from '../../utils/collection.js'
+import { cschNumber } from '../../plain/number/index.js'
 
 const name = 'csch'
 const dependencies = ['typed', 'BigNumber']
diff --git a/src/function/trigonometry/sec.js b/src/function/trigonometry/sec.js
index 6957f0e778..d501854574 100644
--- a/src/function/trigonometry/sec.js
+++ b/src/function/trigonometry/sec.js
@@ -1,6 +1,6 @@
-import { factory } from '../../utils/factory'
-import { deepMap } from '../../utils/collection'
-import { secNumber } from '../../plain/number'
+import { factory } from '../../utils/factory.js'
+import { deepMap } from '../../utils/collection.js'
+import { secNumber } from '../../plain/number/index.js'
 
 const name = 'sec'
 const dependencies = ['typed', 'BigNumber']
diff --git a/src/function/trigonometry/sech.js b/src/function/trigonometry/sech.js
index e55751f05b..49f4105566 100644
--- a/src/function/trigonometry/sech.js
+++ b/src/function/trigonometry/sech.js
@@ -1,6 +1,6 @@
-import { factory } from '../../utils/factory'
-import { deepMap } from '../../utils/collection'
-import { sechNumber } from '../../plain/number'
+import { factory } from '../../utils/factory.js'
+import { deepMap } from '../../utils/collection.js'
+import { sechNumber } from '../../plain/number/index.js'
 
 const name = 'sech'
 const dependencies = ['typed', 'BigNumber']
diff --git a/src/function/trigonometry/sin.js b/src/function/trigonometry/sin.js
index def96600ee..a4efde3f8c 100644
--- a/src/function/trigonometry/sin.js
+++ b/src/function/trigonometry/sin.js
@@ -1,5 +1,5 @@
-import { factory } from '../../utils/factory'
-import { deepMap } from '../../utils/collection'
+import { factory } from '../../utils/factory.js'
+import { deepMap } from '../../utils/collection.js'
 
 const name = 'sin'
 const dependencies = ['typed']
diff --git a/src/function/trigonometry/sinh.js b/src/function/trigonometry/sinh.js
index 9b765416f7..db2652f2eb 100644
--- a/src/function/trigonometry/sinh.js
+++ b/src/function/trigonometry/sinh.js
@@ -1,6 +1,6 @@
-import { factory } from '../../utils/factory'
-import { deepMap } from '../../utils/collection'
-import { sinhNumber } from '../../plain/number'
+import { factory } from '../../utils/factory.js'
+import { deepMap } from '../../utils/collection.js'
+import { sinhNumber } from '../../plain/number/index.js'
 
 const name = 'sinh'
 const dependencies = ['typed']
diff --git a/src/function/trigonometry/tan.js b/src/function/trigonometry/tan.js
index a59186b443..aa1bc9e2d4 100644
--- a/src/function/trigonometry/tan.js
+++ b/src/function/trigonometry/tan.js
@@ -1,5 +1,5 @@
-import { factory } from '../../utils/factory'
-import { deepMap } from '../../utils/collection'
+import { factory } from '../../utils/factory.js'
+import { deepMap } from '../../utils/collection.js'
 
 const name = 'tan'
 const dependencies = ['typed']
diff --git a/src/function/trigonometry/tanh.js b/src/function/trigonometry/tanh.js
index 54d238a16d..6b51a9e96c 100644
--- a/src/function/trigonometry/tanh.js
+++ b/src/function/trigonometry/tanh.js
@@ -1,6 +1,6 @@
-import { factory } from '../../utils/factory'
-import { deepMap } from '../../utils/collection'
-import { tanh as _tanh } from '../../utils/number'
+import { factory } from '../../utils/factory.js'
+import { deepMap } from '../../utils/collection.js'
+import { tanh as _tanh } from '../../utils/number.js'
 
 const name = 'tanh'
 const dependencies = ['typed']
diff --git a/src/function/unit/to.js b/src/function/unit/to.js
index 2df18e201e..6f30e78c47 100644
--- a/src/function/unit/to.js
+++ b/src/function/unit/to.js
@@ -1,6 +1,6 @@
-import { factory } from '../../utils/factory'
-import { createAlgorithm13 } from '../../type/matrix/utils/algorithm13'
-import { createAlgorithm14 } from '../../type/matrix/utils/algorithm14'
+import { factory } from '../../utils/factory.js'
+import { createAlgorithm13 } from '../../type/matrix/utils/algorithm13.js'
+import { createAlgorithm14 } from '../../type/matrix/utils/algorithm14.js'
 
 const name = 'to'
 const dependencies = [
diff --git a/src/function/utils/clone.js b/src/function/utils/clone.js
index f0b29afd6b..61e162a680 100644
--- a/src/function/utils/clone.js
+++ b/src/function/utils/clone.js
@@ -1,5 +1,5 @@
-import { clone as objectClone } from '../../utils/object'
-import { factory } from '../../utils/factory'
+import { clone as objectClone } from '../../utils/object.js'
+import { factory } from '../../utils/factory.js'
 
 const name = 'clone'
 const dependencies = ['typed']
diff --git a/src/function/utils/hasNumericValue.js b/src/function/utils/hasNumericValue.js
index fdd9db9b13..c418aaaa79 100644
--- a/src/function/utils/hasNumericValue.js
+++ b/src/function/utils/hasNumericValue.js
@@ -1,4 +1,4 @@
-import { factory } from '../../utils/factory'
+import { factory } from '../../utils/factory.js'
 
 const name = 'hasNumericValue'
 const dependencies = ['typed', 'isNumeric']
diff --git a/src/function/utils/isInteger.js b/src/function/utils/isInteger.js
index 6014e8f975..c822936a22 100644
--- a/src/function/utils/isInteger.js
+++ b/src/function/utils/isInteger.js
@@ -1,6 +1,6 @@
-import { deepMap } from '../../utils/collection'
-import { isInteger as isIntegerNumber } from '../../utils/number'
-import { factory } from '../../utils/factory'
+import { deepMap } from '../../utils/collection.js'
+import { isInteger as isIntegerNumber } from '../../utils/number.js'
+import { factory } from '../../utils/factory.js'
 
 const name = 'isInteger'
 const dependencies = ['typed']
diff --git a/src/function/utils/isNaN.js b/src/function/utils/isNaN.js
index 85abf0e63e..909578fe33 100644
--- a/src/function/utils/isNaN.js
+++ b/src/function/utils/isNaN.js
@@ -1,6 +1,6 @@
-import { deepMap } from '../../utils/collection'
-import { factory } from '../../utils/factory'
-import { isNaNNumber } from '../../plain/number'
+import { deepMap } from '../../utils/collection.js'
+import { factory } from '../../utils/factory.js'
+import { isNaNNumber } from '../../plain/number/index.js'
 
 const name = 'isNaN'
 const dependencies = ['typed']
diff --git a/src/function/utils/isNegative.js b/src/function/utils/isNegative.js
index 829f6b5b1e..89a8925b7a 100644
--- a/src/function/utils/isNegative.js
+++ b/src/function/utils/isNegative.js
@@ -1,6 +1,6 @@
-import { deepMap } from '../../utils/collection'
-import { factory } from '../../utils/factory'
-import { isNegativeNumber } from '../../plain/number'
+import { deepMap } from '../../utils/collection.js'
+import { factory } from '../../utils/factory.js'
+import { isNegativeNumber } from '../../plain/number/index.js'
 
 const name = 'isNegative'
 const dependencies = ['typed']
diff --git a/src/function/utils/isNumeric.js b/src/function/utils/isNumeric.js
index 83cf444e0c..fa93ae7647 100644
--- a/src/function/utils/isNumeric.js
+++ b/src/function/utils/isNumeric.js
@@ -1,5 +1,5 @@
-import { deepMap } from '../../utils/collection'
-import { factory } from '../../utils/factory'
+import { deepMap } from '../../utils/collection.js'
+import { factory } from '../../utils/factory.js'
 
 const name = 'isNumeric'
 const dependencies = ['typed']
diff --git a/src/function/utils/isPositive.js b/src/function/utils/isPositive.js
index 674ecb2a29..bb66dcdf88 100644
--- a/src/function/utils/isPositive.js
+++ b/src/function/utils/isPositive.js
@@ -1,6 +1,6 @@
-import { deepMap } from '../../utils/collection'
-import { factory } from '../../utils/factory'
-import { isPositiveNumber } from '../../plain/number'
+import { deepMap } from '../../utils/collection.js'
+import { factory } from '../../utils/factory.js'
+import { isPositiveNumber } from '../../plain/number/index.js'
 
 const name = 'isPositive'
 const dependencies = ['typed']
diff --git a/src/function/utils/isPrime.js b/src/function/utils/isPrime.js
index 3d1b2bc538..bffe2ca102 100644
--- a/src/function/utils/isPrime.js
+++ b/src/function/utils/isPrime.js
@@ -1,5 +1,5 @@
-import { deepMap } from '../../utils/collection'
-import { factory } from '../../utils/factory'
+import { deepMap } from '../../utils/collection.js'
+import { factory } from '../../utils/factory.js'
 
 const name = 'isPrime'
 const dependencies = ['typed']
diff --git a/src/function/utils/isZero.js b/src/function/utils/isZero.js
index 2ff5cb284d..1841c53984 100644
--- a/src/function/utils/isZero.js
+++ b/src/function/utils/isZero.js
@@ -1,6 +1,6 @@
-import { deepMap } from '../../utils/collection'
-import { factory } from '../../utils/factory'
-import { isZeroNumber } from '../../plain/number'
+import { deepMap } from '../../utils/collection.js'
+import { factory } from '../../utils/factory.js'
+import { isZeroNumber } from '../../plain/number/index.js'
 
 const name = 'isZero'
 const dependencies = ['typed']
diff --git a/src/function/utils/numeric.js b/src/function/utils/numeric.js
index ffb6d97f12..f945dd9918 100644
--- a/src/function/utils/numeric.js
+++ b/src/function/utils/numeric.js
@@ -1,6 +1,6 @@
-import { typeOf } from '../../utils/is'
-import { factory } from '../../utils/factory'
-import { noBignumber, noFraction } from '../../utils/noop'
+import { typeOf } from '../../utils/is.js'
+import { factory } from '../../utils/factory.js'
+import { noBignumber, noFraction } from '../../utils/noop.js'
 
 const name = 'numeric'
 const dependencies = ['number', '?bignumber', '?fraction']
diff --git a/src/function/utils/typeOf.js b/src/function/utils/typeOf.js
index 9339a45223..a5f434c646 100644
--- a/src/function/utils/typeOf.js
+++ b/src/function/utils/typeOf.js
@@ -1,5 +1,5 @@
-import { factory } from '../../utils/factory'
-import { typeOf as _typeOf } from '../../utils/is'
+import { factory } from '../../utils/factory.js'
+import { typeOf as _typeOf } from '../../utils/is.js'
 
 const name = 'typeOf'
 const dependencies = ['typed']
diff --git a/src/index.js b/src/index.js
new file mode 100644
index 0000000000..c133fdda4f
--- /dev/null
+++ b/src/index.js
@@ -0,0 +1 @@
+export * from './entry/mainAny.js'
diff --git a/src/json/replacer.js b/src/json/replacer.js
index 1ce6e78e16..2f928e449d 100644
--- a/src/json/replacer.js
+++ b/src/json/replacer.js
@@ -1,4 +1,4 @@
-import { factory } from '../utils/factory'
+import { factory } from '../utils/factory.js'
 
 const name = 'replacer'
 const dependencies = []
diff --git a/src/json/reviver.js b/src/json/reviver.js
index 35ec489c22..b9d57df371 100644
--- a/src/json/reviver.js
+++ b/src/json/reviver.js
@@ -1,4 +1,4 @@
-import { factory } from '../utils/factory'
+import { factory } from '../utils/factory.js'
 
 const name = 'reviver'
 const dependencies = [
diff --git a/src/number.js b/src/number.js
new file mode 100644
index 0000000000..7489d13711
--- /dev/null
+++ b/src/number.js
@@ -0,0 +1 @@
+export * from './entry/mainNumber.js'
diff --git a/src/plain/bignumber/index.js b/src/plain/bignumber/index.js
index 9fbb100958..9ed24155b4 100644
--- a/src/plain/bignumber/index.js
+++ b/src/plain/bignumber/index.js
@@ -1,6 +1,6 @@
 import Decimal from 'decimal.js'
 
-export * from './arithmetic'
+export * from './arithmetic.js'
 
 // TODO: this is ugly. Instead, be able to pass your own isBigNumber function to typed?
 const BigNumber = Decimal.clone()
diff --git a/src/plain/number/arithmetic.js b/src/plain/number/arithmetic.js
index bef1b4a174..32371a0d52 100644
--- a/src/plain/number/arithmetic.js
+++ b/src/plain/number/arithmetic.js
@@ -1,4 +1,4 @@
-import { isInteger, log2, log10, cbrt, expm1, sign, toFixed, log1p } from '../../utils/number'
+import { isInteger, log2, log10, cbrt, expm1, sign, toFixed, log1p } from '../../utils/number.js'
 
 const n1 = 'number'
 const n2 = 'number, number'
diff --git a/src/plain/number/bitwise.js b/src/plain/number/bitwise.js
index 4be522c118..356bbfe393 100644
--- a/src/plain/number/bitwise.js
+++ b/src/plain/number/bitwise.js
@@ -1,4 +1,4 @@
-import { isInteger } from '../../utils/number'
+import { isInteger } from '../../utils/number.js'
 
 const n1 = 'number'
 const n2 = 'number, number'
diff --git a/src/plain/number/combinations.js b/src/plain/number/combinations.js
index 6b5d9e0494..f56efc7693 100644
--- a/src/plain/number/combinations.js
+++ b/src/plain/number/combinations.js
@@ -1,5 +1,5 @@
-import { isInteger } from '../../utils/number'
-import { product } from '../../utils/product'
+import { isInteger } from '../../utils/number.js'
+import { product } from '../../utils/product.js'
 
 export function combinationsNumber (n, k) {
   if (!isInteger(n) || n < 0) {
diff --git a/src/plain/number/index.js b/src/plain/number/index.js
index bc96956167..69cfadce92 100644
--- a/src/plain/number/index.js
+++ b/src/plain/number/index.js
@@ -1,9 +1,9 @@
-export * from './arithmetic'
-export * from './bitwise'
-export * from './combinations'
-export * from './constants'
-export * from './logical'
-export * from './relational'
-export * from './probability'
-export * from './trigonometry'
-export * from './utils'
+export * from './arithmetic.js'
+export * from './bitwise.js'
+export * from './combinations.js'
+export * from './constants.js'
+export * from './logical.js'
+export * from './relational.js'
+export * from './probability.js'
+export * from './trigonometry.js'
+export * from './utils.js'
diff --git a/src/plain/number/probability.js b/src/plain/number/probability.js
index d6032e5df7..0722293b4d 100644
--- a/src/plain/number/probability.js
+++ b/src/plain/number/probability.js
@@ -1,5 +1,5 @@
-import { isInteger } from '../../utils/number'
-import { product } from '../../utils/product'
+import { isInteger } from '../../utils/number.js'
+import { product } from '../../utils/product.js'
 
 export function gammaNumber (n) {
   let x
diff --git a/src/plain/number/trigonometry.js b/src/plain/number/trigonometry.js
index 8e4115ed53..03bf6e04c7 100644
--- a/src/plain/number/trigonometry.js
+++ b/src/plain/number/trigonometry.js
@@ -1,4 +1,4 @@
-import { acosh, asinh, atanh, cosh, sign, sinh, tanh } from '../../utils/number'
+import { acosh, asinh, atanh, cosh, sign, sinh, tanh } from '../../utils/number.js'
 
 const n1 = 'number'
 const n2 = 'number, number'
diff --git a/src/plain/number/utils.js b/src/plain/number/utils.js
index 16d654adb4..b65222ca40 100644
--- a/src/plain/number/utils.js
+++ b/src/plain/number/utils.js
@@ -1,4 +1,4 @@
-import { isInteger } from '../../utils/number'
+import { isInteger } from '../../utils/number.js'
 
 const n1 = 'number'
 
diff --git a/src/type/bignumber/BigNumber.js b/src/type/bignumber/BigNumber.js
index b2fb8d900b..bb0c24c874 100644
--- a/src/type/bignumber/BigNumber.js
+++ b/src/type/bignumber/BigNumber.js
@@ -1,5 +1,5 @@
 import Decimal from 'decimal.js'
-import { factory } from '../../utils/factory'
+import { factory } from '../../utils/factory.js'
 
 const name = 'BigNumber'
 const dependencies = ['?on', 'config']
diff --git a/src/type/bignumber/function/bignumber.js b/src/type/bignumber/function/bignumber.js
index 6c1228c68e..c78407d7f5 100644
--- a/src/type/bignumber/function/bignumber.js
+++ b/src/type/bignumber/function/bignumber.js
@@ -1,5 +1,5 @@
-import { factory } from '../../../utils/factory'
-import { deepMap } from '../../../utils/collection'
+import { factory } from '../../../utils/factory.js'
+import { deepMap } from '../../../utils/collection.js'
 
 const name = 'bignumber'
 const dependencies = ['typed', 'BigNumber']
diff --git a/src/type/boolean.js b/src/type/boolean.js
index 28b45ec335..09a52d8190 100644
--- a/src/type/boolean.js
+++ b/src/type/boolean.js
@@ -1,5 +1,5 @@
-import { factory } from '../utils/factory'
-import { deepMap } from '../utils/collection'
+import { factory } from '../utils/factory.js'
+import { deepMap } from '../utils/collection.js'
 
 const name = 'boolean'
 const dependencies = ['typed']
diff --git a/src/type/chain/Chain.js b/src/type/chain/Chain.js
index 0e396bb6c8..351252a4a5 100644
--- a/src/type/chain/Chain.js
+++ b/src/type/chain/Chain.js
@@ -1,7 +1,7 @@
-import { isChain } from '../../utils/is'
-import { format } from '../../utils/string'
-import { hasOwnProperty, lazy } from '../../utils/object'
-import { factory } from '../../utils/factory'
+import { isChain } from '../../utils/is.js'
+import { format } from '../../utils/string.js'
+import { hasOwnProperty, lazy } from '../../utils/object.js'
+import { factory } from '../../utils/factory.js'
 
 const name = 'Chain'
 const dependencies = ['?on', 'math']
diff --git a/src/type/chain/function/chain.js b/src/type/chain/function/chain.js
index fffb9bd17f..9d33a149ab 100644
--- a/src/type/chain/function/chain.js
+++ b/src/type/chain/function/chain.js
@@ -1,4 +1,4 @@
-import { factory } from '../../../utils/factory'
+import { factory } from '../../../utils/factory.js'
 
 const name = 'chain'
 const dependencies = ['typed', 'Chain']
diff --git a/src/type/complex/Complex.js b/src/type/complex/Complex.js
index 48d142a3b2..22f27c783d 100644
--- a/src/type/complex/Complex.js
+++ b/src/type/complex/Complex.js
@@ -1,7 +1,7 @@
 import Complex from 'complex.js'
-import { format } from '../../utils/number'
-import { isNumber, isUnit } from '../../utils/is'
-import { factory } from '../../utils/factory'
+import { format } from '../../utils/number.js'
+import { isNumber, isUnit } from '../../utils/is.js'
+import { factory } from '../../utils/factory.js'
 
 const name = 'Complex'
 const dependencies = []
diff --git a/src/type/complex/function/complex.js b/src/type/complex/function/complex.js
index b116c62f04..f3e8122f31 100644
--- a/src/type/complex/function/complex.js
+++ b/src/type/complex/function/complex.js
@@ -1,5 +1,5 @@
-import { factory } from '../../../utils/factory'
-import { deepMap } from '../../../utils/collection'
+import { factory } from '../../../utils/factory.js'
+import { deepMap } from '../../../utils/collection.js'
 
 const name = 'complex'
 const dependencies = ['typed', 'Complex']
diff --git a/src/type/fraction/Fraction.js b/src/type/fraction/Fraction.js
index 8ff2ec361a..2fc580c639 100644
--- a/src/type/fraction/Fraction.js
+++ b/src/type/fraction/Fraction.js
@@ -1,5 +1,5 @@
 import Fraction from 'fraction.js'
-import { factory } from '../../utils/factory'
+import { factory } from '../../utils/factory.js'
 
 const name = 'Fraction'
 const dependencies = []
diff --git a/src/type/fraction/function/fraction.js b/src/type/fraction/function/fraction.js
index 68302d8367..2d62f51469 100644
--- a/src/type/fraction/function/fraction.js
+++ b/src/type/fraction/function/fraction.js
@@ -1,5 +1,5 @@
-import { factory } from '../../../utils/factory'
-import { deepMap } from '../../../utils/collection'
+import { factory } from '../../../utils/factory.js'
+import { deepMap } from '../../../utils/collection.js'
 
 const name = 'fraction'
 const dependencies = ['typed', 'Fraction']
diff --git a/src/type/matrix/DenseMatrix.js b/src/type/matrix/DenseMatrix.js
index a18bf5f559..85d1cf73e0 100644
--- a/src/type/matrix/DenseMatrix.js
+++ b/src/type/matrix/DenseMatrix.js
@@ -1,10 +1,10 @@
-import { isArray, isBigNumber, isCollection, isIndex, isMatrix, isNumber, isString, typeOf } from '../../utils/is'
-import { arraySize, getArrayDataType, reshape, resize, unsqueeze, validate, validateIndex } from '../../utils/array'
-import { format } from '../../utils/string'
-import { isInteger } from '../../utils/number'
-import { clone, deepStrictEqual } from '../../utils/object'
-import { DimensionError } from '../../error/DimensionError'
-import { factory } from '../../utils/factory'
+import { isArray, isBigNumber, isCollection, isIndex, isMatrix, isNumber, isString, typeOf } from '../../utils/is.js'
+import { arraySize, getArrayDataType, reshape, resize, unsqueeze, validate, validateIndex } from '../../utils/array.js'
+import { format } from '../../utils/string.js'
+import { isInteger } from '../../utils/number.js'
+import { clone, deepStrictEqual } from '../../utils/object.js'
+import { DimensionError } from '../../error/DimensionError.js'
+import { factory } from '../../utils/factory.js'
 
 const name = 'DenseMatrix'
 const dependencies = [
diff --git a/src/type/matrix/FibonacciHeap.js b/src/type/matrix/FibonacciHeap.js
index 077f10b422..663014b531 100644
--- a/src/type/matrix/FibonacciHeap.js
+++ b/src/type/matrix/FibonacciHeap.js
@@ -1,4 +1,4 @@
-import { factory } from '../../utils/factory'
+import { factory } from '../../utils/factory.js'
 
 const name = 'FibonacciHeap'
 const dependencies = ['smaller', 'larger']
diff --git a/src/type/matrix/ImmutableDenseMatrix.js b/src/type/matrix/ImmutableDenseMatrix.js
index 69d2945910..1fc6406a04 100644
--- a/src/type/matrix/ImmutableDenseMatrix.js
+++ b/src/type/matrix/ImmutableDenseMatrix.js
@@ -1,6 +1,6 @@
-import { isArray, isMatrix, isString, typeOf } from '../../utils/is'
-import { clone } from '../../utils/object'
-import { factory } from '../../utils/factory'
+import { isArray, isMatrix, isString, typeOf } from '../../utils/is.js'
+import { clone } from '../../utils/object.js'
+import { factory } from '../../utils/factory.js'
 
 const name = 'ImmutableDenseMatrix'
 const dependencies = [
diff --git a/src/type/matrix/Matrix.js b/src/type/matrix/Matrix.js
index 57ddd18aee..bb052f98a5 100644
--- a/src/type/matrix/Matrix.js
+++ b/src/type/matrix/Matrix.js
@@ -1,4 +1,4 @@
-import { factory } from '../../utils/factory'
+import { factory } from '../../utils/factory.js'
 
 const name = 'Matrix'
 const dependencies = []
diff --git a/src/type/matrix/MatrixIndex.js b/src/type/matrix/MatrixIndex.js
index f38c64948d..f1b234dcf0 100644
--- a/src/type/matrix/MatrixIndex.js
+++ b/src/type/matrix/MatrixIndex.js
@@ -1,7 +1,7 @@
-import { isMatrix, isRange } from '../../utils/is'
-import { clone } from '../../utils/object'
-import { isInteger } from '../../utils/number'
-import { factory } from '../../utils/factory'
+import { isMatrix, isRange } from '../../utils/is.js'
+import { clone } from '../../utils/object.js'
+import { isInteger } from '../../utils/number.js'
+import { factory } from '../../utils/factory.js'
 
 const name = 'Index'
 const dependencies = ['ImmutableDenseMatrix']
diff --git a/src/type/matrix/Range.js b/src/type/matrix/Range.js
index 312a3331cd..3f7d914a4f 100644
--- a/src/type/matrix/Range.js
+++ b/src/type/matrix/Range.js
@@ -1,6 +1,6 @@
-import { isBigNumber } from '../../utils/is'
-import { format, sign } from '../../utils/number'
-import { factory } from '../../utils/factory'
+import { isBigNumber } from '../../utils/is.js'
+import { format, sign } from '../../utils/number.js'
+import { factory } from '../../utils/factory.js'
 
 const name = 'Range'
 const dependencies = []
diff --git a/src/type/matrix/Spa.js b/src/type/matrix/Spa.js
index 8b57d05c66..3808a1dfdc 100644
--- a/src/type/matrix/Spa.js
+++ b/src/type/matrix/Spa.js
@@ -1,4 +1,4 @@
-import { factory } from '../../utils/factory'
+import { factory } from '../../utils/factory.js'
 
 const name = 'Spa'
 const dependencies = ['addScalar', 'equalScalar', 'FibonacciHeap']
diff --git a/src/type/matrix/SparseMatrix.js b/src/type/matrix/SparseMatrix.js
index 5ba9cb2a5a..7318e2fc8d 100644
--- a/src/type/matrix/SparseMatrix.js
+++ b/src/type/matrix/SparseMatrix.js
@@ -1,10 +1,10 @@
-import { isArray, isBigNumber, isCollection, isIndex, isMatrix, isNumber, isString, typeOf } from '../../utils/is'
-import { isInteger } from '../../utils/number'
-import { format } from '../../utils/string'
-import { clone, deepStrictEqual } from '../../utils/object'
-import { arraySize, getArrayDataType, unsqueeze, validateIndex } from '../../utils/array'
-import { factory } from '../../utils/factory'
-import { DimensionError } from '../../error/DimensionError'
+import { isArray, isBigNumber, isCollection, isIndex, isMatrix, isNumber, isString, typeOf } from '../../utils/is.js'
+import { isInteger } from '../../utils/number.js'
+import { format } from '../../utils/string.js'
+import { clone, deepStrictEqual } from '../../utils/object.js'
+import { arraySize, getArrayDataType, unsqueeze, validateIndex } from '../../utils/array.js'
+import { factory } from '../../utils/factory.js'
+import { DimensionError } from '../../error/DimensionError.js'
 
 const name = 'SparseMatrix'
 const dependencies = [
diff --git a/src/type/matrix/function/index.js b/src/type/matrix/function/index.js
index c0f9eb056e..45e50c4fc4 100644
--- a/src/type/matrix/function/index.js
+++ b/src/type/matrix/function/index.js
@@ -1,5 +1,5 @@
-import { factory } from '../../../utils/factory'
-import { isBigNumber, isMatrix } from '../../../utils/is'
+import { factory } from '../../../utils/factory.js'
+import { isBigNumber, isMatrix } from '../../../utils/is.js'
 
 const name = 'index'
 const dependencies = ['typed', 'Index']
diff --git a/src/type/matrix/function/matrix.js b/src/type/matrix/function/matrix.js
index 9a3896c355..4e7314e762 100644
--- a/src/type/matrix/function/matrix.js
+++ b/src/type/matrix/function/matrix.js
@@ -1,4 +1,4 @@
-import { factory } from '../../../utils/factory'
+import { factory } from '../../../utils/factory.js'
 
 const name = 'matrix'
 const dependencies = ['typed', 'Matrix', 'DenseMatrix', 'SparseMatrix']
diff --git a/src/type/matrix/function/sparse.js b/src/type/matrix/function/sparse.js
index 5e843db44d..24c0cbf0ce 100644
--- a/src/type/matrix/function/sparse.js
+++ b/src/type/matrix/function/sparse.js
@@ -1,4 +1,4 @@
-import { factory } from '../../../utils/factory'
+import { factory } from '../../../utils/factory.js'
 
 const name = 'sparse'
 const dependencies = ['typed', 'SparseMatrix']
diff --git a/src/type/matrix/utils/algorithm01.js b/src/type/matrix/utils/algorithm01.js
index 9f174f9760..36498344b4 100644
--- a/src/type/matrix/utils/algorithm01.js
+++ b/src/type/matrix/utils/algorithm01.js
@@ -1,5 +1,5 @@
-import { factory } from '../../../utils/factory'
-import { DimensionError } from '../../../error/DimensionError'
+import { factory } from '../../../utils/factory.js'
+import { DimensionError } from '../../../error/DimensionError.js'
 
 const name = 'algorithm01'
 const dependencies = ['typed']
diff --git a/src/type/matrix/utils/algorithm02.js b/src/type/matrix/utils/algorithm02.js
index b1c10ab234..0563a0b588 100644
--- a/src/type/matrix/utils/algorithm02.js
+++ b/src/type/matrix/utils/algorithm02.js
@@ -1,5 +1,5 @@
-import { factory } from '../../../utils/factory'
-import { DimensionError } from '../../../error/DimensionError'
+import { factory } from '../../../utils/factory.js'
+import { DimensionError } from '../../../error/DimensionError.js'
 
 const name = 'algorithm02'
 const dependencies = ['typed', 'equalScalar']
diff --git a/src/type/matrix/utils/algorithm03.js b/src/type/matrix/utils/algorithm03.js
index 736db6968d..9ff16f14c7 100644
--- a/src/type/matrix/utils/algorithm03.js
+++ b/src/type/matrix/utils/algorithm03.js
@@ -1,5 +1,5 @@
-import { factory } from '../../../utils/factory'
-import { DimensionError } from '../../../error/DimensionError'
+import { factory } from '../../../utils/factory.js'
+import { DimensionError } from '../../../error/DimensionError.js'
 
 const name = 'algorithm03'
 const dependencies = ['typed']
diff --git a/src/type/matrix/utils/algorithm04.js b/src/type/matrix/utils/algorithm04.js
index a720693f4d..34315a391b 100644
--- a/src/type/matrix/utils/algorithm04.js
+++ b/src/type/matrix/utils/algorithm04.js
@@ -1,5 +1,5 @@
-import { factory } from '../../../utils/factory'
-import { DimensionError } from '../../../error/DimensionError'
+import { factory } from '../../../utils/factory.js'
+import { DimensionError } from '../../../error/DimensionError.js'
 
 const name = 'algorithm04'
 const dependencies = ['typed', 'equalScalar']
diff --git a/src/type/matrix/utils/algorithm05.js b/src/type/matrix/utils/algorithm05.js
index 8201e21d45..3eeb30e954 100644
--- a/src/type/matrix/utils/algorithm05.js
+++ b/src/type/matrix/utils/algorithm05.js
@@ -1,5 +1,5 @@
-import { factory } from '../../../utils/factory'
-import { DimensionError } from '../../../error/DimensionError'
+import { factory } from '../../../utils/factory.js'
+import { DimensionError } from '../../../error/DimensionError.js'
 
 const name = 'algorithm05'
 const dependencies = ['typed', 'equalScalar']
diff --git a/src/type/matrix/utils/algorithm06.js b/src/type/matrix/utils/algorithm06.js
index eafe5b9ddb..8510c393ce 100644
--- a/src/type/matrix/utils/algorithm06.js
+++ b/src/type/matrix/utils/algorithm06.js
@@ -1,6 +1,6 @@
-import { factory } from '../../../utils/factory'
-import { DimensionError } from '../../../error/DimensionError'
-import { scatter } from '../../../utils/collection'
+import { factory } from '../../../utils/factory.js'
+import { DimensionError } from '../../../error/DimensionError.js'
+import { scatter } from '../../../utils/collection.js'
 
 const name = 'algorithm06'
 const dependencies = ['typed', 'equalScalar']
diff --git a/src/type/matrix/utils/algorithm07.js b/src/type/matrix/utils/algorithm07.js
index 7e1cac706e..a25530dd8d 100644
--- a/src/type/matrix/utils/algorithm07.js
+++ b/src/type/matrix/utils/algorithm07.js
@@ -1,5 +1,5 @@
-import { factory } from '../../../utils/factory'
-import { DimensionError } from '../../../error/DimensionError'
+import { factory } from '../../../utils/factory.js'
+import { DimensionError } from '../../../error/DimensionError.js'
 
 const name = 'algorithm07'
 const dependencies = ['typed', 'DenseMatrix']
diff --git a/src/type/matrix/utils/algorithm08.js b/src/type/matrix/utils/algorithm08.js
index dec55fd296..7a8d8c2d02 100644
--- a/src/type/matrix/utils/algorithm08.js
+++ b/src/type/matrix/utils/algorithm08.js
@@ -1,5 +1,5 @@
-import { factory } from '../../../utils/factory'
-import { DimensionError } from '../../../error/DimensionError'
+import { factory } from '../../../utils/factory.js'
+import { DimensionError } from '../../../error/DimensionError.js'
 
 const name = 'algorithm08'
 const dependencies = ['typed', 'equalScalar']
diff --git a/src/type/matrix/utils/algorithm09.js b/src/type/matrix/utils/algorithm09.js
index 91fcd443d9..90cf4702ff 100644
--- a/src/type/matrix/utils/algorithm09.js
+++ b/src/type/matrix/utils/algorithm09.js
@@ -1,5 +1,5 @@
-import { factory } from '../../../utils/factory'
-import { DimensionError } from '../../../error/DimensionError'
+import { factory } from '../../../utils/factory.js'
+import { DimensionError } from '../../../error/DimensionError.js'
 
 const name = 'algorithm09'
 const dependencies = ['typed', 'equalScalar']
diff --git a/src/type/matrix/utils/algorithm10.js b/src/type/matrix/utils/algorithm10.js
index 1b6ab8f70b..0c7eeaa220 100644
--- a/src/type/matrix/utils/algorithm10.js
+++ b/src/type/matrix/utils/algorithm10.js
@@ -1,4 +1,4 @@
-import { factory } from '../../../utils/factory'
+import { factory } from '../../../utils/factory.js'
 
 const name = 'algorithm10'
 const dependencies = ['typed', 'DenseMatrix']
diff --git a/src/type/matrix/utils/algorithm11.js b/src/type/matrix/utils/algorithm11.js
index 34a74c34dc..a79cead99c 100644
--- a/src/type/matrix/utils/algorithm11.js
+++ b/src/type/matrix/utils/algorithm11.js
@@ -1,4 +1,4 @@
-import { factory } from '../../../utils/factory'
+import { factory } from '../../../utils/factory.js'
 
 const name = 'algorithm11'
 const dependencies = ['typed', 'equalScalar']
diff --git a/src/type/matrix/utils/algorithm12.js b/src/type/matrix/utils/algorithm12.js
index a0b6394e8e..dfa1812a85 100644
--- a/src/type/matrix/utils/algorithm12.js
+++ b/src/type/matrix/utils/algorithm12.js
@@ -1,4 +1,4 @@
-import { factory } from '../../../utils/factory'
+import { factory } from '../../../utils/factory.js'
 
 const name = 'algorithm12'
 const dependencies = ['typed', 'DenseMatrix']
diff --git a/src/type/matrix/utils/algorithm13.js b/src/type/matrix/utils/algorithm13.js
index 4ae533089f..ce1a064bd2 100644
--- a/src/type/matrix/utils/algorithm13.js
+++ b/src/type/matrix/utils/algorithm13.js
@@ -1,5 +1,5 @@
-import { factory } from '../../../utils/factory'
-import { DimensionError } from '../../../error/DimensionError'
+import { factory } from '../../../utils/factory.js'
+import { DimensionError } from '../../../error/DimensionError.js'
 
 const name = 'algorithm13'
 const dependencies = ['typed']
diff --git a/src/type/matrix/utils/algorithm14.js b/src/type/matrix/utils/algorithm14.js
index f6c191d809..d03382b883 100644
--- a/src/type/matrix/utils/algorithm14.js
+++ b/src/type/matrix/utils/algorithm14.js
@@ -1,5 +1,5 @@
-import { factory } from '../../../utils/factory'
-import { clone } from '../../../utils/object'
+import { factory } from '../../../utils/factory.js'
+import { clone } from '../../../utils/object.js'
 
 const name = 'algorithm14'
 const dependencies = ['typed']
diff --git a/src/type/number.js b/src/type/number.js
index 0fcdeecf49..52e160f8f0 100644
--- a/src/type/number.js
+++ b/src/type/number.js
@@ -1,5 +1,5 @@
-import { factory } from '../utils/factory'
-import { deepMap } from '../utils/collection'
+import { factory } from '../utils/factory.js'
+import { deepMap } from '../utils/collection.js'
 
 const name = 'number'
 const dependencies = ['typed']
diff --git a/src/type/resultset/ResultSet.js b/src/type/resultset/ResultSet.js
index 9663809bd5..a56be92e7a 100644
--- a/src/type/resultset/ResultSet.js
+++ b/src/type/resultset/ResultSet.js
@@ -1,4 +1,4 @@
-import { factory } from '../../utils/factory'
+import { factory } from '../../utils/factory.js'
 
 const name = 'ResultSet'
 const dependencies = []
diff --git a/src/type/string.js b/src/type/string.js
index dd4d297485..4b35b5738c 100644
--- a/src/type/string.js
+++ b/src/type/string.js
@@ -1,6 +1,6 @@
-import { factory } from '../utils/factory'
-import { deepMap } from '../utils/collection'
-import { format } from '../utils/number'
+import { factory } from '../utils/factory.js'
+import { deepMap } from '../utils/collection.js'
+import { format } from '../utils/number.js'
 
 const name = 'string'
 const dependencies = ['typed']
diff --git a/src/type/unit/Unit.js b/src/type/unit/Unit.js
index c42bb2a835..e5781e2ef3 100644
--- a/src/type/unit/Unit.js
+++ b/src/type/unit/Unit.js
@@ -1,8 +1,8 @@
-import { isComplex, isUnit, typeOf } from '../../utils/is'
-import { factory } from '../../utils/factory'
-import { endsWith } from '../../utils/string'
-import { clone, hasOwnProperty } from '../../utils/object'
-import { createBigNumberPi as createPi } from '../../utils/bignumber/constants'
+import { isComplex, isUnit, typeOf } from '../../utils/is.js'
+import { factory } from '../../utils/factory.js'
+import { endsWith } from '../../utils/string.js'
+import { clone, hasOwnProperty } from '../../utils/object.js'
+import { createBigNumberPi as createPi } from '../../utils/bignumber/constants.js'
 
 const name = 'Unit'
 const dependencies = [
diff --git a/src/type/unit/function/createUnit.js b/src/type/unit/function/createUnit.js
index 235e099ae6..76fa53a68c 100644
--- a/src/type/unit/function/createUnit.js
+++ b/src/type/unit/function/createUnit.js
@@ -1,4 +1,4 @@
-import { factory } from '../../../utils/factory'
+import { factory } from '../../../utils/factory.js'
 
 const name = 'createUnit'
 const dependencies = ['typed', 'Unit']
diff --git a/src/type/unit/function/splitUnit.js b/src/type/unit/function/splitUnit.js
index b61b3d0966..d6a787a5cf 100644
--- a/src/type/unit/function/splitUnit.js
+++ b/src/type/unit/function/splitUnit.js
@@ -1,4 +1,4 @@
-import { factory } from '../../../utils/factory'
+import { factory } from '../../../utils/factory.js'
 
 const name = 'splitUnit'
 const dependencies = ['typed']
diff --git a/src/type/unit/function/unit.js b/src/type/unit/function/unit.js
index 710c9bdd10..108e643329 100644
--- a/src/type/unit/function/unit.js
+++ b/src/type/unit/function/unit.js
@@ -1,5 +1,5 @@
-import { factory } from '../../../utils/factory'
-import { deepMap } from '../../../utils/collection'
+import { factory } from '../../../utils/factory.js'
+import { deepMap } from '../../../utils/collection.js'
 
 const name = 'unit'
 const dependencies = ['typed', 'Unit']
diff --git a/src/type/unit/physicalConstants.js b/src/type/unit/physicalConstants.js
index c539776050..cd47ea6626 100644
--- a/src/type/unit/physicalConstants.js
+++ b/src/type/unit/physicalConstants.js
@@ -1,4 +1,4 @@
-import { factory } from '../../utils/factory'
+import { factory } from '../../utils/factory.js'
 
 // Source: https://en.wikipedia.org/wiki/Physical_constant
 
diff --git a/src/utils/array.js b/src/utils/array.js
index 2f3330a4e0..59ccb80a42 100644
--- a/src/utils/array.js
+++ b/src/utils/array.js
@@ -1,8 +1,8 @@
-import { isInteger } from './number'
-import { isNumber } from './is'
-import { format } from './string'
-import { DimensionError } from '../error/DimensionError'
-import { IndexError } from '../error/IndexError'
+import { isInteger } from './number.js'
+import { isNumber } from './is.js'
+import { format } from './string.js'
+import { DimensionError } from '../error/DimensionError.js'
+import { IndexError } from '../error/IndexError.js'
 
 /**
  * Calculate the size of a multi dimensional array.
diff --git a/src/utils/bignumber/constants.js b/src/utils/bignumber/constants.js
index bbe9e7fac1..1d67e95cf9 100644
--- a/src/utils/bignumber/constants.js
+++ b/src/utils/bignumber/constants.js
@@ -1,4 +1,4 @@
-import { memoize } from '../function'
+import { memoize } from '../function.js'
 
 /**
  * Calculate BigNumber e
diff --git a/src/utils/collection.js b/src/utils/collection.js
index a9be960235..d5da0647a1 100644
--- a/src/utils/collection.js
+++ b/src/utils/collection.js
@@ -1,6 +1,6 @@
-import { isCollection, isMatrix } from './is'
-import { IndexError } from '../error/IndexError'
-import { arraySize } from './array'
+import { isCollection, isMatrix } from './is.js'
+import { IndexError } from '../error/IndexError.js'
+import { arraySize } from './array.js'
 
 /**
  * Test whether an array contains collections
diff --git a/src/utils/complex.js b/src/utils/complex.js
index f9589d25ec..dae1aaa09c 100644
--- a/src/utils/complex.js
+++ b/src/utils/complex.js
@@ -1,4 +1,4 @@
-import { nearlyEqual } from './number'
+import { nearlyEqual } from './number.js'
 
 /**
  * Test whether two complex values are equal provided a given epsilon.
diff --git a/src/utils/customs.js b/src/utils/customs.js
index c132d80f33..eaaba2cfb6 100644
--- a/src/utils/customs.js
+++ b/src/utils/customs.js
@@ -1,4 +1,4 @@
-import { hasOwnProperty } from './object'
+import { hasOwnProperty } from './object.js'
 
 /**
  * Get a property of a plain object
diff --git a/src/utils/factory.js b/src/utils/factory.js
index 1f48c4072b..32afaa763d 100644
--- a/src/utils/factory.js
+++ b/src/utils/factory.js
@@ -1,5 +1,5 @@
-import { contains } from './array'
-import { pickShallow } from './object'
+import { contains } from './array.js'
+import { pickShallow } from './object.js'
 
 /**
  * Create a factory function, which can be used to inject dependencies.
diff --git a/src/utils/latex.js b/src/utils/latex.js
index 0ab7f99e44..6f91847030 100644
--- a/src/utils/latex.js
+++ b/src/utils/latex.js
@@ -1,7 +1,7 @@
 /* eslint no-template-curly-in-string: "off" */
 
 import escapeLatexLib from 'escape-latex'
-import { hasOwnProperty } from './object'
+import { hasOwnProperty } from './object.js'
 
 export const latexSymbols = {
   // GREEK LETTERS
diff --git a/src/utils/number.js b/src/utils/number.js
index 2d1a747e9d..d35fbe5307 100644
--- a/src/utils/number.js
+++ b/src/utils/number.js
@@ -1,4 +1,4 @@
-import { isNumber } from './is'
+import { isNumber } from './is.js'
 
 /**
  * @typedef {{sign: '+' | '-' | '', coefficients: number[], exponent: number}} SplitValue
diff --git a/src/utils/object.js b/src/utils/object.js
index 46cf4b3c7e..78a8118399 100644
--- a/src/utils/object.js
+++ b/src/utils/object.js
@@ -1,4 +1,4 @@
-import { isBigNumber } from './is'
+import { isBigNumber } from './is.js'
 
 /**
  * Clone an object
diff --git a/src/utils/snapshot.js b/src/utils/snapshot.js
index c9f6273562..f06444fc08 100644
--- a/src/utils/snapshot.js
+++ b/src/utils/snapshot.js
@@ -6,9 +6,9 @@
  * into ES5 code under /lib and can be used straight by node.js
  */
 import assert from 'assert'
-import * as allIsFunctions from './is'
-import { create } from '../core/create'
-import { endsWith } from './string'
+import * as allIsFunctions from './is.js'
+import { create } from '../core/create.js'
+import { endsWith } from './string.js'
 
 export function validateBundle (expectedBundleStructure, bundle) {
   const originalWarn = console.warn
diff --git a/src/utils/string.js b/src/utils/string.js
index 35a338bce1..0558ef29d6 100644
--- a/src/utils/string.js
+++ b/src/utils/string.js
@@ -1,6 +1,6 @@
-import { isBigNumber, isString, typeOf } from './is'
-import { format as formatNumber } from './number'
-import { format as formatBigNumber } from './bignumber/formatter'
+import { isBigNumber, isString, typeOf } from './is.js'
+import { format as formatNumber } from './number.js'
+import { format as formatBigNumber } from './bignumber/formatter.js'
 
 /**
  * Check if a text ends with a certain string.
diff --git a/test/benchmark/expression_parser.js b/test/benchmark/expression_parser.js
index 61e45a1676..23d431f73c 100644
--- a/test/benchmark/expression_parser.js
+++ b/test/benchmark/expression_parser.js
@@ -6,7 +6,7 @@ const assert = require('assert')
 const Benchmark = require('benchmark')
 const padRight = require('pad-right')
 const math = require('../..')
-const getSafeProperty = require('../../lib/utils/customs').getSafeProperty
+const getSafeProperty = require('../../lib/cjs/utils/customs').getSafeProperty
 
 // expose on window when using bundled in a browser
 if (typeof window !== 'undefined') {
diff --git a/test/browser-test-config/package.json b/test/browser-test-config/package.json
new file mode 100644
index 0000000000..5bbefffbab
--- /dev/null
+++ b/test/browser-test-config/package.json
@@ -0,0 +1,3 @@
+{
+  "type": "commonjs"
+}
diff --git a/test/generated-code-tests/dependencies.test.js b/test/generated-code-tests/dependencies.test.js
index ce9b29bcde..e72469f742 100644
--- a/test/generated-code-tests/dependencies.test.js
+++ b/test/generated-code-tests/dependencies.test.js
@@ -1,6 +1,6 @@
 import assert from 'assert'
-import { addDependencies, divideDependencies, piDependencies } from '../../src/entry/dependenciesAny.generated'
-const { create } = require('../../src/core/create')
+import { addDependencies, divideDependencies, piDependencies } from '../../src/entry/dependenciesAny.generated.js'
+import { create } from '../../src/core/create.js'
 
 describe('dependencies', function () {
   it('should create functions from a collection of dependencies', () => {
diff --git a/test/generated-code-tests/entry/mainAny.test.js b/test/generated-code-tests/entry/mainAny.test.js
index f3111cc0b0..4c7bcc9216 100644
--- a/test/generated-code-tests/entry/mainAny.test.js
+++ b/test/generated-code-tests/entry/mainAny.test.js
@@ -1,7 +1,7 @@
 import assert from 'assert'
-import * as mainAny from '../../../src/entry/mainAny'
-import * as factoriesAny from '../../../src/factoriesAny'
-import { createSnapshotFromFactories, validateBundle, validateTypeOf } from '../../../src/utils/snapshot'
+import * as mainAny from '../../../src/entry/mainAny.js'
+import * as factoriesAny from '../../../src/factoriesAny.js'
+import { createSnapshotFromFactories, validateBundle, validateTypeOf } from '../../../src/utils/snapshot.js'
 const { create, all, add, matrix, isObject, isMatrix, pi, speedOfLight, sqrt, evaluate, chain, reviver, Complex, addDependencies } = mainAny
 
 const {
diff --git a/test/generated-code-tests/entry/mainNumber.test.js b/test/generated-code-tests/entry/mainNumber.test.js
index 3c240373b7..d450cf63cc 100644
--- a/test/generated-code-tests/entry/mainNumber.test.js
+++ b/test/generated-code-tests/entry/mainNumber.test.js
@@ -1,7 +1,7 @@
 import assert from 'assert'
-import * as mainNumber from '../../../src/entry/mainNumber'
-import { createSnapshotFromFactories, validateBundle, validateTypeOf } from '../../../src/utils/snapshot'
-import * as factoriesNumber from '../../../src/factoriesNumber'
+import * as mainNumber from '../../../src/entry/mainNumber.js'
+import { createSnapshotFromFactories, validateBundle, validateTypeOf } from '../../../src/utils/snapshot.js'
+import * as factoriesNumber from '../../../src/factoriesNumber.js'
 const { create, all, add, isObject, isNumber, pi, sqrt, evaluate, chain, Range, reviver, derivative, simplify, addDependencies } = mainNumber
 
 const {
diff --git a/test/node-tests/dist.test.js b/test/node-tests/browser.test.js
similarity index 69%
rename from test/node-tests/dist.test.js
rename to test/node-tests/browser.test.js
index 97cb88d29c..f328b4013e 100644
--- a/test/node-tests/dist.test.js
+++ b/test/node-tests/browser.test.js
@@ -1,47 +1,23 @@
 // Only use native node.js API's and references to ./lib here, this file is not transpiled!
 const assert = require('assert')
-const { createSnapshotFromFactories, validateBundle } = require('../../lib/utils/snapshot')
-const factoriesAny = require('../../lib/factoriesAny')
+const { createSnapshotFromFactories, validateBundle } = require('../../lib/cjs/utils/snapshot')
+const factoriesAny = require('../../lib/cjs/factoriesAny')
 const version = require('../../package.json').version
-const embeddedDocs = require('../../lib/expression/embeddedDocs/embeddedDocs')
+const embeddedDocs = require('../../lib/cjs/expression/embeddedDocs/embeddedDocs')
 
 const { expectedInstanceStructure } = createSnapshotFromFactories(factoriesAny)
 
-describe('dist', function () {
-  it('should load dist/math.js', function () {
-    const math = require('../../dist/math.js')
+describe('lib/browser', function () {
+  it('should load lib/browser/math.js', function () {
+    const math = require('../../lib/browser/math.js')
 
     assert.strictEqual(math.add(2, 3), 5)
     assert.strictEqual(math.version, version)
   })
 
-  it('should load dist/math.min.js', function () {
-    const math = require('../../dist/math.min.js')
-
-    assert.strictEqual(math.add(2, 3), 5)
-    assert.strictEqual(math.version, version)
-  })
-
-  it('should have all expected functions in dist/main.js', function () {
-    // snapshot testing
-    const math = require('../../dist/math.js')
-
-    // don't output all warnings "math.foo.bar is move to math.bar, ..."
-    const originalWarn = console.warn
-    console.warn = (...args) => {
-      if (args.join(' ').indexOf('is moved to') === -1) {
-        originalWarn.apply(console, args)
-      }
-    }
-
-    validateBundle(expectedInstanceStructure, math)
-
-    console.warn = originalWarn
-  })
-
-  it('should have all expected functions in dist/main.min.js', function () {
+  it('should have all expected functions in lib/browser/main.js', function () {
     // snapshot testing
-    const math = require('../../dist/math.js')
+    const math = require('../../lib/browser/math.js')
 
     // don't output all warnings "math.foo.bar is move to math.bar, ..."
     const originalWarn = console.warn
@@ -57,7 +33,7 @@ describe('dist', function () {
   })
 
   it('should contain embedded docs for every function', function () {
-    const math = require('../../dist/math.js')
+    const math = require('../../lib/browser/math.js')
 
     // names to ignore
     const ignore = [
diff --git a/test/node-tests/commonjs.test.js b/test/node-tests/commonjs.test.js
new file mode 100644
index 0000000000..2660ed2694
--- /dev/null
+++ b/test/node-tests/commonjs.test.js
@@ -0,0 +1,23 @@
+// Only use native node.js API's and references to ./lib here, this file is not transpiled!
+const assert = require('assert')
+const cp = require('child_process')
+const path = require('path')
+
+describe('lib/cjs', function () {
+  it('should load via commonjs', function (done) {
+    const filename = path.join(__dirname, 'commonjsApp.cjs')
+    cp.exec('node ' + filename, function (error, result) {
+      assert.strictEqual(error, null)
+      assert.strictEqual(result, '2\n2i\n')
+      done()
+    })
+  })
+  it('should load numbers only via commonjs', function (done) {
+    const filename = path.join(__dirname, 'commonjsAppNumberOnly.cjs')
+    cp.exec('node ' + filename, function (error, result) {
+      assert.strictEqual(error, null)
+      assert.strictEqual(result, '2\nNaN\n')
+      done()
+    })
+  })
+})
diff --git a/test/node-tests/commonjsApp.cjs b/test/node-tests/commonjsApp.cjs
new file mode 100644
index 0000000000..5dbaf45110
--- /dev/null
+++ b/test/node-tests/commonjsApp.cjs
@@ -0,0 +1,4 @@
+const { sqrt, format } = require('../..')
+
+console.log(format(sqrt(4)))
+console.log(format(sqrt(-4)))
diff --git a/test/node-tests/commonjsAppNumberOnly.cjs b/test/node-tests/commonjsAppNumberOnly.cjs
new file mode 100644
index 0000000000..0294129d23
--- /dev/null
+++ b/test/node-tests/commonjsAppNumberOnly.cjs
@@ -0,0 +1,4 @@
+const { sqrt, format } = require('../../lib/cjs/number.js')
+
+console.log(format(sqrt(4)))
+console.log(format(sqrt(-4)))
diff --git a/test/unit-tests/bundleAny.test.js b/test/node-tests/defaultInstance.test.js
similarity index 84%
rename from test/unit-tests/bundleAny.test.js
rename to test/node-tests/defaultInstance.test.js
index 602c74b82d..211f168457 100644
--- a/test/unit-tests/bundleAny.test.js
+++ b/test/node-tests/defaultInstance.test.js
@@ -1,7 +1,10 @@
-import assert from 'assert'
-import math from '../../src/bundleAny'
+const assert = require('assert')
+const cp = require('child_process')
+const path = require('path')
+const math = require('../../lib/cjs/defaultInstance.js').default
+const version = require('../../package.json').version
 
-describe('bundleAny', function () {
+describe('defaultInstance', function () {
   it('should get a default instance of mathjs', function () {
     assert.strictEqual(typeof math, 'object')
     assert.deepStrictEqual(math.config(), {
@@ -129,4 +132,19 @@ describe('bundleAny', function () {
     // restore Object.create
     Object.create = create
   })
+
+  it('should have the correct version number', function () {
+    const math = require('../..')
+
+    assert.strictEqual(math.version, version)
+  })
+
+  it('should be robust against pollution of the Object prototype', function (done) {
+    const filename = path.join(__dirname, 'pollutedObjectPrototype.js')
+    cp.exec('node ' + filename, function (error, result) {
+      assert.strictEqual(error, null)
+      assert.strictEqual(result, '2i\n')
+      done()
+    })
+  })
 })
diff --git a/test/node-tests/esm.test.js b/test/node-tests/esm.test.js
new file mode 100644
index 0000000000..bf7bc88dbc
--- /dev/null
+++ b/test/node-tests/esm.test.js
@@ -0,0 +1,24 @@
+// Only use native node.js API's and references to ./lib here, this file is not transpiled!
+const assert = require('assert')
+const cp = require('child_process')
+const path = require('path')
+
+describe('lib/esm', function () {
+  it('should load via mjs', function (done) {
+    const filename = path.join(__dirname, 'esmApp.mjs')
+    cp.exec('node ' + filename, function (error, result) {
+      assert.strictEqual(error, null)
+      assert.strictEqual(result, '2\n2i\n')
+      done()
+    })
+  })
+
+  it('should load number only via mjs', function (done) {
+    const filename = path.join(__dirname, 'esmAppNumberOnly.mjs')
+    cp.exec('node ' + filename, function (error, result) {
+      assert.strictEqual(error, null)
+      assert.strictEqual(result, '2\nNaN\n')
+      done()
+    })
+  })
+})
diff --git a/test/node-tests/esmApp.mjs b/test/node-tests/esmApp.mjs
new file mode 100644
index 0000000000..ae024d1f88
--- /dev/null
+++ b/test/node-tests/esmApp.mjs
@@ -0,0 +1,5 @@
+// TODO: would be nice to call '../../' so we know for sure ESM is correctly exported
+import { sqrt, format } from '../../lib/esm/index.js'
+
+console.log(format(sqrt(4)))
+console.log(format(sqrt(-4)))
diff --git a/test/node-tests/esmAppNumberOnly.mjs b/test/node-tests/esmAppNumberOnly.mjs
new file mode 100644
index 0000000000..e08ca3bda9
--- /dev/null
+++ b/test/node-tests/esmAppNumberOnly.mjs
@@ -0,0 +1,5 @@
+// TODO: would be nice to call '../../' so we know for sure ESM is correctly exported
+import { sqrt, format } from '../../lib/esm/number.js'
+
+console.log(format(sqrt(4)))
+console.log(format(sqrt(-4)))
diff --git a/test/node-tests/function/alegbra/decomposition/slu.test.js b/test/node-tests/function/alegbra/decomposition/slu.test.js
index 02c4c12a2b..b27e9394ff 100644
--- a/test/node-tests/function/alegbra/decomposition/slu.test.js
+++ b/test/node-tests/function/alegbra/decomposition/slu.test.js
@@ -1,5 +1,5 @@
 // Only use native node.js API's and references to ./lib here, this file is not transpiled!
-const math = require('../../../../../lib/bundleAny')
+const math = require('../../../../../lib/cjs/defaultInstance').default
 const approx = require('../../../../../tools/approx')
 const market = require('../../../../../tools/matrixmarket')
 
diff --git a/test/node-tests/function/alegbra/sparse/csAmd.test.js b/test/node-tests/function/alegbra/sparse/csAmd.test.js
index bc32377a12..a956d81cec 100644
--- a/test/node-tests/function/alegbra/sparse/csAmd.test.js
+++ b/test/node-tests/function/alegbra/sparse/csAmd.test.js
@@ -1,6 +1,6 @@
 // Only use native node.js API's and references to ./lib here, this file is not transpiled!
-const math = require('../../../../../lib/bundleAny')
-const { createCsAmd } = require('../../../../../lib/function/algebra/sparse/csAmd')
+const math = require('../../../../../lib/cjs/defaultInstance').default
+const { createCsAmd } = require('../../../../../lib/cjs/function/algebra/sparse/csAmd')
 
 const assert = require('assert')
 const approx = require('../../../../../tools/approx')
diff --git a/test/node-tests/function/alegbra/sparse/csLu.test.js b/test/node-tests/function/alegbra/sparse/csLu.test.js
index 5abbc08d14..cd7fce4410 100644
--- a/test/node-tests/function/alegbra/sparse/csLu.test.js
+++ b/test/node-tests/function/alegbra/sparse/csLu.test.js
@@ -1,9 +1,9 @@
 // Only use native node.js API's and references to ./lib here, this file is not transpiled!
 const approx = require('../../../../../tools/approx')
-const math = require('../../../../../lib/bundleAny')
-const { csPermute } = require('../../../../../lib/function/algebra/sparse/csPermute')
-const { createCsLu } = require('../../../../../lib/function/algebra/sparse/csLu')
-const { createCsSqr } = require('../../../../../lib/function/algebra/sparse/csSqr')
+const math = require('../../../../../lib/cjs/defaultInstance').default
+const { csPermute } = require('../../../../../lib/cjs/function/algebra/sparse/csPermute')
+const { createCsLu } = require('../../../../../lib/cjs/function/algebra/sparse/csLu')
+const { createCsSqr } = require('../../../../../lib/cjs/function/algebra/sparse/csSqr')
 const market = require('../../../../../tools/matrixmarket')
 
 const { abs, add, divideScalar, multiply, subtract, larger, largerEq, transpose, SparseMatrix } = math
diff --git a/test/node-tests/function/arithmetic/multiply.test.js b/test/node-tests/function/arithmetic/multiply.test.js
index 33c1ae0265..c46a1b58d0 100644
--- a/test/node-tests/function/arithmetic/multiply.test.js
+++ b/test/node-tests/function/arithmetic/multiply.test.js
@@ -1,5 +1,5 @@
 // Only use native node.js API's and references to ./lib here, this file is not transpiled!
-const math = require('../../../../lib/bundleAny')
+const math = require('../../../../lib/cjs/defaultInstance').default
 const market = require('../../../../tools/matrixmarket')
 
 describe('multiply', function () {
diff --git a/test/node-tests/lib.test.js b/test/node-tests/lib.test.js
deleted file mode 100644
index 8e15afa995..0000000000
--- a/test/node-tests/lib.test.js
+++ /dev/null
@@ -1,34 +0,0 @@
-// Only use native node.js API's and references to ./lib here, this file is not transpiled!
-const assert = require('assert')
-const cp = require('child_process')
-const path = require('path')
-const version = require('../../package.json').version
-
-describe('lib', function () {
-  it('should load lib/mainAny.js', function () {
-    const math = require('../../lib/entry/mainAny')
-
-    assert.strictEqual(math.add(2, 3), 5)
-  })
-
-  it('should load lib/mainNumber.js', function () {
-    const math = require('../../lib/entry/mainNumber')
-
-    assert.strictEqual(math.add(2, 3), 5)
-  })
-
-  it('should have the correct version number', function () {
-    const math = require('../../lib/entry/mainAny')
-
-    assert.strictEqual(math.version, version)
-  })
-
-  it('should be robust against pollution of the Object prototype', function (done) {
-    const filename = path.join(__dirname, 'polluted_object_prototype.js')
-    cp.exec('node ' + filename, function (error, result) {
-      assert.strictEqual(error, null)
-      assert.strictEqual(result, '2i\n')
-      done()
-    })
-  })
-})
diff --git a/test/node-tests/package.json b/test/node-tests/package.json
new file mode 100644
index 0000000000..5bbefffbab
--- /dev/null
+++ b/test/node-tests/package.json
@@ -0,0 +1,3 @@
+{
+  "type": "commonjs"
+}
diff --git a/test/node-tests/polluted_object_prototype.js b/test/node-tests/pollutedObjectPrototype.js
similarity index 82%
rename from test/node-tests/polluted_object_prototype.js
rename to test/node-tests/pollutedObjectPrototype.js
index bed45f2927..b21495977d 100644
--- a/test/node-tests/polluted_object_prototype.js
+++ b/test/node-tests/pollutedObjectPrototype.js
@@ -4,7 +4,7 @@
 Object.prototype.foo = () => {}
 
 // loading mathjs should not crash
-const math = require('../../lib/entry/mainAny')
+const math = require('../../lib/cjs/entry/mainAny')
 
 // outputs '2i'
 console.log(math.format(math.sqrt(-4)))
diff --git a/test/unit-tests/approx.test.js b/test/unit-tests/approx.test.js
index b021977531..0c4b849c98 100644
--- a/test/unit-tests/approx.test.js
+++ b/test/unit-tests/approx.test.js
@@ -1,7 +1,7 @@
 // test approx itself...
 import assert from 'assert'
 
-import approx from '../../tools/approx'
+import approx from '../../tools/approx.js'
 
 describe('approx', function () {
   it('should test equality of positive values', function () {
diff --git a/test/unit-tests/constants.test.js b/test/unit-tests/constants.test.js
index 1e73d0db83..4a31034665 100644
--- a/test/unit-tests/constants.test.js
+++ b/test/unit-tests/constants.test.js
@@ -1,7 +1,7 @@
 import assert from 'assert'
-import approx from '../../tools/approx'
-import { createBigNumberClass } from '../../src/type/bignumber/BigNumber'
-import { createComplexClass } from '../../src/type/complex/Complex'
+import approx from '../../tools/approx.js'
+import { createBigNumberClass } from '../../src/type/bignumber/BigNumber.js'
+import { createComplexClass } from '../../src/type/complex/Complex.js'
 import {
   createE,
   createFalse,
@@ -19,7 +19,7 @@ import {
   createSQRT1_2, // eslint-disable-line camelcase
   createTau,
   createTrue
-} from '../../src/constants'
+} from '../../src/constants.js'
 
 describe('constants', function () {
   describe('number', function () {
diff --git a/test/unit-tests/core/config.test.js b/test/unit-tests/core/config.test.js
index 1b219721a1..68745d8b00 100644
--- a/test/unit-tests/core/config.test.js
+++ b/test/unit-tests/core/config.test.js
@@ -1,5 +1,5 @@
 import assert from 'assert'
-import math from '../../../src/bundleAny'
+import math from '../../../src/defaultInstance.js'
 
 describe('config', function () {
   it('should allow setting config after having overwritten import', () => {
diff --git a/test/unit-tests/core/import.test.js b/test/unit-tests/core/import.test.js
index d9437b4b41..ca4ca051f9 100644
--- a/test/unit-tests/core/import.test.js
+++ b/test/unit-tests/core/import.test.js
@@ -1,9 +1,9 @@
 import assert from 'assert'
-import mathjs from '../../../src/bundleAny'
-import approx from '../../../tools/approx'
-import { factory } from '../../../src/utils/factory'
-import { create } from '../../../src/core/create'
-import { hasOwnProperty } from '../../../src/utils/object'
+import mathjs from '../../../src/defaultInstance.js'
+import approx from '../../../tools/approx.js'
+import { factory } from '../../../src/utils/factory.js'
+import { create } from '../../../src/core/create.js'
+import { hasOwnProperty } from '../../../src/utils/object.js'
 
 const multiplyTestFactory = factory('multiplyTest', [], () => {
   return function multiply (a, b) {
diff --git a/test/unit-tests/core/typed.test.js b/test/unit-tests/core/typed.test.js
index 52e1d13c89..a003460c1c 100644
--- a/test/unit-tests/core/typed.test.js
+++ b/test/unit-tests/core/typed.test.js
@@ -1,5 +1,5 @@
 import assert from 'assert'
-import math from '../../../src/bundleAny'
+import math from '../../../src/defaultInstance.js'
 const math2 = math.create()
 
 describe('typed', function () {
diff --git a/test/unit-tests/error/ArgumentsError.test.js b/test/unit-tests/error/ArgumentsError.test.js
index 31a3f08aba..870657cb57 100644
--- a/test/unit-tests/error/ArgumentsError.test.js
+++ b/test/unit-tests/error/ArgumentsError.test.js
@@ -1,5 +1,5 @@
 import assert from 'assert'
-import { ArgumentsError } from '../../../src/error/ArgumentsError'
+import { ArgumentsError } from '../../../src/error/ArgumentsError.js'
 
 describe('ArgumentsError', function () {
   it('should construct an ArgumentsError without max', function () {
diff --git a/test/unit-tests/error/DimensionError.test.js b/test/unit-tests/error/DimensionError.test.js
index 96c4b6072a..3f449573c4 100644
--- a/test/unit-tests/error/DimensionError.test.js
+++ b/test/unit-tests/error/DimensionError.test.js
@@ -1,5 +1,5 @@
 import assert from 'assert'
-import { DimensionError } from '../../../src/error/DimensionError'
+import { DimensionError } from '../../../src/error/DimensionError.js'
 
 describe('DimensionError', function () {
   it('should construct a DimensionError with numbers', function () {
diff --git a/test/unit-tests/error/IndexError.test.js b/test/unit-tests/error/IndexError.test.js
index 58774d8b38..07aca96977 100644
--- a/test/unit-tests/error/IndexError.test.js
+++ b/test/unit-tests/error/IndexError.test.js
@@ -1,5 +1,5 @@
 import assert from 'assert'
-import { IndexError } from '../../../src/error/IndexError'
+import { IndexError } from '../../../src/error/IndexError.js'
 
 describe('IndexError', function () {
   it('should construct an IndexError without min and max', function () {
diff --git a/test/unit-tests/expression/Help.test.js b/test/unit-tests/expression/Help.test.js
index bd2c11fcdd..4a90e7a135 100644
--- a/test/unit-tests/expression/Help.test.js
+++ b/test/unit-tests/expression/Help.test.js
@@ -1,8 +1,8 @@
 // test Help
 import assert from 'assert'
 
-import math from '../../../src/bundleAny'
-import { embeddedDocs } from '../../../src/expression/embeddedDocs/embeddedDocs'
+import math from '../../../src/defaultInstance.js'
+import { embeddedDocs } from '../../../src/expression/embeddedDocs/embeddedDocs.js'
 const Help = math.Help
 
 describe('help', function () {
diff --git a/test/unit-tests/expression/Parser.test.js b/test/unit-tests/expression/Parser.test.js
index 6bf497df1c..afa3c3e4d7 100644
--- a/test/unit-tests/expression/Parser.test.js
+++ b/test/unit-tests/expression/Parser.test.js
@@ -2,8 +2,8 @@
 
 import assert from 'assert'
 
-import approx from '../../../tools/approx'
-import math from '../../../src/bundleAny'
+import approx from '../../../tools/approx.js'
+import math from '../../../src/defaultInstance.js'
 const Parser = math.Parser
 
 describe('parser', function () {
diff --git a/test/unit-tests/expression/function/compile.test.js b/test/unit-tests/expression/function/compile.test.js
index 9a8ed79842..aeecd29054 100644
--- a/test/unit-tests/expression/function/compile.test.js
+++ b/test/unit-tests/expression/function/compile.test.js
@@ -1,7 +1,7 @@
 // test compile
 import assert from 'assert'
 
-import math from '../../../../src/bundleAny'
+import math from '../../../../src/defaultInstance.js'
 
 describe('compile', function () {
   it('should compile an expression', function () {
diff --git a/test/unit-tests/expression/function/evaluate.test.js b/test/unit-tests/expression/function/evaluate.test.js
index 51b6c76a5c..6e226717a3 100644
--- a/test/unit-tests/expression/function/evaluate.test.js
+++ b/test/unit-tests/expression/function/evaluate.test.js
@@ -1,6 +1,6 @@
 import assert from 'assert'
-import approx from '../../../../tools/approx'
-import math from '../../../../src/bundleAny'
+import approx from '../../../../tools/approx.js'
+import math from '../../../../src/defaultInstance.js'
 
 const Complex = math.Complex
 const Unit = math.Unit
diff --git a/test/unit-tests/expression/function/help.test.js b/test/unit-tests/expression/function/help.test.js
index d3d01d1049..54d8ae3823 100644
--- a/test/unit-tests/expression/function/help.test.js
+++ b/test/unit-tests/expression/function/help.test.js
@@ -1,6 +1,6 @@
 import assert from 'assert'
-import math from '../../../../src/bundleAny'
-import { embeddedDocs } from '../../../../src/expression/embeddedDocs/embeddedDocs'
+import math from '../../../../src/defaultInstance.js'
+import { embeddedDocs } from '../../../../src/expression/embeddedDocs/embeddedDocs.js'
 
 describe('help', function () {
   it('should find documentation for a function by its name', function () {
diff --git a/test/unit-tests/expression/function/parse.test.js b/test/unit-tests/expression/function/parse.test.js
index c6cc3853d7..033f675713 100644
--- a/test/unit-tests/expression/function/parse.test.js
+++ b/test/unit-tests/expression/function/parse.test.js
@@ -1,7 +1,7 @@
 // test parse
 import assert from 'assert'
 
-import math from '../../../../src/bundleAny'
+import math from '../../../../src/defaultInstance.js'
 const Node = math.Node
 
 describe('parse', function () {
diff --git a/test/unit-tests/expression/function/parser.test.js b/test/unit-tests/expression/function/parser.test.js
index f5016e8adf..ce9dfde369 100644
--- a/test/unit-tests/expression/function/parser.test.js
+++ b/test/unit-tests/expression/function/parser.test.js
@@ -1,5 +1,5 @@
 import assert from 'assert'
-import math from '../../../../src/bundleAny'
+import math from '../../../../src/defaultInstance.js'
 const Parser = math.Parser
 
 describe('parser', function () {
diff --git a/test/unit-tests/expression/keywords.test.js b/test/unit-tests/expression/keywords.test.js
index b817daed7b..1d5cb84172 100644
--- a/test/unit-tests/expression/keywords.test.js
+++ b/test/unit-tests/expression/keywords.test.js
@@ -1,7 +1,7 @@
 // test keywords
 import assert from 'assert'
 
-import { keywords } from '../../../src/expression/keywords'
+import { keywords } from '../../../src/expression/keywords.js'
 
 describe('keywords', function () {
   it('should return a map with reserved keywords', function () {
diff --git a/test/unit-tests/expression/node/AccessorNode.test.js b/test/unit-tests/expression/node/AccessorNode.test.js
index e4caf7e812..bde082b94b 100644
--- a/test/unit-tests/expression/node/AccessorNode.test.js
+++ b/test/unit-tests/expression/node/AccessorNode.test.js
@@ -1,7 +1,7 @@
 // test AccessorNode
 import assert from 'assert'
 
-import math from '../../../../src/bundleAny'
+import math from '../../../../src/defaultInstance.js'
 const bigmath = math.create({ number: 'BigNumber' })
 const Node = math.Node
 const ConstantNode = math.ConstantNode
diff --git a/test/unit-tests/expression/node/ArrayNode.test.js b/test/unit-tests/expression/node/ArrayNode.test.js
index c20fc9a078..77624d03fd 100644
--- a/test/unit-tests/expression/node/ArrayNode.test.js
+++ b/test/unit-tests/expression/node/ArrayNode.test.js
@@ -1,7 +1,7 @@
 // test ArrayNode
 import assert from 'assert'
 
-import math from '../../../../src/bundleAny'
+import math from '../../../../src/defaultInstance.js'
 const ConstantNode = math.ConstantNode
 const SymbolNode = math.SymbolNode
 const RangeNode = math.RangeNode
diff --git a/test/unit-tests/expression/node/AssignmentNode.test.js b/test/unit-tests/expression/node/AssignmentNode.test.js
index e82765c5aa..59976abc0b 100644
--- a/test/unit-tests/expression/node/AssignmentNode.test.js
+++ b/test/unit-tests/expression/node/AssignmentNode.test.js
@@ -1,7 +1,7 @@
 // test AssignmentNode
 import assert from 'assert'
 
-import math from '../../../../src/bundleAny'
+import math from '../../../../src/defaultInstance.js'
 const Node = math.Node
 const AccessorNode = math.AccessorNode
 const ConstantNode = math.ConstantNode
diff --git a/test/unit-tests/expression/node/BlockNode.test.js b/test/unit-tests/expression/node/BlockNode.test.js
index c6de5c7b45..829a6420f8 100644
--- a/test/unit-tests/expression/node/BlockNode.test.js
+++ b/test/unit-tests/expression/node/BlockNode.test.js
@@ -1,7 +1,7 @@
 // test BlockNode
 import assert from 'assert'
 
-import math from '../../../../src/bundleAny'
+import math from '../../../../src/defaultInstance.js'
 const Node = math.Node
 const ConstantNode = math.ConstantNode
 const SymbolNode = math.SymbolNode
diff --git a/test/unit-tests/expression/node/ConditionalNode.test.js b/test/unit-tests/expression/node/ConditionalNode.test.js
index c5955470c9..3c4d44393d 100644
--- a/test/unit-tests/expression/node/ConditionalNode.test.js
+++ b/test/unit-tests/expression/node/ConditionalNode.test.js
@@ -1,7 +1,7 @@
 // test ConditionalNode
 import assert from 'assert'
 
-import math from '../../../../src/bundleAny'
+import math from '../../../../src/defaultInstance.js'
 const Node = math.Node
 const ConstantNode = math.ConstantNode
 const SymbolNode = math.SymbolNode
diff --git a/test/unit-tests/expression/node/ConstantNode.test.js b/test/unit-tests/expression/node/ConstantNode.test.js
index b60e4b133b..c30eb4019f 100644
--- a/test/unit-tests/expression/node/ConstantNode.test.js
+++ b/test/unit-tests/expression/node/ConstantNode.test.js
@@ -1,7 +1,7 @@
 // test ConstantNode
 import assert from 'assert'
 
-import math from '../../../../src/bundleAny'
+import math from '../../../../src/defaultInstance.js'
 const bigmath = math.create({ number: 'BigNumber' })
 const Node = math.Node
 const ConstantNode = math.ConstantNode
diff --git a/test/unit-tests/expression/node/FunctionAssignmentNode.test.js b/test/unit-tests/expression/node/FunctionAssignmentNode.test.js
index 336bd13b87..955c26cda0 100644
--- a/test/unit-tests/expression/node/FunctionAssignmentNode.test.js
+++ b/test/unit-tests/expression/node/FunctionAssignmentNode.test.js
@@ -1,7 +1,7 @@
 // test FunctionAssignmentNode
 import assert from 'assert'
 
-import math from '../../../../src/bundleAny'
+import math from '../../../../src/defaultInstance.js'
 const Node = math.Node
 const ConstantNode = math.ConstantNode
 const SymbolNode = math.SymbolNode
diff --git a/test/unit-tests/expression/node/FunctionNode.test.js b/test/unit-tests/expression/node/FunctionNode.test.js
index fc2c4c3d0c..40e6df2812 100644
--- a/test/unit-tests/expression/node/FunctionNode.test.js
+++ b/test/unit-tests/expression/node/FunctionNode.test.js
@@ -1,7 +1,7 @@
 // test FunctionNode
 import assert from 'assert'
 
-import math from '../../../../src/bundleAny'
+import math from '../../../../src/defaultInstance.js'
 const Node = math.Node
 const ConstantNode = math.ConstantNode
 const SymbolNode = math.SymbolNode
diff --git a/test/unit-tests/expression/node/IndexNode.test.js b/test/unit-tests/expression/node/IndexNode.test.js
index 15a82942f5..6a266d0818 100644
--- a/test/unit-tests/expression/node/IndexNode.test.js
+++ b/test/unit-tests/expression/node/IndexNode.test.js
@@ -1,7 +1,7 @@
 // test IndexNode
 import assert from 'assert'
 
-import math from '../../../../src/bundleAny'
+import math from '../../../../src/defaultInstance.js'
 const Node = math.Node
 const ConstantNode = math.ConstantNode
 const SymbolNode = math.SymbolNode
diff --git a/test/unit-tests/expression/node/Node.test.js b/test/unit-tests/expression/node/Node.test.js
index 16710628ee..e9d0f1a2be 100644
--- a/test/unit-tests/expression/node/Node.test.js
+++ b/test/unit-tests/expression/node/Node.test.js
@@ -1,7 +1,7 @@
 // test Node
 import assert from 'assert'
 
-import math from '../../../../src/bundleAny'
+import math from '../../../../src/defaultInstance.js'
 const Node = math.Node
 
 describe('Node', function () {
diff --git a/test/unit-tests/expression/node/ObjectNode.test.js b/test/unit-tests/expression/node/ObjectNode.test.js
index 4c3354eebe..e60369e673 100644
--- a/test/unit-tests/expression/node/ObjectNode.test.js
+++ b/test/unit-tests/expression/node/ObjectNode.test.js
@@ -1,7 +1,7 @@
 // test ObjectNode
 import assert from 'assert'
 
-import math from '../../../../src/bundleAny'
+import math from '../../../../src/defaultInstance.js'
 const ConstantNode = math.ConstantNode
 const SymbolNode = math.SymbolNode
 const RangeNode = math.RangeNode
diff --git a/test/unit-tests/expression/node/OperatorNode.test.js b/test/unit-tests/expression/node/OperatorNode.test.js
index 02e437914c..4ed42c11e3 100644
--- a/test/unit-tests/expression/node/OperatorNode.test.js
+++ b/test/unit-tests/expression/node/OperatorNode.test.js
@@ -1,7 +1,7 @@
 // test OperatorNode
 import assert from 'assert'
 
-import math from '../../../../src/bundleAny'
+import math from '../../../../src/defaultInstance.js'
 const Node = math.Node
 const ConstantNode = math.ConstantNode
 const SymbolNode = math.SymbolNode
diff --git a/test/unit-tests/expression/node/ParenthesisNode.test.js b/test/unit-tests/expression/node/ParenthesisNode.test.js
index 091cb0ba35..2fe772a88f 100644
--- a/test/unit-tests/expression/node/ParenthesisNode.test.js
+++ b/test/unit-tests/expression/node/ParenthesisNode.test.js
@@ -1,7 +1,7 @@
 // test SymbolNode
 import assert from 'assert'
 
-import math from '../../../../src/bundleAny'
+import math from '../../../../src/defaultInstance.js'
 const Node = math.Node
 const ConstantNode = math.ConstantNode
 const ParenthesisNode = math.ParenthesisNode
diff --git a/test/unit-tests/expression/node/RangeNode.test.js b/test/unit-tests/expression/node/RangeNode.test.js
index ae8a30b0f5..65bbbff24c 100644
--- a/test/unit-tests/expression/node/RangeNode.test.js
+++ b/test/unit-tests/expression/node/RangeNode.test.js
@@ -1,7 +1,7 @@
 // test RangeNode
 import assert from 'assert'
 
-import math from '../../../../src/bundleAny'
+import math from '../../../../src/defaultInstance.js'
 const Node = math.Node
 const ConstantNode = math.ConstantNode
 const SymbolNode = math.SymbolNode
diff --git a/test/unit-tests/expression/node/RelationalNode.test.js b/test/unit-tests/expression/node/RelationalNode.test.js
index 16eb31fcef..85768eadaf 100644
--- a/test/unit-tests/expression/node/RelationalNode.test.js
+++ b/test/unit-tests/expression/node/RelationalNode.test.js
@@ -1,7 +1,7 @@
 // test RelationalNode
 import assert from 'assert'
 
-import math from '../../../../src/bundleAny'
+import math from '../../../../src/defaultInstance.js'
 const Node = math.Node
 const ConstantNode = math.ConstantNode
 const SymbolNode = math.SymbolNode
diff --git a/test/unit-tests/expression/node/SymbolNode.test.js b/test/unit-tests/expression/node/SymbolNode.test.js
index 722477d91b..01c354d0df 100644
--- a/test/unit-tests/expression/node/SymbolNode.test.js
+++ b/test/unit-tests/expression/node/SymbolNode.test.js
@@ -1,7 +1,7 @@
 // test SymbolNode
 import assert from 'assert'
 
-import math from '../../../../src/bundleAny'
+import math from '../../../../src/defaultInstance.js'
 const Node = math.Node
 const ConstantNode = math.ConstantNode
 const SymbolNode = math.SymbolNode
diff --git a/test/unit-tests/expression/operators.test.js b/test/unit-tests/expression/operators.test.js
index faa2ff9821..2ef9640caa 100644
--- a/test/unit-tests/expression/operators.test.js
+++ b/test/unit-tests/expression/operators.test.js
@@ -1,6 +1,6 @@
 import assert from 'assert'
-import math from '../../../src/bundleAny'
-import { getAssociativity, getPrecedence, isAssociativeWith } from '../../../src/expression/operators'
+import math from '../../../src/defaultInstance.js'
+import { getAssociativity, getPrecedence, isAssociativeWith } from '../../../src/expression/operators.js'
 const OperatorNode = math.OperatorNode
 const AssignmentNode = math.AssignmentNode
 const SymbolNode = math.SymbolNode
diff --git a/test/unit-tests/expression/parse.test.js b/test/unit-tests/expression/parse.test.js
index 7182a05a5c..5c9b0a22d8 100644
--- a/test/unit-tests/expression/parse.test.js
+++ b/test/unit-tests/expression/parse.test.js
@@ -1,8 +1,8 @@
 // test parse
 import assert from 'assert'
 
-import approx from '../../../tools/approx'
-import math from '../../../src/bundleAny'
+import approx from '../../../tools/approx.js'
+import math from '../../../src/defaultInstance.js'
 
 const parse = math.parse
 const ConditionalNode = math.ConditionalNode
diff --git a/test/unit-tests/expression/security.test.js b/test/unit-tests/expression/security.test.js
index 1199f1aea6..73df035e28 100644
--- a/test/unit-tests/expression/security.test.js
+++ b/test/unit-tests/expression/security.test.js
@@ -1,5 +1,5 @@
 import assert from 'assert'
-import math from '../../../src/bundleAny'
+import math from '../../../src/defaultInstance.js'
 
 describe('security', function () {
   it('should not allow calling Function via constructor', function () {
diff --git a/test/unit-tests/expression/transform/apply.transform.test.js b/test/unit-tests/expression/transform/apply.transform.test.js
index 1190229983..36f25458ec 100644
--- a/test/unit-tests/expression/transform/apply.transform.test.js
+++ b/test/unit-tests/expression/transform/apply.transform.test.js
@@ -1,5 +1,5 @@
 import assert from 'assert'
-import math from '../../../../src/bundleAny'
+import math from '../../../../src/defaultInstance.js'
 
 const sum = math.sum
 const apply = math.expression.transform.apply
diff --git a/test/unit-tests/expression/transform/diff.transform.test.js b/test/unit-tests/expression/transform/diff.transform.test.js
index 3b3964ef12..6c2bbfdaaf 100644
--- a/test/unit-tests/expression/transform/diff.transform.test.js
+++ b/test/unit-tests/expression/transform/diff.transform.test.js
@@ -1,5 +1,5 @@
 import assert from 'assert'
-import math from '../../../../src/bundleAny'
+import math from '../../../../src/defaultInstance.js'
 
 const diff = math.expression.transform.diff
 
diff --git a/test/unit-tests/expression/transform/std.transform.test.js b/test/unit-tests/expression/transform/std.transform.test.js
index 656e6474dc..6f36ef708a 100644
--- a/test/unit-tests/expression/transform/std.transform.test.js
+++ b/test/unit-tests/expression/transform/std.transform.test.js
@@ -1,6 +1,6 @@
 import assert from 'assert'
-import approx from '../../../../tools/approx'
-import math from '../../../../src/bundleAny'
+import approx from '../../../../tools/approx.js'
+import math from '../../../../src/defaultInstance.js'
 
 const Unit = math.Unit
 const std = math.expression.transform.std
diff --git a/test/unit-tests/expression/transform/variance.transform.test.js b/test/unit-tests/expression/transform/variance.transform.test.js
index 8a99c2b34b..1ad1008d8e 100644
--- a/test/unit-tests/expression/transform/variance.transform.test.js
+++ b/test/unit-tests/expression/transform/variance.transform.test.js
@@ -1,6 +1,6 @@
 import assert from 'assert'
-import approx from '../../../../tools/approx'
-import math from '../../../../src/bundleAny'
+import approx from '../../../../tools/approx.js'
+import math from '../../../../src/defaultInstance.js'
 
 const variance = math.expression.transform.variance
 
diff --git a/test/unit-tests/expression/transforms.test.js b/test/unit-tests/expression/transforms.test.js
index 8689855674..1a1fc3d3f4 100644
--- a/test/unit-tests/expression/transforms.test.js
+++ b/test/unit-tests/expression/transforms.test.js
@@ -1,6 +1,6 @@
 // test transforms
 import assert from 'assert'
-import math from '../../../src/bundleAny'
+import math from '../../../src/defaultInstance.js'
 
 const parse = math.parse
 
diff --git a/test/unit-tests/function/algebra/decomposition/lup.test.js b/test/unit-tests/function/algebra/decomposition/lup.test.js
index f5b96188f5..b213012071 100644
--- a/test/unit-tests/function/algebra/decomposition/lup.test.js
+++ b/test/unit-tests/function/algebra/decomposition/lup.test.js
@@ -1,8 +1,8 @@
 // test lup
 import assert from 'assert'
 
-import approx from '../../../../../tools/approx'
-import math from '../../../../../src/bundleAny'
+import approx from '../../../../../tools/approx.js'
+import math from '../../../../../src/defaultInstance.js'
 
 describe('lup', function () {
   it('should decompose matrix, n x n, no permutations, array', function () {
diff --git a/test/unit-tests/function/algebra/decomposition/qr.test.js b/test/unit-tests/function/algebra/decomposition/qr.test.js
index 64154299af..6086abd4d3 100644
--- a/test/unit-tests/function/algebra/decomposition/qr.test.js
+++ b/test/unit-tests/function/algebra/decomposition/qr.test.js
@@ -1,8 +1,8 @@
 // test lup
 import assert from 'assert'
 
-import approx from '../../../../../tools/approx'
-import math from '../../../../../src/bundleAny'
+import approx from '../../../../../tools/approx.js'
+import math from '../../../../../src/defaultInstance.js'
 
 /**
  * Tests whether `Q` and `R` are the valid QR decomposition of `A`.
diff --git a/test/unit-tests/function/algebra/decomposition/slu.test.js b/test/unit-tests/function/algebra/decomposition/slu.test.js
index 4b21006f36..496a1a5058 100644
--- a/test/unit-tests/function/algebra/decomposition/slu.test.js
+++ b/test/unit-tests/function/algebra/decomposition/slu.test.js
@@ -1,5 +1,5 @@
-import approx from '../../../../../tools/approx'
-import math from '../../../../../src/bundleAny'
+import approx from '../../../../../tools/approx.js'
+import math from '../../../../../src/defaultInstance.js'
 
 describe('slu', function () {
   it('should decompose matrix, 4 x 4, natural ordering (order=0), partial pivoting', function () {
diff --git a/test/unit-tests/function/algebra/derivative.test.js b/test/unit-tests/function/algebra/derivative.test.js
index 10dd25d30d..d061f84717 100644
--- a/test/unit-tests/function/algebra/derivative.test.js
+++ b/test/unit-tests/function/algebra/derivative.test.js
@@ -1,7 +1,7 @@
 // test derivative
 import assert from 'assert'
 
-import math from '../../../../src/bundleAny'
+import math from '../../../../src/defaultInstance.js'
 const OperatorNode = math.OperatorNode
 const ConstantNode = math.ConstantNode
 const SymbolNode = math.SymbolNode
diff --git a/test/unit-tests/function/algebra/rationalize.test.js b/test/unit-tests/function/algebra/rationalize.test.js
index bac00278fc..81ded24563 100644
--- a/test/unit-tests/function/algebra/rationalize.test.js
+++ b/test/unit-tests/function/algebra/rationalize.test.js
@@ -1,5 +1,5 @@
 import assert from 'assert'
-import math from '../../../../src/bundleAny'
+import math from '../../../../src/defaultInstance.js'
 
 /**
    * Transform node, array and single type value in a string with no spaces inside.
diff --git a/test/unit-tests/function/algebra/simplify.test.js b/test/unit-tests/function/algebra/simplify.test.js
index c67181a13c..7ea9de1437 100644
--- a/test/unit-tests/function/algebra/simplify.test.js
+++ b/test/unit-tests/function/algebra/simplify.test.js
@@ -1,7 +1,7 @@
 // test simplify
 import assert from 'assert'
 
-import math from '../../../../src/bundleAny'
+import math from '../../../../src/defaultInstance.js'
 
 describe('simplify', function () {
   function simplifyAndCompare (left, right, rules, scope, opt) {
diff --git a/test/unit-tests/function/algebra/solver/lsolve.test.js b/test/unit-tests/function/algebra/solver/lsolve.test.js
index b1d9902398..44c05811b1 100644
--- a/test/unit-tests/function/algebra/solver/lsolve.test.js
+++ b/test/unit-tests/function/algebra/solver/lsolve.test.js
@@ -1,8 +1,8 @@
 // test lsolve
 import assert from 'assert'
 
-import approx from '../../../../../tools/approx'
-import math from '../../../../../src/bundleAny'
+import approx from '../../../../../tools/approx.js'
+import math from '../../../../../src/defaultInstance.js'
 
 describe('lsolve', function () {
   it('should solve linear system 4 x 4, arrays', function () {
diff --git a/test/unit-tests/function/algebra/solver/lsolveAll.test.js b/test/unit-tests/function/algebra/solver/lsolveAll.test.js
index 6df922ba84..9f669b8761 100644
--- a/test/unit-tests/function/algebra/solver/lsolveAll.test.js
+++ b/test/unit-tests/function/algebra/solver/lsolveAll.test.js
@@ -1,8 +1,8 @@
 // test lsolveAll
 import assert from 'assert'
 
-import approx from '../../../../../tools/approx'
-import math from '../../../../../src/bundleAny'
+import approx from '../../../../../tools/approx.js'
+import math from '../../../../../src/defaultInstance.js'
 
 describe('lsolveAll', function () {
   it('should solve linear system 4 x 4, arrays', function () {
diff --git a/test/unit-tests/function/algebra/solver/lusolve.test.js b/test/unit-tests/function/algebra/solver/lusolve.test.js
index b76fa4cdd2..3404236eb9 100644
--- a/test/unit-tests/function/algebra/solver/lusolve.test.js
+++ b/test/unit-tests/function/algebra/solver/lusolve.test.js
@@ -1,8 +1,8 @@
 // test lusolve
 import assert from 'assert'
 
-import approx from '../../../../../tools/approx'
-import math from '../../../../../src/bundleAny'
+import approx from '../../../../../tools/approx.js'
+import math from '../../../../../src/defaultInstance.js'
 
 describe('lusolve', function () {
   it('should solve linear system 4 x 4, arrays', function () {
diff --git a/test/unit-tests/function/algebra/solver/usolve.test.js b/test/unit-tests/function/algebra/solver/usolve.test.js
index b105da6d3a..620cf85504 100644
--- a/test/unit-tests/function/algebra/solver/usolve.test.js
+++ b/test/unit-tests/function/algebra/solver/usolve.test.js
@@ -1,8 +1,8 @@
 // test usolve
 import assert from 'assert'
 
-import approx from '../../../../../tools/approx'
-import math from '../../../../../src/bundleAny'
+import approx from '../../../../../tools/approx.js'
+import math from '../../../../../src/defaultInstance.js'
 
 describe('usolve', function () {
   it('should solve linear system 4 x 4, arrays', function () {
diff --git a/test/unit-tests/function/algebra/solver/usolveAll.test.js b/test/unit-tests/function/algebra/solver/usolveAll.test.js
index f7e3453146..6910b861a0 100644
--- a/test/unit-tests/function/algebra/solver/usolveAll.test.js
+++ b/test/unit-tests/function/algebra/solver/usolveAll.test.js
@@ -1,8 +1,8 @@
 // test usolveAll
 import assert from 'assert'
 
-import approx from '../../../../../tools/approx'
-import math from '../../../../../src/bundleAny'
+import approx from '../../../../../tools/approx.js'
+import math from '../../../../../src/defaultInstance.js'
 
 describe('usolveAll', function () {
   it('should solve linear system 4 x 4, arrays', function () {
diff --git a/test/unit-tests/function/algebra/sparse/csLu.test.js b/test/unit-tests/function/algebra/sparse/csLu.test.js
index 1b4061efc2..4ffe24ed79 100644
--- a/test/unit-tests/function/algebra/sparse/csLu.test.js
+++ b/test/unit-tests/function/algebra/sparse/csLu.test.js
@@ -1,9 +1,9 @@
 import assert from 'assert'
-import approx from '../../../../../tools/approx'
-import math from '../../../../../src/bundleAny'
-import { csPermute } from '../../../../../src/function/algebra/sparse/csPermute'
-import { createCsLu } from '../../../../../src/function/algebra/sparse/csLu'
-import { createCsSqr } from '../../../../../src/function/algebra/sparse/csSqr'
+import approx from '../../../../../tools/approx.js'
+import math from '../../../../../src/defaultInstance.js'
+import { csPermute } from '../../../../../src/function/algebra/sparse/csPermute.js'
+import { createCsLu } from '../../../../../src/function/algebra/sparse/csLu.js'
+import { createCsSqr } from '../../../../../src/function/algebra/sparse/csSqr.js'
 
 const { abs, add, divideScalar, multiply, subtract, larger, largerEq, transpose, SparseMatrix } = math
 
diff --git a/test/unit-tests/function/arithmetic/abs.test.js b/test/unit-tests/function/arithmetic/abs.test.js
index 3566039bc6..a737ba37e9 100644
--- a/test/unit-tests/function/arithmetic/abs.test.js
+++ b/test/unit-tests/function/arithmetic/abs.test.js
@@ -1,5 +1,5 @@
 import assert from 'assert'
-import math from '../../../../src/bundleAny'
+import math from '../../../../src/defaultInstance.js'
 const { abs, bignumber, complex, fraction, matrix, Matrix, unit, parse } = math
 
 describe('abs', function () {
diff --git a/test/unit-tests/function/arithmetic/add.test.js b/test/unit-tests/function/arithmetic/add.test.js
index 0655a4b9f4..1102c050dc 100644
--- a/test/unit-tests/function/arithmetic/add.test.js
+++ b/test/unit-tests/function/arithmetic/add.test.js
@@ -1,7 +1,7 @@
 // test add
 import assert from 'assert'
 
-import math from '../../../../src/bundleAny'
+import math from '../../../../src/defaultInstance.js'
 const add = math.add
 
 // TODO: make unit tests independent of math
diff --git a/test/unit-tests/function/arithmetic/addScalar.test.js b/test/unit-tests/function/arithmetic/addScalar.test.js
index f14b0e9610..075d9d68f8 100644
--- a/test/unit-tests/function/arithmetic/addScalar.test.js
+++ b/test/unit-tests/function/arithmetic/addScalar.test.js
@@ -1,8 +1,8 @@
 // test add
 import assert from 'assert'
 
-import approx from '../../../../tools/approx'
-import math from '../../../../src/bundleAny'
+import approx from '../../../../tools/approx.js'
+import math from '../../../../src/defaultInstance.js'
 import BigNumber from 'decimal.js'
 const add = math.add
 
diff --git a/test/unit-tests/function/arithmetic/cbrt.test.js b/test/unit-tests/function/arithmetic/cbrt.test.js
index a9ab273a67..87e9668df6 100644
--- a/test/unit-tests/function/arithmetic/cbrt.test.js
+++ b/test/unit-tests/function/arithmetic/cbrt.test.js
@@ -1,8 +1,8 @@
 // test cbrt
 import assert from 'assert'
 
-import approx from '../../../../tools/approx'
-import math from '../../../../src/bundleAny'
+import approx from '../../../../tools/approx.js'
+import math from '../../../../src/defaultInstance.js'
 const cbrt = math.cbrt
 const bignumber = math.bignumber
 const complex = math.complex
diff --git a/test/unit-tests/function/arithmetic/ceil.test.js b/test/unit-tests/function/arithmetic/ceil.test.js
index 1e2db273ee..efbf2219c7 100644
--- a/test/unit-tests/function/arithmetic/ceil.test.js
+++ b/test/unit-tests/function/arithmetic/ceil.test.js
@@ -1,8 +1,8 @@
 // test ceil
 import assert from 'assert'
 
-import approx from '../../../../tools/approx'
-import math from '../../../../src/bundleAny'
+import approx from '../../../../tools/approx.js'
+import math from '../../../../src/defaultInstance.js'
 const { bignumber, ceil, complex, fraction, i, isFraction, matrix, pi, unit, parse } = math
 
 describe('ceil', function () {
diff --git a/test/unit-tests/function/arithmetic/createHypot.test.js b/test/unit-tests/function/arithmetic/createHypot.test.js
index 502b718851..3b028685ab 100644
--- a/test/unit-tests/function/arithmetic/createHypot.test.js
+++ b/test/unit-tests/function/arithmetic/createHypot.test.js
@@ -1,8 +1,8 @@
 // test hypot
 import assert from 'assert'
 
-import approx from '../../../../tools/approx'
-import math from '../../../../src/bundleAny'
+import approx from '../../../../tools/approx.js'
+import math from '../../../../src/defaultInstance.js'
 const hypot = math.hypot
 const bignumber = math.bignumber
 
diff --git a/test/unit-tests/function/arithmetic/cube.test.js b/test/unit-tests/function/arithmetic/cube.test.js
index 25ebfe063c..10f2fd695a 100644
--- a/test/unit-tests/function/arithmetic/cube.test.js
+++ b/test/unit-tests/function/arithmetic/cube.test.js
@@ -1,7 +1,7 @@
 // test cube
 import assert from 'assert'
 
-import math from '../../../../src/bundleAny'
+import math from '../../../../src/defaultInstance.js'
 const bignumber = math.bignumber
 const fraction = math.fraction
 const matrix = math.matrix
diff --git a/test/unit-tests/function/arithmetic/divide.test.js b/test/unit-tests/function/arithmetic/divide.test.js
index 08fc0e228e..ccc83c528b 100644
--- a/test/unit-tests/function/arithmetic/divide.test.js
+++ b/test/unit-tests/function/arithmetic/divide.test.js
@@ -1,8 +1,8 @@
 // test divide
 import assert from 'assert'
 
-import math from '../../../../src/bundleAny'
-import approx from '../../../../tools/approx'
+import math from '../../../../src/defaultInstance.js'
+import approx from '../../../../tools/approx.js'
 const divide = math.divide
 const bignumber = math.bignumber
 const complex = math.complex
diff --git a/test/unit-tests/function/arithmetic/dotDivide.test.js b/test/unit-tests/function/arithmetic/dotDivide.test.js
index c4ce4b2bb2..b1e0a24baf 100644
--- a/test/unit-tests/function/arithmetic/dotDivide.test.js
+++ b/test/unit-tests/function/arithmetic/dotDivide.test.js
@@ -1,8 +1,8 @@
 // test dotDivide (element-wise divide)
 import assert from 'assert'
 
-import math from '../../../../src/bundleAny'
-import approx from '../../../../tools/approx'
+import math from '../../../../src/defaultInstance.js'
+import approx from '../../../../tools/approx.js'
 const dotDivide = math.dotDivide
 const complex = math.complex
 
diff --git a/test/unit-tests/function/arithmetic/dotMultiply.test.js b/test/unit-tests/function/arithmetic/dotMultiply.test.js
index 93237c18cf..5df8b04822 100644
--- a/test/unit-tests/function/arithmetic/dotMultiply.test.js
+++ b/test/unit-tests/function/arithmetic/dotMultiply.test.js
@@ -1,8 +1,8 @@
 // test dotMultiply (element-wise multiply)
 import assert from 'assert'
 
-import math from '../../../../src/bundleAny'
-import approx from '../../../../tools/approx'
+import math from '../../../../src/defaultInstance.js'
+import approx from '../../../../tools/approx.js'
 const dotMultiply = math.dotMultiply
 const divide = math.divide
 const matrix = math.matrix
diff --git a/test/unit-tests/function/arithmetic/dotPow.test.js b/test/unit-tests/function/arithmetic/dotPow.test.js
index 27c049d668..b619cd5960 100644
--- a/test/unit-tests/function/arithmetic/dotPow.test.js
+++ b/test/unit-tests/function/arithmetic/dotPow.test.js
@@ -1,8 +1,8 @@
 // test exp
 import assert from 'assert'
 
-import approx from '../../../../tools/approx'
-import math from '../../../../src/bundleAny'
+import approx from '../../../../tools/approx.js'
+import math from '../../../../src/defaultInstance.js'
 const complex = math.complex
 const matrix = math.matrix
 const sparse = math.sparse
diff --git a/test/unit-tests/function/arithmetic/exp.test.js b/test/unit-tests/function/arithmetic/exp.test.js
index 60923410e9..1e4faccb4e 100644
--- a/test/unit-tests/function/arithmetic/exp.test.js
+++ b/test/unit-tests/function/arithmetic/exp.test.js
@@ -1,8 +1,8 @@
 // test exp
 import assert from 'assert'
 
-import approx from '../../../../tools/approx'
-import math from '../../../../src/bundleAny'
+import approx from '../../../../tools/approx.js'
+import math from '../../../../src/defaultInstance.js'
 const complex = math.complex
 const matrix = math.matrix
 const sparse = math.sparse
diff --git a/test/unit-tests/function/arithmetic/expm1.test.js b/test/unit-tests/function/arithmetic/expm1.test.js
index 870f686a82..702dabac84 100644
--- a/test/unit-tests/function/arithmetic/expm1.test.js
+++ b/test/unit-tests/function/arithmetic/expm1.test.js
@@ -1,8 +1,8 @@
 // test expm1
 import assert from 'assert'
 
-import approx from '../../../../tools/approx'
-import math from '../../../../src/bundleAny'
+import approx from '../../../../tools/approx.js'
+import math from '../../../../src/defaultInstance.js'
 const complex = math.complex
 const matrix = math.matrix
 const sparse = math.sparse
diff --git a/test/unit-tests/function/arithmetic/fix.test.js b/test/unit-tests/function/arithmetic/fix.test.js
index a51722f90a..deff1741d3 100644
--- a/test/unit-tests/function/arithmetic/fix.test.js
+++ b/test/unit-tests/function/arithmetic/fix.test.js
@@ -1,8 +1,8 @@
 // test fix
 import assert from 'assert'
 
-import approx from '../../../../tools/approx'
-import math from '../../../../src/bundleAny'
+import approx from '../../../../tools/approx.js'
+import math from '../../../../src/defaultInstance.js'
 const bignumber = math.bignumber
 const complex = math.complex
 const fraction = math.fraction
diff --git a/test/unit-tests/function/arithmetic/floor.test.js b/test/unit-tests/function/arithmetic/floor.test.js
index 4c76e08fb5..e7a909ef48 100644
--- a/test/unit-tests/function/arithmetic/floor.test.js
+++ b/test/unit-tests/function/arithmetic/floor.test.js
@@ -1,8 +1,8 @@
 // test floor
 import assert from 'assert'
 
-import approx from '../../../../tools/approx'
-import math from '../../../../src/bundleAny'
+import approx from '../../../../tools/approx.js'
+import math from '../../../../src/defaultInstance.js'
 const bignumber = math.bignumber
 const complex = math.complex
 const fraction = math.fraction
diff --git a/test/unit-tests/function/arithmetic/gcd.test.js b/test/unit-tests/function/arithmetic/gcd.test.js
index a9002ea738..b18201aec7 100644
--- a/test/unit-tests/function/arithmetic/gcd.test.js
+++ b/test/unit-tests/function/arithmetic/gcd.test.js
@@ -1,7 +1,7 @@
 // test gcd
 import assert from 'assert'
 
-import math from '../../../../src/bundleAny'
+import math from '../../../../src/defaultInstance.js'
 const matrix = math.matrix
 const sparse = math.sparse
 const gcd = math.gcd
diff --git a/test/unit-tests/function/arithmetic/lcm.test.js b/test/unit-tests/function/arithmetic/lcm.test.js
index 262e4cdc1a..da3497c4d9 100644
--- a/test/unit-tests/function/arithmetic/lcm.test.js
+++ b/test/unit-tests/function/arithmetic/lcm.test.js
@@ -1,5 +1,5 @@
 import assert from 'assert'
-import math from '../../../../src/bundleAny'
+import math from '../../../../src/defaultInstance.js'
 const matrix = math.matrix
 const sparse = math.sparse
 const lcm = math.lcm
diff --git a/test/unit-tests/function/arithmetic/log.test.js b/test/unit-tests/function/arithmetic/log.test.js
index 8dc8c7f73a..dd62635148 100644
--- a/test/unit-tests/function/arithmetic/log.test.js
+++ b/test/unit-tests/function/arithmetic/log.test.js
@@ -1,8 +1,8 @@
 // test log
 import assert from 'assert'
 
-import approx from '../../../../tools/approx'
-import math from '../../../../src/bundleAny'
+import approx from '../../../../tools/approx.js'
+import math from '../../../../src/defaultInstance.js'
 const mathPredictable = math.create({ predictable: true })
 const complex = math.complex
 const matrix = math.matrix
diff --git a/test/unit-tests/function/arithmetic/log10.test.js b/test/unit-tests/function/arithmetic/log10.test.js
index d54d1b82aa..0809844edf 100644
--- a/test/unit-tests/function/arithmetic/log10.test.js
+++ b/test/unit-tests/function/arithmetic/log10.test.js
@@ -1,8 +1,8 @@
 // test exp
 import assert from 'assert'
 
-import approx from '../../../../tools/approx'
-import math from '../../../../src/bundleAny'
+import approx from '../../../../tools/approx.js'
+import math from '../../../../src/defaultInstance.js'
 const mathPredictable = math.create({ predictable: true })
 const complex = math.complex
 const matrix = math.matrix
diff --git a/test/unit-tests/function/arithmetic/log1p.test.js b/test/unit-tests/function/arithmetic/log1p.test.js
index 5ce9c50b6f..5afda93720 100644
--- a/test/unit-tests/function/arithmetic/log1p.test.js
+++ b/test/unit-tests/function/arithmetic/log1p.test.js
@@ -1,8 +1,8 @@
 // test log1p
 import assert from 'assert'
 
-import approx from '../../../../tools/approx'
-import math from '../../../../src/bundleAny'
+import approx from '../../../../tools/approx.js'
+import math from '../../../../src/defaultInstance.js'
 const mathPredictable = math.create({ predictable: true })
 const complex = math.complex
 const matrix = math.matrix
diff --git a/test/unit-tests/function/arithmetic/log2.test.js b/test/unit-tests/function/arithmetic/log2.test.js
index 54654e339f..3f1711f92c 100644
--- a/test/unit-tests/function/arithmetic/log2.test.js
+++ b/test/unit-tests/function/arithmetic/log2.test.js
@@ -1,8 +1,8 @@
 // test exp
 import assert from 'assert'
 
-import approx from '../../../../tools/approx'
-import math from '../../../../src/bundleAny'
+import approx from '../../../../tools/approx.js'
+import math from '../../../../src/defaultInstance.js'
 const mathPredictable = math.create({ predictable: true })
 const complex = math.complex
 const matrix = math.matrix
diff --git a/test/unit-tests/function/arithmetic/mod.test.js b/test/unit-tests/function/arithmetic/mod.test.js
index 5f67ec9952..cd56d57ea2 100644
--- a/test/unit-tests/function/arithmetic/mod.test.js
+++ b/test/unit-tests/function/arithmetic/mod.test.js
@@ -1,8 +1,8 @@
 // test mod
 import assert from 'assert'
 
-import approx from '../../../../tools/approx'
-import math from '../../../../src/bundleAny'
+import approx from '../../../../tools/approx.js'
+import math from '../../../../src/defaultInstance.js'
 const bignumber = math.bignumber
 const matrix = math.matrix
 const sparse = math.sparse
diff --git a/test/unit-tests/function/arithmetic/multiply.test.js b/test/unit-tests/function/arithmetic/multiply.test.js
index 3c3d3b699e..04bcb1baf3 100644
--- a/test/unit-tests/function/arithmetic/multiply.test.js
+++ b/test/unit-tests/function/arithmetic/multiply.test.js
@@ -1,8 +1,8 @@
 // test multiply
 import assert from 'assert'
 
-import math from '../../../../src/bundleAny'
-import approx from '../../../../tools/approx'
+import math from '../../../../src/defaultInstance.js'
+import approx from '../../../../tools/approx.js'
 const multiply = math.multiply
 const divide = math.divide
 const matrix = math.matrix
diff --git a/test/unit-tests/function/arithmetic/norm.test.js b/test/unit-tests/function/arithmetic/norm.test.js
index 734abd657f..ee8dc32da9 100644
--- a/test/unit-tests/function/arithmetic/norm.test.js
+++ b/test/unit-tests/function/arithmetic/norm.test.js
@@ -1,7 +1,7 @@
 // test norm
 import assert from 'assert'
 
-import math from '../../../../src/bundleAny'
+import math from '../../../../src/defaultInstance.js'
 
 describe('norm', function () {
   it('should return the absolute value of a boolean', function () {
diff --git a/test/unit-tests/function/arithmetic/nthRoot.test.js b/test/unit-tests/function/arithmetic/nthRoot.test.js
index 3755a6720d..504ee5dc69 100644
--- a/test/unit-tests/function/arithmetic/nthRoot.test.js
+++ b/test/unit-tests/function/arithmetic/nthRoot.test.js
@@ -1,8 +1,8 @@
 // test nthRoot
 import assert from 'assert'
 
-import approx from '../../../../tools/approx'
-import math from '../../../../src/bundleAny'
+import approx from '../../../../tools/approx.js'
+import math from '../../../../src/defaultInstance.js'
 const matrix = math.matrix
 const sparse = math.sparse
 const unit = math.unit
diff --git a/test/unit-tests/function/arithmetic/nthRoots.test.js b/test/unit-tests/function/arithmetic/nthRoots.test.js
index c01d3b333b..641d52c7c9 100644
--- a/test/unit-tests/function/arithmetic/nthRoots.test.js
+++ b/test/unit-tests/function/arithmetic/nthRoots.test.js
@@ -1,7 +1,7 @@
 // test nthRoots
 import assert from 'assert'
 
-import math from '../../../../src/bundleAny'
+import math from '../../../../src/defaultInstance.js'
 const complex = math.complex
 const nthRoots = math.nthRoots
 
diff --git a/test/unit-tests/function/arithmetic/pow.test.js b/test/unit-tests/function/arithmetic/pow.test.js
index 677f97de4a..987dafc067 100644
--- a/test/unit-tests/function/arithmetic/pow.test.js
+++ b/test/unit-tests/function/arithmetic/pow.test.js
@@ -1,8 +1,8 @@
 // test exp
 import assert from 'assert'
 
-import approx from '../../../../tools/approx'
-import math from '../../../../src/bundleAny'
+import approx from '../../../../tools/approx.js'
+import math from '../../../../src/defaultInstance.js'
 const mathPredictable = math.create({ predictable: true })
 const bignumber = math.bignumber
 const fraction = math.fraction
diff --git a/test/unit-tests/function/arithmetic/round.test.js b/test/unit-tests/function/arithmetic/round.test.js
index 3d525e4e27..b7896ce9b6 100644
--- a/test/unit-tests/function/arithmetic/round.test.js
+++ b/test/unit-tests/function/arithmetic/round.test.js
@@ -1,8 +1,8 @@
 // test round
 import assert from 'assert'
 
-import approx from '../../../../tools/approx'
-import math from '../../../../src/bundleAny'
+import approx from '../../../../tools/approx.js'
+import math from '../../../../src/defaultInstance.js'
 const bignumber = math.bignumber
 const fraction = math.fraction
 const matrix = math.matrix
diff --git a/test/unit-tests/function/arithmetic/sign.test.js b/test/unit-tests/function/arithmetic/sign.test.js
index 2bed176bcc..81e770460e 100644
--- a/test/unit-tests/function/arithmetic/sign.test.js
+++ b/test/unit-tests/function/arithmetic/sign.test.js
@@ -1,8 +1,8 @@
 // test sign
 import assert from 'assert'
 
-import approx from '../../../../tools/approx'
-import math from '../../../../src/bundleAny'
+import approx from '../../../../tools/approx.js'
+import math from '../../../../src/defaultInstance.js'
 const bignumber = math.bignumber
 const fraction = math.fraction
 const complex = math.complex
diff --git a/test/unit-tests/function/arithmetic/sqrt.test.js b/test/unit-tests/function/arithmetic/sqrt.test.js
index c6df786169..6d206693aa 100644
--- a/test/unit-tests/function/arithmetic/sqrt.test.js
+++ b/test/unit-tests/function/arithmetic/sqrt.test.js
@@ -1,7 +1,7 @@
 // test sqrt
 import assert from 'assert'
 
-import math from '../../../../src/bundleAny'
+import math from '../../../../src/defaultInstance.js'
 const mathPredictable = math.create({ predictable: true })
 const sqrt = math.sqrt
 const bignumber = math.bignumber
diff --git a/test/unit-tests/function/arithmetic/square.test.js b/test/unit-tests/function/arithmetic/square.test.js
index 5b7d6aa6a2..6340b2c6fb 100644
--- a/test/unit-tests/function/arithmetic/square.test.js
+++ b/test/unit-tests/function/arithmetic/square.test.js
@@ -1,7 +1,7 @@
 // test square
 import assert from 'assert'
 
-import math from '../../../../src/bundleAny'
+import math from '../../../../src/defaultInstance.js'
 const bignumber = math.bignumber
 const fraction = math.fraction
 const matrix = math.matrix
diff --git a/test/unit-tests/function/arithmetic/subtract.test.js b/test/unit-tests/function/arithmetic/subtract.test.js
index e6e45dc3f0..18a7391816 100644
--- a/test/unit-tests/function/arithmetic/subtract.test.js
+++ b/test/unit-tests/function/arithmetic/subtract.test.js
@@ -1,8 +1,8 @@
 // test subtract
 import assert from 'assert'
 
-import approx from '../../../../tools/approx'
-import math from '../../../../src/bundleAny'
+import approx from '../../../../tools/approx.js'
+import math from '../../../../src/defaultInstance.js'
 const bignumber = math.bignumber
 const subtract = math.subtract
 
diff --git a/test/unit-tests/function/arithmetic/unaryMinus.test.js b/test/unit-tests/function/arithmetic/unaryMinus.test.js
index fa4b719781..cce82c1b5d 100644
--- a/test/unit-tests/function/arithmetic/unaryMinus.test.js
+++ b/test/unit-tests/function/arithmetic/unaryMinus.test.js
@@ -1,7 +1,7 @@
 // test unary minus
 import assert from 'assert'
 
-import math from '../../../../src/bundleAny'
+import math from '../../../../src/defaultInstance.js'
 const bignumber = math.bignumber
 const fraction = math.fraction
 const complex = math.complex
diff --git a/test/unit-tests/function/arithmetic/unaryPlus.test.js b/test/unit-tests/function/arithmetic/unaryPlus.test.js
index 10265408aa..b86ca633fb 100644
--- a/test/unit-tests/function/arithmetic/unaryPlus.test.js
+++ b/test/unit-tests/function/arithmetic/unaryPlus.test.js
@@ -1,7 +1,7 @@
 // test unary plus
 import assert from 'assert'
 
-import math from '../../../../src/bundleAny'
+import math from '../../../../src/defaultInstance.js'
 const bignumber = math.bignumber
 const fraction = math.fraction
 
diff --git a/test/unit-tests/function/arithmetic/xgcd.test.js b/test/unit-tests/function/arithmetic/xgcd.test.js
index 756c5019a0..57a6d6663b 100644
--- a/test/unit-tests/function/arithmetic/xgcd.test.js
+++ b/test/unit-tests/function/arithmetic/xgcd.test.js
@@ -1,7 +1,7 @@
 // test xgcd
 import assert from 'assert'
 
-import defaultMath from '../../../../src/bundleAny'
+import defaultMath from '../../../../src/defaultInstance.js'
 const math = defaultMath.create({ matrix: 'Array' })
 const gcd = math.gcd
 const xgcd = math.xgcd
diff --git a/test/unit-tests/function/bitwise/bitAnd.test.js b/test/unit-tests/function/bitwise/bitAnd.test.js
index db241670c6..0b1ed196e5 100644
--- a/test/unit-tests/function/bitwise/bitAnd.test.js
+++ b/test/unit-tests/function/bitwise/bitAnd.test.js
@@ -1,7 +1,7 @@
 // test bitAnd
 import assert from 'assert'
 
-import math from '../../../../src/bundleAny'
+import math from '../../../../src/defaultInstance.js'
 const bignumber = math.bignumber
 const bitAnd = math.bitAnd
 
diff --git a/test/unit-tests/function/bitwise/bitNot.test.js b/test/unit-tests/function/bitwise/bitNot.test.js
index a2aa3e133e..10a99b99ab 100644
--- a/test/unit-tests/function/bitwise/bitNot.test.js
+++ b/test/unit-tests/function/bitwise/bitNot.test.js
@@ -1,7 +1,7 @@
 // test bitNot
 import assert from 'assert'
 
-import math from '../../../../src/bundleAny'
+import math from '../../../../src/defaultInstance.js'
 const bignumber = math.bignumber
 const bitNot = math.bitNot
 
diff --git a/test/unit-tests/function/bitwise/bitOr.test.js b/test/unit-tests/function/bitwise/bitOr.test.js
index 98917b86cf..1043d68e0b 100644
--- a/test/unit-tests/function/bitwise/bitOr.test.js
+++ b/test/unit-tests/function/bitwise/bitOr.test.js
@@ -1,7 +1,7 @@
 // test bitOr
 import assert from 'assert'
 
-import math from '../../../../src/bundleAny'
+import math from '../../../../src/defaultInstance.js'
 const bignumber = math.bignumber
 const bitOr = math.bitOr
 
diff --git a/test/unit-tests/function/bitwise/bitXor.test.js b/test/unit-tests/function/bitwise/bitXor.test.js
index ce6e01037b..f4ca7481a6 100644
--- a/test/unit-tests/function/bitwise/bitXor.test.js
+++ b/test/unit-tests/function/bitwise/bitXor.test.js
@@ -1,7 +1,7 @@
 // test bitXor
 import assert from 'assert'
 
-import math from '../../../../src/bundleAny'
+import math from '../../../../src/defaultInstance.js'
 const matrix = math.matrix
 const sparse = math.sparse
 const bignumber = math.bignumber
diff --git a/test/unit-tests/function/bitwise/leftShift.test.js b/test/unit-tests/function/bitwise/leftShift.test.js
index 2387e6a153..d85989e478 100644
--- a/test/unit-tests/function/bitwise/leftShift.test.js
+++ b/test/unit-tests/function/bitwise/leftShift.test.js
@@ -1,7 +1,7 @@
 // test leftShift
 import assert from 'assert'
 
-import math from '../../../../src/bundleAny'
+import math from '../../../../src/defaultInstance.js'
 const matrix = math.matrix
 const sparse = math.sparse
 const bignumber = math.bignumber
diff --git a/test/unit-tests/function/bitwise/rightArithShift.test.js b/test/unit-tests/function/bitwise/rightArithShift.test.js
index b8241e4fef..3900eeda55 100644
--- a/test/unit-tests/function/bitwise/rightArithShift.test.js
+++ b/test/unit-tests/function/bitwise/rightArithShift.test.js
@@ -1,7 +1,7 @@
 // test rightArithShift
 import assert from 'assert'
 
-import math from '../../../../src/bundleAny'
+import math from '../../../../src/defaultInstance.js'
 const matrix = math.matrix
 const sparse = math.sparse
 const bignumber = math.bignumber
diff --git a/test/unit-tests/function/bitwise/rightLogShift.test.js b/test/unit-tests/function/bitwise/rightLogShift.test.js
index 482025d60f..e55fd510e5 100644
--- a/test/unit-tests/function/bitwise/rightLogShift.test.js
+++ b/test/unit-tests/function/bitwise/rightLogShift.test.js
@@ -1,7 +1,7 @@
 // test rightLogShift
 import assert from 'assert'
 
-import math from '../../../../src/bundleAny'
+import math from '../../../../src/defaultInstance.js'
 const matrix = math.matrix
 const sparse = math.sparse
 const rightLogShift = math.rightLogShift
diff --git a/test/unit-tests/function/combinatorics/bellNumbers.test.js b/test/unit-tests/function/combinatorics/bellNumbers.test.js
index 66e00f16ad..de6634eb01 100644
--- a/test/unit-tests/function/combinatorics/bellNumbers.test.js
+++ b/test/unit-tests/function/combinatorics/bellNumbers.test.js
@@ -1,5 +1,5 @@
 import assert from 'assert'
-import math from '../../../../src/bundleAny'
+import math from '../../../../src/defaultInstance.js'
 const bellNumbers = math.bellNumbers
 
 describe('bellNumbers', function () {
diff --git a/test/unit-tests/function/combinatorics/catalan.test.js b/test/unit-tests/function/combinatorics/catalan.test.js
index 7baabbf21f..96d951d06b 100644
--- a/test/unit-tests/function/combinatorics/catalan.test.js
+++ b/test/unit-tests/function/combinatorics/catalan.test.js
@@ -1,5 +1,5 @@
 import assert from 'assert'
-import math from '../../../../src/bundleAny'
+import math from '../../../../src/defaultInstance.js'
 const catalan = math.catalan
 
 describe('catalan', function () {
diff --git a/test/unit-tests/function/combinatorics/composition.test.js b/test/unit-tests/function/combinatorics/composition.test.js
index 629cdfc983..3fd05127fc 100644
--- a/test/unit-tests/function/combinatorics/composition.test.js
+++ b/test/unit-tests/function/combinatorics/composition.test.js
@@ -1,5 +1,5 @@
 import assert from 'assert'
-import math from '../../../../src/bundleAny'
+import math from '../../../../src/defaultInstance.js'
 const composition = math.composition
 
 describe('composition', function () {
diff --git a/test/unit-tests/function/combinatorics/stirlingS2.test.js b/test/unit-tests/function/combinatorics/stirlingS2.test.js
index ab1b0db01b..6043049c12 100644
--- a/test/unit-tests/function/combinatorics/stirlingS2.test.js
+++ b/test/unit-tests/function/combinatorics/stirlingS2.test.js
@@ -1,5 +1,5 @@
 import assert from 'assert'
-import math from '../../../../src/bundleAny'
+import math from '../../../../src/defaultInstance.js'
 const stirlingS2 = math.stirlingS2
 
 describe('stirlingS2', function () {
diff --git a/test/unit-tests/function/complex/arg.test.js b/test/unit-tests/function/complex/arg.test.js
index 3d5e36f25d..e07d50594a 100644
--- a/test/unit-tests/function/complex/arg.test.js
+++ b/test/unit-tests/function/complex/arg.test.js
@@ -1,6 +1,6 @@
 import assert from 'assert'
-import approx from '../../../../tools/approx'
-import math from '../../../../src/bundleAny'
+import approx from '../../../../tools/approx.js'
+import math from '../../../../src/defaultInstance.js'
 const arg = math.arg
 
 describe('arg', function () {
diff --git a/test/unit-tests/function/complex/conj.test.js b/test/unit-tests/function/complex/conj.test.js
index b3e47c76ee..ccc6c8235d 100644
--- a/test/unit-tests/function/complex/conj.test.js
+++ b/test/unit-tests/function/complex/conj.test.js
@@ -1,5 +1,5 @@
 import assert from 'assert'
-import math from '../../../../src/bundleAny'
+import math from '../../../../src/defaultInstance.js'
 const conj = math.conj
 
 describe('conj', function () {
diff --git a/test/unit-tests/function/complex/im.test.js b/test/unit-tests/function/complex/im.test.js
index eeaa9a3ab7..3c91fee99a 100644
--- a/test/unit-tests/function/complex/im.test.js
+++ b/test/unit-tests/function/complex/im.test.js
@@ -1,5 +1,5 @@
 import assert from 'assert'
-import math from '../../../../src/bundleAny'
+import math from '../../../../src/defaultInstance.js'
 
 describe('im', function () {
   it('should return the imaginary part of a complex number', function () {
diff --git a/test/unit-tests/function/complex/re.test.js b/test/unit-tests/function/complex/re.test.js
index d1f2370a0c..a05b46b02f 100644
--- a/test/unit-tests/function/complex/re.test.js
+++ b/test/unit-tests/function/complex/re.test.js
@@ -1,5 +1,5 @@
 import assert from 'assert'
-import math from '../../../../src/bundleAny'
+import math from '../../../../src/defaultInstance.js'
 
 describe('re', function () {
   it('should return the real part of a complex number', function () {
diff --git a/test/unit-tests/function/geometry/distance.test.js b/test/unit-tests/function/geometry/distance.test.js
index 7fb3c46659..99b5fa4e63 100644
--- a/test/unit-tests/function/geometry/distance.test.js
+++ b/test/unit-tests/function/geometry/distance.test.js
@@ -1,5 +1,5 @@
 import assert from 'assert'
-import math from '../../../../src/bundleAny'
+import math from '../../../../src/defaultInstance.js'
 
 describe('distance', function () {
   it('should calculate the distance of two 1D points', function () {
diff --git a/test/unit-tests/function/geometry/intersect.test.js b/test/unit-tests/function/geometry/intersect.test.js
index e00566b4a6..c33ab531f7 100644
--- a/test/unit-tests/function/geometry/intersect.test.js
+++ b/test/unit-tests/function/geometry/intersect.test.js
@@ -1,5 +1,5 @@
 import assert from 'assert'
-import math from '../../../../src/bundleAny'
+import math from '../../../../src/defaultInstance.js'
 
 describe('intersect', function () {
   it('should calculate the intersection point of two 2D lines', function () {
diff --git a/test/unit-tests/function/logical/and.test.js b/test/unit-tests/function/logical/and.test.js
index 46e7c821eb..9878005d20 100644
--- a/test/unit-tests/function/logical/and.test.js
+++ b/test/unit-tests/function/logical/and.test.js
@@ -1,7 +1,7 @@
 // test and
 import assert from 'assert'
 
-import math from '../../../../src/bundleAny'
+import math from '../../../../src/defaultInstance.js'
 const bignumber = math.bignumber
 const complex = math.complex
 const matrix = math.matrix
diff --git a/test/unit-tests/function/logical/not.test.js b/test/unit-tests/function/logical/not.test.js
index e120292a2c..dce3319ce6 100644
--- a/test/unit-tests/function/logical/not.test.js
+++ b/test/unit-tests/function/logical/not.test.js
@@ -1,7 +1,7 @@
 // test not
 import assert from 'assert'
 
-import math from '../../../../src/bundleAny'
+import math from '../../../../src/defaultInstance.js'
 const bignumber = math.bignumber
 const complex = math.complex
 const matrix = math.matrix
diff --git a/test/unit-tests/function/logical/or.test.js b/test/unit-tests/function/logical/or.test.js
index f8ae71338f..d7f81e9622 100644
--- a/test/unit-tests/function/logical/or.test.js
+++ b/test/unit-tests/function/logical/or.test.js
@@ -1,7 +1,7 @@
 // test or
 import assert from 'assert'
 
-import math from '../../../../src/bundleAny'
+import math from '../../../../src/defaultInstance.js'
 const bignumber = math.bignumber
 const complex = math.complex
 const matrix = math.matrix
diff --git a/test/unit-tests/function/logical/xor.test.js b/test/unit-tests/function/logical/xor.test.js
index b62cb4dcf1..04b67133e0 100644
--- a/test/unit-tests/function/logical/xor.test.js
+++ b/test/unit-tests/function/logical/xor.test.js
@@ -1,7 +1,7 @@
 // test xor
 import assert from 'assert'
 
-import math from '../../../../src/bundleAny'
+import math from '../../../../src/defaultInstance.js'
 const bignumber = math.bignumber
 const complex = math.complex
 const matrix = math.matrix
diff --git a/test/unit-tests/function/matrix/apply.test.js b/test/unit-tests/function/matrix/apply.test.js
index 3cf5f5388a..c661bfc19c 100644
--- a/test/unit-tests/function/matrix/apply.test.js
+++ b/test/unit-tests/function/matrix/apply.test.js
@@ -1,5 +1,5 @@
 import assert from 'assert'
-import math from '../../../../src/bundleAny'
+import math from '../../../../src/defaultInstance.js'
 
 const sum = math.sum
 
diff --git a/test/unit-tests/function/matrix/column.test.js b/test/unit-tests/function/matrix/column.test.js
index 0838ce2ff3..949bcdc482 100644
--- a/test/unit-tests/function/matrix/column.test.js
+++ b/test/unit-tests/function/matrix/column.test.js
@@ -1,5 +1,5 @@
 import assert from 'assert'
-import math from '../../../../src/bundleAny'
+import math from '../../../../src/defaultInstance.js'
 
 const column = math.column
 const matrix = math.matrix
diff --git a/test/unit-tests/function/matrix/concat.test.js b/test/unit-tests/function/matrix/concat.test.js
index b41388a52e..d6292ffb34 100644
--- a/test/unit-tests/function/matrix/concat.test.js
+++ b/test/unit-tests/function/matrix/concat.test.js
@@ -1,5 +1,5 @@
 import assert from 'assert'
-import math from '../../../../src/bundleAny'
+import math from '../../../../src/defaultInstance.js'
 const bignumber = math.bignumber
 
 describe('concat', function () {
diff --git a/test/unit-tests/function/matrix/cross.test.js b/test/unit-tests/function/matrix/cross.test.js
index 92e9d1d63f..2bcb4f54bc 100644
--- a/test/unit-tests/function/matrix/cross.test.js
+++ b/test/unit-tests/function/matrix/cross.test.js
@@ -1,5 +1,5 @@
 import assert from 'assert'
-import math from '../../../../src/bundleAny'
+import math from '../../../../src/defaultInstance.js'
 
 describe('cross', function () {
   it('should calculate cross product for two arrays', function () {
diff --git a/test/unit-tests/function/matrix/ctranspose.test.js b/test/unit-tests/function/matrix/ctranspose.test.js
index 22f8658f9b..a60a11f8c8 100644
--- a/test/unit-tests/function/matrix/ctranspose.test.js
+++ b/test/unit-tests/function/matrix/ctranspose.test.js
@@ -1,7 +1,7 @@
 // test transpose
 import assert from 'assert'
 
-import math from '../../../../src/bundleAny'
+import math from '../../../../src/defaultInstance.js'
 const ctranspose = math.ctranspose
 
 describe('ctranspose', function () {
diff --git a/test/unit-tests/function/matrix/det.test.js b/test/unit-tests/function/matrix/det.test.js
index 1a72e33754..37a88fd391 100644
--- a/test/unit-tests/function/matrix/det.test.js
+++ b/test/unit-tests/function/matrix/det.test.js
@@ -1,6 +1,6 @@
 import assert from 'assert'
-import approx from '../../../../tools/approx'
-import math from '../../../../src/bundleAny'
+import approx from '../../../../tools/approx.js'
+import math from '../../../../src/defaultInstance.js'
 const BigNumber = math.BigNumber
 const Complex = math.Complex
 const DenseMatrix = math.DenseMatrix
diff --git a/test/unit-tests/function/matrix/diag.test.js b/test/unit-tests/function/matrix/diag.test.js
index 254c2c751e..f9a71d1534 100644
--- a/test/unit-tests/function/matrix/diag.test.js
+++ b/test/unit-tests/function/matrix/diag.test.js
@@ -1,5 +1,5 @@
 import assert from 'assert'
-import math from '../../../../src/bundleAny'
+import math from '../../../../src/defaultInstance.js'
 const bignumber = math.bignumber
 
 describe('diag', function () {
diff --git a/test/unit-tests/function/matrix/diff.test.js b/test/unit-tests/function/matrix/diff.test.js
index fb50af45b5..27ee3c9c64 100644
--- a/test/unit-tests/function/matrix/diff.test.js
+++ b/test/unit-tests/function/matrix/diff.test.js
@@ -1,6 +1,6 @@
 import assert from 'assert'
-import approx from '../../../../tools/approx'
-import math from '../../../../src/bundleAny'
+import approx from '../../../../tools/approx.js'
+import math from '../../../../src/defaultInstance.js'
 
 // Parsing tests are inside diff.transform.test
 
diff --git a/test/unit-tests/function/matrix/dot.test.js b/test/unit-tests/function/matrix/dot.test.js
index a3de75795c..2a9abdfb08 100644
--- a/test/unit-tests/function/matrix/dot.test.js
+++ b/test/unit-tests/function/matrix/dot.test.js
@@ -1,5 +1,5 @@
 import assert from 'assert'
-import math from '../../../../src/bundleAny'
+import math from '../../../../src/defaultInstance.js'
 
 const dot = math.dot
 const matrix = math.matrix
diff --git a/test/unit-tests/function/matrix/eigs.test.js b/test/unit-tests/function/matrix/eigs.test.js
index 483628753e..4494570bd6 100644
--- a/test/unit-tests/function/matrix/eigs.test.js
+++ b/test/unit-tests/function/matrix/eigs.test.js
@@ -1,6 +1,6 @@
 import assert from 'assert'
-import math from '../../../../src/bundleAny'
-import approx from '../../../../tools/approx'
+import math from '../../../../src/defaultInstance.js'
+import approx from '../../../../tools/approx.js'
 const eigs = math.eigs
 
 describe('eigs', function () {
diff --git a/test/unit-tests/function/matrix/expm.test.js b/test/unit-tests/function/matrix/expm.test.js
index 4b5243edd2..b274734191 100644
--- a/test/unit-tests/function/matrix/expm.test.js
+++ b/test/unit-tests/function/matrix/expm.test.js
@@ -1,8 +1,8 @@
 // test expm
 import assert from 'assert'
 
-import approx from '../../../../tools/approx'
-import math from '../../../../src/bundleAny'
+import approx from '../../../../tools/approx.js'
+import math from '../../../../src/defaultInstance.js'
 const expm = math.expm
 
 describe('expm', function () {
diff --git a/test/unit-tests/function/matrix/filter.test.js b/test/unit-tests/function/matrix/filter.test.js
index 13de99165d..24f954a7e2 100644
--- a/test/unit-tests/function/matrix/filter.test.js
+++ b/test/unit-tests/function/matrix/filter.test.js
@@ -1,5 +1,5 @@
 import assert from 'assert'
-import math from '../../../../src/bundleAny'
+import math from '../../../../src/defaultInstance.js'
 
 describe('filter', function () {
   it('should filter an array with a filter function', function () {
diff --git a/test/unit-tests/function/matrix/flatten.test.js b/test/unit-tests/function/matrix/flatten.test.js
index e46233a5ef..87bcf49771 100644
--- a/test/unit-tests/function/matrix/flatten.test.js
+++ b/test/unit-tests/function/matrix/flatten.test.js
@@ -1,5 +1,5 @@
 import assert from 'assert'
-import math from '../../../../src/bundleAny'
+import math from '../../../../src/defaultInstance.js'
 const matrix = math.matrix
 const flatten = math.flatten
 
diff --git a/test/unit-tests/function/matrix/forEach.test.js b/test/unit-tests/function/matrix/forEach.test.js
index 0349508ca5..a4b7ade880 100644
--- a/test/unit-tests/function/matrix/forEach.test.js
+++ b/test/unit-tests/function/matrix/forEach.test.js
@@ -1,5 +1,5 @@
 import assert from 'assert'
-import math from '../../../../src/bundleAny'
+import math from '../../../../src/defaultInstance.js'
 
 describe('forEach', function () {
   it('should iterate over all elements of the matrix', function () {
diff --git a/test/unit-tests/function/matrix/identity.test.js b/test/unit-tests/function/matrix/identity.test.js
index 0ff31e991a..0604c81a8c 100644
--- a/test/unit-tests/function/matrix/identity.test.js
+++ b/test/unit-tests/function/matrix/identity.test.js
@@ -1,5 +1,5 @@
 import assert from 'assert'
-import math from '../../../../src/bundleAny'
+import math from '../../../../src/defaultInstance.js'
 const matrix = math.matrix
 const identity = math.identity
 
diff --git a/test/unit-tests/function/matrix/inv.test.js b/test/unit-tests/function/matrix/inv.test.js
index 3242e0e7bc..edfc674fc5 100644
--- a/test/unit-tests/function/matrix/inv.test.js
+++ b/test/unit-tests/function/matrix/inv.test.js
@@ -1,8 +1,8 @@
 // test inv
 import assert from 'assert'
 
-import approx from '../../../../tools/approx'
-import math from '../../../../src/bundleAny'
+import approx from '../../../../tools/approx.js'
+import math from '../../../../src/defaultInstance.js'
 const inv = math.inv
 
 describe('inv', function () {
diff --git a/test/unit-tests/function/matrix/kron.test.js b/test/unit-tests/function/matrix/kron.test.js
index 89ef610ca8..56af01123d 100644
--- a/test/unit-tests/function/matrix/kron.test.js
+++ b/test/unit-tests/function/matrix/kron.test.js
@@ -1,7 +1,7 @@
 // test kronecker product
 import assert from 'assert'
 
-import math from '../../../../src/bundleAny'
+import math from '../../../../src/defaultInstance.js'
 
 describe('kron', function () {
   it('should calculate the kronecker product of two arrays', function () {
diff --git a/test/unit-tests/function/matrix/map.test.js b/test/unit-tests/function/matrix/map.test.js
index 48b7cab5bd..625d832162 100644
--- a/test/unit-tests/function/matrix/map.test.js
+++ b/test/unit-tests/function/matrix/map.test.js
@@ -1,5 +1,5 @@
 import assert from 'assert'
-import math from '../../../../src/bundleAny'
+import math from '../../../../src/defaultInstance.js'
 
 describe('map', function () {
   it('should apply map to all elements of the matrix', function () {
diff --git a/test/unit-tests/function/matrix/ones.test.js b/test/unit-tests/function/matrix/ones.test.js
index 6ff60c992e..9ef2425187 100644
--- a/test/unit-tests/function/matrix/ones.test.js
+++ b/test/unit-tests/function/matrix/ones.test.js
@@ -1,7 +1,7 @@
 // test ones
 import assert from 'assert'
 
-import math from '../../../../src/bundleAny'
+import math from '../../../../src/defaultInstance.js'
 const ones = math.ones
 const matrix = math.matrix
 
diff --git a/test/unit-tests/function/matrix/partitionSelect.test.js b/test/unit-tests/function/matrix/partitionSelect.test.js
index 6ee82fb855..c9a3f1f527 100644
--- a/test/unit-tests/function/matrix/partitionSelect.test.js
+++ b/test/unit-tests/function/matrix/partitionSelect.test.js
@@ -1,5 +1,5 @@
 import assert from 'assert'
-import math from '../../../../src/bundleAny'
+import math from '../../../../src/defaultInstance.js'
 const matrix = math.matrix
 const partitionSelect = math.partitionSelect
 
diff --git a/test/unit-tests/function/matrix/range.test.js b/test/unit-tests/function/matrix/range.test.js
index 0ea0bb6d6f..caa3584f61 100644
--- a/test/unit-tests/function/matrix/range.test.js
+++ b/test/unit-tests/function/matrix/range.test.js
@@ -1,5 +1,5 @@
 import assert from 'assert'
-import math from '../../../../src/bundleAny'
+import math from '../../../../src/defaultInstance.js'
 const range = math.range
 const matrix = math.matrix
 const bignumber = math.bignumber
diff --git a/test/unit-tests/function/matrix/reshape.test.js b/test/unit-tests/function/matrix/reshape.test.js
index 4fdc10224c..d05c75fb2f 100644
--- a/test/unit-tests/function/matrix/reshape.test.js
+++ b/test/unit-tests/function/matrix/reshape.test.js
@@ -1,6 +1,6 @@
 import assert from 'assert'
-import math from '../../../../src/bundleAny'
-import { DimensionError } from '../../../../src/error/DimensionError'
+import math from '../../../../src/defaultInstance.js'
+import { DimensionError } from '../../../../src/error/DimensionError.js'
 
 describe('reshape', function () {
   it('should reshape an array', function () {
diff --git a/test/unit-tests/function/matrix/resize.test.js b/test/unit-tests/function/matrix/resize.test.js
index 1b17caad35..58acdc9eb0 100644
--- a/test/unit-tests/function/matrix/resize.test.js
+++ b/test/unit-tests/function/matrix/resize.test.js
@@ -1,7 +1,7 @@
 // test resize
 import assert from 'assert'
 
-import math from '../../../../src/bundleAny'
+import math from '../../../../src/defaultInstance.js'
 
 describe('resize', function () {
   it('should resize an array', function () {
diff --git a/test/unit-tests/function/matrix/row.test.js b/test/unit-tests/function/matrix/row.test.js
index fc1d2efaef..5ff1faa1c5 100644
--- a/test/unit-tests/function/matrix/row.test.js
+++ b/test/unit-tests/function/matrix/row.test.js
@@ -1,5 +1,5 @@
 import assert from 'assert'
-import math from '../../../../src/bundleAny'
+import math from '../../../../src/defaultInstance.js'
 
 const row = math.row
 const matrix = math.matrix
diff --git a/test/unit-tests/function/matrix/size.test.js b/test/unit-tests/function/matrix/size.test.js
index ef1261750b..40e2ca3040 100644
--- a/test/unit-tests/function/matrix/size.test.js
+++ b/test/unit-tests/function/matrix/size.test.js
@@ -1,7 +1,7 @@
 // test size
 import assert from 'assert'
 
-import math from '../../../../src/bundleAny'
+import math from '../../../../src/defaultInstance.js'
 const size = math.size
 const matrix = math.matrix
 
diff --git a/test/unit-tests/function/matrix/sort.test.js b/test/unit-tests/function/matrix/sort.test.js
index 2944543247..2f353640d2 100644
--- a/test/unit-tests/function/matrix/sort.test.js
+++ b/test/unit-tests/function/matrix/sort.test.js
@@ -1,5 +1,5 @@
 import assert from 'assert'
-import math from '../../../../src/bundleAny'
+import math from '../../../../src/defaultInstance.js'
 
 describe('sort', function () {
   it('should sort an array with numbers', function () {
diff --git a/test/unit-tests/function/matrix/sqrtm.test.js b/test/unit-tests/function/matrix/sqrtm.test.js
index 3cca04cb2d..e3f2fdd7b5 100644
--- a/test/unit-tests/function/matrix/sqrtm.test.js
+++ b/test/unit-tests/function/matrix/sqrtm.test.js
@@ -1,8 +1,8 @@
 // test sqrtm
 import assert from 'assert'
 
-import approx from '../../../../tools/approx'
-import math from '../../../../src/bundleAny'
+import approx from '../../../../tools/approx.js'
+import math from '../../../../src/defaultInstance.js'
 
 describe('sqrtm', function () {
   const A = [[5, 2], [4, 7]]
diff --git a/test/unit-tests/function/matrix/squeeze.test.js b/test/unit-tests/function/matrix/squeeze.test.js
index deb76d773c..3f3532fac6 100644
--- a/test/unit-tests/function/matrix/squeeze.test.js
+++ b/test/unit-tests/function/matrix/squeeze.test.js
@@ -1,7 +1,7 @@
 // test squeeze
 import assert from 'assert'
 
-import math from '../../../../src/bundleAny'
+import math from '../../../../src/defaultInstance.js'
 const squeeze = math.squeeze
 const size = math.size
 const matrix = math.matrix
diff --git a/test/unit-tests/function/matrix/subset.test.js b/test/unit-tests/function/matrix/subset.test.js
index fa7380b12a..46ddcfe0ea 100644
--- a/test/unit-tests/function/matrix/subset.test.js
+++ b/test/unit-tests/function/matrix/subset.test.js
@@ -1,5 +1,5 @@
 import assert from 'assert'
-import math from '../../../../src/bundleAny'
+import math from '../../../../src/defaultInstance.js'
 const subset = math.subset
 const matrix = math.matrix
 const Range = math.Range
diff --git a/test/unit-tests/function/matrix/trace.test.js b/test/unit-tests/function/matrix/trace.test.js
index 3363f9d5bd..fc0562683a 100644
--- a/test/unit-tests/function/matrix/trace.test.js
+++ b/test/unit-tests/function/matrix/trace.test.js
@@ -1,6 +1,6 @@
 import assert from 'assert'
-import approx from '../../../../tools/approx'
-import math from '../../../../src/bundleAny'
+import approx from '../../../../tools/approx.js'
+import math from '../../../../src/defaultInstance.js'
 
 describe('trace', function () {
   it('should calculate correctly the trace of a NxN array', function () {
diff --git a/test/unit-tests/function/matrix/transpose.test.js b/test/unit-tests/function/matrix/transpose.test.js
index 773f076c60..14312be02e 100644
--- a/test/unit-tests/function/matrix/transpose.test.js
+++ b/test/unit-tests/function/matrix/transpose.test.js
@@ -1,7 +1,7 @@
 // test transpose
 import assert from 'assert'
 
-import math from '../../../../src/bundleAny'
+import math from '../../../../src/defaultInstance.js'
 const transpose = math.transpose
 
 describe('transpose', function () {
diff --git a/test/unit-tests/function/matrix/zeros.test.js b/test/unit-tests/function/matrix/zeros.test.js
index b27407dea5..bb3535fcb8 100644
--- a/test/unit-tests/function/matrix/zeros.test.js
+++ b/test/unit-tests/function/matrix/zeros.test.js
@@ -1,7 +1,7 @@
 // test zeros
 import assert from 'assert'
 
-import math from '../../../../src/bundleAny'
+import math from '../../../../src/defaultInstance.js'
 const zeros = math.zeros
 const matrix = math.matrix
 
diff --git a/test/unit-tests/function/probability/combinations.test.js b/test/unit-tests/function/probability/combinations.test.js
index 001f1a502d..728101e33d 100644
--- a/test/unit-tests/function/probability/combinations.test.js
+++ b/test/unit-tests/function/probability/combinations.test.js
@@ -1,5 +1,5 @@
 import assert from 'assert'
-import math from '../../../../src/bundleAny'
+import math from '../../../../src/defaultInstance.js'
 const combinations = math.combinations
 
 describe('combinations', function () {
diff --git a/test/unit-tests/function/probability/combinationsWithRep.test.js b/test/unit-tests/function/probability/combinationsWithRep.test.js
index 3f47693b6f..749d969d71 100644
--- a/test/unit-tests/function/probability/combinationsWithRep.test.js
+++ b/test/unit-tests/function/probability/combinationsWithRep.test.js
@@ -1,5 +1,5 @@
 import assert from 'assert'
-import math from '../../../../src/bundleAny'
+import math from '../../../../src/defaultInstance.js'
 const combinationsWithRep = math.combinationsWithRep
 
 describe('combinations', function () {
diff --git a/test/unit-tests/function/probability/factorial.test.js b/test/unit-tests/function/probability/factorial.test.js
index c502ada0a6..0883dda6e8 100644
--- a/test/unit-tests/function/probability/factorial.test.js
+++ b/test/unit-tests/function/probability/factorial.test.js
@@ -1,6 +1,6 @@
 import assert from 'assert'
-import approx from '../../../../tools/approx'
-import math from '../../../../src/bundleAny'
+import approx from '../../../../tools/approx.js'
+import math from '../../../../src/defaultInstance.js'
 const factorial = math.factorial
 
 describe('factorial', function () {
diff --git a/test/unit-tests/function/probability/gamma.test.js b/test/unit-tests/function/probability/gamma.test.js
index 77b024440f..eab5e57fae 100644
--- a/test/unit-tests/function/probability/gamma.test.js
+++ b/test/unit-tests/function/probability/gamma.test.js
@@ -1,6 +1,6 @@
 import assert from 'assert'
-import approx from '../../../../tools/approx'
-import math from '../../../../src/bundleAny'
+import approx from '../../../../tools/approx.js'
+import math from '../../../../src/defaultInstance.js'
 const bignumber = math.bignumber
 const gamma = math.gamma
 
diff --git a/test/unit-tests/function/probability/kldivergence.test.js b/test/unit-tests/function/probability/kldivergence.test.js
index 8a4416f6d1..7974e6ba8d 100644
--- a/test/unit-tests/function/probability/kldivergence.test.js
+++ b/test/unit-tests/function/probability/kldivergence.test.js
@@ -1,5 +1,5 @@
 import assert from 'assert'
-import math from '../../../../src/bundleAny'
+import math from '../../../../src/defaultInstance.js'
 
 describe('kldivergence', function () {
   it('should return 0, cause distributions is equals', function () {
diff --git a/test/unit-tests/function/probability/multinomial.test.js b/test/unit-tests/function/probability/multinomial.test.js
index ff9fbfb015..052987c9cc 100644
--- a/test/unit-tests/function/probability/multinomial.test.js
+++ b/test/unit-tests/function/probability/multinomial.test.js
@@ -1,6 +1,5 @@
 import assert from 'assert'
-import { isEqual } from 'lodash'
-import math from '../../../../src/bundleAny'
+import math from '../../../../src/defaultInstance.js'
 
 const multinomial = math.multinomial
 
@@ -12,7 +11,7 @@ describe('multinomial', function () {
   })
 
   it('should calculate the multinomial of n items taken k at a time with BigNumbers', function () {
-    assert.strictEqual(isEqual(multinomial([math.bignumber(3), math.bignumber(4), math.bignumber(5)]), math.bignumber(27720)), true)
+    assert.deepStrictEqual(multinomial([math.bignumber(3), math.bignumber(4), math.bignumber(5)]), math.bignumber(27720))
     assert.deepStrictEqual(multinomial([math.bignumber(10), math.bignumber(1), math.bignumber(2)]), math.bignumber(858))
   })
 
diff --git a/test/unit-tests/function/probability/permutations.test.js b/test/unit-tests/function/probability/permutations.test.js
index 028bbe9211..e7da73d4b4 100644
--- a/test/unit-tests/function/probability/permutations.test.js
+++ b/test/unit-tests/function/probability/permutations.test.js
@@ -1,5 +1,5 @@
 import assert from 'assert'
-import math from '../../../../src/bundleAny'
+import math from '../../../../src/defaultInstance.js'
 const permutations = math.permutations
 
 describe('permutations', function () {
diff --git a/test/unit-tests/function/probability/pickRandom.test.js b/test/unit-tests/function/probability/pickRandom.test.js
index fc0cbdd0c8..7b10651b33 100644
--- a/test/unit-tests/function/probability/pickRandom.test.js
+++ b/test/unit-tests/function/probability/pickRandom.test.js
@@ -1,6 +1,5 @@
 import assert from 'assert'
-import { filter, times } from 'lodash'
-import math from '../../../../src/bundleAny'
+import math from '../../../../src/defaultInstance.js'
 
 const math2 = math.create({ randomSeed: 'test2' })
 const pickRandom = math2.pickRandom
@@ -126,19 +125,19 @@ describe('pickRandom', function () {
       picked.push(pickRandom(possibles))
     })
 
-    count = filter(picked, function (val) { return val === 11 }).length
+    count = picked.filter(function (val) { return val === 11 }).length
     assert.strictEqual(math.round(count / picked.length, 1), 0.2)
 
-    count = filter(picked, function (val) { return val === 22 }).length
+    count = picked.filter(function (val) { return val === 22 }).length
     assert.strictEqual(math.round(count / picked.length, 1), 0.2)
 
-    count = filter(picked, function (val) { return val === 33 }).length
+    count = picked.filter(function (val) { return val === 33 }).length
     assert.strictEqual(math.round(count / picked.length, 1), 0.2)
 
-    count = filter(picked, function (val) { return val === 44 }).length
+    count = picked.filter(function (val) { return val === 44 }).length
     assert.strictEqual(math.round(count / picked.length, 1), 0.2)
 
-    count = filter(picked, function (val) { return val === 55 }).length
+    count = picked.filter(function (val) { return val === 55 }).length
     assert.strictEqual(math.round(count / picked.length, 1), 0.2)
   })
 
@@ -151,19 +150,19 @@ describe('pickRandom', function () {
       picked.push(pickRandom(possibles))
     })
 
-    count = filter(picked, function (val) { return val === 11 }).length
+    count = picked.filter(function (val) { return val === 11 }).length
     assert.strictEqual(math.round(count / picked.length, 1), 0.2)
 
-    count = filter(picked, function (val) { return val === 22 }).length
+    count = picked.filter(function (val) { return val === 22 }).length
     assert.strictEqual(math.round(count / picked.length, 1), 0.2)
 
-    count = filter(picked, function (val) { return val === 33 }).length
+    count = picked.filter(function (val) { return val === 33 }).length
     assert.strictEqual(math.round(count / picked.length, 1), 0.2)
 
-    count = filter(picked, function (val) { return val === 44 }).length
+    count = picked.filter(function (val) { return val === 44 }).length
     assert.strictEqual(math.round(count / picked.length, 1), 0.2)
 
-    count = filter(picked, function (val) { return val === 55 }).length
+    count = picked.filter(function (val) { return val === 55 }).length
     assert.strictEqual(math.round(count / picked.length, 1), 0.2)
   })
 
@@ -179,19 +178,19 @@ describe('pickRandom', function () {
 
     assert.strictEqual(picked.length, 2000)
 
-    count = filter(picked, function (val) { return val === 11 }).length
+    count = picked.filter(function (val) { return val === 11 }).length
     assert.strictEqual(math.round(count / picked.length, 1), 0.2)
 
-    count = filter(picked, function (val) { return val === 22 }).length
+    count = picked.filter(function (val) { return val === 22 }).length
     assert.strictEqual(math.round(count / picked.length, 1), 0.2)
 
-    count = filter(picked, function (val) { return val === 33 }).length
+    count = picked.filter(function (val) { return val === 33 }).length
     assert.strictEqual(math.round(count / picked.length, 1), 0.2)
 
-    count = filter(picked, function (val) { return val === 44 }).length
+    count = picked.filter(function (val) { return val === 44 }).length
     assert.strictEqual(math.round(count / picked.length, 1), 0.2)
 
-    count = filter(picked, function (val) { return val === 55 }).length
+    count = picked.filter(function (val) { return val === 55 }).length
     assert.strictEqual(math.round(count / picked.length, 1), 0.2)
   })
 
@@ -207,19 +206,19 @@ describe('pickRandom', function () {
 
     assert.strictEqual(picked.length, 3000)
 
-    count = filter(picked, function (val) { return val === 11 }).length
+    count = picked.filter(function (val) { return val === 11 }).length
     assert.strictEqual(math.round(count / picked.length, 1), 0.2)
 
-    count = filter(picked, function (val) { return val === 22 }).length
+    count = picked.filter(function (val) { return val === 22 }).length
     assert.strictEqual(math.round(count / picked.length, 1), 0.2)
 
-    count = filter(picked, function (val) { return val === 33 }).length
+    count = picked.filter(function (val) { return val === 33 }).length
     assert.strictEqual(math.round(count / picked.length, 1), 0.2)
 
-    count = filter(picked, function (val) { return val === 44 }).length
+    count = picked.filter(function (val) { return val === 44 }).length
     assert.strictEqual(math.round(count / picked.length, 1), 0.2)
 
-    count = filter(picked, function (val) { return val === 55 }).length
+    count = picked.filter(function (val) { return val === 55 }).length
     assert.strictEqual(math.round(count / picked.length, 1), 0.2)
   })
 
@@ -233,19 +232,19 @@ describe('pickRandom', function () {
       picked.push(pickRandom(possibles, weights))
     })
 
-    count = filter(picked, function (val) { return val === 11 }).length
+    count = picked.filter(function (val) { return val === 11 }).length
     assert.strictEqual(math.round(count / picked.length, 1), 0.1)
 
-    count = filter(picked, function (val) { return val === 22 }).length
+    count = picked.filter(function (val) { return val === 22 }).length
     assert.strictEqual(math.round((count) / picked.length, 1), 0.4)
 
-    count = filter(picked, function (val) { return val === 33 }).length
+    count = picked.filter(function (val) { return val === 33 }).length
     assert.strictEqual(math.round(count / picked.length, 1), 0)
 
-    count = filter(picked, function (val) { return val === 44 }).length
+    count = picked.filter(function (val) { return val === 44 }).length
     assert.strictEqual(math.round(count / picked.length, 1), 0.2)
 
-    count = filter(picked, function (val) { return val === 55 }).length
+    count = picked.filter(function (val) { return val === 55 }).length
     assert.strictEqual(math.round(count / picked.length, 1), 0.3)
   })
 
@@ -259,19 +258,19 @@ describe('pickRandom', function () {
       picked.push(pickRandom(possibles, weights))
     })
 
-    count = filter(picked, function (val) { return val === 11 }).length
+    count = picked.filter(function (val) { return val === 11 }).length
     assert.strictEqual(math.round(count / picked.length, 1), 0.1)
 
-    count = filter(picked, function (val) { return val === 22 }).length
+    count = picked.filter(function (val) { return val === 22 }).length
     assert.strictEqual(math.round((count) / picked.length, 1), 0.4)
 
-    count = filter(picked, function (val) { return val === 33 }).length
+    count = picked.filter(function (val) { return val === 33 }).length
     assert.strictEqual(math.round(count / picked.length, 1), 0)
 
-    count = filter(picked, function (val) { return val === 44 }).length
+    count = picked.filter(function (val) { return val === 44 }).length
     assert.strictEqual(math.round(count / picked.length, 1), 0.2)
 
-    count = filter(picked, function (val) { return val === 55 }).length
+    count = picked.filter(function (val) { return val === 55 }).length
     assert.strictEqual(math.round(count / picked.length, 1), 0.3)
   })
 
@@ -286,38 +285,38 @@ describe('pickRandom', function () {
       picked.push.apply(picked, pickRandom(possibles, number, weights))
     })
 
-    count = filter(picked, function (val) { return val === 11 }).length
+    count = picked.filter(function (val) { return val === 11 }).length
     assert.strictEqual(math.round(count / picked.length, 1), 0.1)
 
-    count = filter(picked, function (val) { return val === 22 }).length
+    count = picked.filter(function (val) { return val === 22 }).length
     assert.strictEqual(math.round((count) / picked.length, 1), 0.4)
 
-    count = filter(picked, function (val) { return val === 33 }).length
+    count = picked.filter(function (val) { return val === 33 }).length
     assert.strictEqual(math.round(count / picked.length, 1), 0)
 
-    count = filter(picked, function (val) { return val === 44 }).length
+    count = picked.filter(function (val) { return val === 44 }).length
     assert.strictEqual(math.round(count / picked.length, 1), 0.2)
 
-    count = filter(picked, function (val) { return val === 55 }).length
+    count = picked.filter(function (val) { return val === 55 }).length
     assert.strictEqual(math.round(count / picked.length, 1), 0.3)
 
     times(1000, function () {
       picked.push.apply(picked, pickRandom(possibles, weights, number))
     })
 
-    count = filter(picked, function (val) { return val === 11 }).length
+    count = picked.filter(function (val) { return val === 11 }).length
     assert.strictEqual(math.round(count / picked.length, 1), 0.1)
 
-    count = filter(picked, function (val) { return val === 22 }).length
+    count = picked.filter(function (val) { return val === 22 }).length
     assert.strictEqual(math.round((count) / picked.length, 1), 0.4)
 
-    count = filter(picked, function (val) { return val === 33 }).length
+    count = picked.filter(function (val) { return val === 33 }).length
     assert.strictEqual(math.round(count / picked.length, 1), 0)
 
-    count = filter(picked, function (val) { return val === 44 }).length
+    count = picked.filter(function (val) { return val === 44 }).length
     assert.strictEqual(math.round(count / picked.length, 1), 0.2)
 
-    count = filter(picked, function (val) { return val === 55 }).length
+    count = picked.filter(function (val) { return val === 55 }).length
     assert.strictEqual(math.round(count / picked.length, 1), 0.3)
   })
 
@@ -332,38 +331,38 @@ describe('pickRandom', function () {
       picked.push.apply(picked, pickRandom(possibles, number, weights))
     })
 
-    count = filter(picked, function (val) { return val === 11 }).length
+    count = picked.filter(function (val) { return val === 11 }).length
     assert.strictEqual(math.round(count / picked.length, 1), 0.1)
 
-    count = filter(picked, function (val) { return val === 22 }).length
+    count = picked.filter(function (val) { return val === 22 }).length
     assert.strictEqual(math.round((count) / picked.length, 1), 0.4)
 
-    count = filter(picked, function (val) { return val === 33 }).length
+    count = picked.filter(function (val) { return val === 33 }).length
     assert.strictEqual(math.round(count / picked.length, 1), 0)
 
-    count = filter(picked, function (val) { return val === 44 }).length
+    count = picked.filter(function (val) { return val === 44 }).length
     assert.strictEqual(math.round(count / picked.length, 1), 0.2)
 
-    count = filter(picked, function (val) { return val === 55 }).length
+    count = picked.filter(function (val) { return val === 55 }).length
     assert.strictEqual(math.round(count / picked.length, 1), 0.3)
 
     times(1000, function () {
       picked.push.apply(picked, pickRandom(possibles, weights, number))
     })
 
-    count = filter(picked, function (val) { return val === 11 }).length
+    count = picked.filter(function (val) { return val === 11 }).length
     assert.strictEqual(math.round(count / picked.length, 1), 0.1)
 
-    count = filter(picked, function (val) { return val === 22 }).length
+    count = picked.filter(function (val) { return val === 22 }).length
     assert.strictEqual(math.round((count) / picked.length, 1), 0.4)
 
-    count = filter(picked, function (val) { return val === 33 }).length
+    count = picked.filter(function (val) { return val === 33 }).length
     assert.strictEqual(math.round(count / picked.length, 1), 0)
 
-    count = filter(picked, function (val) { return val === 44 }).length
+    count = picked.filter(function (val) { return val === 44 }).length
     assert.strictEqual(math.round(count / picked.length, 1), 0.2)
 
-    count = filter(picked, function (val) { return val === 55 }).length
+    count = picked.filter(function (val) { return val === 55 }).length
     assert.strictEqual(math.round(count / picked.length, 1), 0.3)
   })
 
@@ -380,3 +379,9 @@ describe('pickRandom', function () {
     assert.strictEqual(expression.toTex(), '\\mathrm{pickRandom}\\left(\\begin{bmatrix}1\\\\2\\\\3\\\\\\end{bmatrix}\\right)')
   })
 })
+
+function times (n, callback) {
+  for (let i = 0; i < n; i++) {
+    callback()
+  }
+}
diff --git a/test/unit-tests/function/probability/random.test.js b/test/unit-tests/function/probability/random.test.js
index bd153283da..201d87639a 100644
--- a/test/unit-tests/function/probability/random.test.js
+++ b/test/unit-tests/function/probability/random.test.js
@@ -1,6 +1,5 @@
 import assert from 'assert'
-import { filter, times } from 'lodash'
-import math from '../../../../src/bundleAny'
+import math from '../../../../src/defaultInstance.js'
 
 const math2 = math.create({ randomSeed: 'test' })
 const random = math2.random
@@ -137,13 +136,13 @@ function assertUniformDistribution (values, min, max) {
   const interval = (max - min) / 10
   let count
   let i
-  count = filter(values, function (val) { return val < min }).length
+  count = values.filter(function (val) { return val < min }).length
   assert.strictEqual(count, 0)
-  count = filter(values, function (val) { return val > max }).length
+  count = values.filter(function (val) { return val > max }).length
   assert.strictEqual(count, 0)
 
   for (i = 0; i < 10; i++) {
-    count = filter(values, function (val) {
+    count = values.filter(function (val) {
       return val >= (min + i * interval) && val < (min + (i + 1) * interval)
     }).length
     assertApproxEqual(count / values.length, 0.1, 0.02)
@@ -155,3 +154,9 @@ const assertApproxEqual = function (testVal, val, tolerance) {
   if (diff > tolerance) assert.strictEqual(testVal, val)
   else assert.ok(diff <= tolerance)
 }
+
+function times (n, callback) {
+  for (let i = 0; i < n; i++) {
+    callback()
+  }
+}
diff --git a/test/unit-tests/function/probability/randomInt.test.js b/test/unit-tests/function/probability/randomInt.test.js
index acd3c89479..bfc72dcc14 100644
--- a/test/unit-tests/function/probability/randomInt.test.js
+++ b/test/unit-tests/function/probability/randomInt.test.js
@@ -1,6 +1,5 @@
 import assert from 'assert'
-import { filter, includes, range, times } from 'lodash'
-import math from '../../../../src/bundleAny'
+import math from '../../../../src/defaultInstance.js'
 
 const math2 = math.create({ randomSeed: 'test' })
 const randomInt = math2.randomInt
@@ -65,11 +64,11 @@ const assertUniformDistributionInt = function (values, min, max) {
   let count
 
   values.forEach(function (val) {
-    assert.ok(includes(valuesRange, val))
+    assert.ok(valuesRange.includes(val))
   })
 
   valuesRange.forEach(function (val) {
-    count = filter(values, function (testVal) { return testVal === val }).length
+    count = values.filter(function (testVal) { return testVal === val }).length
     assertApproxEqual(count / values.length, 1 / valuesRange.length, 0.03)
   })
 }
@@ -79,3 +78,19 @@ const assertApproxEqual = function (testVal, val, tolerance) {
   if (diff > tolerance) assert.strictEqual(testVal, val)
   else assert.ok(diff <= tolerance)
 }
+
+function times (n, callback) {
+  for (let i = 0; i < n; i++) {
+    callback()
+  }
+}
+
+function range (start, end) {
+  const array = []
+
+  for (let i = start; i < end; i++) {
+    array.push(i)
+  }
+
+  return array
+}
diff --git a/test/unit-tests/function/probability/seededrandom.test.js b/test/unit-tests/function/probability/seededrandom.test.js
index f9edfe1b2d..b150682343 100644
--- a/test/unit-tests/function/probability/seededrandom.test.js
+++ b/test/unit-tests/function/probability/seededrandom.test.js
@@ -1,5 +1,5 @@
 import assert from 'assert'
-import math from '../../../../src/bundleAny'
+import math from '../../../../src/defaultInstance.js'
 
 describe('seed', function () {
   it('should generate same number with seed', function () {
diff --git a/test/unit-tests/function/relational/compare.test.js b/test/unit-tests/function/relational/compare.test.js
index 3a93319af5..3cb9c92b54 100644
--- a/test/unit-tests/function/relational/compare.test.js
+++ b/test/unit-tests/function/relational/compare.test.js
@@ -1,7 +1,7 @@
 // test compare
 import assert from 'assert'
 
-import math from '../../../../src/bundleAny'
+import math from '../../../../src/defaultInstance.js'
 const bignumber = math.bignumber
 const complex = math.complex
 const matrix = math.matrix
diff --git a/test/unit-tests/function/relational/compareNatural.test.js b/test/unit-tests/function/relational/compareNatural.test.js
index e96ede49e8..722adc74bf 100644
--- a/test/unit-tests/function/relational/compareNatural.test.js
+++ b/test/unit-tests/function/relational/compareNatural.test.js
@@ -1,7 +1,7 @@
 // test compareNatural
 import assert from 'assert'
 
-import math from '../../../../src/bundleAny'
+import math from '../../../../src/defaultInstance.js'
 const bignumber = math.bignumber
 const complex = math.complex
 const matrix = math.matrix
diff --git a/test/unit-tests/function/relational/compareText.test.js b/test/unit-tests/function/relational/compareText.test.js
index 6df895d25a..f346f7d482 100644
--- a/test/unit-tests/function/relational/compareText.test.js
+++ b/test/unit-tests/function/relational/compareText.test.js
@@ -1,7 +1,7 @@
 // test compareText
 import assert from 'assert'
 
-import math from '../../../../src/bundleAny'
+import math from '../../../../src/defaultInstance.js'
 const bignumber = math.bignumber
 const matrix = math.matrix
 const sparse = math.sparse
diff --git a/test/unit-tests/function/relational/deepEqual.test.js b/test/unit-tests/function/relational/deepEqual.test.js
index f692d17475..ac517030cd 100644
--- a/test/unit-tests/function/relational/deepEqual.test.js
+++ b/test/unit-tests/function/relational/deepEqual.test.js
@@ -1,7 +1,7 @@
 // test deepEqual
 import assert from 'assert'
 
-import math from '../../../../src/bundleAny'
+import math from '../../../../src/defaultInstance.js'
 const bignumber = math.bignumber
 const complex = math.complex
 const matrix = math.matrix
diff --git a/test/unit-tests/function/relational/equal.test.js b/test/unit-tests/function/relational/equal.test.js
index f6a8ad8af9..679d6cfbe5 100644
--- a/test/unit-tests/function/relational/equal.test.js
+++ b/test/unit-tests/function/relational/equal.test.js
@@ -1,7 +1,7 @@
 // test equal
 import assert from 'assert'
 
-import math from '../../../../src/bundleAny'
+import math from '../../../../src/defaultInstance.js'
 const bignumber = math.bignumber
 const complex = math.complex
 const matrix = math.matrix
diff --git a/test/unit-tests/function/relational/equalText.test.js b/test/unit-tests/function/relational/equalText.test.js
index 7d8f11f669..dd4492982b 100644
--- a/test/unit-tests/function/relational/equalText.test.js
+++ b/test/unit-tests/function/relational/equalText.test.js
@@ -1,7 +1,7 @@
 // test equalText
 import assert from 'assert'
 
-import math from '../../../../src/bundleAny'
+import math from '../../../../src/defaultInstance.js'
 const bignumber = math.bignumber
 const matrix = math.matrix
 const sparse = math.sparse
diff --git a/test/unit-tests/function/relational/larger.test.js b/test/unit-tests/function/relational/larger.test.js
index f39023d837..b122ed398e 100644
--- a/test/unit-tests/function/relational/larger.test.js
+++ b/test/unit-tests/function/relational/larger.test.js
@@ -1,7 +1,7 @@
 // test larger
 import assert from 'assert'
 
-import math from '../../../../src/bundleAny'
+import math from '../../../../src/defaultInstance.js'
 const bignumber = math.bignumber
 const complex = math.complex
 const matrix = math.matrix
diff --git a/test/unit-tests/function/relational/largerEq.test.js b/test/unit-tests/function/relational/largerEq.test.js
index 965aa06d60..d4aec87de3 100644
--- a/test/unit-tests/function/relational/largerEq.test.js
+++ b/test/unit-tests/function/relational/largerEq.test.js
@@ -1,7 +1,7 @@
 // test largerEq
 import assert from 'assert'
 
-import math from '../../../../src/bundleAny'
+import math from '../../../../src/defaultInstance.js'
 const bignumber = math.bignumber
 const complex = math.complex
 const matrix = math.matrix
diff --git a/test/unit-tests/function/relational/smaller.test.js b/test/unit-tests/function/relational/smaller.test.js
index b643012c9d..d578dbf234 100644
--- a/test/unit-tests/function/relational/smaller.test.js
+++ b/test/unit-tests/function/relational/smaller.test.js
@@ -1,7 +1,7 @@
 // test smaller
 import assert from 'assert'
 
-import math from '../../../../src/bundleAny'
+import math from '../../../../src/defaultInstance.js'
 const bignumber = math.bignumber
 const complex = math.complex
 const matrix = math.matrix
diff --git a/test/unit-tests/function/relational/smallerEq.test.js b/test/unit-tests/function/relational/smallerEq.test.js
index 2475c4fe19..9f49589a2c 100644
--- a/test/unit-tests/function/relational/smallerEq.test.js
+++ b/test/unit-tests/function/relational/smallerEq.test.js
@@ -1,7 +1,7 @@
 // test smaller
 import assert from 'assert'
 
-import math from '../../../../src/bundleAny'
+import math from '../../../../src/defaultInstance.js'
 const bignumber = math.bignumber
 const complex = math.complex
 const matrix = math.matrix
diff --git a/test/unit-tests/function/relational/unequal.test.js b/test/unit-tests/function/relational/unequal.test.js
index b025e22272..1c74c3d488 100644
--- a/test/unit-tests/function/relational/unequal.test.js
+++ b/test/unit-tests/function/relational/unequal.test.js
@@ -1,7 +1,7 @@
 // test unequal
 import assert from 'assert'
 
-import math from '../../../../src/bundleAny'
+import math from '../../../../src/defaultInstance.js'
 const bignumber = math.bignumber
 const complex = math.complex
 const matrix = math.matrix
diff --git a/test/unit-tests/function/set/setCartesian.test.js b/test/unit-tests/function/set/setCartesian.test.js
index dd57c90d4c..619591cac9 100644
--- a/test/unit-tests/function/set/setCartesian.test.js
+++ b/test/unit-tests/function/set/setCartesian.test.js
@@ -1,7 +1,7 @@
 // test setCartesian
 import assert from 'assert'
 
-import math from '../../../../src/bundleAny'
+import math from '../../../../src/defaultInstance.js'
 
 describe('setCartesian', function () {
   it('should return the cartesian product of two sets', function () {
diff --git a/test/unit-tests/function/set/setDifference.test.js b/test/unit-tests/function/set/setDifference.test.js
index ebd26139bd..80e3cd96fe 100644
--- a/test/unit-tests/function/set/setDifference.test.js
+++ b/test/unit-tests/function/set/setDifference.test.js
@@ -1,7 +1,7 @@
 // test setDifference
 import assert from 'assert'
 
-import math from '../../../../src/bundleAny'
+import math from '../../../../src/defaultInstance.js'
 
 describe('setDifference', function () {
   it('should return the difference of two sets', function () {
diff --git a/test/unit-tests/function/set/setDistinct.test.js b/test/unit-tests/function/set/setDistinct.test.js
index 48832c7cfb..93e1b5bf27 100644
--- a/test/unit-tests/function/set/setDistinct.test.js
+++ b/test/unit-tests/function/set/setDistinct.test.js
@@ -1,7 +1,7 @@
 // test setDistinct
 import assert from 'assert'
 
-import math from '../../../../src/bundleAny'
+import math from '../../../../src/defaultInstance.js'
 
 describe('setDistinct', function () {
   it('should return the elements of a set', function () {
diff --git a/test/unit-tests/function/set/setIntersect.test.js b/test/unit-tests/function/set/setIntersect.test.js
index 58613d58d4..5ec2f87b47 100644
--- a/test/unit-tests/function/set/setIntersect.test.js
+++ b/test/unit-tests/function/set/setIntersect.test.js
@@ -1,7 +1,7 @@
 // test setIntersect
 import assert from 'assert'
 
-import math from '../../../../src/bundleAny'
+import math from '../../../../src/defaultInstance.js'
 
 describe('setIntersect', function () {
   it('should return the intersection of two sets', function () {
diff --git a/test/unit-tests/function/set/setIsSubset.test.js b/test/unit-tests/function/set/setIsSubset.test.js
index 80033472c6..265c480af8 100644
--- a/test/unit-tests/function/set/setIsSubset.test.js
+++ b/test/unit-tests/function/set/setIsSubset.test.js
@@ -1,7 +1,7 @@
 // test setIsSubset
 import assert from 'assert'
 
-import math from '../../../../src/bundleAny'
+import math from '../../../../src/defaultInstance.js'
 
 describe('setIsSubset', function () {
   it('should return true or false', function () {
diff --git a/test/unit-tests/function/set/setMultiplicity.test.js b/test/unit-tests/function/set/setMultiplicity.test.js
index 5e18abaee3..60b99c2852 100644
--- a/test/unit-tests/function/set/setMultiplicity.test.js
+++ b/test/unit-tests/function/set/setMultiplicity.test.js
@@ -1,7 +1,7 @@
 // test setMultiplicity
 import assert from 'assert'
 
-import math from '../../../../src/bundleAny'
+import math from '../../../../src/defaultInstance.js'
 
 describe('setMultiplicity', function () {
   it('should return the multiplicity on an element of a set', function () {
diff --git a/test/unit-tests/function/set/setPowerset.test.js b/test/unit-tests/function/set/setPowerset.test.js
index a3d1e51c85..da1db06516 100644
--- a/test/unit-tests/function/set/setPowerset.test.js
+++ b/test/unit-tests/function/set/setPowerset.test.js
@@ -1,7 +1,7 @@
 // test setPowerset
 import assert from 'assert'
 
-import math from '../../../../src/bundleAny'
+import math from '../../../../src/defaultInstance.js'
 
 describe('setPowerset', function () {
   it('should return the powerset of a set', function () {
diff --git a/test/unit-tests/function/set/setSize.test.js b/test/unit-tests/function/set/setSize.test.js
index 672316135b..1bfaef04d2 100644
--- a/test/unit-tests/function/set/setSize.test.js
+++ b/test/unit-tests/function/set/setSize.test.js
@@ -1,7 +1,7 @@
 // test setSize
 import assert from 'assert'
 
-import math from '../../../../src/bundleAny'
+import math from '../../../../src/defaultInstance.js'
 
 describe('setSize', function () {
   it('should return the number of elements of a set', function () {
diff --git a/test/unit-tests/function/set/setSymDifference.test.js b/test/unit-tests/function/set/setSymDifference.test.js
index be0d58674f..e79e90c916 100644
--- a/test/unit-tests/function/set/setSymDifference.test.js
+++ b/test/unit-tests/function/set/setSymDifference.test.js
@@ -1,7 +1,7 @@
 // test setSymDifference
 import assert from 'assert'
 
-import math from '../../../../src/bundleAny'
+import math from '../../../../src/defaultInstance.js'
 
 describe('setSymDifference', function () {
   it('should return the symetric difference of two sets', function () {
diff --git a/test/unit-tests/function/set/setUnion.test.js b/test/unit-tests/function/set/setUnion.test.js
index 77074d51b6..9470cf4443 100644
--- a/test/unit-tests/function/set/setUnion.test.js
+++ b/test/unit-tests/function/set/setUnion.test.js
@@ -1,7 +1,7 @@
 // test setUnion
 import assert from 'assert'
 
-import math from '../../../../src/bundleAny'
+import math from '../../../../src/defaultInstance.js'
 
 describe('setUnion', function () {
   it('should return the union of two sets', function () {
diff --git a/test/unit-tests/function/special/erf.test.js b/test/unit-tests/function/special/erf.test.js
index b64a791a66..a924b6ed4c 100644
--- a/test/unit-tests/function/special/erf.test.js
+++ b/test/unit-tests/function/special/erf.test.js
@@ -1,6 +1,6 @@
 import assert from 'assert'
-import math from '../../../../src/bundleAny'
-import actualErfValues from './erf.values.json'
+import math from '../../../../src/defaultInstance.js'
+
 const erf = math.erf
 
 const DIFF_THRESH = 5e-16
@@ -109,3 +109,146 @@ describe('erf', function () {
   // TODO: Test with nums really close to 0
   // TODO: Once this works for complex numbers and imaginary units, test
 })
+
+const actualErfValues = {
+  '-7.0': -1.0,
+  '-6.9': -1.0,
+  '-6.8': -1.0,
+  '-6.7': -1.0,
+  '-6.6': -1.0,
+  '-6.5': -1.0,
+  '-6.4': -1.0,
+  '-6.3': -1.0,
+  '-6.2': -1.0,
+  '-6.1': -1.0,
+  '-6.0': -1.0,
+  '-5.9': -0.9999999999999999,
+  '-5.8': -0.9999999999999998,
+  '-5.7': -0.9999999999999992,
+  '-5.6': -0.9999999999999977,
+  '-5.5': -0.9999999999999927,
+  '-5.4': -0.9999999999999777,
+  '-5.3': -0.9999999999999338,
+  '-5.2': -0.9999999999998075,
+  '-5.1': -0.9999999999994507,
+  '-5.0': -0.9999999999984626,
+  '-4.9': -0.999999999995781,
+  '-4.8': -0.9999999999886479,
+  '-4.7': -0.9999999999700474,
+  '-4.6': -0.999999999922504,
+  '-4.5': -0.9999999998033839,
+  '-4.4': -0.999999999510829,
+  '-4.3': -0.9999999988065282,
+  '-4.2': -0.9999999971445058,
+  '-4.1': -0.9999999932999724,
+  '-4.0': -0.9999999845827421,
+  '-3.9': -0.9999999652077514,
+  '-3.8': -0.9999999229960725,
+  '-3.7': -0.9999998328489421,
+  '-3.6': -0.999999644137007,
+  '-3.5': -0.9999992569016276,
+  '-3.4': -0.9999984780066371,
+  '-3.3': -0.9999969422902035,
+  '-3.2': -0.9999939742388483,
+  '-3.1': -0.9999883513426328,
+  '-3.0': -0.9999779095030014,
+  '-2.9': -0.9999589021219005,
+  '-2.8': -0.9999249868053346,
+  '-2.7': -0.9998656672600594,
+  '-2.6': -0.9997639655834707,
+  '-2.5': -0.999593047982555,
+  '-2.4': -0.999311486103355,
+  '-2.3': -0.9988568234026434,
+  '-2.2': -0.9981371537020182,
+  '-2.1': -0.997020533343667,
+  '-2.0': -0.9953222650189527,
+  '-1.9': -0.9927904292352574,
+  '-1.8': -0.9890905016357308,
+  '-1.7': -0.9837904585907746,
+  '-1.6': -0.976348383344644,
+  '-1.5': -0.9661051464753108,
+  '-1.4': -0.9522851197626488,
+  '-1.3': -0.9340079449406524,
+  '-1.2': -0.9103139782296352,
+  '-1.1': -0.8802050695740816,
+  '-1.0': -0.842700792949715,
+  '-0.9': -0.796908212422832,
+  '-0.8': -0.7421009647076606,
+  '-0.7': -0.6778011938374184,
+  '-0.6': -0.6038560908479259,
+  '-0.5': -0.5204998778130465,
+  '-0.4': -0.42839235504666845,
+  '-0.3': -0.3286267594591274,
+  '-0.2': -0.22270258921047842,
+  '-0.1': -0.11246291601828488,
+  '0.0': 0.0,
+  0.1: 0.11246291601828488,
+  0.2: 0.22270258921047842,
+  0.3: 0.3286267594591274,
+  0.4: 0.42839235504666845,
+  0.5: 0.5204998778130465,
+  0.6: 0.6038560908479259,
+  0.7: 0.6778011938374184,
+  0.8: 0.7421009647076606,
+  0.9: 0.796908212422832,
+  '1.0': 0.842700792949715,
+  1.1: 0.8802050695740816,
+  1.2: 0.9103139782296352,
+  1.3: 0.9340079449406524,
+  1.4: 0.9522851197626488,
+  1.5: 0.9661051464753108,
+  1.6: 0.976348383344644,
+  1.7: 0.9837904585907746,
+  1.8: 0.9890905016357308,
+  1.9: 0.9927904292352574,
+  '2.0': 0.9953222650189527,
+  2.1: 0.997020533343667,
+  2.2: 0.9981371537020182,
+  2.3: 0.9988568234026434,
+  2.4: 0.999311486103355,
+  2.5: 0.999593047982555,
+  2.6: 0.9997639655834707,
+  2.7: 0.9998656672600594,
+  2.8: 0.9999249868053346,
+  2.9: 0.9999589021219005,
+  '3.0': 0.9999779095030014,
+  3.1: 0.9999883513426328,
+  3.2: 0.9999939742388483,
+  3.3: 0.9999969422902035,
+  3.4: 0.9999984780066371,
+  3.5: 0.9999992569016276,
+  3.6: 0.999999644137007,
+  3.7: 0.9999998328489421,
+  3.8: 0.9999999229960725,
+  3.9: 0.9999999652077514,
+  '4.0': 0.9999999845827421,
+  4.1: 0.9999999932999724,
+  4.2: 0.9999999971445058,
+  4.3: 0.9999999988065282,
+  4.4: 0.999999999510829,
+  4.5: 0.9999999998033839,
+  4.6: 0.999999999922504,
+  4.7: 0.9999999999700474,
+  4.8: 0.9999999999886479,
+  4.9: 0.999999999995781,
+  '5.0': 0.9999999999984626,
+  5.1: 0.9999999999994507,
+  5.2: 0.9999999999998075,
+  5.3: 0.9999999999999338,
+  5.4: 0.9999999999999777,
+  5.5: 0.9999999999999927,
+  5.6: 0.9999999999999977,
+  5.7: 0.9999999999999992,
+  5.8: 0.9999999999999998,
+  5.9: 0.9999999999999999,
+  '6.0': 1.0,
+  6.1: 1.0,
+  6.2: 1.0,
+  6.3: 1.0,
+  6.4: 1.0,
+  6.5: 1.0,
+  6.6: 1.0,
+  6.7: 1.0,
+  6.8: 1.0,
+  6.9: 1.0
+}
diff --git a/test/unit-tests/function/special/erf.values.json b/test/unit-tests/function/special/erf.values.json
deleted file mode 100644
index 3eff57eac2..0000000000
--- a/test/unit-tests/function/special/erf.values.json
+++ /dev/null
@@ -1,46 +0,0 @@
-{
-  "-7.0": -1.0, "-6.9": -1.0, "-6.8": -1.0, "-6.7": -1.0, "-6.6": -1.0, "-6.5": -1.0,
-  "-6.4": -1.0, "-6.3": -1.0, "-6.2": -1.0, "-6.1": -1.0, "-6.0": -1.0,
-  "-5.9": -0.9999999999999999,  "-5.8": -0.9999999999999998,  "-5.7": -0.9999999999999992,
-  "-5.6": -0.9999999999999977,  "-5.5": -0.9999999999999927,  "-5.4": -0.9999999999999777,
-  "-5.3": -0.9999999999999338,  "-5.2": -0.9999999999998075,  "-5.1": -0.9999999999994507,
-  "-5.0": -0.9999999999984626,  "-4.9": -0.999999999995781,   "-4.8": -0.9999999999886479,
-  "-4.7": -0.9999999999700474,  "-4.6": -0.999999999922504,   "-4.5": -0.9999999998033839,
-  "-4.4": -0.999999999510829,   "-4.3": -0.9999999988065282,  "-4.2": -0.9999999971445058,
-  "-4.1": -0.9999999932999724,  "-4.0": -0.9999999845827421,  "-3.9": -0.9999999652077514,
-  "-3.8": -0.9999999229960725,  "-3.7": -0.9999998328489421,  "-3.6": -0.999999644137007,
-  "-3.5": -0.9999992569016276,  "-3.4": -0.9999984780066371,  "-3.3": -0.9999969422902035,
-  "-3.2": -0.9999939742388483,  "-3.1": -0.9999883513426328,  "-3.0": -0.9999779095030014,
-  "-2.9": -0.9999589021219005,  "-2.8": -0.9999249868053346,  "-2.7": -0.9998656672600594,
-  "-2.6": -0.9997639655834707,  "-2.5": -0.999593047982555,   "-2.4": -0.999311486103355,
-  "-2.3": -0.9988568234026434,  "-2.2": -0.9981371537020182,  "-2.1": -0.997020533343667,
-  "-2.0": -0.9953222650189527,  "-1.9": -0.9927904292352574,  "-1.8": -0.9890905016357308,
-  "-1.7": -0.9837904585907746,  "-1.6": -0.976348383344644,   "-1.5": -0.9661051464753108,
-  "-1.4": -0.9522851197626488,  "-1.3": -0.9340079449406524,  "-1.2": -0.9103139782296352,
-  "-1.1": -0.8802050695740816,  "-1.0": -0.842700792949715,   "-0.9": -0.796908212422832,
-  "-0.8": -0.7421009647076606,  "-0.7": -0.6778011938374184,  "-0.6": -0.6038560908479259,
-  "-0.5": -0.5204998778130465,  "-0.4": -0.42839235504666845, "-0.3": -0.3286267594591274,
-  "-0.2": -0.22270258921047842, "-0.1": -0.11246291601828488,  "0.0": 0.0,
-   "0.1": 0.11246291601828488,   "0.2": 0.22270258921047842,   "0.3": 0.3286267594591274,
-   "0.4": 0.42839235504666845,   "0.5": 0.5204998778130465,    "0.6": 0.6038560908479259,
-   "0.7": 0.6778011938374184,    "0.8": 0.7421009647076606,    "0.9": 0.796908212422832,
-   "1.0": 0.842700792949715,     "1.1": 0.8802050695740816,    "1.2": 0.9103139782296352,
-   "1.3": 0.9340079449406524,    "1.4": 0.9522851197626488,    "1.5": 0.9661051464753108,
-   "1.6": 0.976348383344644,     "1.7": 0.9837904585907746,    "1.8": 0.9890905016357308,
-   "1.9": 0.9927904292352574,    "2.0": 0.9953222650189527,    "2.1": 0.997020533343667,
-   "2.2": 0.9981371537020182,    "2.3": 0.9988568234026434,    "2.4": 0.999311486103355,
-   "2.5": 0.999593047982555,     "2.6": 0.9997639655834707,    "2.7": 0.9998656672600594,
-   "2.8": 0.9999249868053346,    "2.9": 0.9999589021219005,    "3.0": 0.9999779095030014,
-   "3.1": 0.9999883513426328,    "3.2": 0.9999939742388483,    "3.3": 0.9999969422902035,
-   "3.4": 0.9999984780066371,    "3.5": 0.9999992569016276,    "3.6": 0.999999644137007,
-   "3.7": 0.9999998328489421,    "3.8": 0.9999999229960725,    "3.9": 0.9999999652077514,
-   "4.0": 0.9999999845827421,    "4.1": 0.9999999932999724,    "4.2": 0.9999999971445058,
-   "4.3": 0.9999999988065282,    "4.4": 0.999999999510829,     "4.5": 0.9999999998033839,
-   "4.6": 0.999999999922504,     "4.7": 0.9999999999700474,    "4.8": 0.9999999999886479,
-   "4.9": 0.999999999995781,     "5.0": 0.9999999999984626,    "5.1": 0.9999999999994507,
-   "5.2": 0.9999999999998075,    "5.3": 0.9999999999999338,    "5.4": 0.9999999999999777,
-   "5.5": 0.9999999999999927,    "5.6": 0.9999999999999977,    "5.7": 0.9999999999999992,
-   "5.8": 0.9999999999999998,    "5.9": 0.9999999999999999,    "6.0": 1.0, "6.1": 1.0,
-   "6.2": 1.0, "6.3": 1.0, "6.4": 1.0, "6.5": 1.0, "6.6": 1.0, "6.7": 1.0, "6.8": 1.0,
-   "6.9": 1.0
-}
diff --git a/test/unit-tests/function/statistics/mad.test.js b/test/unit-tests/function/statistics/mad.test.js
index 02459fbae7..0a36c969ff 100644
--- a/test/unit-tests/function/statistics/mad.test.js
+++ b/test/unit-tests/function/statistics/mad.test.js
@@ -1,5 +1,5 @@
 import assert from 'assert'
-import math from '../../../../src/bundleAny'
+import math from '../../../../src/defaultInstance.js'
 const BigNumber = math.BigNumber
 const DenseMatrix = math.DenseMatrix
 const Complex = math.Complex
diff --git a/test/unit-tests/function/statistics/max.test.js b/test/unit-tests/function/statistics/max.test.js
index b2b3337098..bd035cacda 100644
--- a/test/unit-tests/function/statistics/max.test.js
+++ b/test/unit-tests/function/statistics/max.test.js
@@ -1,5 +1,5 @@
 import assert from 'assert'
-import math from '../../../../src/bundleAny'
+import math from '../../../../src/defaultInstance.js'
 const BigNumber = math.BigNumber
 const Complex = math.Complex
 const DenseMatrix = math.DenseMatrix
diff --git a/test/unit-tests/function/statistics/mean.test.js b/test/unit-tests/function/statistics/mean.test.js
index f33cce1df9..af8592af51 100644
--- a/test/unit-tests/function/statistics/mean.test.js
+++ b/test/unit-tests/function/statistics/mean.test.js
@@ -1,6 +1,6 @@
 import assert from 'assert'
-import approx from '../../../../tools/approx'
-import math from '../../../../src/bundleAny'
+import approx from '../../../../tools/approx.js'
+import math from '../../../../src/defaultInstance.js'
 const BigNumber = math.BigNumber
 const Complex = math.Complex
 const DenseMatrix = math.DenseMatrix
diff --git a/test/unit-tests/function/statistics/median.test.js b/test/unit-tests/function/statistics/median.test.js
index 51cfeb06e3..a27e5ea8c3 100644
--- a/test/unit-tests/function/statistics/median.test.js
+++ b/test/unit-tests/function/statistics/median.test.js
@@ -1,6 +1,6 @@
 import assert from 'assert'
-import approx from '../../../../tools/approx'
-import math from '../../../../src/bundleAny'
+import approx from '../../../../tools/approx.js'
+import math from '../../../../src/defaultInstance.js'
 const BigNumber = math.BigNumber
 const Complex = math.Complex
 const DenseMatrix = math.DenseMatrix
diff --git a/test/unit-tests/function/statistics/min.test.js b/test/unit-tests/function/statistics/min.test.js
index 344b726c8d..30fe610572 100644
--- a/test/unit-tests/function/statistics/min.test.js
+++ b/test/unit-tests/function/statistics/min.test.js
@@ -1,5 +1,5 @@
 import assert from 'assert'
-import math from '../../../../src/bundleAny'
+import math from '../../../../src/defaultInstance.js'
 const BigNumber = math.BigNumber
 const Complex = math.Complex
 const DenseMatrix = math.DenseMatrix
diff --git a/test/unit-tests/function/statistics/mode.test.js b/test/unit-tests/function/statistics/mode.test.js
index 38219c49a4..5bf0eb6cd4 100644
--- a/test/unit-tests/function/statistics/mode.test.js
+++ b/test/unit-tests/function/statistics/mode.test.js
@@ -1,5 +1,5 @@
 import assert from 'assert'
-import math from '../../../../src/bundleAny'
+import math from '../../../../src/defaultInstance.js'
 const mode = math.mode
 const DenseMatrix = math.DenseMatrix
 
diff --git a/test/unit-tests/function/statistics/prod.test.js b/test/unit-tests/function/statistics/prod.test.js
index 4b97fcba58..d1d5553bb5 100644
--- a/test/unit-tests/function/statistics/prod.test.js
+++ b/test/unit-tests/function/statistics/prod.test.js
@@ -1,5 +1,5 @@
 import assert from 'assert'
-import math from '../../../../src/bundleAny'
+import math from '../../../../src/defaultInstance.js'
 const BigNumber = math.BigNumber
 const Complex = math.Complex
 const DenseMatrix = math.DenseMatrix
diff --git a/test/unit-tests/function/statistics/quantileSeq.test.js b/test/unit-tests/function/statistics/quantileSeq.test.js
index 24e1cffe7e..55bec0da28 100644
--- a/test/unit-tests/function/statistics/quantileSeq.test.js
+++ b/test/unit-tests/function/statistics/quantileSeq.test.js
@@ -1,6 +1,6 @@
 import assert from 'assert'
-import approx from '../../../../tools/approx'
-import math from '../../../../src/bundleAny'
+import approx from '../../../../tools/approx.js'
+import math from '../../../../src/defaultInstance.js'
 const bignumber = math.bignumber
 const quantileSeq = math.quantileSeq
 
diff --git a/test/unit-tests/function/statistics/std.test.js b/test/unit-tests/function/statistics/std.test.js
index 2ab8ba0853..31dbafa6dc 100644
--- a/test/unit-tests/function/statistics/std.test.js
+++ b/test/unit-tests/function/statistics/std.test.js
@@ -1,6 +1,6 @@
 import assert from 'assert'
-import approx from '../../../../tools/approx'
-import math from '../../../../src/bundleAny'
+import approx from '../../../../tools/approx.js'
+import math from '../../../../src/defaultInstance.js'
 const BigNumber = math.BigNumber
 const Complex = math.Complex
 const DenseMatrix = math.DenseMatrix
diff --git a/test/unit-tests/function/statistics/sum.test.js b/test/unit-tests/function/statistics/sum.test.js
index 4c69de5530..79f0f5601f 100644
--- a/test/unit-tests/function/statistics/sum.test.js
+++ b/test/unit-tests/function/statistics/sum.test.js
@@ -1,5 +1,6 @@
 import assert from 'assert'
-import math from '../../../../src/bundleAny'
+import math from '../../../../src/defaultInstance.js'
+
 const BigNumber = math.BigNumber
 const Complex = math.Complex
 const DenseMatrix = math.DenseMatrix
diff --git a/test/unit-tests/function/statistics/variance.test.js b/test/unit-tests/function/statistics/variance.test.js
index d5d8be319d..9798e11501 100644
--- a/test/unit-tests/function/statistics/variance.test.js
+++ b/test/unit-tests/function/statistics/variance.test.js
@@ -1,6 +1,6 @@
 import assert from 'assert'
-import approx from '../../../../tools/approx'
-import math from '../../../../src/bundleAny'
+import approx from '../../../../tools/approx.js'
+import math from '../../../../src/defaultInstance.js'
 const BigNumber = math.BigNumber
 const Complex = math.Complex
 const DenseMatrix = math.DenseMatrix
diff --git a/test/unit-tests/function/string/format.test.js b/test/unit-tests/function/string/format.test.js
index 29cc2500d4..f9c380660f 100644
--- a/test/unit-tests/function/string/format.test.js
+++ b/test/unit-tests/function/string/format.test.js
@@ -1,7 +1,7 @@
 // test format
 import assert from 'assert'
 
-import math from '../../../../src/bundleAny'
+import math from '../../../../src/defaultInstance.js'
 
 describe('format', function () {
   it('should format numbers', function () {
diff --git a/test/unit-tests/function/string/print.test.js b/test/unit-tests/function/string/print.test.js
index 9c8597b927..01aaeaee45 100644
--- a/test/unit-tests/function/string/print.test.js
+++ b/test/unit-tests/function/string/print.test.js
@@ -1,7 +1,7 @@
 // test print
 import assert from 'assert'
 
-import math from '../../../../src/bundleAny'
+import math from '../../../../src/defaultInstance.js'
 
 describe('print', function () {
   it('should interpolate values in a template (object template)', function () {
diff --git a/test/unit-tests/function/trigonometry/acos.test.js b/test/unit-tests/function/trigonometry/acos.test.js
index 5cb30a39d0..d1e79fced3 100644
--- a/test/unit-tests/function/trigonometry/acos.test.js
+++ b/test/unit-tests/function/trigonometry/acos.test.js
@@ -1,6 +1,6 @@
 import assert from 'assert'
-import math from '../../../../src/bundleAny'
-import approx from '../../../../tools/approx'
+import math from '../../../../src/defaultInstance.js'
+import approx from '../../../../tools/approx.js'
 const pi = math.pi
 const acos = math.acos
 const cos = math.cos
diff --git a/test/unit-tests/function/trigonometry/acosh.test.js b/test/unit-tests/function/trigonometry/acosh.test.js
index 3694de1d87..02db38acf9 100644
--- a/test/unit-tests/function/trigonometry/acosh.test.js
+++ b/test/unit-tests/function/trigonometry/acosh.test.js
@@ -1,6 +1,6 @@
 import assert from 'assert'
-import math from '../../../../src/bundleAny'
-import approx from '../../../../tools/approx'
+import math from '../../../../src/defaultInstance.js'
+import approx from '../../../../tools/approx.js'
 const pi = math.pi
 const acosh = math.acosh
 const cosh = math.cosh
diff --git a/test/unit-tests/function/trigonometry/acot.test.js b/test/unit-tests/function/trigonometry/acot.test.js
index 01ec42dea0..1ab2ffdb58 100644
--- a/test/unit-tests/function/trigonometry/acot.test.js
+++ b/test/unit-tests/function/trigonometry/acot.test.js
@@ -1,6 +1,6 @@
 import assert from 'assert'
-import math from '../../../../src/bundleAny'
-import approx from '../../../../tools/approx'
+import math from '../../../../src/defaultInstance.js'
+import approx from '../../../../tools/approx.js'
 const pi = math.pi
 const complex = math.complex
 const matrix = math.matrix
diff --git a/test/unit-tests/function/trigonometry/acoth.test.js b/test/unit-tests/function/trigonometry/acoth.test.js
index e9689a4fdb..14d4cd0bf7 100644
--- a/test/unit-tests/function/trigonometry/acoth.test.js
+++ b/test/unit-tests/function/trigonometry/acoth.test.js
@@ -1,6 +1,6 @@
 import assert from 'assert'
-import math from '../../../../src/bundleAny'
-import approx from '../../../../tools/approx'
+import math from '../../../../src/defaultInstance.js'
+import approx from '../../../../tools/approx.js'
 const pi = math.pi
 const acoth = math.acoth
 const coth = math.coth
diff --git a/test/unit-tests/function/trigonometry/acsc.test.js b/test/unit-tests/function/trigonometry/acsc.test.js
index bb9ff51049..e7f597683a 100644
--- a/test/unit-tests/function/trigonometry/acsc.test.js
+++ b/test/unit-tests/function/trigonometry/acsc.test.js
@@ -1,6 +1,6 @@
 import assert from 'assert'
-import math from '../../../../src/bundleAny'
-import approx from '../../../../tools/approx'
+import math from '../../../../src/defaultInstance.js'
+import approx from '../../../../tools/approx.js'
 const pi = math.pi
 const complex = math.complex
 const matrix = math.matrix
diff --git a/test/unit-tests/function/trigonometry/acsch.test.js b/test/unit-tests/function/trigonometry/acsch.test.js
index 8676882de0..f8c744908f 100644
--- a/test/unit-tests/function/trigonometry/acsch.test.js
+++ b/test/unit-tests/function/trigonometry/acsch.test.js
@@ -1,6 +1,6 @@
 import assert from 'assert'
-import math from '../../../../src/bundleAny'
-import approx from '../../../../tools/approx'
+import math from '../../../../src/defaultInstance.js'
+import approx from '../../../../tools/approx.js'
 const pi = math.pi
 const acsch = math.acsch
 const csch = math.csch
diff --git a/test/unit-tests/function/trigonometry/asec.test.js b/test/unit-tests/function/trigonometry/asec.test.js
index de88c33477..bc3e7a9605 100644
--- a/test/unit-tests/function/trigonometry/asec.test.js
+++ b/test/unit-tests/function/trigonometry/asec.test.js
@@ -1,6 +1,6 @@
 import assert from 'assert'
-import math from '../../../../src/bundleAny'
-import approx from '../../../../tools/approx'
+import math from '../../../../src/defaultInstance.js'
+import approx from '../../../../tools/approx.js'
 const pi = math.pi
 const asec = math.asec
 const sec = math.sec
diff --git a/test/unit-tests/function/trigonometry/asech.test.js b/test/unit-tests/function/trigonometry/asech.test.js
index 06b547157d..79a1664b29 100644
--- a/test/unit-tests/function/trigonometry/asech.test.js
+++ b/test/unit-tests/function/trigonometry/asech.test.js
@@ -1,6 +1,6 @@
 import assert from 'assert'
-import math from '../../../../src/bundleAny'
-import approx from '../../../../tools/approx'
+import math from '../../../../src/defaultInstance.js'
+import approx from '../../../../tools/approx.js'
 const pi = math.pi
 const asech = math.asech
 const sech = math.sech
diff --git a/test/unit-tests/function/trigonometry/asin.test.js b/test/unit-tests/function/trigonometry/asin.test.js
index 5230ca8bd1..2d6b54c218 100644
--- a/test/unit-tests/function/trigonometry/asin.test.js
+++ b/test/unit-tests/function/trigonometry/asin.test.js
@@ -1,6 +1,6 @@
 import assert from 'assert'
-import math from '../../../../src/bundleAny'
-import approx from '../../../../tools/approx'
+import math from '../../../../src/defaultInstance.js'
+import approx from '../../../../tools/approx.js'
 const pi = math.pi
 const complex = math.complex
 const matrix = math.matrix
diff --git a/test/unit-tests/function/trigonometry/asinh.test.js b/test/unit-tests/function/trigonometry/asinh.test.js
index 63b74e3fd7..fcbf628f57 100644
--- a/test/unit-tests/function/trigonometry/asinh.test.js
+++ b/test/unit-tests/function/trigonometry/asinh.test.js
@@ -1,6 +1,6 @@
 import assert from 'assert'
-import math from '../../../../src/bundleAny'
-import approx from '../../../../tools/approx'
+import math from '../../../../src/defaultInstance.js'
+import approx from '../../../../tools/approx.js'
 const pi = math.pi
 const asinh = math.asinh
 const sinh = math.sinh
diff --git a/test/unit-tests/function/trigonometry/atan.test.js b/test/unit-tests/function/trigonometry/atan.test.js
index 8e86bd02f9..c64135aead 100644
--- a/test/unit-tests/function/trigonometry/atan.test.js
+++ b/test/unit-tests/function/trigonometry/atan.test.js
@@ -1,6 +1,6 @@
 import assert from 'assert'
-import math from '../../../../src/bundleAny'
-import approx from '../../../../tools/approx'
+import math from '../../../../src/defaultInstance.js'
+import approx from '../../../../tools/approx.js'
 const pi = math.pi
 const complex = math.complex
 const matrix = math.matrix
diff --git a/test/unit-tests/function/trigonometry/atan2.test.js b/test/unit-tests/function/trigonometry/atan2.test.js
index a1d28881f1..62353f699d 100644
--- a/test/unit-tests/function/trigonometry/atan2.test.js
+++ b/test/unit-tests/function/trigonometry/atan2.test.js
@@ -1,8 +1,8 @@
 // test atan2
 import assert from 'assert'
 
-import math from '../../../../src/bundleAny'
-import approx from '../../../../tools/approx'
+import math from '../../../../src/defaultInstance.js'
+import approx from '../../../../tools/approx.js'
 const pi = math.pi
 const complex = math.complex
 const matrix = math.matrix
diff --git a/test/unit-tests/function/trigonometry/atanh.test.js b/test/unit-tests/function/trigonometry/atanh.test.js
index d271bb9ee1..e628d8164d 100644
--- a/test/unit-tests/function/trigonometry/atanh.test.js
+++ b/test/unit-tests/function/trigonometry/atanh.test.js
@@ -1,6 +1,6 @@
 import assert from 'assert'
-import math from '../../../../src/bundleAny'
-import approx from '../../../../tools/approx'
+import math from '../../../../src/defaultInstance.js'
+import approx from '../../../../tools/approx.js'
 const pi = math.pi
 const atanh = math.atanh
 const tanh = math.tanh
diff --git a/test/unit-tests/function/trigonometry/cos.test.js b/test/unit-tests/function/trigonometry/cos.test.js
index 4fe95bd168..8d75cb73f8 100644
--- a/test/unit-tests/function/trigonometry/cos.test.js
+++ b/test/unit-tests/function/trigonometry/cos.test.js
@@ -1,6 +1,6 @@
 import assert from 'assert'
-import math from '../../../../src/bundleAny'
-import approx from '../../../../tools/approx'
+import math from '../../../../src/defaultInstance.js'
+import approx from '../../../../tools/approx.js'
 const pi = math.pi
 const complex = math.complex
 const matrix = math.matrix
diff --git a/test/unit-tests/function/trigonometry/cosh.test.js b/test/unit-tests/function/trigonometry/cosh.test.js
index 9c5eba169c..3c53fffe98 100644
--- a/test/unit-tests/function/trigonometry/cosh.test.js
+++ b/test/unit-tests/function/trigonometry/cosh.test.js
@@ -1,6 +1,6 @@
 import assert from 'assert'
-import math from '../../../../src/bundleAny'
-import approx from '../../../../tools/approx'
+import math from '../../../../src/defaultInstance.js'
+import approx from '../../../../tools/approx.js'
 const pi = math.pi
 const complex = math.complex
 const matrix = math.matrix
diff --git a/test/unit-tests/function/trigonometry/cot.test.js b/test/unit-tests/function/trigonometry/cot.test.js
index 2e3ae2a852..ed347e355c 100644
--- a/test/unit-tests/function/trigonometry/cot.test.js
+++ b/test/unit-tests/function/trigonometry/cot.test.js
@@ -1,6 +1,6 @@
 import assert from 'assert'
-import math from '../../../../src/bundleAny'
-import approx from '../../../../tools/approx'
+import math from '../../../../src/defaultInstance.js'
+import approx from '../../../../tools/approx.js'
 const pi = math.pi
 const complex = math.complex
 const matrix = math.matrix
diff --git a/test/unit-tests/function/trigonometry/coth.test.js b/test/unit-tests/function/trigonometry/coth.test.js
index e1f8613f3b..7b8e887101 100644
--- a/test/unit-tests/function/trigonometry/coth.test.js
+++ b/test/unit-tests/function/trigonometry/coth.test.js
@@ -1,6 +1,6 @@
 import assert from 'assert'
-import math from '../../../../src/bundleAny'
-import approx from '../../../../tools/approx'
+import math from '../../../../src/defaultInstance.js'
+import approx from '../../../../tools/approx.js'
 const pi = math.pi
 const complex = math.complex
 const matrix = math.matrix
diff --git a/test/unit-tests/function/trigonometry/csc.test.js b/test/unit-tests/function/trigonometry/csc.test.js
index 5c918e106a..a5e3dbafb1 100644
--- a/test/unit-tests/function/trigonometry/csc.test.js
+++ b/test/unit-tests/function/trigonometry/csc.test.js
@@ -1,6 +1,6 @@
 import assert from 'assert'
-import math from '../../../../src/bundleAny'
-import approx from '../../../../tools/approx'
+import math from '../../../../src/defaultInstance.js'
+import approx from '../../../../tools/approx.js'
 const pi = math.pi
 const complex = math.complex
 const matrix = math.matrix
diff --git a/test/unit-tests/function/trigonometry/csch.test.js b/test/unit-tests/function/trigonometry/csch.test.js
index c5d1e78b98..170e787c8f 100644
--- a/test/unit-tests/function/trigonometry/csch.test.js
+++ b/test/unit-tests/function/trigonometry/csch.test.js
@@ -1,6 +1,6 @@
 import assert from 'assert'
-import math from '../../../../src/bundleAny'
-import approx from '../../../../tools/approx'
+import math from '../../../../src/defaultInstance.js'
+import approx from '../../../../tools/approx.js'
 const pi = math.pi
 const complex = math.complex
 const matrix = math.matrix
diff --git a/test/unit-tests/function/trigonometry/sec.test.js b/test/unit-tests/function/trigonometry/sec.test.js
index 82186c52ab..79b70c1efc 100644
--- a/test/unit-tests/function/trigonometry/sec.test.js
+++ b/test/unit-tests/function/trigonometry/sec.test.js
@@ -1,6 +1,6 @@
 import assert from 'assert'
-import math from '../../../../src/bundleAny'
-import approx from '../../../../tools/approx'
+import math from '../../../../src/defaultInstance.js'
+import approx from '../../../../tools/approx.js'
 const pi = math.pi
 const complex = math.complex
 const matrix = math.matrix
diff --git a/test/unit-tests/function/trigonometry/sech.test.js b/test/unit-tests/function/trigonometry/sech.test.js
index ad07de9f79..fe25a1e9ec 100644
--- a/test/unit-tests/function/trigonometry/sech.test.js
+++ b/test/unit-tests/function/trigonometry/sech.test.js
@@ -1,6 +1,6 @@
 import assert from 'assert'
-import math from '../../../../src/bundleAny'
-import approx from '../../../../tools/approx'
+import math from '../../../../src/defaultInstance.js'
+import approx from '../../../../tools/approx.js'
 const pi = math.pi
 const complex = math.complex
 const matrix = math.matrix
diff --git a/test/unit-tests/function/trigonometry/sin.test.js b/test/unit-tests/function/trigonometry/sin.test.js
index ceea5858b4..3530aa322a 100644
--- a/test/unit-tests/function/trigonometry/sin.test.js
+++ b/test/unit-tests/function/trigonometry/sin.test.js
@@ -1,6 +1,6 @@
 import assert from 'assert'
-import math from '../../../../src/bundleAny'
-import approx from '../../../../tools/approx'
+import math from '../../../../src/defaultInstance.js'
+import approx from '../../../../tools/approx.js'
 const pi = math.pi
 const complex = math.complex
 const matrix = math.matrix
diff --git a/test/unit-tests/function/trigonometry/sinh.test.js b/test/unit-tests/function/trigonometry/sinh.test.js
index 18a0b0f0ef..16863af7ba 100644
--- a/test/unit-tests/function/trigonometry/sinh.test.js
+++ b/test/unit-tests/function/trigonometry/sinh.test.js
@@ -1,6 +1,6 @@
 import assert from 'assert'
-import math from '../../../../src/bundleAny'
-import approx from '../../../../tools/approx'
+import math from '../../../../src/defaultInstance.js'
+import approx from '../../../../tools/approx.js'
 const complex = math.complex
 const matrix = math.matrix
 const unit = math.unit
diff --git a/test/unit-tests/function/trigonometry/tan.test.js b/test/unit-tests/function/trigonometry/tan.test.js
index a7b61c3026..2b675d9446 100644
--- a/test/unit-tests/function/trigonometry/tan.test.js
+++ b/test/unit-tests/function/trigonometry/tan.test.js
@@ -1,6 +1,6 @@
 import assert from 'assert'
-import math from '../../../../src/bundleAny'
-import approx from '../../../../tools/approx'
+import math from '../../../../src/defaultInstance.js'
+import approx from '../../../../tools/approx.js'
 const pi = math.pi
 const complex = math.complex
 const matrix = math.matrix
diff --git a/test/unit-tests/function/trigonometry/tanh.test.js b/test/unit-tests/function/trigonometry/tanh.test.js
index 8ba58b8706..0f42f3cd7b 100644
--- a/test/unit-tests/function/trigonometry/tanh.test.js
+++ b/test/unit-tests/function/trigonometry/tanh.test.js
@@ -1,6 +1,6 @@
 import assert from 'assert'
-import math from '../../../../src/bundleAny'
-import approx from '../../../../tools/approx'
+import math from '../../../../src/defaultInstance.js'
+import approx from '../../../../tools/approx.js'
 const pi = math.pi
 const complex = math.complex
 const matrix = math.matrix
diff --git a/test/unit-tests/function/unit/to.test.js b/test/unit-tests/function/unit/to.test.js
index c0ff27543f..1da0cc4655 100644
--- a/test/unit-tests/function/unit/to.test.js
+++ b/test/unit-tests/function/unit/to.test.js
@@ -1,6 +1,6 @@
 import assert from 'assert'
-import approx from '../../../../tools/approx'
-import math from '../../../../src/bundleAny'
+import approx from '../../../../tools/approx.js'
+import math from '../../../../src/defaultInstance.js'
 const matrix = math.matrix
 const Unit = math.Unit
 const unit = math.unit
diff --git a/test/unit-tests/function/utils/clone.test.js b/test/unit-tests/function/utils/clone.test.js
index e618762c64..39d0f5d9e0 100644
--- a/test/unit-tests/function/utils/clone.test.js
+++ b/test/unit-tests/function/utils/clone.test.js
@@ -1,5 +1,5 @@
 import assert from 'assert'
-import math from '../../../../src/bundleAny'
+import math from '../../../../src/defaultInstance.js'
 
 describe('clone', function () {
   it('should clone a boolean', function () {
diff --git a/test/unit-tests/function/utils/hasNumericValue.test.js b/test/unit-tests/function/utils/hasNumericValue.test.js
index 0bbf008c2d..5fe5d0bee9 100644
--- a/test/unit-tests/function/utils/hasNumericValue.test.js
+++ b/test/unit-tests/function/utils/hasNumericValue.test.js
@@ -1,5 +1,5 @@
 import assert from 'assert'
-import math from '../../../../src/bundleAny'
+import math from '../../../../src/defaultInstance.js'
 
 const hasNumericValue = math.hasNumericValue
 const bignumber = math.bignumber
diff --git a/test/unit-tests/function/utils/isInteger.test.js b/test/unit-tests/function/utils/isInteger.test.js
index acd613bd48..c1008e88fd 100644
--- a/test/unit-tests/function/utils/isInteger.test.js
+++ b/test/unit-tests/function/utils/isInteger.test.js
@@ -1,5 +1,5 @@
 import assert from 'assert'
-import math from '../../../../src/bundleAny'
+import math from '../../../../src/defaultInstance.js'
 const isInteger = math.isInteger
 const bignumber = math.bignumber
 const fraction = math.fraction
diff --git a/test/unit-tests/function/utils/isNaN.test.js b/test/unit-tests/function/utils/isNaN.test.js
index 832344bbc7..97d5c7db01 100644
--- a/test/unit-tests/function/utils/isNaN.test.js
+++ b/test/unit-tests/function/utils/isNaN.test.js
@@ -1,5 +1,5 @@
 import assert from 'assert'
-import math from '../../../../src/bundleAny'
+import math from '../../../../src/defaultInstance.js'
 const isNaN = math.isNaN
 const bignumber = math.bignumber
 const fraction = math.fraction
diff --git a/test/unit-tests/function/utils/isNegative.test.js b/test/unit-tests/function/utils/isNegative.test.js
index fbff96a512..c4b8cce14e 100644
--- a/test/unit-tests/function/utils/isNegative.test.js
+++ b/test/unit-tests/function/utils/isNegative.test.js
@@ -1,5 +1,5 @@
 import assert from 'assert'
-import math from '../../../../src/bundleAny'
+import math from '../../../../src/defaultInstance.js'
 const isNegative = math.isNegative
 const bignumber = math.bignumber
 const fraction = math.fraction
diff --git a/test/unit-tests/function/utils/isNumeric.test.js b/test/unit-tests/function/utils/isNumeric.test.js
index 50142c1633..fc7f3757f6 100644
--- a/test/unit-tests/function/utils/isNumeric.test.js
+++ b/test/unit-tests/function/utils/isNumeric.test.js
@@ -1,5 +1,5 @@
 import assert from 'assert'
-import math from '../../../../src/bundleAny'
+import math from '../../../../src/defaultInstance.js'
 const isNumeric = math.isNumeric
 const bignumber = math.bignumber
 const fraction = math.fraction
diff --git a/test/unit-tests/function/utils/isPositive.test.js b/test/unit-tests/function/utils/isPositive.test.js
index 7e0e8c918c..f5ba63dfb8 100644
--- a/test/unit-tests/function/utils/isPositive.test.js
+++ b/test/unit-tests/function/utils/isPositive.test.js
@@ -1,5 +1,5 @@
 import assert from 'assert'
-import math from '../../../../src/bundleAny'
+import math from '../../../../src/defaultInstance.js'
 const isPositive = math.isPositive
 const bignumber = math.bignumber
 const fraction = math.fraction
diff --git a/test/unit-tests/function/utils/isPrime.test.js b/test/unit-tests/function/utils/isPrime.test.js
index a8f97bf57e..004aac088a 100644
--- a/test/unit-tests/function/utils/isPrime.test.js
+++ b/test/unit-tests/function/utils/isPrime.test.js
@@ -1,5 +1,5 @@
 import assert from 'assert'
-import math from '../../../../src/bundleAny'
+import math from '../../../../src/defaultInstance.js'
 const isPrime = math.isPrime
 const bignumber = math.bignumber
 const complex = math.complex
diff --git a/test/unit-tests/function/utils/isZero.test.js b/test/unit-tests/function/utils/isZero.test.js
index 5b1349eb39..6e1f7dd4d5 100644
--- a/test/unit-tests/function/utils/isZero.test.js
+++ b/test/unit-tests/function/utils/isZero.test.js
@@ -1,5 +1,5 @@
 import assert from 'assert'
-import math from '../../../../src/bundleAny'
+import math from '../../../../src/defaultInstance.js'
 const isZero = math.isZero
 const bignumber = math.bignumber
 const fraction = math.fraction
diff --git a/test/unit-tests/function/utils/typeof.test.js b/test/unit-tests/function/utils/typeof.test.js
index 312ee80ae1..5df6623b93 100644
--- a/test/unit-tests/function/utils/typeof.test.js
+++ b/test/unit-tests/function/utils/typeof.test.js
@@ -1,7 +1,7 @@
 // test typeOf
 import assert from 'assert'
 
-import math from '../../../../src/bundleAny'
+import math from '../../../../src/defaultInstance.js'
 
 const Index = math.Index
 const Range = math.Range
diff --git a/test/unit-tests/json/replacer.test.js b/test/unit-tests/json/replacer.test.js
index 8a96589e8a..770f4383e7 100644
--- a/test/unit-tests/json/replacer.test.js
+++ b/test/unit-tests/json/replacer.test.js
@@ -1,5 +1,5 @@
 import assert from 'assert'
-import math from '../../../src/bundleAny'
+import math from '../../../src/defaultInstance.js'
 const replacer = math.replacer
 
 describe('replacer', function () {
diff --git a/test/unit-tests/json/reviver.test.js b/test/unit-tests/json/reviver.test.js
index cad25b412b..26bab43122 100644
--- a/test/unit-tests/json/reviver.test.js
+++ b/test/unit-tests/json/reviver.test.js
@@ -1,5 +1,5 @@
 import assert from 'assert'
-import math from '../../../src/bundleAny'
+import math from '../../../src/defaultInstance.js'
 const reviver = math.reviver
 const Range = math.Range
 
diff --git a/test/unit-tests/test.html b/test/unit-tests/test.html
index 5a0e961010..6c90398779 100644
--- a/test/unit-tests/test.html
+++ b/test/unit-tests/test.html
@@ -6,8 +6,7 @@
   <script>
     console.time('load')
   </script>
-  <!--<script src="../dist/math.min.js" type="text/javascript"></script>-->
-  <script src="../../dist/math.js" type="text/javascript"></script>
+  <script src="../../lib/browser/math.js" type="text/javascript"></script>
   <script>
     console.timeEnd('load')
   </script>
@@ -61,4 +60,4 @@
 
 </script>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/test/unit-tests/test.min.html b/test/unit-tests/test.min.html
deleted file mode 100644
index 64a9f1ade2..0000000000
--- a/test/unit-tests/test.min.html
+++ /dev/null
@@ -1,31 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-  <title>mathjs test</title>
-
-  <script src="../../dist/math.min.js" type="text/javascript"></script>
-</head>
-<body>
-<p>
-  Use the mathjs library from the console...
-</p>
-<script>
-  function print (args) {
-    for (var i = 0; i < arguments.length; i++) {
-      document.write(arguments[i] + '');
-    }
-    document.write('<br>');
-  }
-
-  var complex1 = math.complex(3, -4);
-  print(complex1.toString());
-
-  print('sqrt(25) = ' + math.sqrt(25));
-  print('sqrt(' + complex1.toString() + ') = ' + math.sqrt(complex1));
-  print('sqrt(-4) = ' + math.sqrt(-4));
-
-  var parser = math.parser();
-
-</script>
-</body>
-</html>
\ No newline at end of file
diff --git a/test/unit-tests/type/bignumber/BigNumber.test.js b/test/unit-tests/type/bignumber/BigNumber.test.js
index 7c053bd6c7..2bc4c17954 100644
--- a/test/unit-tests/type/bignumber/BigNumber.test.js
+++ b/test/unit-tests/type/bignumber/BigNumber.test.js
@@ -1,5 +1,5 @@
 import assert from 'assert'
-import math from '../../../../src/bundleAny'
+import math from '../../../../src/defaultInstance.js'
 
 describe('BigNumber', function () {
   it('should have a property isBigNumber', function () {
diff --git a/test/unit-tests/type/bignumber/function/bignumber.test.js b/test/unit-tests/type/bignumber/function/bignumber.test.js
index ac89683eb7..97a16475a3 100644
--- a/test/unit-tests/type/bignumber/function/bignumber.test.js
+++ b/test/unit-tests/type/bignumber/function/bignumber.test.js
@@ -1,5 +1,5 @@
 import assert from 'assert'
-import math from '../../../../../src/bundleAny'
+import math from '../../../../../src/defaultInstance.js'
 const bignumber = math.bignumber
 const BigNumber = math.BigNumber
 
diff --git a/test/unit-tests/type/boolean.test.js b/test/unit-tests/type/boolean.test.js
index c0338383c6..64283b0de4 100644
--- a/test/unit-tests/type/boolean.test.js
+++ b/test/unit-tests/type/boolean.test.js
@@ -1,5 +1,5 @@
 import assert from 'assert'
-import math from '../../../src/bundleAny'
+import math from '../../../src/defaultInstance.js'
 const bool = math.boolean
 
 describe('boolean', function () {
diff --git a/test/unit-tests/type/chain/Chain.test.js b/test/unit-tests/type/chain/Chain.test.js
index f5497f082b..e14c7c1efd 100644
--- a/test/unit-tests/type/chain/Chain.test.js
+++ b/test/unit-tests/type/chain/Chain.test.js
@@ -1,8 +1,8 @@
 // test chain
 import assert from 'assert'
 
-import math from '../../../../src/bundleAny'
-import { hasOwnProperty } from '../../../../src/utils/object'
+import math from '../../../../src/defaultInstance.js'
+import { hasOwnProperty } from '../../../../src/utils/object.js'
 const Chain = math.Chain
 
 describe('Chain', function () {
diff --git a/test/unit-tests/type/chain/function/chain.test.js b/test/unit-tests/type/chain/function/chain.test.js
index caf8b2cf2a..635d6380f7 100644
--- a/test/unit-tests/type/chain/function/chain.test.js
+++ b/test/unit-tests/type/chain/function/chain.test.js
@@ -1,5 +1,5 @@
 import assert from 'assert'
-import math from '../../../../../src/bundleAny'
+import math from '../../../../../src/defaultInstance.js'
 const Chain = math.Chain
 
 describe('chain', function () {
diff --git a/test/unit-tests/type/complex/Complex.test.js b/test/unit-tests/type/complex/Complex.test.js
index f1dfcf9771..515684f2fc 100644
--- a/test/unit-tests/type/complex/Complex.test.js
+++ b/test/unit-tests/type/complex/Complex.test.js
@@ -2,7 +2,7 @@
 
 import assert from 'assert'
 
-import math from '../../../../src/bundleAny'
+import math from '../../../../src/defaultInstance.js'
 const Unit = math.Unit
 const Complex = math.Complex
 
diff --git a/test/unit-tests/type/complex/function/complex.test.js b/test/unit-tests/type/complex/function/complex.test.js
index d0c19d152b..7ed1747daf 100644
--- a/test/unit-tests/type/complex/function/complex.test.js
+++ b/test/unit-tests/type/complex/function/complex.test.js
@@ -1,5 +1,5 @@
 import assert from 'assert'
-import math from '../../../../../src/bundleAny'
+import math from '../../../../../src/defaultInstance.js'
 const complex = math.complex
 
 describe('complex', function () {
diff --git a/test/unit-tests/type/fraction/Fraction.test.js b/test/unit-tests/type/fraction/Fraction.test.js
index 659abe95fd..afa21e4ff9 100644
--- a/test/unit-tests/type/fraction/Fraction.test.js
+++ b/test/unit-tests/type/fraction/Fraction.test.js
@@ -1,5 +1,5 @@
 import assert from 'assert'
-import math from '../../../../src/bundleAny'
+import math from '../../../../src/defaultInstance.js'
 
 describe('Fraction', function () {
   it('should have a property isFraction', function () {
diff --git a/test/unit-tests/type/fraction/function/fraction.test.js b/test/unit-tests/type/fraction/function/fraction.test.js
index cf25c0b517..d6c5d76664 100644
--- a/test/unit-tests/type/fraction/function/fraction.test.js
+++ b/test/unit-tests/type/fraction/function/fraction.test.js
@@ -1,5 +1,5 @@
 import assert from 'assert'
-import math from '../../../../../src/bundleAny'
+import math from '../../../../../src/defaultInstance.js'
 import Fraction from 'fraction.js'
 
 describe('fraction', function () {
diff --git a/test/unit-tests/type/matrix/DenseMatrix.test.js b/test/unit-tests/type/matrix/DenseMatrix.test.js
index 37a417bfe9..fabcacd9ce 100644
--- a/test/unit-tests/type/matrix/DenseMatrix.test.js
+++ b/test/unit-tests/type/matrix/DenseMatrix.test.js
@@ -1,5 +1,5 @@
 import assert from 'assert'
-import math from '../../../../src/bundleAny'
+import math from '../../../../src/defaultInstance.js'
 const Matrix = math.Matrix
 const DenseMatrix = math.DenseMatrix
 const SparseMatrix = math.SparseMatrix
diff --git a/test/unit-tests/type/matrix/FibonacciHeap.test.js b/test/unit-tests/type/matrix/FibonacciHeap.test.js
index 5bdda15fde..42e907e922 100644
--- a/test/unit-tests/type/matrix/FibonacciHeap.test.js
+++ b/test/unit-tests/type/matrix/FibonacciHeap.test.js
@@ -1,5 +1,5 @@
 import assert from 'assert'
-import math from '../../../../src/bundleAny'
+import math from '../../../../src/defaultInstance.js'
 const FibonacciHeap = math.FibonacciHeap
 
 describe('FibonacciHeap', function () {
diff --git a/test/unit-tests/type/matrix/ImmutableDenseMatrix.test.js b/test/unit-tests/type/matrix/ImmutableDenseMatrix.test.js
index 268ada2399..db910c47fd 100644
--- a/test/unit-tests/type/matrix/ImmutableDenseMatrix.test.js
+++ b/test/unit-tests/type/matrix/ImmutableDenseMatrix.test.js
@@ -1,5 +1,5 @@
 import assert from 'assert'
-import math from '../../../../src/bundleAny'
+import math from '../../../../src/defaultInstance.js'
 const Matrix = math.Matrix
 const DenseMatrix = math.DenseMatrix
 const ImmutableDenseMatrix = math.ImmutableDenseMatrix
diff --git a/test/unit-tests/type/matrix/Index.test.js b/test/unit-tests/type/matrix/Index.test.js
index e18aff7e36..14035da31e 100644
--- a/test/unit-tests/type/matrix/Index.test.js
+++ b/test/unit-tests/type/matrix/Index.test.js
@@ -1,7 +1,7 @@
 // test data type Index
 import assert from 'assert'
 
-import math from '../../../../src/bundleAny'
+import math from '../../../../src/defaultInstance.js'
 const Index = math.Index
 const Range = math.Range
 const ImmutableDenseMatrix = math.ImmutableDenseMatrix
diff --git a/test/unit-tests/type/matrix/Matrix.test.js b/test/unit-tests/type/matrix/Matrix.test.js
index 2f2816d8a1..4db9e2d582 100644
--- a/test/unit-tests/type/matrix/Matrix.test.js
+++ b/test/unit-tests/type/matrix/Matrix.test.js
@@ -1,5 +1,5 @@
 import assert from 'assert'
-import math from '../../../../src/bundleAny'
+import math from '../../../../src/defaultInstance.js'
 const Matrix = math.Matrix
 
 describe('matrix', function () {
diff --git a/test/unit-tests/type/matrix/Range.test.js b/test/unit-tests/type/matrix/Range.test.js
index c00be4b700..1bcfd18a43 100644
--- a/test/unit-tests/type/matrix/Range.test.js
+++ b/test/unit-tests/type/matrix/Range.test.js
@@ -2,7 +2,7 @@
 
 import assert from 'assert'
 
-import math from '../../../../src/bundleAny'
+import math from '../../../../src/defaultInstance.js'
 const Range = math.Range
 
 describe('range', function () {
diff --git a/test/unit-tests/type/matrix/Spa.test.js b/test/unit-tests/type/matrix/Spa.test.js
index 4dafdde368..4a089c3f47 100644
--- a/test/unit-tests/type/matrix/Spa.test.js
+++ b/test/unit-tests/type/matrix/Spa.test.js
@@ -1,5 +1,5 @@
 import assert from 'assert'
-import math from '../../../../src/bundleAny'
+import math from '../../../../src/defaultInstance.js'
 const Spa = math.Spa
 
 describe('Spa', function () {
diff --git a/test/unit-tests/type/matrix/SparseMatrix.test.js b/test/unit-tests/type/matrix/SparseMatrix.test.js
index e68ace932d..69083db3bb 100644
--- a/test/unit-tests/type/matrix/SparseMatrix.test.js
+++ b/test/unit-tests/type/matrix/SparseMatrix.test.js
@@ -1,5 +1,5 @@
 import assert from 'assert'
-import math from '../../../../src/bundleAny'
+import math from '../../../../src/defaultInstance.js'
 const index = math.index
 const Matrix = math.Matrix
 const SparseMatrix = math.SparseMatrix
diff --git a/test/unit-tests/type/matrix/collection.test.js b/test/unit-tests/type/matrix/collection.test.js
index 8e26846737..624b04fb9c 100644
--- a/test/unit-tests/type/matrix/collection.test.js
+++ b/test/unit-tests/type/matrix/collection.test.js
@@ -1,6 +1,6 @@
 import assert from 'assert'
-import { isCollection } from '../../../../src/utils/is'
-import math from '../../../../src/bundleAny'
+import { isCollection } from '../../../../src/utils/is.js'
+import math from '../../../../src/defaultInstance.js'
 const DenseMatrix = math.DenseMatrix
 const SparseMatrix = math.SparseMatrix
 
diff --git a/test/unit-tests/type/matrix/function/index.test.js b/test/unit-tests/type/matrix/function/index.test.js
index f74e87f696..594569956c 100644
--- a/test/unit-tests/type/matrix/function/index.test.js
+++ b/test/unit-tests/type/matrix/function/index.test.js
@@ -1,7 +1,7 @@
 // test index construction
 import assert from 'assert'
 
-import math from '../../../../../src/bundleAny'
+import math from '../../../../../src/defaultInstance.js'
 const Range = math.Range
 const ImmutableDenseMatrix = math.ImmutableDenseMatrix
 
diff --git a/test/unit-tests/type/matrix/function/matrix.test.js b/test/unit-tests/type/matrix/function/matrix.test.js
index 63c8a7922d..0163ca0221 100644
--- a/test/unit-tests/type/matrix/function/matrix.test.js
+++ b/test/unit-tests/type/matrix/function/matrix.test.js
@@ -1,7 +1,7 @@
 // test matrix construction
 import assert from 'assert'
 
-import math from '../../../../../src/bundleAny'
+import math from '../../../../../src/defaultInstance.js'
 const matrix = math.matrix
 
 describe('matrix', function () {
diff --git a/test/unit-tests/type/matrix/function/sparse.test.js b/test/unit-tests/type/matrix/function/sparse.test.js
index 80ce0b38fb..0e67124ea5 100644
--- a/test/unit-tests/type/matrix/function/sparse.test.js
+++ b/test/unit-tests/type/matrix/function/sparse.test.js
@@ -1,7 +1,7 @@
 // test matrix construction
 import assert from 'assert'
 
-import math from '../../../../../src/bundleAny'
+import math from '../../../../../src/defaultInstance.js'
 const sparse = math.sparse
 
 describe('sparse', function () {
diff --git a/test/unit-tests/type/matrix/utils/getMatrixDataType.test.js b/test/unit-tests/type/matrix/utils/getMatrixDataType.test.js
index eb2db2dfae..caf2b3aa4c 100644
--- a/test/unit-tests/type/matrix/utils/getMatrixDataType.test.js
+++ b/test/unit-tests/type/matrix/utils/getMatrixDataType.test.js
@@ -1,5 +1,5 @@
 import assert from 'assert'
-import math from '../../../../../src/bundleAny'
+import math from '../../../../../src/defaultInstance.js'
 const DenseMatrix = math.DenseMatrix
 const SparseMatrix = math.SparseMatrix
 const getMatrixDataType = math.getMatrixDataType
diff --git a/test/unit-tests/type/number.test.js b/test/unit-tests/type/number.test.js
index cd62bb5985..d44a41c9b8 100644
--- a/test/unit-tests/type/number.test.js
+++ b/test/unit-tests/type/number.test.js
@@ -1,6 +1,6 @@
 import assert from 'assert'
-import math from '../../../src/bundleAny'
-import approx from '../../../tools/approx'
+import math from '../../../src/defaultInstance.js'
+import approx from '../../../tools/approx.js'
 const number = math.number
 
 describe('number', function () {
diff --git a/test/unit-tests/type/numeric.test.js b/test/unit-tests/type/numeric.test.js
index 9cee728917..857fc382ca 100644
--- a/test/unit-tests/type/numeric.test.js
+++ b/test/unit-tests/type/numeric.test.js
@@ -1,5 +1,5 @@
 import assert from 'assert'
-import math from '../../../src/bundleAny'
+import math from '../../../src/defaultInstance.js'
 const numeric = math.numeric
 
 describe('numeric', function () {
diff --git a/test/unit-tests/type/resultset/ResultSet.test.js b/test/unit-tests/type/resultset/ResultSet.test.js
index 68af9f6668..ef7e16c95b 100644
--- a/test/unit-tests/type/resultset/ResultSet.test.js
+++ b/test/unit-tests/type/resultset/ResultSet.test.js
@@ -2,7 +2,7 @@
 
 import assert from 'assert'
 
-import math from '../../../../src/bundleAny'
+import math from '../../../../src/defaultInstance.js'
 const Complex = math.Complex
 const ResultSet = math.ResultSet
 
diff --git a/test/unit-tests/type/string.test.js b/test/unit-tests/type/string.test.js
index 55c09092b3..192ed8c510 100644
--- a/test/unit-tests/type/string.test.js
+++ b/test/unit-tests/type/string.test.js
@@ -1,5 +1,5 @@
 import assert from 'assert'
-import math from '../../../src/bundleAny'
+import math from '../../../src/defaultInstance.js'
 const string = math.string
 
 describe('string', function () {
diff --git a/test/unit-tests/type/unit/Unit.test.js b/test/unit-tests/type/unit/Unit.test.js
index e61798cbee..07b9a48e4f 100644
--- a/test/unit-tests/type/unit/Unit.test.js
+++ b/test/unit-tests/type/unit/Unit.test.js
@@ -1,8 +1,8 @@
 import assert from 'assert'
-import approx from '../../../../tools/approx'
-import math from '../../../../src/bundleAny'
-import { isBigNumber, isFraction } from '../../../../src/utils/is'
-import { hasOwnProperty } from '../../../../src/utils/object'
+import approx from '../../../../tools/approx.js'
+import math from '../../../../src/defaultInstance.js'
+import { isBigNumber, isFraction } from '../../../../src/utils/is.js'
+import { hasOwnProperty } from '../../../../src/utils/object.js'
 
 const Unit = math.Unit
 
diff --git a/test/unit-tests/type/unit/function/createUnit.test.js b/test/unit-tests/type/unit/function/createUnit.test.js
index f5a2cbf1b4..d591e09dc0 100644
--- a/test/unit-tests/type/unit/function/createUnit.test.js
+++ b/test/unit-tests/type/unit/function/createUnit.test.js
@@ -1,5 +1,5 @@
 import assert from 'assert'
-import math from '../../../../../src/bundleAny'
+import math from '../../../../../src/defaultInstance.js'
 const createUnit = math.createUnit
 
 describe('createUnit', function () {
diff --git a/test/unit-tests/type/unit/function/splitUnit.test.js b/test/unit-tests/type/unit/function/splitUnit.test.js
index cf39ca756a..aad0b20833 100644
--- a/test/unit-tests/type/unit/function/splitUnit.test.js
+++ b/test/unit-tests/type/unit/function/splitUnit.test.js
@@ -1,5 +1,5 @@
 import assert from 'assert'
-import math from '../../../../../src/bundleAny'
+import math from '../../../../../src/defaultInstance.js'
 const splitUnit = math.splitUnit
 const Unit = math.Unit
 
diff --git a/test/unit-tests/type/unit/function/unit.test.js b/test/unit-tests/type/unit/function/unit.test.js
index 530af1f725..86415ea346 100644
--- a/test/unit-tests/type/unit/function/unit.test.js
+++ b/test/unit-tests/type/unit/function/unit.test.js
@@ -1,5 +1,5 @@
 import assert from 'assert'
-import math from '../../../../../src/bundleAny'
+import math from '../../../../../src/defaultInstance.js'
 const unit = math.unit
 const Unit = math.Unit
 
diff --git a/test/unit-tests/type/unit/physicalConstants.test.js b/test/unit-tests/type/unit/physicalConstants.test.js
index c869945d5d..1f3e089a08 100644
--- a/test/unit-tests/type/unit/physicalConstants.test.js
+++ b/test/unit-tests/type/unit/physicalConstants.test.js
@@ -1,5 +1,5 @@
 import assert from 'assert'
-import approx from '../../../../tools/approx'
+import approx from '../../../../tools/approx.js'
 import {
   createAtomicMass,
   createAvogadro,
@@ -52,8 +52,10 @@ import {
   createVacuumImpedance,
   createWeakMixingAngle,
   createWienDisplacement
-} from '../../../../src/type/unit/physicalConstants'
-import { BigNumber, Unit } from '../../../../src/bundleAny'
+} from '../../../../src/type/unit/physicalConstants.js'
+import math from '../../../../src/defaultInstance.js'
+
+const { BigNumber, Unit } = math
 
 describe('physical constants', function () {
   it('should return the correct value and unit for physical constants', function () {
diff --git a/test/unit-tests/utils/array.test.js b/test/unit-tests/utils/array.test.js
index c2f829cef8..9549e70a19 100644
--- a/test/unit-tests/utils/array.test.js
+++ b/test/unit-tests/utils/array.test.js
@@ -10,7 +10,7 @@ import {
   unsqueeze,
   validate,
   validateIndex
-} from '../../../src/utils/array'
+} from '../../../src/utils/array.js'
 
 describe('util.array', function () {
   describe('size', function () {
diff --git a/test/unit-tests/utils/bignumber/constants.test.js b/test/unit-tests/utils/bignumber/constants.test.js
index 8e8bb18289..6260081651 100644
--- a/test/unit-tests/utils/bignumber/constants.test.js
+++ b/test/unit-tests/utils/bignumber/constants.test.js
@@ -2,7 +2,7 @@
 import assert from 'assert'
 
 import BigNumber from 'decimal.js'
-import { createBigNumberE, createBigNumberPhi, createBigNumberPi, createBigNumberTau } from '../../../../src/utils/bignumber/constants'
+import { createBigNumberE, createBigNumberPhi, createBigNumberPi, createBigNumberTau } from '../../../../src/utils/bignumber/constants.js'
 
 const Big32 = BigNumber.clone({ precision: 32 })
 const Big64 = BigNumber.clone({ precision: 64 })
diff --git a/test/unit-tests/utils/bignumber/formatter.test.js b/test/unit-tests/utils/bignumber/formatter.test.js
index 5e7992b4c3..b8b6c72ca4 100644
--- a/test/unit-tests/utils/bignumber/formatter.test.js
+++ b/test/unit-tests/utils/bignumber/formatter.test.js
@@ -1,6 +1,6 @@
 import assert from 'assert'
 import BigNumber from 'decimal.js'
-import { format, toExponential, toFixed } from '../../../../src/utils/bignumber/formatter'
+import { format, toExponential, toFixed } from '../../../../src/utils/bignumber/formatter.js'
 
 describe('format', function () {
   describe('format', function () {
diff --git a/test/unit-tests/utils/bignumber/nearlyEqual.test.js b/test/unit-tests/utils/bignumber/nearlyEqual.test.js
index 2c6f3588a5..9d42944aa0 100644
--- a/test/unit-tests/utils/bignumber/nearlyEqual.test.js
+++ b/test/unit-tests/utils/bignumber/nearlyEqual.test.js
@@ -1,4 +1,4 @@
-import { nearlyEqual } from '../../../../src/utils/bignumber/nearlyEqual'
+import { nearlyEqual } from '../../../../src/utils/bignumber/nearlyEqual.js'
 
 import assert from 'assert'
 import BigNumber from 'decimal.js'
diff --git a/test/unit-tests/utils/customs.test.js b/test/unit-tests/utils/customs.test.js
index 7e2e233737..34b95668ca 100644
--- a/test/unit-tests/utils/customs.test.js
+++ b/test/unit-tests/utils/customs.test.js
@@ -1,8 +1,8 @@
 // test boolean utils
 import assert from 'assert'
 
-import { isPlainObject, isSafeMethod, isSafeProperty } from '../../../src/utils/customs'
-import math from '../../../src/bundleAny'
+import { isPlainObject, isSafeMethod, isSafeProperty } from '../../../src/utils/customs.js'
+import math from '../../../src/defaultInstance.js'
 
 describe('customs', function () {
   describe('isSafeMethod', function () {
diff --git a/test/unit-tests/utils/factory.test.js b/test/unit-tests/utils/factory.test.js
index a594715011..20df2b7af6 100644
--- a/test/unit-tests/utils/factory.test.js
+++ b/test/unit-tests/utils/factory.test.js
@@ -1,5 +1,5 @@
 import assert from 'assert'
-import { sortFactories, factory, isFactory } from '../../../src/utils/factory'
+import { sortFactories, factory, isFactory } from '../../../src/utils/factory.js'
 
 describe('factory', function () {
   it('should test whether something is a factory', () => {
diff --git a/test/unit-tests/utils/function.test.js b/test/unit-tests/utils/function.test.js
index a927529650..10345a505b 100644
--- a/test/unit-tests/utils/function.test.js
+++ b/test/unit-tests/utils/function.test.js
@@ -1,6 +1,6 @@
 import assert from 'assert'
-import { maxArgumentCount, memoize, memoizeCompare } from '../../../src/utils/function'
-import { deepStrictEqual } from '../../../src/utils/object'
+import { maxArgumentCount, memoize, memoizeCompare } from '../../../src/utils/function.js'
+import { deepStrictEqual } from '../../../src/utils/object.js'
 
 describe('util.function', function () {
   describe('memoize', function () {
diff --git a/test/unit-tests/utils/is.test.js b/test/unit-tests/utils/is.test.js
index b01262d3c1..f5080aaf57 100644
--- a/test/unit-tests/utils/is.test.js
+++ b/test/unit-tests/utils/is.test.js
@@ -1,6 +1,6 @@
 import assert from 'assert'
-import { isBoolean, isNumber, isObject, isString } from '../../../src/utils/is'
-import math from '../../../src/bundleAny'
+import { isBoolean, isNumber, isObject, isString } from '../../../src/utils/is.js'
+import math from '../../../src/defaultInstance.js'
 const { bignumber, complex, fraction, matrix, parse } = math
 
 describe('is', function () {
diff --git a/test/unit-tests/utils/latex.test.js b/test/unit-tests/utils/latex.test.js
index 083b43210a..089b6ec91a 100644
--- a/test/unit-tests/utils/latex.test.js
+++ b/test/unit-tests/utils/latex.test.js
@@ -1,5 +1,5 @@
 import assert from 'assert'
-import { toSymbol } from '../../../src/utils/latex'
+import { toSymbol } from '../../../src/utils/latex.js'
 
 describe('util.latex', function () {
   it('should convert symbols with underscores', function () {
diff --git a/test/unit-tests/utils/number.test.js b/test/unit-tests/utils/number.test.js
index 276f192db5..87e98039cf 100644
--- a/test/unit-tests/utils/number.test.js
+++ b/test/unit-tests/utils/number.test.js
@@ -12,7 +12,7 @@ import {
   toExponential,
   toFixed,
   toPrecision
-} from '../../../src/utils/number'
+} from '../../../src/utils/number.js'
 
 describe('number', function () {
   it('isInteger', function () {
diff --git a/test/unit-tests/utils/object.test.js b/test/unit-tests/utils/object.test.js
index 3da1b443ff..4e9469b761 100644
--- a/test/unit-tests/utils/object.test.js
+++ b/test/unit-tests/utils/object.test.js
@@ -12,7 +12,7 @@ import {
   set,
   traverse,
   deepFlatten, hasOwnProperty
-} from '../../../src/utils/object'
+} from '../../../src/utils/object.js'
 
 describe('object', function () {
   describe('clone', function () {
diff --git a/test/unit-tests/utils/string.test.js b/test/unit-tests/utils/string.test.js
index 00f4b1b9ed..4b4ffc8df7 100644
--- a/test/unit-tests/utils/string.test.js
+++ b/test/unit-tests/utils/string.test.js
@@ -2,8 +2,8 @@
 import assert from 'assert'
 
 import BigNumber from 'decimal.js'
-import math from '../../../src/bundleAny'
-import { endsWith, escape, format } from '../../../src/utils/string'
+import math from '../../../src/defaultInstance.js'
+import { endsWith, escape, format } from '../../../src/utils/string.js'
 
 describe('string', function () {
   it('endsWith', function () {
diff --git a/tools/docgenerator.js b/tools/docgenerator.js
index 0409af8e60..baeb866718 100644
--- a/tools/docgenerator.js
+++ b/tools/docgenerator.js
@@ -524,10 +524,10 @@ function iteratePath (functionNames, inputPath, outputPath, outputRoot) {
         } else {
           category = path[functionIndex + 1]
         }
-      } else if (fullPath === './lib/expression/parse.js') {
+      } else if (fullPath === './lib/cjs/expression/parse.js') {
         // TODO: this is an ugly special case
         category = 'expression'
-      } else if (path.join('/') === './lib/type') {
+      } else if (path.join('/') === './lib/cjs/type') {
         // for boolean.js, number.js, string.js
         category = 'construction'
       }
diff --git a/tools/entryGenerator.js b/tools/entryGenerator.js
index e59c19459c..346a794109 100644
--- a/tools/entryGenerator.js
+++ b/tools/entryGenerator.js
@@ -38,7 +38,7 @@ const dependenciesIndexTemplate = Handlebars.compile(`/**
  * DON'T MAKE CHANGES HERE
  */
 {{#factories}}
-export { {{name}} } from '{{fileName}}'{{eslintComment}}
+export { {{name}} } from '{{fileName}}.js'{{eslintComment}}
 {{/factories}}
 
 export { all } from './allFactories{{suffix}}.js'
@@ -49,7 +49,7 @@ const dependenciesFileTemplate = Handlebars.compile(`/**
  * DON'T MAKE CHANGES HERE
  */
 {{#dependencies}}
-import { {{name}} } from '{{fileName}}'
+import { {{name}} } from '{{fileName}}.js'
 {{/dependencies}}
 import { {{factoryName}} } from '../../factories{{suffix}}.js'{{eslintComment}}
 
@@ -65,12 +65,12 @@ const pureFunctionsTemplate = Handlebars.compile(`/**
  * THIS FILE IS AUTO-GENERATED
  * DON'T MAKE CHANGES HERE
  */
-import { config } from './configReadonly'
+import { config } from './configReadonly.js'
 import {
   {{#pureFactories}}
   {{factoryName}}{{#unless @last}},{{/unless}}{{eslintComment}}
   {{/pureFactories}}
-} from '../factories{{suffix}}'
+} from '../factories{{suffix}}.js'
 
 {{#pureFactories}}
 export const {{name}} = /* #__PURE__ */ {{factoryName ~}}
@@ -86,7 +86,7 @@ const impureFunctionsTemplate = Handlebars.compile(`/**
  * THIS FILE IS AUTO-GENERATED
  * DON'T MAKE CHANGES HERE
  */
-import { config } from './configReadonly'
+import { config } from './configReadonly.js'
 import {
   {{#impureFactories}}
   {{factoryName}},{{eslintComment}}
@@ -94,12 +94,12 @@ import {
   {{#transformFactories}}
   {{factoryName}}{{#unless @last}},{{/unless}}{{eslintComment}}
   {{/transformFactories}}
-} from '../factories{{suffix}}'
+} from '../factories{{suffix}}.js'
 import {
   {{#pureFactories}}
   {{name}}{{#unless @last}},{{/unless}}{{eslintComment}}
   {{/pureFactories}}
-} from './pureFunctions{{suffix}}.generated'
+} from './pureFunctions{{suffix}}.generated.js'
 
 const math = {} // NOT pure!
 const mathWithTransform = {} // NOT pure!
@@ -146,12 +146,12 @@ Object.assign(classes, {
 
 Chain.createProxy(math)
 
-export { embeddedDocs as docs } from '../expression/embeddedDocs/embeddedDocs'
+export { embeddedDocs as docs } from '../expression/embeddedDocs/embeddedDocs.js'
 `)
 
 exports.generateEntryFiles = function () {
-  const factoriesAny = require('../lib/factoriesAny')
-  const factoriesNumber = require('../lib/factoriesNumber')
+  const factoriesAny = require('../lib/cjs/factoriesAny')
+  const factoriesNumber = require('../lib/cjs/factoriesNumber')
 
   generateDependenciesFiles({
     suffix: 'Any',
diff --git a/tools/matrixmarket.js b/tools/matrixmarket.js
index 4bb3a327d7..3e32b1f870 100644
--- a/tools/matrixmarket.js
+++ b/tools/matrixmarket.js
@@ -1,6 +1,7 @@
 const fs = require('fs')
 const typed = require('typed-function')
-const math = require('../lib/bundleAny')
+const { create, all } = require('../lib/cjs/index.js')
+const math = create(all)
 const Spa = math.Spa
 const DenseMatrix = math.DenseMatrix
 const SparseMatrix = math.SparseMatrix
diff --git a/tools/package.json b/tools/package.json
new file mode 100644
index 0000000000..5bbefffbab
--- /dev/null
+++ b/tools/package.json
@@ -0,0 +1,3 @@
+{
+  "type": "commonjs"
+}