diff --git a/Makefile b/Makefile
index fdd7807..e46f0db 100644
--- a/Makefile
+++ b/Makefile
@@ -133,12 +133,12 @@ benchmark: build
# Run JSHint on the source
hint: build
- $(JSHINT) \
- $(SRC_DIR)/*.js \
- $(TEST_DIR)/*.js \
- $(TEST_RUN) \
- $(BENCHMARK_DIR)/*.js \
- $(BENCHMARK_RUN) \
+ $(JSHINT) \
+ `find $(SRC_DIR) -name '*.js'` \
+ `find $(TEST_DIR) -name '*.js' -and -not -path '$(TEST_DIR)/vendor/*'` \
+ $(TEST_RUN) \
+ $(BENCHMARK_DIR)/*.js \
+ $(BENCHMARK_RUN) \
$(PEGJS)
.PHONY: test benchmark hint parser build clean dist distclean
diff --git a/src/compiler.js b/src/compiler.js
index 8c4a474..320d3d9 100644
--- a/src/compiler.js
+++ b/src/compiler.js
@@ -32,5 +32,5 @@ PEG.compiler = {
}
};
-// @include "passes.js"
-// @include "emitter.js"
+// @include "compiler/passes.js"
+// @include "compiler/emitter.js"
diff --git a/src/emitter.js b/src/compiler/emitter.js
similarity index 100%
rename from src/emitter.js
rename to src/compiler/emitter.js
diff --git a/src/passes.js b/src/compiler/passes.js
similarity index 100%
rename from src/passes.js
rename to src/compiler/passes.js
diff --git a/test/passes-test.js b/test/compiler/passes-test.js
similarity index 100%
rename from test/passes-test.js
rename to test/compiler/passes-test.js
diff --git a/test/index.html b/test/index.html
index 12422ff..262b103 100644
--- a/test/index.html
+++ b/test/index.html
@@ -8,8 +8,8 @@
-
+
diff --git a/test/run b/test/run
index 849d616..34d9159 100755
--- a/test/run
+++ b/test/run
@@ -76,8 +76,8 @@ QUnit.done(function(details) {
[
"helpers.js",
"parser-test.js",
- "passes-test.js",
"compiler-test.js",
+ "compiler/passes-test.js"
].forEach(function(file) {
eval("with (QUnit) {" + fs.readFileSync(__dirname + "/" + file, "utf8") + "}");
});