Restructure cassandra utilities