diff --git a/.gitignore b/.gitignore
index a043de4e..f274b4d7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,10 +17,6 @@ index.html
 # Annoying mac stuff
 .DS_STORE
 
-# Casper stuff
-src/__tests__/casperjs/screenshots/*.png
-src/__tests__/casperjs/*.js-e
-
 # Xcode
 *.xcuserstate
 *.xcworkspace
diff --git a/Gruntfile.js b/Gruntfile.js
index 49f3032c..47b0a7d3 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -107,7 +107,7 @@ module.exports = function(grunt) {
     jshint: {
       all: [
         'Gruntfile.js',
-        'src/__tests__/spec/*.js',
+        '__tests__/*.spec.js',
         'src/js/**/*.js',
         'src/js/**/**/*.js',
         'src/levels/**/*.js'
@@ -202,32 +202,24 @@ module.exports = function(grunt) {
       }
     },
     jasmine_node: {
-      projectRoot: './src/js/__tests__/',
+      projectRoot: './__tests__/',
       forceExit: true,
       verbose: true,
       requirejs: false
     },
     browserify: {
       options: {
-        transform: [require('grunt-react').browserify],
-        ignore: [
-          'src/js/__tests__/create.js',
-          'src/js/__tests__/*.js',
-          'src/js/native_react_views/*.js',
-          'src/js/**/*.ios.js'
-        ]
+        transform: [require('grunt-react').browserify]
       },
       dist: {
         files: {
           'build/bundle.js': [
             'src/**/*.js',
-            'src/**/*.jsx',
-            'src/js/**/*.js',
-            'src/js/**/*.jsx'
+            'src/**/*.jsx'
           ]
-        },
+        }
       }
-    },
+    }
   });
 
   // all my npm helpers
diff --git a/src/js/__tests__/CommandLineStore.spec.js b/__tests__/CommandLineStore.spec.js
similarity index 90%
rename from src/js/__tests__/CommandLineStore.spec.js
rename to __tests__/CommandLineStore.spec.js
index 365c37d4..d667d9f4 100644
--- a/src/js/__tests__/CommandLineStore.spec.js
+++ b/__tests__/CommandLineStore.spec.js
@@ -1,5 +1,5 @@
-var CommandLineActions = require('../actions/CommandLineActions');
-var CommandLineStore = require('../stores/CommandLineStore');
+var CommandLineActions = require('../src/js/actions/CommandLineActions');
+var CommandLineStore = require('../src/js/stores/CommandLineStore');
 
 describe('this store', function() {
 
diff --git a/src/js/__tests__/GlobalStateStore.spec.js b/__tests__/GlobalStateStore.spec.js
similarity index 82%
rename from src/js/__tests__/GlobalStateStore.spec.js
rename to __tests__/GlobalStateStore.spec.js
index c2590946..1d1acd2d 100644
--- a/src/js/__tests__/GlobalStateStore.spec.js
+++ b/__tests__/GlobalStateStore.spec.js
@@ -1,5 +1,5 @@
-var GlobalStateActions = require('../actions/GlobalStateActions');
-var GlobalStateStore = require('../stores/GlobalStateStore');
+var GlobalStateActions = require('../src/js/actions/GlobalStateActions');
+var GlobalStateStore = require('../src/js/stores/GlobalStateStore');
 
 describe('this store', function() {
   it('is can change animating', function() {
diff --git a/src/js/__tests__/LevelStore.spec.js b/__tests__/LevelStore.spec.js
similarity index 89%
rename from src/js/__tests__/LevelStore.spec.js
rename to __tests__/LevelStore.spec.js
index 042474fa..efcd8ac9 100644
--- a/src/js/__tests__/LevelStore.spec.js
+++ b/__tests__/LevelStore.spec.js
@@ -1,5 +1,5 @@
-var LevelActions = require('../actions/LevelActions');
-var LevelStore = require('../stores/LevelStore');
+var LevelActions = require('../src/js/actions/LevelActions');
+var LevelStore = require('../src/js/stores/LevelStore');
 
 describe('this store', function() {
 
diff --git a/src/js/__tests__/LocaleStore.spec.js b/__tests__/LocaleStore.spec.js
similarity index 89%
rename from src/js/__tests__/LocaleStore.spec.js
rename to __tests__/LocaleStore.spec.js
index da08162a..e1dd32e3 100644
--- a/src/js/__tests__/LocaleStore.spec.js
+++ b/__tests__/LocaleStore.spec.js
@@ -1,5 +1,5 @@
-var LocaleActions = require('../actions/LocaleActions');
-var LocaleStore = require('../stores/LocaleStore');
+var LocaleActions = require('../src/js/actions/LocaleActions');
+var LocaleStore = require('../src/js/stores/LocaleStore');
 
 describe('LocaleStore', function() {
 
diff --git a/src/js/__tests__/animation.spec.js b/__tests__/animation.spec.js
similarity index 96%
rename from src/js/__tests__/animation.spec.js
rename to __tests__/animation.spec.js
index 74ee935e..65b9ab66 100644
--- a/src/js/__tests__/animation.spec.js
+++ b/__tests__/animation.spec.js
@@ -1,4 +1,4 @@
-var AnimationModule = require('../visuals/animation/index');
+var AnimationModule = require('../src/js/visuals/animation/index');
 var PromiseAnimation = AnimationModule.PromiseAnimation;
 var Animation = AnimationModule.Animation;
 var Q = require('q');
diff --git a/src/js/__tests__/base.js b/__tests__/base.js
similarity index 96%
rename from src/js/__tests__/base.js
rename to __tests__/base.js
index 264595df..a8d5ab32 100644
--- a/src/js/__tests__/base.js
+++ b/__tests__/base.js
@@ -1,5 +1,5 @@
-var HeadlessGit = require('../git/headless').HeadlessGit;
-var TreeCompare = require('../graph/treeCompare.js');
+var HeadlessGit = require('../src/js/git/headless').HeadlessGit;
+var TreeCompare = require('../src/js/graph/treeCompare.js');
 
 var loadTree = function(json) {
   return JSON.parse(unescape(json));
diff --git a/src/js/__tests__/create.js b/__tests__/create.js
similarity index 90%
rename from src/js/__tests__/create.js
rename to __tests__/create.js
index 6a37e31b..6e9d24bd 100644
--- a/src/js/__tests__/create.js
+++ b/__tests__/create.js
@@ -1,5 +1,5 @@
-var TreeCompare = require('../graph/treeCompare');
-var HeadlessGit = require('../git/headless').HeadlessGit;
+var TreeCompare = require('../src/js/graph/treeCompare');
+var HeadlessGit = require('../src/js/git/headless').HeadlessGit;
 
 var fs = require('fs');
 prompt = require('prompt');
diff --git a/src/js/__tests__/git.spec.js b/__tests__/git.spec.js
similarity index 100%
rename from src/js/__tests__/git.spec.js
rename to __tests__/git.spec.js
diff --git a/src/js/__tests__/levels.spec.js b/__tests__/levels.spec.js
similarity index 86%
rename from src/js/__tests__/levels.spec.js
rename to __tests__/levels.spec.js
index 971fe10b..8ee2e6fb 100644
--- a/src/js/__tests__/levels.spec.js
+++ b/__tests__/levels.spec.js
@@ -2,7 +2,7 @@ var base = require('./base');
 
 describe('GitEngine Levels', function() {
   it('solves levels', function() {
-    var sequences = require('../../levels/index').levelSequences;
+    var sequences = require('../src/levels/index').levelSequences;
     Object.keys(sequences).forEach(function(sequenceKey) {
       var levels = sequences[sequenceKey];
       Object.keys(levels).forEach(function(index) {
diff --git a/src/js/__tests__/mercurial.spec.js b/__tests__/mercurial.spec.js
similarity index 100%
rename from src/js/__tests__/mercurial.spec.js
rename to __tests__/mercurial.spec.js
diff --git a/src/js/__tests__/remote.spec.js b/__tests__/remote.spec.js
similarity index 100%
rename from src/js/__tests__/remote.spec.js
rename to __tests__/remote.spec.js
diff --git a/src/js/__tests__/simpleRemote.spec.js b/__tests__/simpleRemote.spec.js
similarity index 100%
rename from src/js/__tests__/simpleRemote.spec.js
rename to __tests__/simpleRemote.spec.js
diff --git a/src/js/__tests__/treeCompare.spec.js b/__tests__/treeCompare.spec.js
similarity index 98%
rename from src/js/__tests__/treeCompare.spec.js
rename to __tests__/treeCompare.spec.js
index ab71ec35..83efa368 100644
--- a/src/js/__tests__/treeCompare.spec.js
+++ b/__tests__/treeCompare.spec.js
@@ -1,4 +1,4 @@
-var TreeCompare = require('../graph/treeCompare');
+var TreeCompare = require('../src/js/graph/treeCompare');
 
 var loadTree = function(treeString) {
   return TreeCompare.convertTreeSafe(treeString);
@@ -112,7 +112,7 @@ describe('Tree Compare', function() {
   });
 
   it('compares all branches with hash agnostic', function() {
-    var selectiveRebaseGoal = require('../../levels/rebase/selectiveRebase').level.goalTreeString;
+    var selectiveRebaseGoal = require('../src/levels/rebase/selectiveRebase').level.goalTreeString;
     testMethod(
       { compareAllBranchesHashAgnostic: true },
       selectiveRebaseGoal,
@@ -130,7 +130,7 @@ describe('Tree Compare', function() {
   });
 
   it('compares only master with hash agnostic', function() {
-    var manyRebaseGoal = require('../../levels/rebase/manyRebases').level.goalTreeString;
+    var manyRebaseGoal = require('../src/levels/rebase/manyRebases').level.goalTreeString;
     testMethod(
       { compareOnlyMasterHashAgnostic: true },
       manyRebaseGoal,
@@ -148,7 +148,7 @@ describe('Tree Compare', function() {
   });
 
   it('compares only master with hash agnostic and asserts', function() {
-    var jugglingGoal = require('../../levels/mixed/jugglingCommits').level.goalTreeString;
+    var jugglingGoal = require('../src/levels/mixed/jugglingCommits').level.goalTreeString;
     testMethod(
       {
         compareOnlyMasterHashAgnosticWithAsserts: true,
diff --git a/src/js/__tests__/vcs.spec.js b/__tests__/vcs.spec.js
similarity index 94%
rename from src/js/__tests__/vcs.spec.js
rename to __tests__/vcs.spec.js
index 3ad551ea..a1b1ed64 100644
--- a/src/js/__tests__/vcs.spec.js
+++ b/__tests__/vcs.spec.js
@@ -1,4 +1,4 @@
-var Command = require('../models/commandModel').Command;
+var Command = require('../src/js/models/commandModel').Command;
 
 describe('commands', function() {
   it('replaces . with HEAD correctly', function() {