diff --git a/doclet/resources/classes.edn b/doclet/resources/classes.edn
index 69646c8..297086d 100644
--- a/doclet/resources/classes.edn
+++ b/doclet/resources/classes.edn
@@ -131,8 +131,6 @@
  "Material" {"material" :methods
              "material!" :methods}
  "MathUtils" {"math!" :static-methods}
- "MapLayer" {"map-layer" :methods
-             "map-layer!" :methods}
  "Matrix3" {"matrix-3" :methods
             "matrix-3!" :methods}
  "Matrix4" {"matrix-4" :methods
diff --git a/doclet/src/clojure/play_clj_doclet/core.clj b/doclet/src/clojure/play_clj_doclet/core.clj
index 5db9ac9..b35d8c0 100644
--- a/doclet/src/clojure/play_clj_doclet/core.clj
+++ b/doclet/src/clojure/play_clj_doclet/core.clj
@@ -126,6 +126,8 @@
   (->> (io/file "../src/")
        file-seq
        (filter #(-> % .getName (.endsWith ".clj")))
+       (remove #(contains? #{"physics.clj" "utils.clj"}
+                           (-> % .getName)))
        (sort-by #(.getName %))
        (map #(.getCanonicalPath %))
        (map marg/path-to-doc)
@@ -134,10 +136,8 @@
 
 (defn save
   [parsed-files]
-  (let [dir "doc"]
-    (.mkdir (io/file dir))
-    (->> parsed-files pr-str (spit (io/file "doc.edn")))
-    (html/create dir parsed-files)))
+  (->> parsed-files pr-str (spit (io/file "doc.edn")))
+  (html/create "doc" parsed-files))
 
 (defn parse
   [^RootDoc root]
diff --git a/doclet/src/clojure/play_clj_doclet/html.clj b/doclet/src/clojure/play_clj_doclet/html.clj
index 1296718..d2b47e7 100644
--- a/doclet/src/clojure/play_clj_doclet/html.clj
+++ b/doclet/src/clojure/play_clj_doclet/html.clj
@@ -4,8 +4,12 @@
             [hiccup.core :refer :all]))
 
 (defn str->filename
-  [s]
-  (-> s
+  [ns s]
+  (-> (or (let [dot-pos (.lastIndexOf ns ".")]
+            (when-not (= dot-pos -1)
+              (subs ns (+ 1 dot-pos))))
+          "core")
+      (str "." s)
       (string/replace "?" "_q")
       (string/replace "->" "_")
       (string/replace ">" "_r")
@@ -20,7 +24,7 @@
              [:div {:class "ns"} ns])
            (for [{:keys [name]} groups]
              [:div {:class "name"}
-              [:a {:href (str->filename name)}
+              [:a {:href (str->filename ns name)}
                name]])))])
 
 (defn java-param
@@ -80,13 +84,14 @@
 
 (defn create
   [dir parsed-files]
+  (.mkdir (io/file dir))
   (copy-from-res dir "main.css")
   (copy-from-res dir "main.js")
   (copy-from-res dir "highlight.css")
   (copy-from-res dir "highlight.js")
-  (doseq [{:keys [groups] :as pf} parsed-files]
+  (doseq [{:keys [ns groups] :as pf} parsed-files]
     (doseq [{:keys [name] :as group} groups]
-      (spit (io/file dir (str->filename name))
+      (spit (io/file dir (str->filename ns name))
             (create-file parsed-files name (content group)))))
   (spit (io/file dir "index.html")
         (create-file parsed-files "play-clj docs" nil)))