From 1667cd23e579c96158efea2bc6f628eb4bde65e0 Mon Sep 17 00:00:00 2001
From: Jonathan Shook <jshook@gmail.com>
Date: Thu, 5 Mar 2020 11:28:06 -0600
Subject: [PATCH] updated package structure

---
 activitytype-cql/pom.xml                      | 14 ----------
 .../driver/core/TokenRangeStmtFilter.java     |  2 +-
 .../cql => }/api/ErrorResponse.java           |  2 +-
 .../cql => }/api/ResultSetCycleOperator.java  |  2 +-
 .../cql => }/api/RowCycleOperator.java        |  2 +-
 .../cql => }/api/StatementFilter.java         |  2 +-
 .../cql => }/api/VerifyApplied.java           |  2 +-
 .../cql => }/core/CQLBindHelper.java          |  2 +-
 .../{ebdrivers/cql => }/core/CQLOptions.java  |  2 +-
 .../{ebdrivers/cql => }/core/CqlAction.java   | 22 ++++++++--------
 .../cql => }/core/CqlActionDispenser.java     |  2 +-
 .../{ebdrivers/cql => }/core/CqlActivity.java | 26 +++++++++----------
 .../cql => }/core/CqlActivityType.java        |  2 +-
 .../cql => }/core/CqlAsyncAction.java         | 22 ++++++++--------
 .../{ebdrivers/cql => }/core/CqlOpData.java   |  4 +--
 .../cql => }/core/ProxyTranslator.java        |  2 +-
 .../cql => }/core/StatementModifier.java      |  2 +-
 .../errorhandling/CQLExceptionEnum.java       | 12 ++++-----
 .../errorhandling/EbdseCycleErrorHandler.java |  8 +++---
 .../cql => }/errorhandling/ErrorStatus.java   |  4 +--
 .../cql => }/errorhandling/ExceptionMap.java  |  4 +--
 .../errorhandling/HashedCQLErrorHandler.java  | 10 +++----
 .../exceptions/CQLCycleException.java         |  4 +--
 .../exceptions/CQLExceptionDetailer.java      |  2 +-
 .../exceptions/CQLResultSetException.java     |  2 +-
 .../ChangeUnappliedCycleException.java        |  2 +-
 .../exceptions/CqlCycleException.java         |  2 +-
 .../MaxTriesExhaustedException.java           |  2 +-
 .../ResultSetVerificationException.java       |  2 +-
 .../exceptions/RowVerificationException.java  |  2 +-
 .../exceptions/UnexpectedPagingException.java |  2 +-
 .../filtering/CQLResultFilterType.java        |  4 +--
 .../statements/binders/CqlBinderTypes.java    |  2 +-
 .../binders/DiagnosticPreparedBinder.java     |  4 +--
 .../binders/DirectArrayValuesBinder.java      |  2 +-
 .../binders/SimpleStatementValuesBinder.java  |  2 +-
 .../binders/UnsettableValuesBinder.java       |  2 +-
 .../core/AvailableCQLStatements.java          |  2 +-
 .../statements/core/CQLSessionCache.java      |  6 ++---
 .../statements/core/CQLStatementDef.java      |  2 +-
 .../core/CQLStatementDefParser.java           |  2 +-
 .../statements/core/CQLStatementGroups.java   |  2 +-
 .../statements/core/ReadyCQLStatement.java    |  6 ++---
 .../core/ReadyCQLStatementTemplate.java       | 12 ++++-----
 .../core/ReadyCQLStatementsTemplate.java      |  2 +-
 .../core/TaggedCQLStatementDefs.java          |  2 +-
 .../core/YamlCQLStatementLoader.java          |  2 +-
 .../statements/rowoperators/Print.java        |  4 +--
 .../rowoperators/RowCycleOperators.java       |  4 +--
 .../statements/rowoperators/Save.java         |  4 +--
 .../rowoperators/SaveGlobalVars.java          |  4 +--
 .../rowoperators/SaveThreadRows.java          |  6 ++---
 .../rowoperators/SaveThreadVars.java          |  4 +--
 .../rsoperators/AssertSingleRowResultSet.java |  6 ++---
 .../statements/rsoperators/ClearVars.java     |  4 +--
 .../rsoperators/CqlResultSetLogger.java       |  4 +--
 .../rsoperators/PerThreadCQLData.java         |  2 +-
 .../statements/rsoperators/PopVars.java       |  4 +--
 .../statements/rsoperators/Print.java         |  4 +--
 .../statements/rsoperators/PushVars.java      |  4 +--
 .../rsoperators/ResultSetCycleOperators.java  |  4 +--
 .../statements/rsoperators/RowCapture.java    |  4 +--
 .../statements/rsoperators/TraceLogger.java   |  6 ++---
 .../datastax/ebdrivers/cql/CqlActionTest.java |  4 +--
 .../CQLCQLStatementDefParserTest.java         |  2 +-
 .../cql/statements/CQLOptionsTest.java        |  2 +-
 66 files changed, 143 insertions(+), 157 deletions(-)
 rename activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/{ebdrivers/cql => }/api/ErrorResponse.java (93%)
 rename activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/{ebdrivers/cql => }/api/ResultSetCycleOperator.java (91%)
 rename activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/{ebdrivers/cql => }/api/RowCycleOperator.java (80%)
 rename activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/{ebdrivers/cql => }/api/StatementFilter.java (68%)
 rename activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/{ebdrivers/cql => }/api/VerifyApplied.java (52%)
 rename activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/{ebdrivers/cql => }/core/CQLBindHelper.java (99%)
 rename activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/{ebdrivers/cql => }/core/CQLOptions.java (99%)
 rename activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/{ebdrivers/cql => }/core/CqlAction.java (94%)
 rename activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/{ebdrivers/cql => }/core/CqlActionDispenser.java (92%)
 rename activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/{ebdrivers/cql => }/core/CqlActivity.java (96%)
 rename activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/{ebdrivers/cql => }/core/CqlActivityType.java (96%)
 rename activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/{ebdrivers/cql => }/core/CqlAsyncAction.java (91%)
 rename activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/{ebdrivers/cql => }/core/CqlOpData.java (89%)
 rename activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/{ebdrivers/cql => }/core/ProxyTranslator.java (91%)
 rename activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/{ebdrivers/cql => }/core/StatementModifier.java (83%)
 rename activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/{ebdrivers/cql => }/errorhandling/CQLExceptionEnum.java (87%)
 rename activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/{ebdrivers/cql => }/errorhandling/EbdseCycleErrorHandler.java (92%)
 rename activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/{ebdrivers/cql => }/errorhandling/ErrorStatus.java (81%)
 rename activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/{ebdrivers/cql => }/errorhandling/ExceptionMap.java (96%)
 rename activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/{ebdrivers/cql => }/errorhandling/HashedCQLErrorHandler.java (86%)
 rename activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/{ebdrivers/cql => }/errorhandling/exceptions/CQLCycleException.java (84%)
 rename activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/{ebdrivers/cql => }/errorhandling/exceptions/CQLExceptionDetailer.java (90%)
 rename activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/{ebdrivers/cql => }/errorhandling/exceptions/CQLResultSetException.java (95%)
 rename activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/{ebdrivers/cql => }/errorhandling/exceptions/ChangeUnappliedCycleException.java (91%)
 rename activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/{ebdrivers/cql => }/errorhandling/exceptions/CqlCycleException.java (90%)
 rename activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/{ebdrivers/cql => }/errorhandling/exceptions/MaxTriesExhaustedException.java (84%)
 rename activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/{ebdrivers/cql => }/errorhandling/exceptions/ResultSetVerificationException.java (87%)
 rename activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/{ebdrivers/cql => }/errorhandling/exceptions/RowVerificationException.java (90%)
 rename activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/{ebdrivers/cql => }/errorhandling/exceptions/UnexpectedPagingException.java (96%)
 rename activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/{ebdrivers/cql => }/filtering/CQLResultFilterType.java (94%)
 rename activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/{ebdrivers/cql => }/statements/binders/CqlBinderTypes.java (91%)
 rename activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/{ebdrivers/cql => }/statements/binders/DiagnosticPreparedBinder.java (93%)
 rename activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/{ebdrivers/cql => }/statements/binders/DirectArrayValuesBinder.java (95%)
 rename activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/{ebdrivers/cql => }/statements/binders/SimpleStatementValuesBinder.java (89%)
 rename activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/{ebdrivers/cql => }/statements/binders/UnsettableValuesBinder.java (97%)
 rename activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/{ebdrivers/cql => }/statements/core/AvailableCQLStatements.java (96%)
 rename activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/{ebdrivers/cql => }/statements/core/CQLSessionCache.java (98%)
 rename activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/{ebdrivers/cql => }/statements/core/CQLStatementDef.java (97%)
 rename activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/{ebdrivers/cql => }/statements/core/CQLStatementDefParser.java (98%)
 rename activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/{ebdrivers/cql => }/statements/core/CQLStatementGroups.java (94%)
 rename activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/{ebdrivers/cql => }/statements/core/ReadyCQLStatement.java (96%)
 rename activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/{ebdrivers/cql => }/statements/core/ReadyCQLStatementTemplate.java (89%)
 rename activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/{ebdrivers/cql => }/statements/core/ReadyCQLStatementsTemplate.java (89%)
 rename activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/{ebdrivers/cql => }/statements/core/TaggedCQLStatementDefs.java (95%)
 rename activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/{ebdrivers/cql => }/statements/core/YamlCQLStatementLoader.java (97%)
 rename activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/{ebdrivers/cql => }/statements/rowoperators/Print.java (64%)
 rename activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/{ebdrivers/cql => }/statements/rowoperators/RowCycleOperators.java (84%)
 rename activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/{ebdrivers/cql => }/statements/rowoperators/Save.java (90%)
 rename activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/{ebdrivers/cql => }/statements/rowoperators/SaveGlobalVars.java (84%)
 rename activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/{ebdrivers/cql => }/statements/rowoperators/SaveThreadRows.java (54%)
 rename activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/{ebdrivers/cql => }/statements/rowoperators/SaveThreadVars.java (84%)
 rename activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/{ebdrivers/cql => }/statements/rsoperators/AssertSingleRowResultSet.java (72%)
 rename activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/{ebdrivers/cql => }/statements/rsoperators/ClearVars.java (71%)
 rename activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/{ebdrivers/cql => }/statements/rsoperators/CqlResultSetLogger.java (89%)
 rename activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/{ebdrivers/cql => }/statements/rsoperators/PerThreadCQLData.java (72%)
 rename activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/{ebdrivers/cql => }/statements/rsoperators/PopVars.java (82%)
 rename activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/{ebdrivers/cql => }/statements/rsoperators/Print.java (66%)
 rename activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/{ebdrivers/cql => }/statements/rsoperators/PushVars.java (78%)
 rename activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/{ebdrivers/cql => }/statements/rsoperators/ResultSetCycleOperators.java (85%)
 rename activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/{ebdrivers/cql => }/statements/rsoperators/RowCapture.java (71%)
 rename activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/{ebdrivers/cql => }/statements/rsoperators/TraceLogger.java (94%)

diff --git a/activitytype-cql/pom.xml b/activitytype-cql/pom.xml
index 1d62a8292..6aff653d3 100644
--- a/activitytype-cql/pom.xml
+++ b/activitytype-cql/pom.xml
@@ -31,20 +31,6 @@
             <version>3.12.3-SNAPSHOT</version>
         </dependency>
 
-<!--        <dependency>-->
-<!--            <groupId>com.datastax.labs</groupId>-->
-<!--            <artifactId>dsbench-virtdata</artifactId>-->
-<!--            <version>3.12.1-SNAPSHOT</version>-->
-<!--            <scope>compile</scope>-->
-<!--        </dependency>-->
-
-<!--        <dependency>-->
-<!--            <groupId>com.datastax.labs</groupId>-->
-<!--            <artifactId>dsbench-udts</artifactId>-->
-<!--            <version>3.12.1-SNAPSHOT</version>-->
-<!--            <scope>compile</scope>-->
-<!--        </dependency>-->
-
         <dependency>
             <groupId>com.datastax.dse</groupId>
             <artifactId>dse-java-driver-core</artifactId>
diff --git a/activitytype-cql/src/main/java/com/datastax/driver/core/TokenRangeStmtFilter.java b/activitytype-cql/src/main/java/com/datastax/driver/core/TokenRangeStmtFilter.java
index 73d90b628..78f7d865a 100644
--- a/activitytype-cql/src/main/java/com/datastax/driver/core/TokenRangeStmtFilter.java
+++ b/activitytype-cql/src/main/java/com/datastax/driver/core/TokenRangeStmtFilter.java
@@ -1,6 +1,6 @@
 package com.datastax.driver.core;
 
-import io.nosqlbench.activitytype.cql.ebdrivers.cql.api.StatementFilter;
+import io.nosqlbench.activitytype.cql.api.StatementFilter;
 
 import java.nio.ByteBuffer;
 import java.util.ArrayList;
diff --git a/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/ebdrivers/cql/api/ErrorResponse.java b/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/api/ErrorResponse.java
similarity index 93%
rename from activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/ebdrivers/cql/api/ErrorResponse.java
rename to activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/api/ErrorResponse.java
index f5ad95617..74fd940d4 100644
--- a/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/ebdrivers/cql/api/ErrorResponse.java
+++ b/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/api/ErrorResponse.java
@@ -1,4 +1,4 @@
-package io.nosqlbench.activitytype.cql.ebdrivers.cql.api;
+package io.nosqlbench.activitytype.cql.api;
 
 /**
  * When an error filter allows us to see and handle an error in a specific way,
diff --git a/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/ebdrivers/cql/api/ResultSetCycleOperator.java b/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/api/ResultSetCycleOperator.java
similarity index 91%
rename from activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/ebdrivers/cql/api/ResultSetCycleOperator.java
rename to activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/api/ResultSetCycleOperator.java
index 0f0466518..b653159b9 100644
--- a/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/ebdrivers/cql/api/ResultSetCycleOperator.java
+++ b/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/api/ResultSetCycleOperator.java
@@ -1,4 +1,4 @@
-package io.nosqlbench.activitytype.cql.ebdrivers.cql.api;
+package io.nosqlbench.activitytype.cql.api;
 
 import com.datastax.driver.core.ResultSet;
 import com.datastax.driver.core.Statement;
diff --git a/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/ebdrivers/cql/api/RowCycleOperator.java b/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/api/RowCycleOperator.java
similarity index 80%
rename from activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/ebdrivers/cql/api/RowCycleOperator.java
rename to activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/api/RowCycleOperator.java
index 1e33b0670..313de6bbe 100644
--- a/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/ebdrivers/cql/api/RowCycleOperator.java
+++ b/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/api/RowCycleOperator.java
@@ -1,4 +1,4 @@
-package io.nosqlbench.activitytype.cql.ebdrivers.cql.api;
+package io.nosqlbench.activitytype.cql.api;
 
 import com.datastax.driver.core.Row;
 
diff --git a/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/ebdrivers/cql/api/StatementFilter.java b/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/api/StatementFilter.java
similarity index 68%
rename from activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/ebdrivers/cql/api/StatementFilter.java
rename to activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/api/StatementFilter.java
index 9ece49d14..fd9b1daa3 100644
--- a/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/ebdrivers/cql/api/StatementFilter.java
+++ b/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/api/StatementFilter.java
@@ -1,4 +1,4 @@
-package io.nosqlbench.activitytype.cql.ebdrivers.cql.api;
+package io.nosqlbench.activitytype.cql.api;
 
 import com.datastax.driver.core.Statement;
 
diff --git a/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/ebdrivers/cql/api/VerifyApplied.java b/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/api/VerifyApplied.java
similarity index 52%
rename from activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/ebdrivers/cql/api/VerifyApplied.java
rename to activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/api/VerifyApplied.java
index e7c149209..cf9850b2a 100644
--- a/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/ebdrivers/cql/api/VerifyApplied.java
+++ b/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/api/VerifyApplied.java
@@ -1,4 +1,4 @@
-package io.nosqlbench.activitytype.cql.ebdrivers.cql.api;
+package io.nosqlbench.activitytype.cql.api;
 
 public enum VerifyApplied {
     ignore,
diff --git a/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/ebdrivers/cql/core/CQLBindHelper.java b/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/core/CQLBindHelper.java
similarity index 99%
rename from activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/ebdrivers/cql/core/CQLBindHelper.java
rename to activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/core/CQLBindHelper.java
index 27f50c8e5..7d15800d0 100644
--- a/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/ebdrivers/cql/core/CQLBindHelper.java
+++ b/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/core/CQLBindHelper.java
@@ -1,4 +1,4 @@
-package io.nosqlbench.activitytype.cql.ebdrivers.cql.core;
+package io.nosqlbench.activitytype.cql.core;
 
 import com.datastax.driver.core.*;
 import io.nosqlbench.engine.api.activityconfig.ParsedStmt;
diff --git a/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/ebdrivers/cql/core/CQLOptions.java b/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/core/CQLOptions.java
similarity index 99%
rename from activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/ebdrivers/cql/core/CQLOptions.java
rename to activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/core/CQLOptions.java
index 99c72350e..996fc8eec 100644
--- a/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/ebdrivers/cql/core/CQLOptions.java
+++ b/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/core/CQLOptions.java
@@ -1,4 +1,4 @@
-package io.nosqlbench.activitytype.cql.ebdrivers.cql.core;
+package io.nosqlbench.activitytype.cql.core;
 
 import com.datastax.driver.core.*;
 import com.datastax.driver.core.policies.*;
diff --git a/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/ebdrivers/cql/core/CqlAction.java b/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/core/CqlAction.java
similarity index 94%
rename from activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/ebdrivers/cql/core/CqlAction.java
rename to activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/core/CqlAction.java
index 7879744b4..9876425bb 100644
--- a/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/ebdrivers/cql/core/CqlAction.java
+++ b/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/core/CqlAction.java
@@ -1,17 +1,17 @@
-package io.nosqlbench.activitytype.cql.ebdrivers.cql.core;
+package io.nosqlbench.activitytype.cql.core;
 
 import com.codahale.metrics.Timer;
 import com.datastax.driver.core.*;
-import io.nosqlbench.activitytype.cql.ebdrivers.cql.api.ResultSetCycleOperator;
-import io.nosqlbench.activitytype.cql.ebdrivers.cql.api.RowCycleOperator;
-import io.nosqlbench.activitytype.cql.ebdrivers.cql.api.StatementFilter;
-import io.nosqlbench.activitytype.cql.ebdrivers.cql.errorhandling.ErrorStatus;
-import io.nosqlbench.activitytype.cql.ebdrivers.cql.errorhandling.HashedCQLErrorHandler;
-import io.nosqlbench.activitytype.cql.ebdrivers.cql.errorhandling.exceptions.CQLCycleException;
-import io.nosqlbench.activitytype.cql.ebdrivers.cql.errorhandling.exceptions.ChangeUnappliedCycleException;
-import io.nosqlbench.activitytype.cql.ebdrivers.cql.errorhandling.exceptions.MaxTriesExhaustedException;
-import io.nosqlbench.activitytype.cql.ebdrivers.cql.errorhandling.exceptions.UnexpectedPagingException;
-import io.nosqlbench.activitytype.cql.ebdrivers.cql.statements.core.ReadyCQLStatement;
+import io.nosqlbench.activitytype.cql.api.ResultSetCycleOperator;
+import io.nosqlbench.activitytype.cql.api.RowCycleOperator;
+import io.nosqlbench.activitytype.cql.api.StatementFilter;
+import io.nosqlbench.activitytype.cql.errorhandling.ErrorStatus;
+import io.nosqlbench.activitytype.cql.errorhandling.HashedCQLErrorHandler;
+import io.nosqlbench.activitytype.cql.errorhandling.exceptions.CQLCycleException;
+import io.nosqlbench.activitytype.cql.errorhandling.exceptions.ChangeUnappliedCycleException;
+import io.nosqlbench.activitytype.cql.errorhandling.exceptions.MaxTriesExhaustedException;
+import io.nosqlbench.activitytype.cql.errorhandling.exceptions.UnexpectedPagingException;
+import io.nosqlbench.activitytype.cql.statements.core.ReadyCQLStatement;
 import com.google.common.util.concurrent.ListenableFuture;
 import io.nosqlbench.engine.api.activityapi.core.ActivityDefObserver;
 import io.nosqlbench.engine.api.activityapi.core.MultiPhaseAction;
diff --git a/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/ebdrivers/cql/core/CqlActionDispenser.java b/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/core/CqlActionDispenser.java
similarity index 92%
rename from activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/ebdrivers/cql/core/CqlActionDispenser.java
rename to activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/core/CqlActionDispenser.java
index 9311ba666..e2bccedc2 100644
--- a/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/ebdrivers/cql/core/CqlActionDispenser.java
+++ b/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/core/CqlActionDispenser.java
@@ -1,4 +1,4 @@
-package io.nosqlbench.activitytype.cql.ebdrivers.cql.core;
+package io.nosqlbench.activitytype.cql.core;
 
 
 import io.nosqlbench.engine.api.activityapi.core.Action;
diff --git a/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/ebdrivers/cql/core/CqlActivity.java b/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/core/CqlActivity.java
similarity index 96%
rename from activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/ebdrivers/cql/core/CqlActivity.java
rename to activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/core/CqlActivity.java
index 873a4a0e5..185367a47 100644
--- a/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/ebdrivers/cql/core/CqlActivity.java
+++ b/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/core/CqlActivity.java
@@ -1,4 +1,4 @@
-package io.nosqlbench.activitytype.cql.ebdrivers.cql.core;
+package io.nosqlbench.activitytype.cql.core;
 
 import com.codahale.metrics.Histogram;
 import com.codahale.metrics.Meter;
@@ -6,18 +6,18 @@ import com.codahale.metrics.Timer;
 import com.datastax.driver.core.*;
 import io.nosqlbench.activitytype.cql.codecsupport.UDTCodecInjector;
 import com.datastax.driver.core.TokenRangeStmtFilter;
-import io.nosqlbench.activitytype.cql.ebdrivers.cql.api.ErrorResponse;
-import io.nosqlbench.activitytype.cql.ebdrivers.cql.api.ResultSetCycleOperator;
-import io.nosqlbench.activitytype.cql.ebdrivers.cql.api.RowCycleOperator;
-import io.nosqlbench.activitytype.cql.ebdrivers.cql.api.StatementFilter;
-import io.nosqlbench.activitytype.cql.ebdrivers.cql.errorhandling.EbdseCycleErrorHandler;
-import io.nosqlbench.activitytype.cql.ebdrivers.cql.errorhandling.HashedCQLErrorHandler;
-import io.nosqlbench.activitytype.cql.ebdrivers.cql.statements.binders.CqlBinderTypes;
-import io.nosqlbench.activitytype.cql.ebdrivers.cql.statements.core.*;
-import io.nosqlbench.activitytype.cql.ebdrivers.cql.statements.rowoperators.RowCycleOperators;
-import io.nosqlbench.activitytype.cql.ebdrivers.cql.statements.rowoperators.Save;
-import io.nosqlbench.activitytype.cql.ebdrivers.cql.statements.rsoperators.ResultSetCycleOperators;
-import io.nosqlbench.activitytype.cql.ebdrivers.cql.statements.rsoperators.TraceLogger;
+import io.nosqlbench.activitytype.cql.api.ErrorResponse;
+import io.nosqlbench.activitytype.cql.api.ResultSetCycleOperator;
+import io.nosqlbench.activitytype.cql.api.RowCycleOperator;
+import io.nosqlbench.activitytype.cql.api.StatementFilter;
+import io.nosqlbench.activitytype.cql.errorhandling.EbdseCycleErrorHandler;
+import io.nosqlbench.activitytype.cql.errorhandling.HashedCQLErrorHandler;
+import io.nosqlbench.activitytype.cql.statements.binders.CqlBinderTypes;
+import io.nosqlbench.activitytype.cql.statements.core.*;
+import io.nosqlbench.activitytype.cql.statements.rowoperators.RowCycleOperators;
+import io.nosqlbench.activitytype.cql.statements.rowoperators.Save;
+import io.nosqlbench.activitytype.cql.statements.rsoperators.ResultSetCycleOperators;
+import io.nosqlbench.activitytype.cql.statements.rsoperators.TraceLogger;
 import io.nosqlbench.engine.api.activityapi.core.Activity;
 import io.nosqlbench.engine.api.activityapi.core.ActivityDefObserver;
 import io.nosqlbench.engine.api.activityapi.planning.OpSequence;
diff --git a/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/ebdrivers/cql/core/CqlActivityType.java b/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/core/CqlActivityType.java
similarity index 96%
rename from activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/ebdrivers/cql/core/CqlActivityType.java
rename to activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/core/CqlActivityType.java
index 0a2fc6af9..a6c124a40 100644
--- a/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/ebdrivers/cql/core/CqlActivityType.java
+++ b/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/core/CqlActivityType.java
@@ -1,4 +1,4 @@
-package io.nosqlbench.activitytype.cql.ebdrivers.cql.core;
+package io.nosqlbench.activitytype.cql.core;
 
 
 import io.nosqlbench.engine.api.activityapi.core.ActionDispenser;
diff --git a/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/ebdrivers/cql/core/CqlAsyncAction.java b/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/core/CqlAsyncAction.java
similarity index 91%
rename from activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/ebdrivers/cql/core/CqlAsyncAction.java
rename to activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/core/CqlAsyncAction.java
index f4a4866c4..559b6ba18 100644
--- a/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/ebdrivers/cql/core/CqlAsyncAction.java
+++ b/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/core/CqlAsyncAction.java
@@ -1,18 +1,18 @@
-package io.nosqlbench.activitytype.cql.ebdrivers.cql.core;
+package io.nosqlbench.activitytype.cql.core;
 
 import com.codahale.metrics.Timer;
 import com.datastax.driver.core.ResultSet;
 import com.datastax.driver.core.ResultSetFuture;
-import io.nosqlbench.activitytype.cql.ebdrivers.cql.api.ErrorResponse;
-import io.nosqlbench.activitytype.cql.ebdrivers.cql.api.ResultSetCycleOperator;
-import io.nosqlbench.activitytype.cql.ebdrivers.cql.api.RowCycleOperator;
-import io.nosqlbench.activitytype.cql.ebdrivers.cql.api.StatementFilter;
-import io.nosqlbench.activitytype.cql.ebdrivers.cql.errorhandling.ErrorStatus;
-import io.nosqlbench.activitytype.cql.ebdrivers.cql.errorhandling.HashedCQLErrorHandler;
-import io.nosqlbench.activitytype.cql.ebdrivers.cql.errorhandling.exceptions.CQLCycleException;
-import io.nosqlbench.activitytype.cql.ebdrivers.cql.errorhandling.exceptions.ChangeUnappliedCycleException;
-import io.nosqlbench.activitytype.cql.ebdrivers.cql.errorhandling.exceptions.UnexpectedPagingException;
-import io.nosqlbench.activitytype.cql.ebdrivers.cql.statements.core.ReadyCQLStatement;
+import io.nosqlbench.activitytype.cql.api.ErrorResponse;
+import io.nosqlbench.activitytype.cql.api.ResultSetCycleOperator;
+import io.nosqlbench.activitytype.cql.api.RowCycleOperator;
+import io.nosqlbench.activitytype.cql.api.StatementFilter;
+import io.nosqlbench.activitytype.cql.errorhandling.ErrorStatus;
+import io.nosqlbench.activitytype.cql.errorhandling.HashedCQLErrorHandler;
+import io.nosqlbench.activitytype.cql.errorhandling.exceptions.CQLCycleException;
+import io.nosqlbench.activitytype.cql.errorhandling.exceptions.ChangeUnappliedCycleException;
+import io.nosqlbench.activitytype.cql.errorhandling.exceptions.UnexpectedPagingException;
+import io.nosqlbench.activitytype.cql.statements.core.ReadyCQLStatement;
 import com.google.common.util.concurrent.Futures;
 import com.google.common.util.concurrent.ListenableFuture;
 import io.nosqlbench.engine.api.activityapi.core.BaseAsyncAction;
diff --git a/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/ebdrivers/cql/core/CqlOpData.java b/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/core/CqlOpData.java
similarity index 89%
rename from activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/ebdrivers/cql/core/CqlOpData.java
rename to activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/core/CqlOpData.java
index 758923336..7c35c6af9 100644
--- a/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/ebdrivers/cql/core/CqlOpData.java
+++ b/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/core/CqlOpData.java
@@ -1,9 +1,9 @@
-package io.nosqlbench.activitytype.cql.ebdrivers.cql.core;
+package io.nosqlbench.activitytype.cql.core;
 
 import com.datastax.driver.core.ResultSet;
 import com.datastax.driver.core.ResultSetFuture;
 import com.datastax.driver.core.Statement;
-import io.nosqlbench.activitytype.cql.ebdrivers.cql.statements.core.ReadyCQLStatement;
+import io.nosqlbench.activitytype.cql.statements.core.ReadyCQLStatement;
 import com.google.common.util.concurrent.FutureCallback;
 import io.nosqlbench.engine.api.activityapi.core.ops.fluent.opfacets.StartedOp;
 
diff --git a/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/ebdrivers/cql/core/ProxyTranslator.java b/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/core/ProxyTranslator.java
similarity index 91%
rename from activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/ebdrivers/cql/core/ProxyTranslator.java
rename to activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/core/ProxyTranslator.java
index f7c022019..9f7a83ce2 100644
--- a/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/ebdrivers/cql/core/ProxyTranslator.java
+++ b/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/core/ProxyTranslator.java
@@ -1,4 +1,4 @@
-package io.nosqlbench.activitytype.cql.ebdrivers.cql.core;
+package io.nosqlbench.activitytype.cql.core;
 
 import com.datastax.driver.core.policies.AddressTranslator;
 import com.datastax.driver.core.Cluster;
diff --git a/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/ebdrivers/cql/core/StatementModifier.java b/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/core/StatementModifier.java
similarity index 83%
rename from activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/ebdrivers/cql/core/StatementModifier.java
rename to activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/core/StatementModifier.java
index 522c49eb6..3c0d444a8 100644
--- a/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/ebdrivers/cql/core/StatementModifier.java
+++ b/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/core/StatementModifier.java
@@ -1,4 +1,4 @@
-package io.nosqlbench.activitytype.cql.ebdrivers.cql.core;
+package io.nosqlbench.activitytype.cql.core;
 
 import com.datastax.driver.core.Statement;
 
diff --git a/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/ebdrivers/cql/errorhandling/CQLExceptionEnum.java b/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/errorhandling/CQLExceptionEnum.java
similarity index 87%
rename from activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/ebdrivers/cql/errorhandling/CQLExceptionEnum.java
rename to activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/errorhandling/CQLExceptionEnum.java
index 0c2a04a9a..b687d9826 100644
--- a/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/ebdrivers/cql/errorhandling/CQLExceptionEnum.java
+++ b/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/errorhandling/CQLExceptionEnum.java
@@ -1,7 +1,7 @@
-package io.nosqlbench.activitytype.cql.ebdrivers.cql.errorhandling;
+package io.nosqlbench.activitytype.cql.errorhandling;
 
 import com.datastax.driver.core.exceptions.*;
-import io.nosqlbench.activitytype.cql.ebdrivers.cql.errorhandling.exceptions.*;
+import io.nosqlbench.activitytype.cql.errorhandling.exceptions.*;
 import io.nosqlbench.engine.api.activityapi.cyclelog.buffers.results.ResultReadable;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -58,11 +58,11 @@ public enum CQLExceptionEnum implements ResultReadable {
     BusyConnectionException(BusyConnectionException.class, 37),
 
     ChangeUnappliedCycleException(ChangeUnappliedCycleException.class, 38),
-    ResultSetVerificationException(io.nosqlbench.activitytype.cql.ebdrivers.cql.errorhandling.exceptions.ResultSetVerificationException.class, 39),
-    RowVerificationException(io.nosqlbench.activitytype.cql.ebdrivers.cql.errorhandling.exceptions.RowVerificationException.class, 40),
-    UnexpectedPagingException(io.nosqlbench.activitytype.cql.ebdrivers.cql.errorhandling.exceptions.UnexpectedPagingException.class, 41),
+    ResultSetVerificationException(io.nosqlbench.activitytype.cql.errorhandling.exceptions.ResultSetVerificationException.class, 39),
+    RowVerificationException(io.nosqlbench.activitytype.cql.errorhandling.exceptions.RowVerificationException.class, 40),
+    UnexpectedPagingException(io.nosqlbench.activitytype.cql.errorhandling.exceptions.UnexpectedPagingException.class, 41),
     EbdseCycleException(CqlCycleException.class, 42),
-    MaxTriesExhaustedException(io.nosqlbench.activitytype.cql.ebdrivers.cql.errorhandling.exceptions.MaxTriesExhaustedException.class,43);
+    MaxTriesExhaustedException(io.nosqlbench.activitytype.cql.errorhandling.exceptions.MaxTriesExhaustedException.class,43);
 
     private final static Logger logger = LoggerFactory.getLogger(CQLExceptionEnum.class);
 
diff --git a/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/ebdrivers/cql/errorhandling/EbdseCycleErrorHandler.java b/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/errorhandling/EbdseCycleErrorHandler.java
similarity index 92%
rename from activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/ebdrivers/cql/errorhandling/EbdseCycleErrorHandler.java
rename to activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/errorhandling/EbdseCycleErrorHandler.java
index f7a67d881..f94d94bf6 100644
--- a/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/ebdrivers/cql/errorhandling/EbdseCycleErrorHandler.java
+++ b/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/errorhandling/EbdseCycleErrorHandler.java
@@ -1,8 +1,8 @@
-package io.nosqlbench.activitytype.cql.ebdrivers.cql.errorhandling;
+package io.nosqlbench.activitytype.cql.errorhandling;
 
-import io.nosqlbench.activitytype.cql.ebdrivers.cql.api.ErrorResponse;
-import io.nosqlbench.activitytype.cql.ebdrivers.cql.errorhandling.exceptions.CQLCycleException;
-import io.nosqlbench.activitytype.cql.ebdrivers.cql.errorhandling.exceptions.CQLExceptionDetailer;
+import io.nosqlbench.activitytype.cql.api.ErrorResponse;
+import io.nosqlbench.activitytype.cql.errorhandling.exceptions.CQLCycleException;
+import io.nosqlbench.activitytype.cql.errorhandling.exceptions.CQLExceptionDetailer;
 import io.nosqlbench.engine.api.activityapi.errorhandling.CycleErrorHandler;
 import io.nosqlbench.engine.api.metrics.ExceptionCountMetrics;
 import io.nosqlbench.engine.api.metrics.ExceptionHistoMetrics;
diff --git a/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/ebdrivers/cql/errorhandling/ErrorStatus.java b/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/errorhandling/ErrorStatus.java
similarity index 81%
rename from activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/ebdrivers/cql/errorhandling/ErrorStatus.java
rename to activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/errorhandling/ErrorStatus.java
index c7b7ecd21..0346b2ac4 100644
--- a/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/ebdrivers/cql/errorhandling/ErrorStatus.java
+++ b/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/errorhandling/ErrorStatus.java
@@ -1,6 +1,6 @@
-package io.nosqlbench.activitytype.cql.ebdrivers.cql.errorhandling;
+package io.nosqlbench.activitytype.cql.errorhandling;
 
-import io.nosqlbench.activitytype.cql.ebdrivers.cql.api.ErrorResponse;
+import io.nosqlbench.activitytype.cql.api.ErrorResponse;
 
 public class ErrorStatus {
     private boolean retryable;
diff --git a/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/ebdrivers/cql/errorhandling/ExceptionMap.java b/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/errorhandling/ExceptionMap.java
similarity index 96%
rename from activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/ebdrivers/cql/errorhandling/ExceptionMap.java
rename to activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/errorhandling/ExceptionMap.java
index fe12ddf51..a9d41b288 100644
--- a/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/ebdrivers/cql/errorhandling/ExceptionMap.java
+++ b/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/errorhandling/ExceptionMap.java
@@ -1,7 +1,7 @@
-package io.nosqlbench.activitytype.cql.ebdrivers.cql.errorhandling;
+package io.nosqlbench.activitytype.cql.errorhandling;
 
 import com.datastax.driver.core.exceptions.*;
-import io.nosqlbench.activitytype.cql.ebdrivers.cql.errorhandling.exceptions.*;
+import io.nosqlbench.activitytype.cql.errorhandling.exceptions.*;
 
 import java.util.LinkedHashMap;
 import java.util.Map;
diff --git a/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/ebdrivers/cql/errorhandling/HashedCQLErrorHandler.java b/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/errorhandling/HashedCQLErrorHandler.java
similarity index 86%
rename from activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/ebdrivers/cql/errorhandling/HashedCQLErrorHandler.java
rename to activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/errorhandling/HashedCQLErrorHandler.java
index 0ed092569..ce324c659 100644
--- a/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/ebdrivers/cql/errorhandling/HashedCQLErrorHandler.java
+++ b/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/errorhandling/HashedCQLErrorHandler.java
@@ -1,10 +1,10 @@
-package io.nosqlbench.activitytype.cql.ebdrivers.cql.errorhandling;
+package io.nosqlbench.activitytype.cql.errorhandling;
 
 import com.datastax.driver.core.exceptions.*;
-import io.nosqlbench.activitytype.cql.ebdrivers.cql.errorhandling.exceptions.CQLCycleException;
-import io.nosqlbench.activitytype.cql.ebdrivers.cql.errorhandling.exceptions.ChangeUnappliedCycleException;
-import io.nosqlbench.activitytype.cql.ebdrivers.cql.errorhandling.exceptions.ResultSetVerificationException;
-import io.nosqlbench.activitytype.cql.ebdrivers.cql.errorhandling.exceptions.RowVerificationException;
+import io.nosqlbench.activitytype.cql.errorhandling.exceptions.CQLCycleException;
+import io.nosqlbench.activitytype.cql.errorhandling.exceptions.ChangeUnappliedCycleException;
+import io.nosqlbench.activitytype.cql.errorhandling.exceptions.ResultSetVerificationException;
+import io.nosqlbench.activitytype.cql.errorhandling.exceptions.RowVerificationException;
 import io.nosqlbench.engine.api.activityapi.errorhandling.CycleErrorHandler;
 import io.nosqlbench.engine.api.activityapi.errorhandling.HashedErrorHandler;
 import io.nosqlbench.engine.api.metrics.ExceptionCountMetrics;
diff --git a/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/ebdrivers/cql/errorhandling/exceptions/CQLCycleException.java b/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/errorhandling/exceptions/CQLCycleException.java
similarity index 84%
rename from activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/ebdrivers/cql/errorhandling/exceptions/CQLCycleException.java
rename to activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/errorhandling/exceptions/CQLCycleException.java
index 79307f37b..c3069b3b2 100644
--- a/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/ebdrivers/cql/errorhandling/exceptions/CQLCycleException.java
+++ b/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/errorhandling/exceptions/CQLCycleException.java
@@ -1,6 +1,6 @@
-package io.nosqlbench.activitytype.cql.ebdrivers.cql.errorhandling.exceptions;
+package io.nosqlbench.activitytype.cql.errorhandling.exceptions;
 
-import io.nosqlbench.activitytype.cql.ebdrivers.cql.statements.core.ReadyCQLStatement;
+import io.nosqlbench.activitytype.cql.statements.core.ReadyCQLStatement;
 
 /**
  * In internal exception type that is used to saverow exception
diff --git a/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/ebdrivers/cql/errorhandling/exceptions/CQLExceptionDetailer.java b/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/errorhandling/exceptions/CQLExceptionDetailer.java
similarity index 90%
rename from activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/ebdrivers/cql/errorhandling/exceptions/CQLExceptionDetailer.java
rename to activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/errorhandling/exceptions/CQLExceptionDetailer.java
index e3c054fa4..1d33f177d 100644
--- a/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/ebdrivers/cql/errorhandling/exceptions/CQLExceptionDetailer.java
+++ b/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/errorhandling/exceptions/CQLExceptionDetailer.java
@@ -1,4 +1,4 @@
-package io.nosqlbench.activitytype.cql.ebdrivers.cql.errorhandling.exceptions;
+package io.nosqlbench.activitytype.cql.errorhandling.exceptions;
 
 import com.datastax.driver.core.exceptions.ReadTimeoutException;
 import com.datastax.driver.core.exceptions.WriteTimeoutException;
diff --git a/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/ebdrivers/cql/errorhandling/exceptions/CQLResultSetException.java b/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/errorhandling/exceptions/CQLResultSetException.java
similarity index 95%
rename from activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/ebdrivers/cql/errorhandling/exceptions/CQLResultSetException.java
rename to activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/errorhandling/exceptions/CQLResultSetException.java
index 6c807af77..3bbc5d5df 100644
--- a/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/ebdrivers/cql/errorhandling/exceptions/CQLResultSetException.java
+++ b/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/errorhandling/exceptions/CQLResultSetException.java
@@ -1,4 +1,4 @@
-package io.nosqlbench.activitytype.cql.ebdrivers.cql.errorhandling.exceptions;
+package io.nosqlbench.activitytype.cql.errorhandling.exceptions;
 
 import com.datastax.driver.core.BoundStatement;
 import com.datastax.driver.core.ResultSet;
diff --git a/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/ebdrivers/cql/errorhandling/exceptions/ChangeUnappliedCycleException.java b/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/errorhandling/exceptions/ChangeUnappliedCycleException.java
similarity index 91%
rename from activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/ebdrivers/cql/errorhandling/exceptions/ChangeUnappliedCycleException.java
rename to activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/errorhandling/exceptions/ChangeUnappliedCycleException.java
index e2526a8b3..05249b499 100644
--- a/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/ebdrivers/cql/errorhandling/exceptions/ChangeUnappliedCycleException.java
+++ b/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/errorhandling/exceptions/ChangeUnappliedCycleException.java
@@ -1,4 +1,4 @@
-package io.nosqlbench.activitytype.cql.ebdrivers.cql.errorhandling.exceptions;
+package io.nosqlbench.activitytype.cql.errorhandling.exceptions;
 
 import com.datastax.driver.core.ResultSet;
 
diff --git a/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/ebdrivers/cql/errorhandling/exceptions/CqlCycleException.java b/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/errorhandling/exceptions/CqlCycleException.java
similarity index 90%
rename from activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/ebdrivers/cql/errorhandling/exceptions/CqlCycleException.java
rename to activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/errorhandling/exceptions/CqlCycleException.java
index cb3a8754e..4389493c4 100644
--- a/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/ebdrivers/cql/errorhandling/exceptions/CqlCycleException.java
+++ b/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/errorhandling/exceptions/CqlCycleException.java
@@ -1,4 +1,4 @@
-package io.nosqlbench.activitytype.cql.ebdrivers.cql.errorhandling.exceptions;
+package io.nosqlbench.activitytype.cql.errorhandling.exceptions;
 
 public abstract class CqlCycleException extends RuntimeException {
 
diff --git a/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/ebdrivers/cql/errorhandling/exceptions/MaxTriesExhaustedException.java b/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/errorhandling/exceptions/MaxTriesExhaustedException.java
similarity index 84%
rename from activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/ebdrivers/cql/errorhandling/exceptions/MaxTriesExhaustedException.java
rename to activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/errorhandling/exceptions/MaxTriesExhaustedException.java
index 1063e2c0b..94c01f768 100644
--- a/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/ebdrivers/cql/errorhandling/exceptions/MaxTriesExhaustedException.java
+++ b/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/errorhandling/exceptions/MaxTriesExhaustedException.java
@@ -1,4 +1,4 @@
-package io.nosqlbench.activitytype.cql.ebdrivers.cql.errorhandling.exceptions;
+package io.nosqlbench.activitytype.cql.errorhandling.exceptions;
 
 public class MaxTriesExhaustedException extends CqlCycleException {
 
diff --git a/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/ebdrivers/cql/errorhandling/exceptions/ResultSetVerificationException.java b/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/errorhandling/exceptions/ResultSetVerificationException.java
similarity index 87%
rename from activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/ebdrivers/cql/errorhandling/exceptions/ResultSetVerificationException.java
rename to activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/errorhandling/exceptions/ResultSetVerificationException.java
index f65613b7f..abf34368b 100644
--- a/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/ebdrivers/cql/errorhandling/exceptions/ResultSetVerificationException.java
+++ b/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/errorhandling/exceptions/ResultSetVerificationException.java
@@ -1,4 +1,4 @@
-package io.nosqlbench.activitytype.cql.ebdrivers.cql.errorhandling.exceptions;
+package io.nosqlbench.activitytype.cql.errorhandling.exceptions;
 
 import com.datastax.driver.core.ResultSet;
 import com.datastax.driver.core.Statement;
diff --git a/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/ebdrivers/cql/errorhandling/exceptions/RowVerificationException.java b/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/errorhandling/exceptions/RowVerificationException.java
similarity index 90%
rename from activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/ebdrivers/cql/errorhandling/exceptions/RowVerificationException.java
rename to activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/errorhandling/exceptions/RowVerificationException.java
index a24b3caba..8f950f28c 100644
--- a/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/ebdrivers/cql/errorhandling/exceptions/RowVerificationException.java
+++ b/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/errorhandling/exceptions/RowVerificationException.java
@@ -1,4 +1,4 @@
-package io.nosqlbench.activitytype.cql.ebdrivers.cql.errorhandling.exceptions;
+package io.nosqlbench.activitytype.cql.errorhandling.exceptions;
 
 import com.datastax.driver.core.Row;
 
diff --git a/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/ebdrivers/cql/errorhandling/exceptions/UnexpectedPagingException.java b/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/errorhandling/exceptions/UnexpectedPagingException.java
similarity index 96%
rename from activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/ebdrivers/cql/errorhandling/exceptions/UnexpectedPagingException.java
rename to activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/errorhandling/exceptions/UnexpectedPagingException.java
index 73156c8f0..ca881aaaa 100644
--- a/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/ebdrivers/cql/errorhandling/exceptions/UnexpectedPagingException.java
+++ b/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/errorhandling/exceptions/UnexpectedPagingException.java
@@ -1,4 +1,4 @@
-package io.nosqlbench.activitytype.cql.ebdrivers.cql.errorhandling.exceptions;
+package io.nosqlbench.activitytype.cql.errorhandling.exceptions;
 
 import com.datastax.driver.core.ResultSet;
 
diff --git a/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/ebdrivers/cql/filtering/CQLResultFilterType.java b/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/filtering/CQLResultFilterType.java
similarity index 94%
rename from activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/ebdrivers/cql/filtering/CQLResultFilterType.java
rename to activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/filtering/CQLResultFilterType.java
index c23faf86b..28ee4b315 100644
--- a/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/ebdrivers/cql/filtering/CQLResultFilterType.java
+++ b/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/filtering/CQLResultFilterType.java
@@ -1,6 +1,6 @@
-package io.nosqlbench.activitytype.cql.ebdrivers.cql.filtering;
+package io.nosqlbench.activitytype.cql.filtering;
 
-import io.nosqlbench.activitytype.cql.ebdrivers.cql.errorhandling.CQLExceptionEnum;
+import io.nosqlbench.activitytype.cql.errorhandling.CQLExceptionEnum;
 import io.nosqlbench.engine.api.activityapi.cyclelog.buffers.results.ResultReadable;
 import io.nosqlbench.engine.api.activityapi.cyclelog.filters.ResultFilterDispenser;
 import io.nosqlbench.engine.api.activityapi.cyclelog.filters.ResultValueFilterType;
diff --git a/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/ebdrivers/cql/statements/binders/CqlBinderTypes.java b/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/statements/binders/CqlBinderTypes.java
similarity index 91%
rename from activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/ebdrivers/cql/statements/binders/CqlBinderTypes.java
rename to activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/statements/binders/CqlBinderTypes.java
index 43a033c7e..df7939a4e 100644
--- a/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/ebdrivers/cql/statements/binders/CqlBinderTypes.java
+++ b/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/statements/binders/CqlBinderTypes.java
@@ -1,4 +1,4 @@
-package io.nosqlbench.activitytype.cql.ebdrivers.cql.statements.binders;
+package io.nosqlbench.activitytype.cql.statements.binders;
 
 import com.datastax.driver.core.PreparedStatement;
 import com.datastax.driver.core.Session;
diff --git a/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/ebdrivers/cql/statements/binders/DiagnosticPreparedBinder.java b/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/statements/binders/DiagnosticPreparedBinder.java
similarity index 93%
rename from activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/ebdrivers/cql/statements/binders/DiagnosticPreparedBinder.java
rename to activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/statements/binders/DiagnosticPreparedBinder.java
index 80df09c15..3510d5f87 100644
--- a/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/ebdrivers/cql/statements/binders/DiagnosticPreparedBinder.java
+++ b/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/statements/binders/DiagnosticPreparedBinder.java
@@ -1,7 +1,7 @@
-package io.nosqlbench.activitytype.cql.ebdrivers.cql.statements.binders;
+package io.nosqlbench.activitytype.cql.statements.binders;
 
 import com.datastax.driver.core.*;
-import io.nosqlbench.activitytype.cql.ebdrivers.cql.core.CQLBindHelper;
+import io.nosqlbench.activitytype.cql.core.CQLBindHelper;
 import io.nosqlbench.virtdata.api.ValuesArrayBinder;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/ebdrivers/cql/statements/binders/DirectArrayValuesBinder.java b/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/statements/binders/DirectArrayValuesBinder.java
similarity index 95%
rename from activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/ebdrivers/cql/statements/binders/DirectArrayValuesBinder.java
rename to activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/statements/binders/DirectArrayValuesBinder.java
index 1f0f547c0..c4ac9655d 100644
--- a/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/ebdrivers/cql/statements/binders/DirectArrayValuesBinder.java
+++ b/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/statements/binders/DirectArrayValuesBinder.java
@@ -1,4 +1,4 @@
-package io.nosqlbench.activitytype.cql.ebdrivers.cql.statements.binders;
+package io.nosqlbench.activitytype.cql.statements.binders;
 
 import com.datastax.driver.core.PreparedStatement;
 import com.datastax.driver.core.Statement;
diff --git a/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/ebdrivers/cql/statements/binders/SimpleStatementValuesBinder.java b/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/statements/binders/SimpleStatementValuesBinder.java
similarity index 89%
rename from activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/ebdrivers/cql/statements/binders/SimpleStatementValuesBinder.java
rename to activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/statements/binders/SimpleStatementValuesBinder.java
index f514672c6..5418cf6bf 100644
--- a/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/ebdrivers/cql/statements/binders/SimpleStatementValuesBinder.java
+++ b/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/statements/binders/SimpleStatementValuesBinder.java
@@ -1,4 +1,4 @@
-package io.nosqlbench.activitytype.cql.ebdrivers.cql.statements.binders;
+package io.nosqlbench.activitytype.cql.statements.binders;
 
 import com.datastax.driver.core.SimpleStatement;
 import com.datastax.driver.core.Statement;
diff --git a/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/ebdrivers/cql/statements/binders/UnsettableValuesBinder.java b/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/statements/binders/UnsettableValuesBinder.java
similarity index 97%
rename from activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/ebdrivers/cql/statements/binders/UnsettableValuesBinder.java
rename to activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/statements/binders/UnsettableValuesBinder.java
index d3b3e03c0..3a5d95a34 100644
--- a/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/ebdrivers/cql/statements/binders/UnsettableValuesBinder.java
+++ b/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/statements/binders/UnsettableValuesBinder.java
@@ -1,4 +1,4 @@
-package io.nosqlbench.activitytype.cql.ebdrivers.cql.statements.binders;
+package io.nosqlbench.activitytype.cql.statements.binders;
 
 import com.datastax.driver.core.*;
 import io.nosqlbench.virtdata.api.VALUE;
diff --git a/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/ebdrivers/cql/statements/core/AvailableCQLStatements.java b/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/statements/core/AvailableCQLStatements.java
similarity index 96%
rename from activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/ebdrivers/cql/statements/core/AvailableCQLStatements.java
rename to activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/statements/core/AvailableCQLStatements.java
index d7928d92b..cb1b0b801 100644
--- a/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/ebdrivers/cql/statements/core/AvailableCQLStatements.java
+++ b/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/statements/core/AvailableCQLStatements.java
@@ -1,4 +1,4 @@
-package io.nosqlbench.activitytype.cql.ebdrivers.cql.statements.core;
+package io.nosqlbench.activitytype.cql.statements.core;
 
 import io.nosqlbench.engine.api.util.TagFilter;
 
diff --git a/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/ebdrivers/cql/statements/core/CQLSessionCache.java b/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/statements/core/CQLSessionCache.java
similarity index 98%
rename from activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/ebdrivers/cql/statements/core/CQLSessionCache.java
rename to activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/statements/core/CQLSessionCache.java
index 9711b899a..b0cbfbb86 100644
--- a/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/ebdrivers/cql/statements/core/CQLSessionCache.java
+++ b/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/statements/core/CQLSessionCache.java
@@ -1,10 +1,10 @@
-package io.nosqlbench.activitytype.cql.ebdrivers.cql.statements.core;
+package io.nosqlbench.activitytype.cql.statements.core;
 
 import com.datastax.driver.core.*;
 import com.datastax.driver.core.policies.*;
 import com.datastax.driver.dse.DseCluster;
-import io.nosqlbench.activitytype.cql.ebdrivers.cql.core.CQLOptions;
-import io.nosqlbench.activitytype.cql.ebdrivers.cql.core.ProxyTranslator;
+import io.nosqlbench.activitytype.cql.core.CQLOptions;
+import io.nosqlbench.activitytype.cql.core.ProxyTranslator;
 import io.nosqlbench.engine.api.activityapi.core.Shutdownable;
 import io.nosqlbench.engine.api.activityimpl.ActivityDef;
 import io.nosqlbench.engine.api.exceptions.BasicError;
diff --git a/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/ebdrivers/cql/statements/core/CQLStatementDef.java b/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/statements/core/CQLStatementDef.java
similarity index 97%
rename from activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/ebdrivers/cql/statements/core/CQLStatementDef.java
rename to activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/statements/core/CQLStatementDef.java
index f07490971..043cea6c6 100644
--- a/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/ebdrivers/cql/statements/core/CQLStatementDef.java
+++ b/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/statements/core/CQLStatementDef.java
@@ -1,4 +1,4 @@
-package io.nosqlbench.activitytype.cql.ebdrivers.cql.statements.core;
+package io.nosqlbench.activitytype.cql.statements.core;
 
 import com.datastax.driver.core.ConsistencyLevel;
 import org.slf4j.Logger;
diff --git a/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/ebdrivers/cql/statements/core/CQLStatementDefParser.java b/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/statements/core/CQLStatementDefParser.java
similarity index 98%
rename from activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/ebdrivers/cql/statements/core/CQLStatementDefParser.java
rename to activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/statements/core/CQLStatementDefParser.java
index 44b425608..c82b124b0 100644
--- a/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/ebdrivers/cql/statements/core/CQLStatementDefParser.java
+++ b/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/statements/core/CQLStatementDefParser.java
@@ -1,4 +1,4 @@
-package io.nosqlbench.activitytype.cql.ebdrivers.cql.statements.core;
+package io.nosqlbench.activitytype.cql.statements.core;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/ebdrivers/cql/statements/core/CQLStatementGroups.java b/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/statements/core/CQLStatementGroups.java
similarity index 94%
rename from activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/ebdrivers/cql/statements/core/CQLStatementGroups.java
rename to activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/statements/core/CQLStatementGroups.java
index 724cdd54e..cd20c9124 100644
--- a/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/ebdrivers/cql/statements/core/CQLStatementGroups.java
+++ b/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/statements/core/CQLStatementGroups.java
@@ -1,4 +1,4 @@
-package io.nosqlbench.activitytype.cql.ebdrivers.cql.statements.core;
+package io.nosqlbench.activitytype.cql.statements.core;
 
 import java.util.*;
 
diff --git a/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/ebdrivers/cql/statements/core/ReadyCQLStatement.java b/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/statements/core/ReadyCQLStatement.java
similarity index 96%
rename from activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/ebdrivers/cql/statements/core/ReadyCQLStatement.java
rename to activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/statements/core/ReadyCQLStatement.java
index 0beacca39..74dc0c094 100644
--- a/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/ebdrivers/cql/statements/core/ReadyCQLStatement.java
+++ b/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/statements/core/ReadyCQLStatement.java
@@ -1,12 +1,12 @@
-package io.nosqlbench.activitytype.cql.ebdrivers.cql.statements.core;
+package io.nosqlbench.activitytype.cql.statements.core;
 
 import com.codahale.metrics.Histogram;
 import com.codahale.metrics.Timer;
 import com.datastax.driver.core.PreparedStatement;
 import com.datastax.driver.core.SimpleStatement;
 import com.datastax.driver.core.Statement;
-import io.nosqlbench.activitytype.cql.ebdrivers.cql.api.ResultSetCycleOperator;
-import io.nosqlbench.activitytype.cql.ebdrivers.cql.api.RowCycleOperator;
+import io.nosqlbench.activitytype.cql.api.ResultSetCycleOperator;
+import io.nosqlbench.activitytype.cql.api.RowCycleOperator;
 import io.nosqlbench.virtdata.api.ContextualArrayBindings;
 
 import java.io.IOException;
diff --git a/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/ebdrivers/cql/statements/core/ReadyCQLStatementTemplate.java b/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/statements/core/ReadyCQLStatementTemplate.java
similarity index 89%
rename from activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/ebdrivers/cql/statements/core/ReadyCQLStatementTemplate.java
rename to activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/statements/core/ReadyCQLStatementTemplate.java
index b1ce136fa..9f761bb01 100644
--- a/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/ebdrivers/cql/statements/core/ReadyCQLStatementTemplate.java
+++ b/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/statements/core/ReadyCQLStatementTemplate.java
@@ -1,4 +1,4 @@
-package io.nosqlbench.activitytype.cql.ebdrivers.cql.statements.core;
+package io.nosqlbench.activitytype.cql.statements.core;
 
 import com.codahale.metrics.Histogram;
 import com.codahale.metrics.Timer;
@@ -6,11 +6,11 @@ import com.datastax.driver.core.PreparedStatement;
 import com.datastax.driver.core.Session;
 import com.datastax.driver.core.SimpleStatement;
 import com.datastax.driver.core.Statement;
-import io.nosqlbench.activitytype.cql.ebdrivers.cql.api.ResultSetCycleOperator;
-import io.nosqlbench.activitytype.cql.ebdrivers.cql.api.RowCycleOperator;
-import io.nosqlbench.activitytype.cql.ebdrivers.cql.core.CqlActivity;
-import io.nosqlbench.activitytype.cql.ebdrivers.cql.statements.binders.CqlBinderTypes;
-import io.nosqlbench.activitytype.cql.ebdrivers.cql.statements.binders.SimpleStatementValuesBinder;
+import io.nosqlbench.activitytype.cql.api.ResultSetCycleOperator;
+import io.nosqlbench.activitytype.cql.api.RowCycleOperator;
+import io.nosqlbench.activitytype.cql.core.CqlActivity;
+import io.nosqlbench.activitytype.cql.statements.binders.CqlBinderTypes;
+import io.nosqlbench.activitytype.cql.statements.binders.SimpleStatementValuesBinder;
 import io.nosqlbench.engine.api.metrics.ActivityMetrics;
 import io.nosqlbench.virtdata.api.BindingsTemplate;
 import io.nosqlbench.virtdata.api.ContextualBindingsArrayTemplate;
diff --git a/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/ebdrivers/cql/statements/core/ReadyCQLStatementsTemplate.java b/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/statements/core/ReadyCQLStatementsTemplate.java
similarity index 89%
rename from activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/ebdrivers/cql/statements/core/ReadyCQLStatementsTemplate.java
rename to activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/statements/core/ReadyCQLStatementsTemplate.java
index 86333a024..a7fcf4545 100644
--- a/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/ebdrivers/cql/statements/core/ReadyCQLStatementsTemplate.java
+++ b/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/statements/core/ReadyCQLStatementsTemplate.java
@@ -1,4 +1,4 @@
-package io.nosqlbench.activitytype.cql.ebdrivers.cql.statements.core;
+package io.nosqlbench.activitytype.cql.statements.core;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/ebdrivers/cql/statements/core/TaggedCQLStatementDefs.java b/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/statements/core/TaggedCQLStatementDefs.java
similarity index 95%
rename from activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/ebdrivers/cql/statements/core/TaggedCQLStatementDefs.java
rename to activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/statements/core/TaggedCQLStatementDefs.java
index 226ca6b11..0fb02ccf2 100644
--- a/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/ebdrivers/cql/statements/core/TaggedCQLStatementDefs.java
+++ b/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/statements/core/TaggedCQLStatementDefs.java
@@ -1,4 +1,4 @@
-package io.nosqlbench.activitytype.cql.ebdrivers.cql.statements.core;
+package io.nosqlbench.activitytype.cql.statements.core;
 
 import io.nosqlbench.engine.api.util.Tagged;
 
diff --git a/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/ebdrivers/cql/statements/core/YamlCQLStatementLoader.java b/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/statements/core/YamlCQLStatementLoader.java
similarity index 97%
rename from activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/ebdrivers/cql/statements/core/YamlCQLStatementLoader.java
rename to activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/statements/core/YamlCQLStatementLoader.java
index cc8868bd7..8f21f908b 100644
--- a/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/ebdrivers/cql/statements/core/YamlCQLStatementLoader.java
+++ b/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/statements/core/YamlCQLStatementLoader.java
@@ -1,4 +1,4 @@
-package io.nosqlbench.activitytype.cql.ebdrivers.cql.statements.core;
+package io.nosqlbench.activitytype.cql.statements.core;
 
 import io.nosqlbench.engine.api.activityimpl.ActivityInitializationError;
 import io.nosqlbench.engine.api.util.NosqlBenchFiles;
diff --git a/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/ebdrivers/cql/statements/rowoperators/Print.java b/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/statements/rowoperators/Print.java
similarity index 64%
rename from activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/ebdrivers/cql/statements/rowoperators/Print.java
rename to activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/statements/rowoperators/Print.java
index c944fb7ee..4e7dbc4fb 100644
--- a/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/ebdrivers/cql/statements/rowoperators/Print.java
+++ b/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/statements/rowoperators/Print.java
@@ -1,7 +1,7 @@
-package io.nosqlbench.activitytype.cql.ebdrivers.cql.statements.rowoperators;
+package io.nosqlbench.activitytype.cql.statements.rowoperators;
 
 import com.datastax.driver.core.Row;
-import io.nosqlbench.activitytype.cql.ebdrivers.cql.api.RowCycleOperator;
+import io.nosqlbench.activitytype.cql.api.RowCycleOperator;
 
 /**
  * Save specific variables to the thread local object map
diff --git a/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/ebdrivers/cql/statements/rowoperators/RowCycleOperators.java b/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/statements/rowoperators/RowCycleOperators.java
similarity index 84%
rename from activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/ebdrivers/cql/statements/rowoperators/RowCycleOperators.java
rename to activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/statements/rowoperators/RowCycleOperators.java
index 875a95fbf..37264a2fe 100644
--- a/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/ebdrivers/cql/statements/rowoperators/RowCycleOperators.java
+++ b/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/statements/rowoperators/RowCycleOperators.java
@@ -1,6 +1,6 @@
-package io.nosqlbench.activitytype.cql.ebdrivers.cql.statements.rowoperators;
+package io.nosqlbench.activitytype.cql.statements.rowoperators;
 
-import io.nosqlbench.activitytype.cql.ebdrivers.cql.api.RowCycleOperator;
+import io.nosqlbench.activitytype.cql.api.RowCycleOperator;
 
 public enum RowCycleOperators {
 
diff --git a/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/ebdrivers/cql/statements/rowoperators/Save.java b/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/statements/rowoperators/Save.java
similarity index 90%
rename from activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/ebdrivers/cql/statements/rowoperators/Save.java
rename to activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/statements/rowoperators/Save.java
index 47d47380f..bf44b3e1c 100644
--- a/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/ebdrivers/cql/statements/rowoperators/Save.java
+++ b/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/statements/rowoperators/Save.java
@@ -1,8 +1,8 @@
-package io.nosqlbench.activitytype.cql.ebdrivers.cql.statements.rowoperators;
+package io.nosqlbench.activitytype.cql.statements.rowoperators;
 
 import com.datastax.driver.core.ColumnDefinitions;
 import com.datastax.driver.core.Row;
-import io.nosqlbench.activitytype.cql.ebdrivers.cql.api.RowCycleOperator;
+import io.nosqlbench.activitytype.cql.api.RowCycleOperator;
 import io.nosqlbench.virtdata.library.basics.core.threadstate.SharedState;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/ebdrivers/cql/statements/rowoperators/SaveGlobalVars.java b/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/statements/rowoperators/SaveGlobalVars.java
similarity index 84%
rename from activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/ebdrivers/cql/statements/rowoperators/SaveGlobalVars.java
rename to activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/statements/rowoperators/SaveGlobalVars.java
index d8a67aa44..ac6089203 100644
--- a/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/ebdrivers/cql/statements/rowoperators/SaveGlobalVars.java
+++ b/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/statements/rowoperators/SaveGlobalVars.java
@@ -1,8 +1,8 @@
-package io.nosqlbench.activitytype.cql.ebdrivers.cql.statements.rowoperators;
+package io.nosqlbench.activitytype.cql.statements.rowoperators;
 
 import com.datastax.driver.core.ColumnDefinitions;
 import com.datastax.driver.core.Row;
-import io.nosqlbench.activitytype.cql.ebdrivers.cql.api.RowCycleOperator;
+import io.nosqlbench.activitytype.cql.api.RowCycleOperator;
 import io.nosqlbench.virtdata.library.basics.core.threadstate.SharedState;
 
 import java.util.List;
diff --git a/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/ebdrivers/cql/statements/rowoperators/SaveThreadRows.java b/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/statements/rowoperators/SaveThreadRows.java
similarity index 54%
rename from activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/ebdrivers/cql/statements/rowoperators/SaveThreadRows.java
rename to activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/statements/rowoperators/SaveThreadRows.java
index b719da4d6..97959a0f7 100644
--- a/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/ebdrivers/cql/statements/rowoperators/SaveThreadRows.java
+++ b/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/statements/rowoperators/SaveThreadRows.java
@@ -1,8 +1,8 @@
-package io.nosqlbench.activitytype.cql.ebdrivers.cql.statements.rowoperators;
+package io.nosqlbench.activitytype.cql.statements.rowoperators;
 
 import com.datastax.driver.core.Row;
-import io.nosqlbench.activitytype.cql.ebdrivers.cql.api.RowCycleOperator;
-import io.nosqlbench.activitytype.cql.ebdrivers.cql.statements.rsoperators.PerThreadCQLData;
+import io.nosqlbench.activitytype.cql.api.RowCycleOperator;
+import io.nosqlbench.activitytype.cql.statements.rsoperators.PerThreadCQLData;
 
 import java.util.LinkedList;
 
diff --git a/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/ebdrivers/cql/statements/rowoperators/SaveThreadVars.java b/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/statements/rowoperators/SaveThreadVars.java
similarity index 84%
rename from activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/ebdrivers/cql/statements/rowoperators/SaveThreadVars.java
rename to activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/statements/rowoperators/SaveThreadVars.java
index 1757901bd..314798b27 100644
--- a/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/ebdrivers/cql/statements/rowoperators/SaveThreadVars.java
+++ b/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/statements/rowoperators/SaveThreadVars.java
@@ -1,8 +1,8 @@
-package io.nosqlbench.activitytype.cql.ebdrivers.cql.statements.rowoperators;
+package io.nosqlbench.activitytype.cql.statements.rowoperators;
 
 import com.datastax.driver.core.ColumnDefinitions;
 import com.datastax.driver.core.Row;
-import io.nosqlbench.activitytype.cql.ebdrivers.cql.api.RowCycleOperator;
+import io.nosqlbench.activitytype.cql.api.RowCycleOperator;
 import io.nosqlbench.virtdata.library.basics.core.threadstate.SharedState;
 
 import java.util.HashMap;
diff --git a/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/ebdrivers/cql/statements/rsoperators/AssertSingleRowResultSet.java b/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/statements/rsoperators/AssertSingleRowResultSet.java
similarity index 72%
rename from activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/ebdrivers/cql/statements/rsoperators/AssertSingleRowResultSet.java
rename to activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/statements/rsoperators/AssertSingleRowResultSet.java
index 42105f647..5126d699b 100644
--- a/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/ebdrivers/cql/statements/rsoperators/AssertSingleRowResultSet.java
+++ b/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/statements/rsoperators/AssertSingleRowResultSet.java
@@ -1,9 +1,9 @@
-package io.nosqlbench.activitytype.cql.ebdrivers.cql.statements.rsoperators;
+package io.nosqlbench.activitytype.cql.statements.rsoperators;
 
 import com.datastax.driver.core.ResultSet;
 import com.datastax.driver.core.Statement;
-import io.nosqlbench.activitytype.cql.ebdrivers.cql.api.ResultSetCycleOperator;
-import io.nosqlbench.activitytype.cql.ebdrivers.cql.errorhandling.exceptions.ResultSetVerificationException;
+import io.nosqlbench.activitytype.cql.api.ResultSetCycleOperator;
+import io.nosqlbench.activitytype.cql.errorhandling.exceptions.ResultSetVerificationException;
 
 public class AssertSingleRowResultSet implements ResultSetCycleOperator {
 
diff --git a/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/ebdrivers/cql/statements/rsoperators/ClearVars.java b/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/statements/rsoperators/ClearVars.java
similarity index 71%
rename from activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/ebdrivers/cql/statements/rsoperators/ClearVars.java
rename to activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/statements/rsoperators/ClearVars.java
index 8979b7a61..8d6543c9a 100644
--- a/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/ebdrivers/cql/statements/rsoperators/ClearVars.java
+++ b/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/statements/rsoperators/ClearVars.java
@@ -1,8 +1,8 @@
-package io.nosqlbench.activitytype.cql.ebdrivers.cql.statements.rsoperators;
+package io.nosqlbench.activitytype.cql.statements.rsoperators;
 
 import com.datastax.driver.core.ResultSet;
 import com.datastax.driver.core.Statement;
-import io.nosqlbench.activitytype.cql.ebdrivers.cql.api.ResultSetCycleOperator;
+import io.nosqlbench.activitytype.cql.api.ResultSetCycleOperator;
 import io.nosqlbench.virtdata.library.basics.core.threadstate.SharedState;
 
 public class ClearVars implements ResultSetCycleOperator {
diff --git a/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/ebdrivers/cql/statements/rsoperators/CqlResultSetLogger.java b/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/statements/rsoperators/CqlResultSetLogger.java
similarity index 89%
rename from activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/ebdrivers/cql/statements/rsoperators/CqlResultSetLogger.java
rename to activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/statements/rsoperators/CqlResultSetLogger.java
index 7569f7f64..d2f3a9daf 100644
--- a/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/ebdrivers/cql/statements/rsoperators/CqlResultSetLogger.java
+++ b/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/statements/rsoperators/CqlResultSetLogger.java
@@ -1,7 +1,7 @@
-package io.nosqlbench.activitytype.cql.ebdrivers.cql.statements.rsoperators;
+package io.nosqlbench.activitytype.cql.statements.rsoperators;
 
 import com.datastax.driver.core.*;
-import io.nosqlbench.activitytype.cql.ebdrivers.cql.api.ResultSetCycleOperator;
+import io.nosqlbench.activitytype.cql.api.ResultSetCycleOperator;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/ebdrivers/cql/statements/rsoperators/PerThreadCQLData.java b/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/statements/rsoperators/PerThreadCQLData.java
similarity index 72%
rename from activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/ebdrivers/cql/statements/rsoperators/PerThreadCQLData.java
rename to activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/statements/rsoperators/PerThreadCQLData.java
index f101b5f32..c9280405c 100644
--- a/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/ebdrivers/cql/statements/rsoperators/PerThreadCQLData.java
+++ b/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/statements/rsoperators/PerThreadCQLData.java
@@ -1,4 +1,4 @@
-package io.nosqlbench.activitytype.cql.ebdrivers.cql.statements.rsoperators;
+package io.nosqlbench.activitytype.cql.statements.rsoperators;
 
 import com.datastax.driver.core.Row;
 
diff --git a/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/ebdrivers/cql/statements/rsoperators/PopVars.java b/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/statements/rsoperators/PopVars.java
similarity index 82%
rename from activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/ebdrivers/cql/statements/rsoperators/PopVars.java
rename to activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/statements/rsoperators/PopVars.java
index 2c18de296..30481c741 100644
--- a/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/ebdrivers/cql/statements/rsoperators/PopVars.java
+++ b/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/statements/rsoperators/PopVars.java
@@ -1,8 +1,8 @@
-package io.nosqlbench.activitytype.cql.ebdrivers.cql.statements.rsoperators;
+package io.nosqlbench.activitytype.cql.statements.rsoperators;
 
 import com.datastax.driver.core.ResultSet;
 import com.datastax.driver.core.Statement;
-import io.nosqlbench.activitytype.cql.ebdrivers.cql.api.ResultSetCycleOperator;
+import io.nosqlbench.activitytype.cql.api.ResultSetCycleOperator;
 import io.nosqlbench.virtdata.library.basics.core.threadstate.SharedState;
 
 import java.util.HashMap;
diff --git a/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/ebdrivers/cql/statements/rsoperators/Print.java b/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/statements/rsoperators/Print.java
similarity index 66%
rename from activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/ebdrivers/cql/statements/rsoperators/Print.java
rename to activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/statements/rsoperators/Print.java
index 5255ddaba..eb9c6af23 100644
--- a/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/ebdrivers/cql/statements/rsoperators/Print.java
+++ b/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/statements/rsoperators/Print.java
@@ -1,8 +1,8 @@
-package io.nosqlbench.activitytype.cql.ebdrivers.cql.statements.rsoperators;
+package io.nosqlbench.activitytype.cql.statements.rsoperators;
 
 import com.datastax.driver.core.ResultSet;
 import com.datastax.driver.core.Statement;
-import io.nosqlbench.activitytype.cql.ebdrivers.cql.api.ResultSetCycleOperator;
+import io.nosqlbench.activitytype.cql.api.ResultSetCycleOperator;
 
 public class Print implements ResultSetCycleOperator {
 
diff --git a/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/ebdrivers/cql/statements/rsoperators/PushVars.java b/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/statements/rsoperators/PushVars.java
similarity index 78%
rename from activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/ebdrivers/cql/statements/rsoperators/PushVars.java
rename to activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/statements/rsoperators/PushVars.java
index 3d2d50716..be24298e7 100644
--- a/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/ebdrivers/cql/statements/rsoperators/PushVars.java
+++ b/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/statements/rsoperators/PushVars.java
@@ -1,8 +1,8 @@
-package io.nosqlbench.activitytype.cql.ebdrivers.cql.statements.rsoperators;
+package io.nosqlbench.activitytype.cql.statements.rsoperators;
 
 import com.datastax.driver.core.ResultSet;
 import com.datastax.driver.core.Statement;
-import io.nosqlbench.activitytype.cql.ebdrivers.cql.api.ResultSetCycleOperator;
+import io.nosqlbench.activitytype.cql.api.ResultSetCycleOperator;
 import io.nosqlbench.virtdata.library.basics.core.threadstate.SharedState;
 
 import java.util.HashMap;
diff --git a/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/ebdrivers/cql/statements/rsoperators/ResultSetCycleOperators.java b/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/statements/rsoperators/ResultSetCycleOperators.java
similarity index 85%
rename from activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/ebdrivers/cql/statements/rsoperators/ResultSetCycleOperators.java
rename to activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/statements/rsoperators/ResultSetCycleOperators.java
index c2b2045ce..0b5a966b8 100644
--- a/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/ebdrivers/cql/statements/rsoperators/ResultSetCycleOperators.java
+++ b/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/statements/rsoperators/ResultSetCycleOperators.java
@@ -1,6 +1,6 @@
-package io.nosqlbench.activitytype.cql.ebdrivers.cql.statements.rsoperators;
+package io.nosqlbench.activitytype.cql.statements.rsoperators;
 
-import io.nosqlbench.activitytype.cql.ebdrivers.cql.api.ResultSetCycleOperator;
+import io.nosqlbench.activitytype.cql.api.ResultSetCycleOperator;
 
 public enum ResultSetCycleOperators {
 
diff --git a/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/ebdrivers/cql/statements/rsoperators/RowCapture.java b/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/statements/rsoperators/RowCapture.java
similarity index 71%
rename from activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/ebdrivers/cql/statements/rsoperators/RowCapture.java
rename to activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/statements/rsoperators/RowCapture.java
index 875581935..2cd4654ad 100644
--- a/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/ebdrivers/cql/statements/rsoperators/RowCapture.java
+++ b/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/statements/rsoperators/RowCapture.java
@@ -1,9 +1,9 @@
-package io.nosqlbench.activitytype.cql.ebdrivers.cql.statements.rsoperators;
+package io.nosqlbench.activitytype.cql.statements.rsoperators;
 
 import com.datastax.driver.core.ResultSet;
 import com.datastax.driver.core.Row;
 import com.datastax.driver.core.Statement;
-import io.nosqlbench.activitytype.cql.ebdrivers.cql.api.ResultSetCycleOperator;
+import io.nosqlbench.activitytype.cql.api.ResultSetCycleOperator;
 
 import java.util.LinkedList;
 
diff --git a/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/ebdrivers/cql/statements/rsoperators/TraceLogger.java b/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/statements/rsoperators/TraceLogger.java
similarity index 94%
rename from activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/ebdrivers/cql/statements/rsoperators/TraceLogger.java
rename to activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/statements/rsoperators/TraceLogger.java
index 54906ab69..59cd91879 100644
--- a/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/ebdrivers/cql/statements/rsoperators/TraceLogger.java
+++ b/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/statements/rsoperators/TraceLogger.java
@@ -1,11 +1,11 @@
-package io.nosqlbench.activitytype.cql.ebdrivers.cql.statements.rsoperators;
+package io.nosqlbench.activitytype.cql.statements.rsoperators;
 
 import com.datastax.driver.core.ExecutionInfo;
 import com.datastax.driver.core.QueryTrace;
 import com.datastax.driver.core.ResultSet;
 import com.datastax.driver.core.Statement;
-import io.nosqlbench.activitytype.cql.ebdrivers.cql.api.ResultSetCycleOperator;
-import io.nosqlbench.activitytype.cql.ebdrivers.cql.core.StatementModifier;
+import io.nosqlbench.activitytype.cql.api.ResultSetCycleOperator;
+import io.nosqlbench.activitytype.cql.core.StatementModifier;
 import io.nosqlbench.engine.api.util.SimpleConfig;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/activitytype-cql/src/test/java/com/datastax/ebdrivers/cql/CqlActionTest.java b/activitytype-cql/src/test/java/com/datastax/ebdrivers/cql/CqlActionTest.java
index ddd930301..79c4a46ce 100644
--- a/activitytype-cql/src/test/java/com/datastax/ebdrivers/cql/CqlActionTest.java
+++ b/activitytype-cql/src/test/java/com/datastax/ebdrivers/cql/CqlActionTest.java
@@ -1,7 +1,7 @@
 package com.datastax.ebdrivers.cql;
 
-import io.nosqlbench.activitytype.cql.ebdrivers.cql.core.CqlAction;
-import io.nosqlbench.activitytype.cql.ebdrivers.cql.core.CqlActivity;
+import io.nosqlbench.activitytype.cql.core.CqlAction;
+import io.nosqlbench.activitytype.cql.core.CqlActivity;
 import io.nosqlbench.engine.api.activityimpl.ActivityDef;
 import org.testng.annotations.Test;
 
diff --git a/activitytype-cql/src/test/java/com/datastax/ebdrivers/cql/statements/CQLCQLStatementDefParserTest.java b/activitytype-cql/src/test/java/com/datastax/ebdrivers/cql/statements/CQLCQLStatementDefParserTest.java
index 05fd32311..7c93f6f76 100644
--- a/activitytype-cql/src/test/java/com/datastax/ebdrivers/cql/statements/CQLCQLStatementDefParserTest.java
+++ b/activitytype-cql/src/test/java/com/datastax/ebdrivers/cql/statements/CQLCQLStatementDefParserTest.java
@@ -1,6 +1,6 @@
 package com.datastax.ebdrivers.cql.statements;
 
-import io.nosqlbench.activitytype.cql.ebdrivers.cql.statements.core.CQLStatementDefParser;
+import io.nosqlbench.activitytype.cql.statements.core.CQLStatementDefParser;
 import org.testng.annotations.Test;
 
 import java.util.HashMap;
diff --git a/activitytype-cql/src/test/java/com/datastax/ebdrivers/cql/statements/CQLOptionsTest.java b/activitytype-cql/src/test/java/com/datastax/ebdrivers/cql/statements/CQLOptionsTest.java
index 87a5a5857..6824933b5 100644
--- a/activitytype-cql/src/test/java/com/datastax/ebdrivers/cql/statements/CQLOptionsTest.java
+++ b/activitytype-cql/src/test/java/com/datastax/ebdrivers/cql/statements/CQLOptionsTest.java
@@ -5,7 +5,7 @@ import com.datastax.driver.core.PoolingOptions;
 import com.datastax.driver.core.SocketOptions;
 import com.datastax.driver.core.policies.LoadBalancingPolicy;
 import com.datastax.driver.core.policies.SpeculativeExecutionPolicy;
-import io.nosqlbench.activitytype.cql.ebdrivers.cql.core.CQLOptions;
+import io.nosqlbench.activitytype.cql.core.CQLOptions;
 import org.testng.annotations.Test;
 
 import static org.assertj.core.api.Assertions.assertThat;