Refactor templates for readability and make Clojure/Java package names more similar
Make package names consistent between Clojure and Java