Clojure reorganisation: fixed some namespace problems