Refactoring, cleanup, making clearer separation between Sources and Sinks
Finalize refactoring, extract CQL functionality to separate Source and SInk.