Updated directory structure.
Refactored code to make it work under clojure 1.5.0