diff --git a/Makefile b/Makefile
index 4e58631b9..ffd9b17a9 100644
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,7 @@ build: setup build/katex.min.js build/katex.min.css zip compress
 setup:
 	npm install
 
-build/katex.js: katex.js $(wildcard *.js)
+build/katex.js: katex.js $(wildcard src/*.js)
 	./node_modules/.bin/browserify $< --standalone katex > $@
 
 build/katex.min.js: build/katex.js
diff --git a/katex.js b/katex.js
index 6785210bc..706a717b6 100644
--- a/katex.js
+++ b/katex.js
@@ -6,11 +6,11 @@
  * errors in the expression, or errors in javascript handling.
  */
 
-var ParseError = require("./ParseError");
+var ParseError = require("./src/ParseError");
 
-var buildTree = require("./buildTree");
-var parseTree = require("./parseTree");
-var utils = require("./utils");
+var buildTree = require("./src/buildTree");
+var parseTree = require("./src/parseTree");
+var utils = require("./src/utils");
 
 /**
  * Parse and build an expression, and place that expression in the DOM node
diff --git a/metrics/replace_line.py b/metrics/replace_line.py
index 0c39746b7..951d40aee 100755
--- a/metrics/replace_line.py
+++ b/metrics/replace_line.py
@@ -2,12 +2,12 @@
 
 import sys
 
-with open("../fontMetrics.js", "r") as metrics:
+with open("../src/fontMetrics.js", "r") as metrics:
     old_lines = file.readlines(metrics)
 
 replace = sys.stdin.read()
 
-with open("../fontMetrics.js", "w") as output:
+with open("../src/fontMetrics.js", "w") as output:
     for line in old_lines:
         if line.startswith("var metricMap"):
             output.write("var metricMap = ")
diff --git a/Lexer.js b/src/Lexer.js
similarity index 100%
rename from Lexer.js
rename to src/Lexer.js
diff --git a/Options.js b/src/Options.js
similarity index 100%
rename from Options.js
rename to src/Options.js
diff --git a/ParseError.js b/src/ParseError.js
similarity index 100%
rename from ParseError.js
rename to src/ParseError.js
diff --git a/Parser.js b/src/Parser.js
similarity index 100%
rename from Parser.js
rename to src/Parser.js
diff --git a/Style.js b/src/Style.js
similarity index 100%
rename from Style.js
rename to src/Style.js
diff --git a/buildCommon.js b/src/buildCommon.js
similarity index 100%
rename from buildCommon.js
rename to src/buildCommon.js
diff --git a/buildTree.js b/src/buildTree.js
similarity index 100%
rename from buildTree.js
rename to src/buildTree.js
diff --git a/delimiter.js b/src/delimiter.js
similarity index 100%
rename from delimiter.js
rename to src/delimiter.js
diff --git a/domTree.js b/src/domTree.js
similarity index 100%
rename from domTree.js
rename to src/domTree.js
diff --git a/fontMetrics.js b/src/fontMetrics.js
similarity index 100%
rename from fontMetrics.js
rename to src/fontMetrics.js
diff --git a/functions.js b/src/functions.js
similarity index 100%
rename from functions.js
rename to src/functions.js
diff --git a/parseTree.js b/src/parseTree.js
similarity index 100%
rename from parseTree.js
rename to src/parseTree.js
diff --git a/symbols.js b/src/symbols.js
similarity index 100%
rename from symbols.js
rename to src/symbols.js
diff --git a/utils.js b/src/utils.js
similarity index 100%
rename from utils.js
rename to src/utils.js
diff --git a/test/katex-spec.js b/test/katex-spec.js
index b7f328540..ef977932b 100644
--- a/test/katex-spec.js
+++ b/test/katex-spec.js
@@ -1,7 +1,7 @@
 var katex = require("../katex");
-var buildTree = require("../buildTree");
-var parseTree = require("../parseTree");
-var ParseError = require("../ParseError");
+var buildTree = require("../src/buildTree");
+var parseTree = require("../src/parseTree");
+var ParseError = require("../src/ParseError");
 
 var getBuilt = function(expr) {
     expect(expr).toBuild();