diff --git a/angular.js b/angular.js
index 9178b20..b7c06ee 100644
--- a/angular.js
+++ b/angular.js
@@ -1,7 +1,7 @@
 var debug = require('debug')('browser-monkey:angular')
-var Mount = require('./mount')
+var Mount = require('./lib/mount')
 var createMonkey = require('./create')
-var createTestDiv = require('./createTestDiv')
+var createTestDiv = require('./lib/createTestDiv')
 var angular = require('angular')
 
 module.exports = function (app) {
diff --git a/create.js b/create.js
index 468fb2c..7fdf139 100644
--- a/create.js
+++ b/create.js
@@ -1,8 +1,8 @@
-var Selector = require('./selector')
-var finders = require('./finders')
-var actions = require('./actions')
-var assertions = require('./assertions')
-var promise = require('./promise')
+var Selector = require('./lib/selector')
+var finders = require('./lib/finders')
+var actions = require('./lib/actions')
+var assertions = require('./lib/assertions')
+var promise = require('./lib/promise')
 
 module.exports = function (rootSelector) {
   return new Selector(rootSelector)
diff --git a/hyperdom.js b/hyperdom.js
index 77c71fd..5b5251a 100644
--- a/hyperdom.js
+++ b/hyperdom.js
@@ -1,8 +1,8 @@
-var Mount = require('./mount')
+var Mount = require('./lib/mount')
 var hyperdom = require('hyperdom')
 var createMonkey = require('./create')
 var window = require('global')
-var createTestDiv = require('./createTestDiv')
+var createTestDiv = require('./lib/createTestDiv')
 var extend = require('lowscore/extend')
 
 module.exports = function (app, options) {
diff --git a/iframe.js b/iframe.js
index dadbbf9..5cec069 100644
--- a/iframe.js
+++ b/iframe.js
@@ -1,8 +1,8 @@
 var debug = require('debug')('browser-monkey:angular')
-var Mount = require('./mount')
+var Mount = require('./lib/mount')
 var createMonkey = require('./create')
 var hobostyle = require('hobostyle')
-var createTestDiv = require('./createTestDiv')
+var createTestDiv = require('./lib/createTestDiv')
 var addressBarInterval
 
 module.exports = function (url) {
diff --git a/karma.conf.js b/karma.conf.js
index aec5277..e7409c0 100644
--- a/karma.conf.js
+++ b/karma.conf.js
@@ -23,7 +23,7 @@ module.exports = function (config) {
     browserify: {
       debug: true,
       extensions: ['.jsx'],
-      transform: ['babelify', [require('./removeStrictFromSend'), {global: true}]]
+      transform: ['babelify', [require('./utils/removeStrictFromSend'), {global: true}]]
     },
 
     client: {
diff --git a/actions.js b/lib/actions.js
similarity index 100%
rename from actions.js
rename to lib/actions.js
diff --git a/assertions.js b/lib/assertions.js
similarity index 100%
rename from assertions.js
rename to lib/assertions.js
diff --git a/createTestDiv.js b/lib/createTestDiv.js
similarity index 100%
rename from createTestDiv.js
rename to lib/createTestDiv.js
diff --git a/elementTester.js b/lib/elementTester.js
similarity index 100%
rename from elementTester.js
rename to lib/elementTester.js
diff --git a/elementsToString.js b/lib/elementsToString.js
similarity index 100%
rename from elementsToString.js
rename to lib/elementsToString.js
diff --git a/errorHandler.js b/lib/errorHandler.js
similarity index 100%
rename from errorHandler.js
rename to lib/errorHandler.js
diff --git a/expectOneElement.js b/lib/expectOneElement.js
similarity index 100%
rename from expectOneElement.js
rename to lib/expectOneElement.js
diff --git a/finders.js b/lib/finders.js
similarity index 100%
rename from finders.js
rename to lib/finders.js
diff --git a/jquery.js b/lib/jquery.js
similarity index 100%
rename from jquery.js
rename to lib/jquery.js
diff --git a/mount.js b/lib/mount.js
similarity index 100%
rename from mount.js
rename to lib/mount.js
diff --git a/options.js b/lib/options.js
similarity index 100%
rename from options.js
rename to lib/options.js
diff --git a/promise.js b/lib/promise.js
similarity index 100%
rename from promise.js
rename to lib/promise.js
diff --git a/reloadButton.js b/lib/reloadButton.js
similarity index 100%
rename from reloadButton.js
rename to lib/reloadButton.js
diff --git a/selector.js b/lib/selector.js
similarity index 100%
rename from selector.js
rename to lib/selector.js
diff --git a/sendkeys.js b/lib/sendkeys.js
similarity index 100%
rename from sendkeys.js
rename to lib/sendkeys.js
diff --git a/setTestUrl.js b/lib/setTestUrl.js
similarity index 100%
rename from setTestUrl.js
rename to lib/setTestUrl.js
diff --git a/stubBrowser.js b/lib/stubBrowser.js
similarity index 100%
rename from stubBrowser.js
rename to lib/stubBrowser.js
diff --git a/react.js b/react.js
index 602556e..2108091 100644
--- a/react.js
+++ b/react.js
@@ -1,8 +1,8 @@
-var Mount = require('./mount')
+var Mount = require('./lib/mount')
 var React = require('react')
 var ReactDOM = require('react-dom')
 var createMonkey = require('./create')
-var createTestDiv = require('./createTestDiv')
+var createTestDiv = require('./lib/createTestDiv')
 
 module.exports = function (app) {
   return new Mount(app, {
diff --git a/test/createTestDom.js b/test/createTestDom.js
index 4f75f35..e3dc9c7 100644
--- a/test/createTestDom.js
+++ b/test/createTestDom.js
@@ -1,5 +1,5 @@
 var $ = require('jquery')
-var createTestDiv = require('../createTestDiv')
+var createTestDiv = require('../lib/createTestDiv')
 
 module.exports = function () {
   var div = createTestDiv()
diff --git a/test/domTest.js b/test/domTest.js
index bb5987d..88201de 100644
--- a/test/domTest.js
+++ b/test/domTest.js
@@ -3,7 +3,7 @@ var createVDom = require('./createVDom')
 var isNode = require('detect-node')
 var h = require('virtual-dom/h')
 var vquery = require('vdom-query')
-var jquery = require('../jquery')
+var jquery = require('../lib/jquery')
 var createBrowser = require('../create')
 
 function domTest (testName, testCb, options) {
diff --git a/removeStrictFromSend.js b/utils/removeStrictFromSend.js
similarity index 100%
rename from removeStrictFromSend.js
rename to utils/removeStrictFromSend.js