diff --git a/package.json b/package.json
index 7e2b2b08..5e0b984f 100644
--- a/package.json
+++ b/package.json
@@ -5,7 +5,7 @@
   "main": "index.js",
   "scripts": {
     "debug": "node index.js -i ../imgs/back.png -s invert",
-    "test": "tape test/*.js | tap-spec; browserify test/image-sequencer.js test/chain.js test/replace.js | tape-run --render=\"tap-spec\""
+    "test": "tape test/modules/*.js | tap-spec; browserify test/modules/image-sequencer.js test/modules/chain.js test/modules/replace.js | tape-run --render=\"tap-spec\""
   },
   "repository": {
     "type": "git",
diff --git a/test/chain.js b/test/modules/chain.js
similarity index 98%
rename from test/chain.js
rename to test/modules/chain.js
index 49916582..d729f227 100644
--- a/test/chain.js
+++ b/test/modules/chain.js
@@ -6,7 +6,7 @@ var test = require('tape');
 // We should only test headless code here.
 // http://stackoverflow.com/questions/21358015/error-jquery-requires-a-window-with-a-document#25622933
 
-require('../src/ImageSequencer.js');
+require('../../src/ImageSequencer.js');
 
 var sequencer = ImageSequencer({ ui: false });
 var red = "data:image/jpeg;base64,/9j/4AAQSkZJRgABAQAAAQABAAD/2wBDAAYEBQYFBAYGBQYHBwYIChAKCgkJChQODwwQFxQYGBcUFhYaHSUfGhsjHBYWICwgIyYnKSopGR8tMC0oMCUoKSj/2wBDAQcHBwoIChMKChMoGhYaKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCj/wAARCAAQABADASIAAhEBAxEB/8QAFQABAQAAAAAAAAAAAAAAAAAAAAf/xAAUEAEAAAAAAAAAAAAAAAAAAAAA/8QAFQEBAQAAAAAAAAAAAAAAAAAABgj/xAAUEQEAAAAAAAAAAAAAAAAAAAAA/9oADAMBAAIRAxEAPwCdABykX//Z";
diff --git a/test/image-manip.js b/test/modules/image-manip.js
similarity index 98%
rename from test/image-manip.js
rename to test/modules/image-manip.js
index aeb8d4af..0dd7b844 100644
--- a/test/image-manip.js
+++ b/test/modules/image-manip.js
@@ -7,7 +7,7 @@ var DataURItoBuffer = require('data-uri-to-buffer');
 // We should only test headless code here.
 // http://stackoverflow.com/questions/21358015/error-jquery-requires-a-window-with-a-document#25622933
 
-require('../src/ImageSequencer.js');
+require('../../src/ImageSequencer.js');
 
 //require image files as DataURLs so they can be tested alike on browser and Node.
 var sequencer = ImageSequencer({ ui: false });
diff --git a/test/image-sequencer.js b/test/modules/image-sequencer.js
similarity index 99%
rename from test/image-sequencer.js
rename to test/modules/image-sequencer.js
index 3b95d206..e79619d1 100644
--- a/test/image-sequencer.js
+++ b/test/modules/image-sequencer.js
@@ -6,7 +6,7 @@ var test = require('tape');
 // We should only test headless code here.
 // http://stackoverflow.com/questions/21358015/error-jquery-requires-a-window-with-a-document#25622933
 
-require('../src/ImageSequencer.js');
+require('../../src/ImageSequencer.js');
 
 // This function is used to test whether or not any additional global variables are being created
 function copy(g,a) {
diff --git a/test/images/IS-QR.js b/test/modules/images/IS-QR.js
similarity index 100%
rename from test/images/IS-QR.js
rename to test/modules/images/IS-QR.js
diff --git a/test/images/test.gif.js b/test/modules/images/test.gif.js
similarity index 100%
rename from test/images/test.gif.js
rename to test/modules/images/test.gif.js
diff --git a/test/images/test.png.js b/test/modules/images/test.png.js
similarity index 100%
rename from test/images/test.png.js
rename to test/modules/images/test.png.js
diff --git a/test/replace.js b/test/modules/replace.js
similarity index 95%
rename from test/replace.js
rename to test/modules/replace.js
index 74b7a43e..c8257dde 100644
--- a/test/replace.js
+++ b/test/modules/replace.js
@@ -3,7 +3,7 @@
 var fs = require('fs');
 var test = require('tape');
 
-require('../src/ImageSequencer.js');
+require('../../src/ImageSequencer.js');
 
 var sequencer = ImageSequencer({ ui: false });
 var red = "data:image/jpeg;base64,/9j/4AAQSkZJRgABAQAAAQABAAD/2wBDAAYEBQYFBAYGBQYHBwYIChAKCgkJChQODwwQFxQYGBcUFhYaHSUfGhsjHBYWICwgIyYnKSopGR8tMC0oMCUoKSj/2wBDAQcHBwoIChMKChMoGhYaKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCj/wAARCAAQABADASIAAhEBAxEB/8QAFQABAQAAAAAAAAAAAAAAAAAAAAf/xAAUEAEAAAAAAAAAAAAAAAAAAAAA/8QAFQEBAQAAAAAAAAAAAAAAAAAABgj/xAAUEQEAAAAAAAAAAAAAAAAAAAAA/9oADAMBAAIRAxEAPwCdABykX//Z";