diff --git a/cli.js b/cli.js
new file mode 100644
index 0000000..637ce36
--- /dev/null
+++ b/cli.js
@@ -0,0 +1,2 @@
+#!/usr/bin/env node
+require('./dist/server/cli').cli()
diff --git a/index.js b/index.js
index 637ce36..80011b8 100644
--- a/index.js
+++ b/index.js
@@ -1,2 +1,3 @@
-#!/usr/bin/env node
-require('./dist/server/cli').cli()
+module.exports = {
+  server: require('./dist/server/server'),
+}
diff --git a/package.json b/package.json
index c68140b..63a2e4b 100644
--- a/package.json
+++ b/package.json
@@ -4,6 +4,7 @@
   "description": "Drive the AxiDraw pen plotter",
   "homepage": "https://github.com/nornagon/saxi",
   "repository": "github:nornagon/saxi",
+  "bugs": "https://github.com/nornagon/saxi/issues",
   "keywords": [
     "axidraw",
     "plotter",
@@ -13,20 +14,15 @@
     "hardware",
     "robot"
   ],
-  "bugs": {
-    "url": "https://github.com/nornagon/saxi/issues"
-  },
   "main": "index.js",
-  "bin": {
-    "saxi": "index.js"
-  },
+  "bin": "cli.js",
   "scripts": {
     "prebuild": "tslint -c tslint.json -p tsconfig.json --fix -t verbose",
     "build": "tsc && webpack --mode=production",
     "prepare": "npm run build",
     "prestart": "npm run build",
-    "start": "node .",
-    "dev": "tsc && webpack --mode=development -w & node .",
+    "start": "node cli.js",
+    "dev": "tsc && webpack --mode=development -w & node cli.js",
     "test": "echo \"Error: no test specified\" && exit 1"
   },
   "author": "Jeremy Apthorp <nornagon@nornagon.net>",