   (:require
     [clojure.future :refer [pos-int?]]
     [clojure.spec :as s]
-    [merkledag.core :as mdag]
-    [merkledag.link :as link]
-    [merkle-db.data :as data]
-    [merkle-db.key :as key]
-    [merkle-db.partition :as part]))
+    (merkledag
+      [core :as mdag]
+      [link :as link]
+      [node :as node])
+    (merkle-db
+      [data :as data]
+      [key :as key]
+      [partition :as part]
+      ; TODO: is patch needed?
+      [patch :as patch])))
 
 
 ;; ## Specs

    part/data-type
    (part/read-batch store node fields record-keys)

    (throw (ex-info (str "Unsupported data-tree node type: "
                         (pr-str (:data/type node)))
                    {:data/type (:data/type node)}))))


    part/data-type
    (part/read-all store node fields)

    (throw (ex-info (str "Unsupported index-tree node type: "
                         (pr-str (:data/type node)))
                    {:data/type (:data/type node)}))))

