Update packages
Batch of updates and reorganization
Batch 2, including better clojure testing
Batch 3