diff --git a/Gruntfile.js b/Gruntfile.js
index 09f5fc94..cae09cd9 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -109,7 +109,7 @@ module.exports = function(grunt) {
     jshint: {
       all: [
         'Gruntfile.js',
-        'spec/*.js',
+        'src/__tests__/spec/*.js',
         'src/js/**/*.js',
         'src/js/**/**/*.js',
         'src/levels/**/*.js',
@@ -196,7 +196,7 @@ module.exports = function(grunt) {
     },
     jasmine_node: {
       specNameMatcher: 'spec',
-      projectRoot: '.',
+      projectRoot: './src/js/__tests__/',
       forceExit: true,
       verbose: true,
       requirejs: false
diff --git a/spec/animation.spec.js b/src/js/__tests__/animation.spec.js
similarity index 96%
rename from spec/animation.spec.js
rename to src/js/__tests__/animation.spec.js
index 65b9ab66..74ee935e 100644
--- a/spec/animation.spec.js
+++ b/src/js/__tests__/animation.spec.js
@@ -1,4 +1,4 @@
-var AnimationModule = require('../src/js/visuals/animation/index');
+var AnimationModule = require('../visuals/animation/index');
 var PromiseAnimation = AnimationModule.PromiseAnimation;
 var Animation = AnimationModule.Animation;
 var Q = require('q');
diff --git a/spec/base.js b/src/js/__tests__/base.js
similarity index 96%
rename from spec/base.js
rename to src/js/__tests__/base.js
index 69152432..f408991e 100644
--- a/spec/base.js
+++ b/src/js/__tests__/base.js
@@ -1,5 +1,5 @@
-var HeadlessGit = require('../src/js/git/headless').HeadlessGit;
-var TreeCompare = require('../src/js/graph/treeCompare.js');
+var HeadlessGit = require('../git/headless').HeadlessGit;
+var TreeCompare = require('../graph/treeCompare.js');
 
 var loadTree = function(json) {
   return JSON.parse(unescape(json));
diff --git a/spec/create.js b/src/js/__tests__/create.js
similarity index 90%
rename from spec/create.js
rename to src/js/__tests__/create.js
index 6e9d24bd..6a37e31b 100644
--- a/spec/create.js
+++ b/src/js/__tests__/create.js
@@ -1,5 +1,5 @@
-var TreeCompare = require('../src/js/graph/treeCompare');
-var HeadlessGit = require('../src/js/git/headless').HeadlessGit;
+var TreeCompare = require('../graph/treeCompare');
+var HeadlessGit = require('../git/headless').HeadlessGit;
 
 var fs = require('fs');
 prompt = require('prompt');
diff --git a/spec/git.spec.js b/src/js/__tests__/git.spec.js
similarity index 100%
rename from spec/git.spec.js
rename to src/js/__tests__/git.spec.js
diff --git a/spec/levels.spec.js b/src/js/__tests__/levels.spec.js
similarity index 86%
rename from spec/levels.spec.js
rename to src/js/__tests__/levels.spec.js
index 290b2c6d..e87c0471 100644
--- a/spec/levels.spec.js
+++ b/src/js/__tests__/levels.spec.js
@@ -3,7 +3,7 @@ var base = require('./base');
 
 describe('GitEngine Levels', function() {
   it('solves levels', function() {
-    var sequences = require('../src/levels/index').levelSequences;
+    var sequences = require('../../levels/index').levelSequences;
     _.each(Object.keys(sequences), function(sequenceKey) {
       var levels = sequences[sequenceKey];
       _.each(levels, function(levelBlob, index) {
diff --git a/spec/mercurial.spec.js b/src/js/__tests__/mercurial.spec.js
similarity index 100%
rename from spec/mercurial.spec.js
rename to src/js/__tests__/mercurial.spec.js
diff --git a/spec/remote.spec.js b/src/js/__tests__/remote.spec.js
similarity index 100%
rename from spec/remote.spec.js
rename to src/js/__tests__/remote.spec.js
diff --git a/spec/simpleRemote.spec.js b/src/js/__tests__/simpleRemote.spec.js
similarity index 100%
rename from spec/simpleRemote.spec.js
rename to src/js/__tests__/simpleRemote.spec.js
diff --git a/spec/treeCompare.spec.js b/src/js/__tests__/treeCompare.spec.js
similarity index 98%
rename from spec/treeCompare.spec.js
rename to src/js/__tests__/treeCompare.spec.js
index 78d39f71..9b007d0c 100644
--- a/spec/treeCompare.spec.js
+++ b/src/js/__tests__/treeCompare.spec.js
@@ -1,4 +1,4 @@
-var TreeCompare = require('../src/js/graph/treeCompare');
+var TreeCompare = require('../graph/treeCompare');
 var _ = require('underscore');
 
 var loadTree = function(treeString) {
@@ -112,7 +112,7 @@ describe('Tree Compare', function() {
   });
 
   it('compares all branches with hash agnostic', function() {
-    var selectiveRebaseGoal = require('../src/levels/rebase/selectiveRebase').level.goalTreeString;
+    var selectiveRebaseGoal = require('../../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('../src/levels/rebase/manyRebases').level.goalTreeString;
+    var manyRebaseGoal = require('../../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('../src/levels/mixed/jugglingCommits').level.goalTreeString;
+    var jugglingGoal = require('../../levels/mixed/jugglingCommits').level.goalTreeString;
     testMethod(
       {
         compareOnlyMasterHashAgnosticWithAsserts: true,
diff --git a/spec/vcs.spec.js b/src/js/__tests__/vcs.spec.js
similarity index 94%
rename from spec/vcs.spec.js
rename to src/js/__tests__/vcs.spec.js
index 09ef1e29..503ecf5e 100644
--- a/spec/vcs.spec.js
+++ b/src/js/__tests__/vcs.spec.js
@@ -1,6 +1,6 @@
 var _ = require('underscore');
 
-var Command = require('../src/js/models/commandModel').Command;
+var Command = require('../models/commandModel').Command;
 
 describe('commands', function() {
   it('replaces . with HEAD correctly', function() {