   (:require-macros [cljs.core.async.macros :refer [go]])
   (:require [om.core :as om :include-macros true]
             [om.dom :as dom :include-macros true]
-            [chess.board :as board]
+            [chess.board :as b]
             [cljs.core.async :refer [chan <! put!]]))
 
 
 (defn piece-class-name
   [p]
-  (str "piece " (board/colour p) " " (board/pieces p)))
+  (str "piece " (b/colour p) " " (b/pieces p)))
 
 (defn piece [p owner]
   (reify

                (if old-selection
                  (do
                    (om/transact! app-state :board (fn [b]
                                                     (board/move b
                                                                 old-selection
                                                                 new-selection)))
                    (om/set-state! owner :selected nil))
                  (if (board/in (deref board) new-selection)
                    (om/set-state! owner :selected new-selection))))))))))

                    (apply dom/div #js {:className "row"}
                           (om/build-all square r {:opts {:click-chan click-chan}})))
                  (->> board
                       b/squares-and-pieces
                       (map (fn [[s p]] [s p (= s selected)]))
                       b/as-rows)))))
      om/IDidMount
      (did-mount [_]
        (go (while true
