Bootstrap 0.9.0
Shuffle things around, get ready for Cassandra test