Removing redundant files.
Improving tests, throwing in first prototype of new cql.