diff --git a/package.json b/package.json
index 7f2a8ae..3fd3dcb 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,6 @@
   "name": "react-component-library",
   "version": "1.0.0",
   "main": "build/index.js",
-  "module": "build/index.esm.js",
   "files": [
     "build"
   ],
diff --git a/rollup.config.js b/rollup.config.js
index 06330f1..c4fe8a5 100644
--- a/rollup.config.js
+++ b/rollup.config.js
@@ -1,26 +1,20 @@
 import peerDepsExternal from "rollup-plugin-peer-deps-external";
-import resolve from "rollup-plugin-node-resolve";
-import commonjs from "rollup-plugin-commonjs";
+import resolve from "@rollup/plugin-node-resolve";
+import commonjs from "@rollup/plugin-commonjs";
 import typescript from "rollup-plugin-typescript2";
 import sass from "rollup-plugin-sass";
 import copy from "rollup-plugin-copy";
 
-import packageJson from "./package.json";
-
 export default {
-  input: "src/index.ts",
+  input: ["src/index.ts", "src/TestComponent/index.ts"],
   output: [
     {
-      file: packageJson.main,
+      dir: "build",
       format: "cjs",
       sourcemap: true
-    },
-    {
-      file: packageJson.module,
-      format: "esm",
-      sourcemap: true
     }
   ],
+  preserveModules: true, // Important if we want to code split
   plugins: [
     peerDepsExternal(),
     resolve(),
diff --git a/src/TestComponent/index.ts b/src/TestComponent/index.ts
new file mode 100644
index 0000000..866e3bc
--- /dev/null
+++ b/src/TestComponent/index.ts
@@ -0,0 +1,3 @@
+import TestComponent from "./TestComponent";
+
+export default TestComponent;
diff --git a/src/index.ts b/src/index.ts
index 4248f57..6a86856 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -1,3 +1,3 @@
-import TestComponent from "./TestComponent/TestComponent";
+import TestComponent from "./TestComponent";
 
 export { TestComponent };