diff --git a/.gitmodules b/.gitmodules
index 6eee969..5ef77b0 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,3 @@
-[submodule "src/test/resources/spec"]
-	path = src/test/resources/spec
+[submodule "test-resources/spec"]
+	path = test-resources/spec
 	url = https://github.com/mustache/spec
diff --git a/project.clj b/project.clj
index 7b70b02..8aeb893 100644
--- a/project.clj
+++ b/project.clj
@@ -6,11 +6,9 @@
             :url "http://www.gnu.org/licenses/lgpl-2.1.txt"
             :distribution :repo}
   :dependencies [[org.clojure/clojure "1.3.0"]]
-  :source-paths ["src/main/clojure"]
-  :test-paths ["src/test/clojure"]
   :profiles {:dev {:dependencies [[org.clojure/data.json "0.1.2"]
                                   [jline/jline "0.9.94"]]
-                   :resource-paths ["src/test/resources"]}
+                   :resource-paths ["test-resources"]}
              :1.4 {:dependencies [[org.clojure/clojure "1.4.0"]]}}
   :repositories {"clojure-releases" "http://build.clojure.org/releases"}
   :aliases {"all" ["with-profile" "dev:dev,1.4"]}
diff --git a/src/main/clojure/clostache/parser.clj b/src/clostache/parser.clj
similarity index 100%
rename from src/main/clojure/clostache/parser.clj
rename to src/clostache/parser.clj
diff --git a/src/test/resources/spec b/src/test/resources/spec
deleted file mode 160000
index 9b1bc7a..0000000
--- a/src/test/resources/spec
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 9b1bc7ad19247e9671304af02078f2ce30132665
diff --git a/test-resources/spec b/test-resources/spec
new file mode 160000
index 0000000..72233f3
--- /dev/null
+++ b/test-resources/spec
@@ -0,0 +1 @@
+Subproject commit 72233f3ffda9e33915fd3022d0a9ebbcce265acd
diff --git a/src/test/resources/templates/hello.mustache b/test-resources/templates/hello.mustache
similarity index 100%
rename from src/test/resources/templates/hello.mustache
rename to test-resources/templates/hello.mustache
diff --git a/src/test/clojure/clostache/test_parser.clj b/test/clostache/test_parser.clj
similarity index 100%
rename from src/test/clojure/clostache/test_parser.clj
rename to test/clostache/test_parser.clj
diff --git a/src/test/clojure/clostache/test_specs.clj b/test/clostache/test_specs.clj
similarity index 100%
rename from src/test/clojure/clostache/test_specs.clj
rename to test/clostache/test_specs.clj