diff --git a/src/buildApp.js b/src/build/buildApp.js
similarity index 98%
rename from src/buildApp.js
rename to src/build/buildApp.js
index 2b22aa7..1fc9e6d 100644
--- a/src/buildApp.js
+++ b/src/build/buildApp.js
@@ -8,9 +8,9 @@ import async from 'async';
 import _ from 'lodash';
 import hasBinary from 'hasbin';
 
-import optionsFactory from './options';
+import optionsFactory from './../options';
 import iconBuild from './iconBuild';
-import helpers from './helpers';
+import helpers from './../helpers/helpers';
 
 const copy = ncp.ncp;
 const isWindows = helpers.isWindows;
diff --git a/src/iconBuild.js b/src/build/iconBuild.js
similarity index 94%
rename from src/iconBuild.js
rename to src/build/iconBuild.js
index 1517f24..0622506 100644
--- a/src/iconBuild.js
+++ b/src/build/iconBuild.js
@@ -1,6 +1,6 @@
 import path from 'path';
-import helpers from './helpers';
-import pngToIcns from './pngToIcns';
+import helpers from './../helpers/helpers';
+import pngToIcns from './../helpers/pngToIcns';
 const isOSX = helpers.isOSX;
 
 /**
diff --git a/src/cli.js b/src/cli.js
index 132d614..be6a42e 100755
--- a/src/cli.js
+++ b/src/cli.js
@@ -4,7 +4,7 @@ import 'source-map-support/register';
 
 import path from 'path';
 import program from 'commander';
-import buildApp from './buildApp';
+import buildApp from './build/buildApp';
 const packageJson = require(path.join('..', 'package'));
 
 if (require.main === module) {
diff --git a/src/helpers.js b/src/helpers/helpers.js
similarity index 100%
rename from src/helpers.js
rename to src/helpers/helpers.js
diff --git a/src/pngToIcns.js b/src/helpers/pngToIcns.js
similarity index 94%
rename from src/pngToIcns.js
rename to src/helpers/pngToIcns.js
index 7a71485..2fc8b2c 100644
--- a/src/pngToIcns.js
+++ b/src/helpers/pngToIcns.js
@@ -5,7 +5,7 @@ import helpers from './helpers';
 const isOSX = helpers.isOSX;
 tmp.setGracefulCleanup();
 
-const PNG_TO_ICNS_BIN_PATH = path.join(__dirname, '..', 'bin/pngToIcns');
+const PNG_TO_ICNS_BIN_PATH = path.join(__dirname, '../..', 'bin/pngToIcns');
 
 /**
  * @callback pngToIcnsCallback
diff --git a/src/index.js b/src/index.js
index f406715..55d2cf8 100644
--- a/src/index.js
+++ b/src/index.js
@@ -1,5 +1,5 @@
 import 'source-map-support/register';
 
-import buildApp from './buildApp';
+import buildApp from './build/buildApp';
 
 export default buildApp;
diff --git a/test/module/getIcon-spec.js b/test/module/getIcon-spec.js
index 8d4fc4c..22bcc3c 100644
--- a/test/module/getIcon-spec.js
+++ b/test/module/getIcon-spec.js
@@ -5,7 +5,7 @@ import chai from 'chai';
 import fs from 'fs';
 import os from 'os';
 import path from 'path';
-import pngToIcns from './../../lib/pngToIcns';
+import pngToIcns from './../../lib/helpers/pngToIcns';
 
 let assert = chai.assert;