Refactor directives and start moving cassandra actions