Reorganize clojure code.