diff --git a/Makefile b/Makefile
index 7f3804f1..2c197111 100644
--- a/Makefile
+++ b/Makefile
@@ -22,10 +22,10 @@ test: $(SPEC)
 	node test/test.js $<
 
 lint:
-	eslint -c eslint.json ${JSMODULES} bin/commonmark test/test.js bench.js
+	eslint -c eslint.json ${JSMODULES} bin/commonmark test/test.js bench/bench.js
 
 bench:
-	sudo renice 99 $$$$; node bench.js ${BENCHINP}
+	sudo renice 99 $$$$; node bench/bench.js ${BENCHINP}
 
 npm:
 	cd js; npm publish
diff --git a/bench.js b/bench/bench.js
similarity index 95%
rename from bench.js
rename to bench/bench.js
index 3493dbb6..80591589 100644
--- a/bench.js
+++ b/bench/bench.js
@@ -1,7 +1,7 @@
 var Benchmark = require('benchmark').Benchmark;
 var suite = new Benchmark.Suite();
 var fs = require('fs');
-var commonmark = require('./lib/index.js');
+var commonmark = require('../lib/index.js');
 // npm install showdown
 var Showdown = require('showdown').converter;
 // npm install marked
diff --git a/bench/detailed_benchmarks.sh b/bench/detailed_benchmarks.sh
new file mode 100755
index 00000000..f286515a
--- /dev/null
+++ b/bench/detailed_benchmarks.sh
@@ -0,0 +1,2 @@
+sudo echo ""
+for x in bench/samples/*.md; do make bench BENCHINP=$x; done | awk -f bench/format_benchmarks.awk
diff --git a/tools/format_benchmarks.awk b/bench/format_benchmarks.awk
similarity index 100%
rename from tools/format_benchmarks.awk
rename to bench/format_benchmarks.awk
diff --git a/tools/detailed_benchmarks.sh b/tools/detailed_benchmarks.sh
deleted file mode 100755
index 8bc76b45..00000000
--- a/tools/detailed_benchmarks.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-sudo echo ""
-for x in samples/*.md; do make benchjs BENCHINP=$x; done | awk -f tools/format_benchmarks.awk