diff --git a/.eslintignore b/.eslintignore
index b5bb780..3bf0a37 100644
--- a/.eslintignore
+++ b/.eslintignore
@@ -1,5 +1,3 @@
 /coverage
-/es
-/lib
 /node_modules
 /templates
diff --git a/.gitignore b/.gitignore
index dd2d28e..a2f3813 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,5 @@
 /.nyc_output
 /coverage
-/es
-/lib
 /node_modules
 npm-debug.log*
 .DS_Store
\ No newline at end of file
diff --git a/babel.config.js b/babel.config.js
deleted file mode 100644
index be1bc8d..0000000
--- a/babel.config.js
+++ /dev/null
@@ -1,12 +0,0 @@
-module.exports = {
-    presets: [
-        [
-            'babel-preset-zillow',
-            {
-                targets: {
-                    node: 'current',
-                },
-            },
-        ],
-    ],
-};
diff --git a/src/bin/commands/new.js b/bin/commands/new.js
similarity index 99%
rename from src/bin/commands/new.js
rename to bin/commands/new.js
index a1d3fba..68c3b05 100644
--- a/src/bin/commands/new.js
+++ b/bin/commands/new.js
@@ -7,7 +7,7 @@ const chalk = require('chalk');
 const copyTemplateDir = require('copy-template-dir');
 const runSeries = require('run-series');
 const install = require('../util/install');
-const pkg = require('../../../package.json');
+const pkg = require('../../package.json');
 const { initGit, initialCommit } = require('../util/git');
 const inquirer = require('inquirer');
 
diff --git a/src/bin/commands/script.js b/bin/commands/script.js
similarity index 100%
rename from src/bin/commands/script.js
rename to bin/commands/script.js
diff --git a/src/bin/commands/scripts/build.js b/bin/commands/scripts/build.js
similarity index 100%
rename from src/bin/commands/scripts/build.js
rename to bin/commands/scripts/build.js
diff --git a/src/bin/commands/scripts/build_styleguide.js b/bin/commands/scripts/build_styleguide.js
similarity index 100%
rename from src/bin/commands/scripts/build_styleguide.js
rename to bin/commands/scripts/build_styleguide.js
diff --git a/src/bin/commands/scripts/build_watch.js b/bin/commands/scripts/build_watch.js
similarity index 100%
rename from src/bin/commands/scripts/build_watch.js
rename to bin/commands/scripts/build_watch.js
diff --git a/src/bin/commands/scripts/clean.js b/bin/commands/scripts/clean.js
similarity index 100%
rename from src/bin/commands/scripts/clean.js
rename to bin/commands/scripts/clean.js
diff --git a/src/bin/commands/scripts/eslint.js b/bin/commands/scripts/eslint.js
similarity index 100%
rename from src/bin/commands/scripts/eslint.js
rename to bin/commands/scripts/eslint.js
diff --git a/src/bin/commands/scripts/eslint_fix.js b/bin/commands/scripts/eslint_fix.js
similarity index 100%
rename from src/bin/commands/scripts/eslint_fix.js
rename to bin/commands/scripts/eslint_fix.js
diff --git a/src/bin/commands/scripts/prepublishOnly.js b/bin/commands/scripts/prepublishOnly.js
similarity index 100%
rename from src/bin/commands/scripts/prepublishOnly.js
rename to bin/commands/scripts/prepublishOnly.js
diff --git a/src/bin/commands/scripts/start.js b/bin/commands/scripts/start.js
similarity index 100%
rename from src/bin/commands/scripts/start.js
rename to bin/commands/scripts/start.js
diff --git a/src/bin/commands/scripts/test.js b/bin/commands/scripts/test.js
similarity index 100%
rename from src/bin/commands/scripts/test.js
rename to bin/commands/scripts/test.js
diff --git a/src/bin/commands/scripts/test_coverage.js b/bin/commands/scripts/test_coverage.js
similarity index 100%
rename from src/bin/commands/scripts/test_coverage.js
rename to bin/commands/scripts/test_coverage.js
diff --git a/src/bin/commands/scripts/test_update.js b/bin/commands/scripts/test_update.js
similarity index 100%
rename from src/bin/commands/scripts/test_update.js
rename to bin/commands/scripts/test_update.js
diff --git a/src/bin/commands/scripts/test_watch.js b/bin/commands/scripts/test_watch.js
similarity index 100%
rename from src/bin/commands/scripts/test_watch.js
rename to bin/commands/scripts/test_watch.js
diff --git a/src/bin/create-react-styleguide.js b/bin/index.js
similarity index 100%
rename from src/bin/create-react-styleguide.js
rename to bin/index.js
diff --git a/src/bin/util/executables.js b/bin/util/executables.js
similarity index 100%
rename from src/bin/util/executables.js
rename to bin/util/executables.js
diff --git a/src/bin/util/git.js b/bin/util/git.js
similarity index 97%
rename from src/bin/util/git.js
rename to bin/util/git.js
index aadc186..fa0a06a 100644
--- a/src/bin/util/git.js
+++ b/bin/util/git.js
@@ -4,7 +4,7 @@ const ora = require('ora');
 const path = require('path');
 const chalk = require('chalk');
 const runSeries = require('run-series');
-const pkg = require('../../../package.json');
+const pkg = require('../../package.json');
 
 /**
 + * Run git related commands
diff --git a/src/bin/util/install.js b/bin/util/install.js
similarity index 100%
rename from src/bin/util/install.js
rename to bin/util/install.js
diff --git a/src/bin/util/noop.js b/bin/util/noop.js
similarity index 100%
rename from src/bin/util/noop.js
rename to bin/util/noop.js
diff --git a/jest.config.js b/jest.config.js
index 1151189..f306187 100644
--- a/jest.config.js
+++ b/jest.config.js
@@ -1,10 +1,12 @@
-const { createJestConfig } = require('./src');
+const { createJestConfig } = require('./lib');
 
 const config = createJestConfig();
 
 module.exports = {
     ...config,
-    // TODO: test the CLI properly
-    coveragePathIgnorePatterns: ['<rootDir>/src/bin/'],
-    testPathIgnorePatterns: [...config.testPathIgnorePatterns, '<rootDir>/templates/'],
+    // TODO: test the CLI properly]
+    collectCoverageFrom: ['lib/**/*.js', 'lib/**/*.jsx'],
+    coveragePathIgnorePatterns: ['<rootDir>/bin/'],
+    modulePathIgnorePatterns: [],
+    testPathIgnorePatterns: ['/node_modules/', '<rootDir>/templates/'],
 };
diff --git a/src/js/__tests__/__snapshots__/createJestConfig.test.js.snap b/lib/configs/__tests__/__snapshots__/createJestConfig.test.js.snap
similarity index 100%
rename from src/js/__tests__/__snapshots__/createJestConfig.test.js.snap
rename to lib/configs/__tests__/__snapshots__/createJestConfig.test.js.snap
diff --git a/src/js/__tests__/createJestConfig.test.js b/lib/configs/__tests__/createJestConfig.test.js
similarity index 100%
rename from src/js/__tests__/createJestConfig.test.js
rename to lib/configs/__tests__/createJestConfig.test.js
diff --git a/src/js/__tests__/createStyleguideConfig.test.js b/lib/configs/__tests__/createStyleguideConfig.test.js
similarity index 100%
rename from src/js/__tests__/createStyleguideConfig.test.js
rename to lib/configs/__tests__/createStyleguideConfig.test.js
diff --git a/src/js/createJestConfig.js b/lib/configs/createJestConfig.js
similarity index 100%
rename from src/js/createJestConfig.js
rename to lib/configs/createJestConfig.js
diff --git a/src/js/createStyleguideConfig.js b/lib/configs/createStyleguideConfig.js
similarity index 100%
rename from src/js/createStyleguideConfig.js
rename to lib/configs/createStyleguideConfig.js
diff --git a/lib/index.js b/lib/index.js
new file mode 100644
index 0000000..4be75ae
--- /dev/null
+++ b/lib/index.js
@@ -0,0 +1,7 @@
+const createJestConfig = require('./configs/createJestConfig');
+const createStyleguideConfig = require('./configs/createStyleguideConfig');
+
+module.exports = {
+    createJestConfig,
+    createStyleguideConfig,
+};
diff --git a/package.json b/package.json
index 5b5d81a..054f33a 100644
--- a/package.json
+++ b/package.json
@@ -9,24 +9,23 @@
     "url": "https://github.com/zillow/create-react-styleguide/issues"
   },
   "bin": {
-    "create-react-styleguide": "./lib/bin/create-react-styleguide.js"
+    "create-react-styleguide": "./bin/index.js"
   },
   "main": "./lib/index.js",
   "scripts": {
-    "build": "src/bin/create-react-styleguide.js script build",
-    "build:watch": "src/bin/create-react-styleguide.js script build:watch",
-    "clean": "src/bin/create-react-styleguide.js script clean",
-    "eslint": "src/bin/create-react-styleguide.js script eslint",
-    "eslint:fix": "src/bin/create-react-styleguide.js script eslint:fix",
-    "test": "src/bin/create-react-styleguide.js script test",
-    "test:coverage": "src/bin/create-react-styleguide.js script test:coverage",
-    "test:update": "src/bin/create-react-styleguide.js script test:update",
-    "test:watch": "src/bin/create-react-styleguide.js script test:watch",
-    "prepublishOnly": "src/bin/create-react-styleguide.js script prepublishOnly",
+    "clean": "./bin/index.js script clean",
+    "eslint": "./bin/index.js script eslint",
+    "eslint:fix": "./bin/index.js script eslint:fix",
+    "test": "./bin/index.js script test",
+    "test:coverage": "./bin/index.js script test:coverage",
+    "test:update": "./bin/index.js script test:update",
+    "test:watch": "./bin/index.js script test:watch",
+    "prepublishOnly": "./bin/index.js script prepublishOnly",
     "release": "standard-version",
     "prepare": "husky install"
   },
   "files": [
+    "bin",
     "lib",
     "templates"
   ],
diff --git a/src/index.js b/src/index.js
deleted file mode 100644
index 2008b2e..0000000
--- a/src/index.js
+++ /dev/null
@@ -1,7 +0,0 @@
-const createStyleguideConfig = require('./js/createStyleguideConfig');
-const createJestConfig = require('./js/createJestConfig');
-
-module.exports = {
-    createStyleguideConfig,
-    createJestConfig,
-};