re-arrange cassandra data structures