Move models into separate file
Remove Clojure implementation