Re-org common/soups for clojure