diff --git a/common/makefile b/common/makefile
new file mode 100644
index 0000000..175834c
--- /dev/null
+++ b/common/makefile
@@ -0,0 +1,16 @@
+.PHONY: all esm cjs
+
+ESM_LOCATION=./esm
+CJS_LOCATION=./cjs
+
+all: esm cjs
+
+esm:
+	mkdir $(ESM_LOCATION) --parents
+	tsc --module es6 --outDir $(ESM_LOCATION)
+	cp ./package.template.json $(ESM_LOCATION)/package.json
+
+cjs:
+	mkdir $(CJS_LOCATION) --parents
+	tsc --module commonjs --outDir $(CJS_LOCATION)
+	cp ./package.template.json $(CJS_LOCATION)/package.json
\ No newline at end of file
diff --git a/common/package.json b/common/package.template.json
similarity index 62%
rename from common/package.json
rename to common/package.template.json
index ea95da4..197cb08 100644
--- a/common/package.json
+++ b/common/package.template.json
@@ -2,12 +2,11 @@
   "name": "common",
   "version": "1.0.0",
   "description": "",
-  "main": "dist/index.js",
-  "types": "dist/index.d.ts",
+  "module": "index.js",
+  "main": "index.js",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"
   },
   "author": "Oliver Akins",
-  "license": "UNLICENSED",
-  "files": ["/dist"]
+  "license": "UNLICENSED"
 }