Tweaks to clojure setup
Move code around and refactor some stuff