diff --git a/.prettierignore b/.prettierignore
index 5852e09a2a..1d0c0f6299 100644
--- a/.prettierignore
+++ b/.prettierignore
@@ -1,4 +1,2 @@
 server.js
 server.spec.js
-gh-badge.js
-gh-badge.spec.js
diff --git a/Makefile b/Makefile
index fdbb672f5a..c026761ad1 100644
--- a/Makefile
+++ b/Makefile
@@ -11,7 +11,7 @@ ifeq ($(UNAME_S),Darwin)
 endif
 
 favicon:
-	node gh-badge.js '' '' '#bada55' .png > favicon.png
+	node lib/badge-cli.js '' '' '#bada55' .png > favicon.png
 
 footer-production-transform:
 	@$(SED) "s,(<img src=\")(/[^\"\?]+)\",\1https://img.shields.io\2?maxAge=2592000\"," \
diff --git a/gh-badge.js b/lib/badge-cli.js
similarity index 76%
rename from gh-badge.js
rename to lib/badge-cli.js
index 078ef01a81..6362040c25 100755
--- a/gh-badge.js
+++ b/lib/badge-cli.js
@@ -1,8 +1,11 @@
 #!/usr/bin/env node
-var path = require('path');
-var badge = require(path.join(__dirname, 'lib', 'badge.js'));
-var svg2img = require(path.join(__dirname, 'lib', 'svg-to-img.js'));
-var colorscheme = require(path.join(__dirname, 'lib', 'colorscheme.json'));
+
+'use strict';
+
+const badge = require('./badge');
+const svg2img = require('./svg-to-img');
+const colorscheme = require('./colorscheme.json');
+
 if (process.argv.length < 4) {
   console.log('Usage: badge subject status [:colorscheme] [.output] [@style]');
   console.log('Or:    badge subject status right-color [left-color] [.output] [@style]');
@@ -22,9 +25,9 @@ if (process.argv.length < 4) {
 }
 
 // Find a format specifier.
-var format = 'svg';
-var style = '';
-for (var i = 4; i < process.argv.length; i++) {
+let format = 'svg';
+let style = '';
+for (let i = 4; i < process.argv.length; i++) {
   if (process.argv[i][0] === '.') {
     format = process.argv[i].slice(1);
     process.argv.splice(i, 1);
@@ -37,12 +40,12 @@ for (var i = 4; i < process.argv.length; i++) {
   }
 }
 
-var subject = process.argv[2];
-var status = process.argv[3];
-var color = process.argv[4] || ':green';
-var colorA = process.argv[5];
+const subject = process.argv[2];
+const status = process.argv[3];
+let color = process.argv[4] || ':green';
+const colorA = process.argv[5];
 
-var badgeData = {text: [subject, status], format: format};
+const badgeData = {text: [subject, status], format: format};
 if (style) {
   badgeData.template = style;
 }
diff --git a/gh-badge.spec.js b/lib/badge-cli.spec.js
similarity index 93%
rename from gh-badge.spec.js
rename to lib/badge-cli.spec.js
index 1ae07cb352..6f511837a8 100644
--- a/gh-badge.spec.js
+++ b/lib/badge-cli.spec.js
@@ -1,10 +1,12 @@
+'use strict';
+
 const assert = require('assert');
 const isPng = require('is-png');
 const isSvg = require('is-svg');
 const {spawn} = require('child-process-promise');
 
 function runCli (args) {
-  return spawn('node', ['gh-badge.js', ...args], { capture: ['stdout'] })
+  return spawn('node', ['lib/badge-cli.js', ...args], { capture: ['stdout'] })
     .then(result => result.stdout);
 }
 
diff --git a/package.json b/package.json
index cddef29480..66caed8e25 100644
--- a/package.json
+++ b/package.json
@@ -46,7 +46,7 @@
     "coverage:report:reopen": "opn coverage/lcov-report/index.html",
     "coverage:report:open": "npm run coverage:report && npm run coverage:report:reopen",
     "lint": "eslint '**/*.js'",
-    "test:js": "mocha lib '*.spec.js'",
+    "test:js": "mocha '*.spec.js' 'lib/**/*.spec.js'",
     "test:services": "mocha --delay service-tests/runner/cli.js",
     "test:services:pr:prepare": "node service-tests/runner/pull-request-services-cli.js > pull-request-services.log",
     "test:services:pr:run": "mocha --delay service-tests/runner/cli.js --stdin < pull-request-services.log",
@@ -62,11 +62,11 @@
     "start": "INFOSITE=/ node server 8080 ::"
   },
   "bin": {
-    "badge": "./gh-badge.js"
+    "badge": "lib/badge-cli.js"
   },
   "files": [
     "README.md",
-    "gh-badge.js",
+    "lib/badge-cli.js",
     "lib/badge.js",
     "lib/colorscheme.json",
     "lib/lru-cache.js",