diff --git a/package.json b/package.json
index 92c36e41..c3a683f7 100644
--- a/package.json
+++ b/package.json
@@ -22,8 +22,8 @@
     "opera >= 42",
     "firefox >= 63"
   ],
-  "main": "dist/sifrrelements.js",
-  "module": "dist/sifrrelements.module.js",
+  "main": "dist/sifrrelements.cjs.js",
+  "module": "src/sifrr.elements.js",
   "browser": "dist/sifrrelements.js",
   "homepage": "https://github.com/sifrr/sifrr-elements",
   "scripts": {
diff --git a/rollup.base.js b/rollup.base.js
index 89dee1ac..05b623ab 100644
--- a/rollup.base.js
+++ b/rollup.base.js
@@ -7,11 +7,12 @@ const globals = {
   '@sifrr/dom': 'Sifrr.Dom',
   '@sifrr/fetch': 'Sifrr.Fetch',
   '@sifrr/storage': 'Sifrr.Storage',
-  '@sifrr/animate': 'Sifrr.animate'
+  '@sifrr/animate': 'Sifrr.animate',
+  'query-string': 'queryString'
 };
 const footer = '/*! (c) @aadityataparia */';
 
-function moduleConfig(name, root, minify = false, isModule = false) {
+function moduleConfig(name, root, minify = false, type) {
   const filename = name.toLowerCase();
   const banner = `/*! ${name} v${version} - sifrr project | MIT licensed | https://github.com/sifrr/sifrr-elements */`;
   return getRollupConfig(
@@ -21,7 +22,7 @@ function moduleConfig(name, root, minify = false, isModule = false) {
       outputFolder: path.join(root, './dist'),
       outputFileName: filename,
       minify,
-      type: isModule ? 'module' : 'browser'
+      type
     },
     {
       output: {
@@ -34,12 +35,11 @@ function moduleConfig(name, root, minify = false, isModule = false) {
   );
 }
 
-module.exports = (name, __dirname, isBrowser = true) => {
-  let ret = [];
-  if (isBrowser) {
-    ret = [moduleConfig(name, __dirname), moduleConfig(name, __dirname, true)];
-  }
-  ret.push(moduleConfig(name, __dirname, false, true));
+module.exports = (name, __dirname) => {
+  let ret = [
+    moduleConfig(name, __dirname, false, ['cjs', 'browser']),
+    moduleConfig(name, __dirname, true, 'browser')
+  ];
 
   return ret;
 };
diff --git a/scripts/test/run.js b/scripts/test/run.js
index c7503a07..76426c73 100755
--- a/scripts/test/run.js
+++ b/scripts/test/run.js
@@ -72,6 +72,5 @@ runTests(options.length === 0 ? options[0] : options, process.env.PARALLEL === '
       process.exit(1);
     }
     global.console.log('All tests passed.');
-    process.exit(0);
   }
 );