diff --git a/project.clj b/project.clj
index 9a48647..e52f97f 100644
--- a/project.clj
+++ b/project.clj
@@ -21,5 +21,5 @@
             [codox             "0.6.4"]]
   :min-lein-version "2.0.0"
   :warn-on-reflection true
-  :java-source-paths ["java-src"]
-  :javac-options     ["-target" "1.6" "-source" "1.6"])
+  :source-paths      ["src/clj"]
+  :java-source-paths ["src/java"])
\ No newline at end of file
diff --git a/src/taoensso/nippy.clj b/src/clj/taoensso/nippy.clj
similarity index 100%
rename from src/taoensso/nippy.clj
rename to src/clj/taoensso/nippy.clj
diff --git a/src/taoensso/nippy/benchmarks.clj b/src/clj/taoensso/nippy/benchmarks.clj
similarity index 100%
rename from src/taoensso/nippy/benchmarks.clj
rename to src/clj/taoensso/nippy/benchmarks.clj
diff --git a/src/taoensso/nippy/compression.clj b/src/clj/taoensso/nippy/compression.clj
similarity index 100%
rename from src/taoensso/nippy/compression.clj
rename to src/clj/taoensso/nippy/compression.clj
diff --git a/src/taoensso/nippy/encryption.clj b/src/clj/taoensso/nippy/encryption.clj
similarity index 100%
rename from src/taoensso/nippy/encryption.clj
rename to src/clj/taoensso/nippy/encryption.clj
diff --git a/src/taoensso/nippy/utils.clj b/src/clj/taoensso/nippy/utils.clj
similarity index 100%
rename from src/taoensso/nippy/utils.clj
rename to src/clj/taoensso/nippy/utils.clj
diff --git a/java-src/com/taoensso/FastByteArrayInputStream.java b/src/java/com/taoensso/FastByteArrayInputStream.java
similarity index 100%
rename from java-src/com/taoensso/FastByteArrayInputStream.java
rename to src/java/com/taoensso/FastByteArrayInputStream.java
diff --git a/java-src/com/taoensso/FastByteArrayOutputStream.java b/src/java/com/taoensso/FastByteArrayOutputStream.java
similarity index 100%
rename from java-src/com/taoensso/FastByteArrayOutputStream.java
rename to src/java/com/taoensso/FastByteArrayOutputStream.java